Anuken/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2024-10-06 21:07:25 +03:00
Code Issues Projects Releases Wiki Activity

Ravage turret cleanup

Browse Source
This commit is contained in:
Anuken 2022-07-05 17:02:20 -04:00
parent 77c5fc02a6
commit e2c0eec3e1
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/src/mindustry/content/Blocks.java
View File

@ -4431,9 +4431,12 @@ public class Blocks{
ammo( ammo(
//this is really lazy //this is really lazy
Items.surgeAlloy, new BasicBulletType(7f, 250){{ Items.surgeAlloy, new BasicBulletType(7f, 250){{
width = 16f; sprite = "large-orb";
width = 17f;
height = 21f;
hitSize = 7f; hitSize = 7f;
height = 20f; hitSize = 8f;
shootEffect = new MultiEffect(Fx.shootTitan, Fx.colorSparkBig, new WaveEffect(){{ shootEffect = new MultiEffect(Fx.shootTitan, Fx.colorSparkBig, new WaveEffect(){{
colorFrom = colorTo = Pal.accent; colorFrom = colorTo = Pal.accent;
lifetime = 12f; lifetime = 12f;
@ -4450,9 +4453,19 @@ public class Blocks{
frontColor = Color.white; frontColor = Color.white;
trailWidth = 2.8f; trailWidth = 2.8f;
trailLength = 9; trailLength = 9;
hitEffect = despawnEffect = Fx.hitBulletColor; hitEffect = Fx.hitBulletColor;
buildingDamageMultiplier = 0.3f; buildingDamageMultiplier = 0.3f;
despawnEffect = new MultiEffect(Fx.hitBulletColor, new WaveEffect(){{
sizeTo = 30f;
colorFrom = colorTo = Pal.accent;
lifetime = 12f;
}});
trailRotation = true;
trailEffect = Fx.disperseTrail;
trailInterval = 3f;
//TODO //TODO
intervalBullet = new LightningBulletType(){{ intervalBullet = new LightningBulletType(){{
damage = 30; damage = 30;
@ -4481,11 +4494,13 @@ public class Blocks{
}} }}
); );
shoot = new ShootAlternate(){{ shoot = new ShootMulti(new ShootAlternate(){{
spread = 3.3f; spread = 3.3f * 1.9f;
barrels = 9; shots = barrels = 5;
shots = 9; }}, new ShootHelix(){{
}}; scl = 4f;
mag = 3f;
}});
minWarmup = 0.99f; minWarmup = 0.99f;
coolantMultiplier = 6f; coolantMultiplier = 6f;
@ -4678,7 +4693,7 @@ public class Blocks{
limitRange(); limitRange();
}}; }};
//TODO 2 more turrets. //TODO 1 more turret
//endregion //endregion
//region units //region units

2
core/src/mindustry/world/meta/StatValues.java
View File

@ -321,7 +321,7 @@ public class StatValues{
} }
//no point in displaying unit icon twice //no point in displaying unit icon twice
if(!compact && !(t instanceof PowerTurret)){ if(!compact && !(t instanceof Turret)){
table.image(icon(t)).size(3 * 8).padRight(4).right().top(); table.image(icon(t)).size(3 * 8).padRight(4).right().top();
table.add(t.localizedName).padRight(10).left().top(); table.add(t.localizedName).padRight(10).left().top();
} }

2
gradle.properties
View File

@ -25,4 +25,4 @@ org.gradle.caching=true
#used for slow jitpack builds; TODO see if this actually works #used for slow jitpack builds; TODO see if this actually works
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
archash=e252d01585 archash=5c2fe62224