mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-06 08:57:45 +07:00
Code Issues 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
commit 1c4dd8011c
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/content/UnitTypes.java
View File

@ -1318,6 +1318,7 @@ public class UnitTypes{
healPercent = 5.5f;
collidesTeam = true;
reflectable = false;
backColor = Pal.heal;
trailColor = Pal.heal;
}};

3
core/src/mindustry/entities/bullet/ContinuousFlameBulletType.java
View File

@ -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();
}

4
core/src/mindustry/mod/ContentParser.java
View File

@ -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

18
servers_v7.json
View File

@ -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"]
}
]