mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-25 22:17:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/7.0-features' into 7.0-features

Browse Source
This commit is contained in:
Epowerj 2022-04-18 22:19:07 -04:00
commit 569aaf1156
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/units/anthicus-leg-base.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 558 B

After

Width:  |  Height:  |  Size: 560 B

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

@ -2929,8 +2929,9 @@ public class UnitTypes{
drag = 0.1f;
hitSize = 21f;
rotateSpeed = 3f;
health = 1100;
armor = 5f;
health = 2600;
armor = 7f;
fogRadius = 40f;
legCount = 6;
legLength = 18f;
@ -2980,8 +2981,8 @@ public class UnitTypes{
minWarmup = 0.9f;
shootStatus = StatusEffects.slow;
shootStatusDuration = reload + 1f;
rotateSpeed = 5f;
rotationLimit = 70f;
rotateSpeed = 2f;
inaccuracy = 20f;
rotate = true;
@ -3038,9 +3039,9 @@ public class UnitTypes{
engineLayer = Layer.effect;
speed = 3.7f;
maxRange = 6f;
lifetime = 60f * 1.63f;
lifetime = 60f * 1.7f;
outlineColor = Pal.darkOutline;
health = 40;
health = 45;
lowAltitude = true;
parts.add(new FlarePart(){{
@ -3058,8 +3059,8 @@ public class UnitTypes{
mirror = false;
reload = 1f;
shootOnDeath = true;
bullet = new ExplosionBulletType(100f, 22f){{
shootEffect = new MultiEffect(Fx.massiveExplosion, new WaveEffect(){{
bullet = new ExplosionBulletType(120f, 25f){{
shootEffect = new MultiEffect(Fx.massiveExplosion, new WrapEffect(Fx.dynamicSpikes, Pal.techBlue, 24f), new WaveEffect(){{
colorFrom = colorTo = Pal.techBlue;
sizeTo = 40f;
lifetime = 12f;

9
core/src/mindustry/entities/effect/WrapEffect.java
View File

@ -32,9 +32,10 @@ public class WrapEffect extends Effect{
@Override
public void render(EffectContainer e){
e.color = color;
if(!Float.isNaN(rotation)) e.rotation = rotation;
effect.render(e);
clip = Math.max(clip, effect.clip);
}
@Override
public void create(float x, float y, float rotation, Color color, Object data){
effect.create(x, y, this.rotation, this.color, data);
}
}