diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index 089f5d4e39..c9200be5e1 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -1318,6 +1318,7 @@ public class UnitTypes{ healPercent = 5.5f; collidesTeam = true; + reflectable = false; backColor = Pal.heal; trailColor = Pal.heal; }}; diff --git a/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java b/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java index 4d67083cec..30dd5011fb 100644 --- a/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java +++ b/core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java @@ -49,6 +49,7 @@ public class ContinuousFlameBulletType extends ContinuousBulletType{ lifetime = 16f; hitColor = colors[1].cpy().a(1f); lightColor = hitColor; + lightOpacity = 0.7f; laserAbsorb = false; ammoMultiplier = 1f; pierceArmor = true; @@ -87,7 +88,7 @@ public class ContinuousFlameBulletType extends ContinuousBulletType{ } Tmp.v1.trns(b.rotation(), realLength * 1.1f); - Drawf.light(b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, lightStroke, lightColor, 0.7f); + Drawf.light(b.x, b.y, b.x + Tmp.v1.x, b.y + Tmp.v1.y, lightStroke, lightColor, lightOpacity); Draw.reset(); } diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 093f9fd98f..40da31c7d1 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -1102,8 +1102,8 @@ public class ContentParser{ } //all items have a produce requirement unless already specified - if(object instanceof Item i && !node.objectives.contains(o -> o instanceof Produce p && p.content == i)){ - node.objectives.add(new Produce(i)); + if((unlock instanceof Item || unlock instanceof Liquid) && !node.objectives.contains(o -> o instanceof Produce p && p.content == unlock)){ + node.objectives.add(new Produce(unlock)); } //remove old node from parent diff --git a/servers_v7.json b/servers_v7.json index d95da17b9b..7ef103cac1 100644 --- a/servers_v7.json +++ b/servers_v7.json @@ -1,4 +1,8 @@ [ + { + "name": "TSR Network", + "address": ["de-prem-01.hosts.optikservers.com:35526"] + }, { "name": "Toast Mindustry", "address": ["192.3.139.5:6567", "192.3.139.5:6568", "192.3.139.5:6569", "104.168.64.154:6567", "104.168.64.154:6568", "104.168.64.154:6569"] @@ -28,13 +32,9 @@ "name": "Crux's Revelations", "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"] }, - { - "name": "Chilldustry", - "address": ["trelesco.xyz"] - }, { "name": "CMS Empire", - "address": ["94.250.250.252","95.84.198.97"] + "address": ["trelesco.xyz"] }, { "name": "ShardDustry Eventos", @@ -293,12 +293,12 @@ "name": "MineCore", "address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"] }, - { - "name": "Sever.VN", - "address": ["192.168.1.2:6567"] - }, { "name": "NPTS", "address": ["81.94.159.242"] + }, + { + "name": "Skywar.VN", + "address": ["nur-de-01.blued.host:25736"] } ]