Skip to content

Commit

Permalink
Closes Anuken/Mindustry-Suggestions/issues/5397
Browse files Browse the repository at this point in the history
  • Loading branch information
@Anuken
Anuken committed Jan 19, 2025
1 parent 68fecc5 commit 224e74c
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 15 deletions.
Binary file modified core/assets-raw/sprites/units/weapons/scathe-missile-phase-cell.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/assets-raw/sprites/units/weapons/scathe-missile-phase.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion core/assets/bundles/bundle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ error.mapnotfound = Map file not found!
error.io = Network I/O error.
error.any = Unknown network error.
error.bloom = Failed to initialize bloom.\nYour device may not support it.
error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThere is no known workaround for this issue.
error.moddex = Mindustry is unable to load this mod.\nYour device is blocking import of Java mods due to recent changes in Android.\nThis will not be fixed. There is no known workaround for this issue.

weather.rain.name = Rain
weather.snowing.name = Snow
Expand Down
38 changes: 24 additions & 14 deletions core/src/mindustry/content/Blocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4927,18 +4927,17 @@ Items.carbide, new BulletType(0f, 0f){{
}};
}},

//TODO - needs balancing
Items.phaseFabric, new BulletType(0f, 0f){{
shootEffect = Fx.shootBig;
smokeEffect = Fx.shootSmokeMissileColor;
hitColor = Color.valueOf("ffd37f");
ammoMultiplier = 1f;
ammoMultiplier = 5f;
reloadMultiplier = 0.8f;

spawnUnit = new MissileUnitType("scathe-missile-phase"){{
speed = 4.4f;
speed = 4f;
maxRange = 6f;
lifetime = 60f * 5.7f;
lifetime = 60f * 6.1f;
outlineColor = Pal.darkOutline;
engineColor = trailColor = Color.valueOf("ffd37f");
engineLayer = Layer.effect;
Expand All @@ -4954,9 +4953,20 @@ Items.phaseFabric, new BulletType(0f, 0f){{
targetAir = false;
targetUnderBlocks = false;

parts.add(new ShapePart(){{
progress = PartProgress.constant(1f);
color = Pal.accent;
sides = 6;
radius = 3f;
rotateSpeed = 3f;
hollow = true;
layer = Layer.effect;
y = 1.8f;
}});

fogRadius = 6f;

health = 250;
health = 500;

weapons.add(new Weapon(){{
shootCone = 360f;
Expand All @@ -4965,7 +4975,7 @@ Items.phaseFabric, new BulletType(0f, 0f){{
deathExplosionEffect = Fx.massiveExplosion;
shootOnDeath = true;
shake = 10f;
bullet = new ExplosionBulletType(1500f, 50f){{
bullet = new ExplosionBulletType(400f, 120f){{
hitColor = engineColor;
shootEffect = new MultiEffect(Fx.massiveExplosion, Fx.scatheExplosion, Fx.scatheLight, new WaveEffect(){{
lifetime = 10f;
Expand All @@ -4974,7 +4984,7 @@ Items.phaseFabric, new BulletType(0f, 0f){{
}});

collidesAir = false;
buildingDamageMultiplier = 0.2f;
buildingDamageMultiplier = 0.1f;

ammoMultiplier = 1f;
fragLifeMin = 0.1f;
Expand All @@ -4988,8 +4998,8 @@ Items.phaseFabric, new BulletType(0f, 0f){{
lifetime = 23f;
width = height = 18f;
collidesTiles = false;
splashDamageRadius = 40f;
splashDamage = 160f;
splashDamageRadius = 56f;
splashDamage = 164f;
backColor = trailColor = hitColor = engineColor;
frontColor = Color.white;
smokeEffect = Fx.shootBigSmoke2;
Expand All @@ -5013,7 +5023,7 @@ Items.phaseFabric, new BulletType(0f, 0f){{
interval = 7f;
}});

abilities.add(new ForceFieldAbility(30f, 0f, 160f, 999999999f));
abilities.add(new ForceFieldAbility(90f, 0f, 2000f, 999999999f));

}};
}},
Expand Down Expand Up @@ -5058,12 +5068,12 @@ Items.surgeAlloy, new BulletType(0f, 0f){{
deathExplosionEffect = Fx.massiveExplosion;
shootOnDeath = true;
shake = 10f;
bullet = new ExplosionBulletType(400f, 40f){{
bullet = new ExplosionBulletType(300f, 40f){{
hitColor = engineColor;
shootEffect = new MultiEffect(Fx.massiveExplosion, Fx.scatheExplosionSmall);

collidesAir = false;
buildingDamageMultiplier = 0.25f;
buildingDamageMultiplier = 0.1f;

ammoMultiplier = 1f;
fragLifeMin = 0.1f;
Expand Down Expand Up @@ -5105,7 +5115,7 @@ Items.surgeAlloy, new BulletType(0f, 0f){{
deathExplosionEffect = Fx.massiveExplosion;
shootOnDeath = true;
shake = 10f;
bullet = new ExplosionBulletType(340f, 35f){{
bullet = new ExplosionBulletType(360f, 35f){{
lightning = 6;
lightningDamage = 35f;
lightningLength = 8;
Expand All @@ -5118,7 +5128,7 @@ Items.surgeAlloy, new BulletType(0f, 0f){{
}});

collidesAir = false;
buildingDamageMultiplier = 0.2f;
buildingDamageMultiplier = 0.1f;
}};
}});

Expand Down
9 changes: 9 additions & 0 deletions core/src/mindustry/entities/abilities/ForceFieldAbility.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,15 @@ public void update(Unit unit){
}
}

@Override
public void death(Unit unit){

//self-destructing units can have a shield on death
if(unit.shield > 0f && !wasBroken){
Fx.shieldBreak.at(unit.x, unit.y, radius, unit.type.shieldColor(unit), this);
}
}

@Override
public void draw(Unit unit){
checkRadius(unit);
Expand Down

0 comments on commit 224e74c

Please sign in to comment.