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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
This commit is contained in:
Anuken
2021-08-18 15:04:30 -04:00
parent 2200a44653 512b65a592
commit f3cacb9e99
86 changed files with 942 additions and 740 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/mindustry/content/Fx.java
View File

@@ -393,12 +393,6 @@ public class Fx{
Lines.circle(e.x, e.y, 2f + e.finpow() * 7f);
}),
healDenamic = new Effect(11, e -> {
color(Pal.heal);
stroke(e.fout() * 2f);
Lines.circle(e.x, e.y, 2f + e.finpow() * e.rotation);
}),
shieldWave = new Effect(22, e -> {
color(e.color, 0.7f);
stroke(e.fout() * 2f);
@@ -1000,7 +994,9 @@ public class Fx{
float length = 20f * e.finpow();
float size = 7f * e.fout();
rect(((Item)e.data).fullIcon, e.x + trnsx(e.rotation, length), e.y + trnsy(e.rotation, length), size, size);
if(!(e.data instanceof Item item)) return;
rect(item.fullIcon, e.x + trnsx(e.rotation, length), e.y + trnsy(e.rotation, length), size, size);
}),
shockwave = new Effect(10f, 80f, e -> {

3
core/src/mindustry/content/StatusEffects.java
View File

@@ -4,6 +4,7 @@ import arc.*;
import arc.graphics.*;
import arc.math.*;
import mindustry.ctype.*;
import mindustry.game.*;
import mindustry.game.EventType.*;
import mindustry.type.*;
import mindustry.graphics.*;
@@ -163,7 +164,7 @@ public class StatusEffects implements ContentList{
}};
boss = new StatusEffect("boss"){{
color = Pal.health;
color = Team.sharded.color;
permanent = true;
damageMultiplier = 1.3f;
healthMultiplier = 1.5f;

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

@@ -1789,7 +1789,7 @@ public class UnitTypes implements ContentList{
shootY = 6f;
beamWidth = 0.8f;
mirror = false;
repairSpeed = 0.7f;
repairSpeed = 0.75f;
bullet = new BulletType(){{
maxRange = 120f;
@@ -1835,8 +1835,8 @@ public class UnitTypes implements ContentList{
speed = 0f;
splashDamage = 50f;
splashDamageRadius = 40f;
splashDamage = 55f;
splashDamageRadius = 45f;
}};
}});
}};