Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2024-03-28 10:01:26 -04:00
parent 138bbdb1c9 e595627895
commit 1c4dd8011c
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/UnitTypes.java
+1
View File
@@ -1318,6 +1318,7 @@ public class UnitTypes{
healPercent = 5.5f; healPercent = 5.5f;
collidesTeam = true; collidesTeam = true;
reflectable = false;
backColor = Pal.heal; backColor = Pal.heal;
trailColor = Pal.heal; trailColor = Pal.heal;
}}; }};
core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java
+2 -1
View File
@@ -49,6 +49,7 @@ public class ContinuousFlameBulletType extends ContinuousBulletType{
lifetime = 16f; lifetime = 16f;
hitColor = colors[1].cpy().a(1f); hitColor = colors[1].cpy().a(1f);
lightColor = hitColor; lightColor = hitColor;
lightOpacity = 0.7f;
laserAbsorb = false; laserAbsorb = false;
ammoMultiplier = 1f; ammoMultiplier = 1f;
pierceArmor = true; pierceArmor = true;
@@ -87,7 +88,7 @@ public class ContinuousFlameBulletType extends ContinuousBulletType{
} }
Tmp.v1.trns(b.rotation(), realLength * 1.1f); 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(); Draw.reset();
} }
core/src/mindustry/mod/ContentParser.java
+2 -2
View File
@@ -1102,8 +1102,8 @@ public class ContentParser{
} }
//all items have a produce requirement unless already specified //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)){ if((unlock instanceof Item || unlock instanceof Liquid) && !node.objectives.contains(o -> o instanceof Produce p && p.content == unlock)){
node.objectives.add(new Produce(i)); node.objectives.add(new Produce(unlock));
} }
//remove old node from parent //remove old node from parent
servers_v7.json
+9 -9
View File
@@ -1,4 +1,8 @@
[ [
{
"name": "TSR Network",
"address": ["de-prem-01.hosts.optikservers.com:35526"]
},
{ {
"name": "Toast Mindustry", "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"] "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", "name": "Crux's Revelations",
"address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"] "address": ["de-free-01.hosts.optikservers.com:31528","de-prem-01.hosts.optikservers.com:35922"]
}, },
{
"name": "Chilldustry",
"address": ["trelesco.xyz"]
},
{ {
"name": "CMS Empire", "name": "CMS Empire",
"address": ["94.250.250.252","95.84.198.97"] "address": ["trelesco.xyz"]
}, },
{ {
"name": "ShardDustry Eventos", "name": "ShardDustry Eventos",
@@ -293,12 +293,12 @@
"name": "MineCore", "name": "MineCore",
"address": ["194.247.42.11:27792", "194.247.42.11:27977", "194.247.42.61:27989", "194.247.42.181:28514"] "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", "name": "NPTS",
"address": ["81.94.159.242"] "address": ["81.94.159.242"]
},
{
"name": "Skywar.VN",
"address": ["nur-de-01.blued.host:25736"]
} }
] ]