mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-26 22:42:41 -08:00
Code Issues Projects Releases Wiki Activity

Colored duo/salvo/spectre bullets based on ammo

Browse source
This commit is contained in:
Anuken 2025-04-05 13:51:07 -04:00
parent 8771504cbe
commit 20fc176cd9
1 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

40
core/src/mindustry/content/Blocks.java
View file

@ -3071,6 +3071,10 @@ public class Blocks{
height = 9f;
lifetime = 60f;
ammoMultiplier = 2;
hitEffect = despawnEffect = Fx.hitBulletColor;
hitColor = backColor = trailColor = Color.valueOf("d39169");
frontColor = Color.valueOf("eac1a8");
}},
Items.graphite, new BasicBulletType(3.5f, 18){{
width = 9f;
@ -3079,6 +3083,7 @@ public class Blocks{
lifetime = 60f;
rangeChange = 16f;
hitEffect = despawnEffect = Fx.hitBulletColor;
hitColor = backColor = trailColor = Color.valueOf("858a9b");
frontColor = Color.valueOf("dae1ee");
}},
@ -3093,6 +3098,7 @@ public class Blocks{
trailLength = 5;
trailWidth = 1.5f;
hitEffect = despawnEffect = Fx.hitBulletColor;
hitColor = backColor = trailColor = Color.valueOf("707594");
frontColor = Color.valueOf("999ba0");
}}
@ -3503,13 +3509,22 @@ public class Blocks{
height = 9f;
lifetime = 60f;
ammoMultiplier = 2;
hitEffect = despawnEffect = Fx.hitBulletColor;
hitColor = backColor = trailColor = Color.valueOf("d39169");
frontColor = Color.valueOf("eac1a8");
}},
Items.graphite, new BasicBulletType(3.5f, 20){{
width = 9f;
height = 12f;
reloadMultiplier = 0.6f;
ammoMultiplier = 4;
lifetime = 60f;
rangeChange = 4f * 8f;
hitEffect = despawnEffect = Fx.hitBulletColor;
hitColor = backColor = trailColor = Color.valueOf("858a9b");
frontColor = Color.valueOf("dae1ee");
}},
Items.pyratite, new BasicBulletType(3.2f, 18){{
width = 10f;
@ -3528,20 +3543,30 @@ public class Blocks{
lifetime = 60f;
}},
Items.silicon, new BasicBulletType(3f, 15, "bullet"){{
width = 7f;
height = 9f;
homingPower = 0.1f;
width = 8f;
height = 10f;
homingPower = 0.2f;
reloadMultiplier = 1.5f;
ammoMultiplier = 5;
lifetime = 60f;
trailLength = 5;
trailWidth = 1.5f;
hitEffect = despawnEffect = Fx.hitBulletColor;
hitColor = backColor = trailColor = Color.valueOf("707594");
frontColor = Color.valueOf("999ba0");
}},
Items.thorium, new BasicBulletType(4f, 29, "bullet"){{
width = 10f;
width = 8f;
height = 13f;
shootEffect = Fx.shootBig;
smokeEffect = Fx.shootBigSmoke;
ammoMultiplier = 4;
lifetime = 60f;
hitEffect = despawnEffect = Fx.hitBulletColor;
backColor = hitColor = trailColor = Color.valueOf("f595be");
frontColor = Color.white;
}}
);
@ -3950,6 +3975,10 @@ public class Blocks{
ammoMultiplier = 4;
reloadMultiplier = 1.7f;
knockback = 0.3f;
hitEffect = despawnEffect = Fx.hitBulletColor;
hitColor = backColor = trailColor = Color.valueOf("858a9b");
frontColor = Color.valueOf("dae1ee");
}},
Items.thorium, new BasicBulletType(8f, 80){{
hitSize = 5;
@ -4319,7 +4348,6 @@ public class Blocks{
requirements(Category.turret, with(Items.tungsten, 250, Items.silicon, 300, Items.thorium, 400));
ammo(
//TODO another ammo type
Items.thorium, new ArtilleryBulletType(2.5f, 350, "shell"){{
hitEffect = new MultiEffect(Fx.titanExplosion, Fx.titanSmoke);
despawnEffect = Fx.none;