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

New serpulo core unit bullet effects

Browse Source
This commit is contained in:
Anuken
2025-11-03 16:28:46 -05:00
parent 7a18e676fd
commit 38d9bc83a3
4 changed files with 61 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/sounds/laserbolt.ogg Normal file
View File

Binary file not shown.

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

@@ -2392,14 +2392,22 @@ public class UnitTypes{
x = 2.75f; x = 2.75f;
y = 1f; y = 1f;
top = false; top = false;
ejectEffect = Fx.casing1;
bullet = new BasicBulletType(2.5f, 11){{ bullet = new LaserBoltBulletType(2.5f, 11){{
width = 7f; shootSound = Sounds.laserbolt;
height = 9f; keepVelocity = false;
width = 1.5f;
height = 4.5f;
hitEffect = despawnEffect = Fx.hitBulletColor;
trailWidth = 1.2f;
trailLength = 3;
shootEffect = Fx.shootSmallColor;
smokeEffect = Fx.hitLaserColor;
backColor = trailColor = Pal.yellowBoltFront;
hitColor = Pal.yellowBoltFront;
frontColor = Color.white;
lifetime = 60f; lifetime = 60f;
shootEffect = Fx.shootSmall;
smokeEffect = Fx.shootSmallSmoke;
buildingDamageMultiplier = 0.01f; buildingDamageMultiplier = 0.01f;
}}; }};
}}); }});
@@ -2434,14 +2442,22 @@ public class UnitTypes{
rotate = true; rotate = true;
shoot.shots = 2; shoot.shots = 2;
shoot.shotDelay = 4f; shoot.shotDelay = 4f;
ejectEffect = Fx.casing1;
bullet = new BasicBulletType(3f, 11){{ bullet = new LaserBoltBulletType(3f, 11){{
width = 7f; shootSound = Sounds.laserbolt;
height = 9f; keepVelocity = false;
width = 1.5f;
height = 4.5f;
hitEffect = despawnEffect = Fx.hitBulletColor;
trailWidth = 1.2f;
trailLength = 3;
shootEffect = Fx.shootSmallColor;
smokeEffect = Fx.hitLaserColor;
backColor = trailColor = Pal.yellowBoltFront;
hitColor = Pal.yellowBoltFront;
frontColor = Color.white;
lifetime = 60f; lifetime = 60f;
shootEffect = Fx.shootSmall;
smokeEffect = Fx.shootSmallSmoke;
buildingDamageMultiplier = 0.01f; buildingDamageMultiplier = 0.01f;
}}; }};
}}); }});
@@ -2479,14 +2495,22 @@ public class UnitTypes{
}}; }};
inaccuracy = 3f; inaccuracy = 3f;
ejectEffect = Fx.casing1;
bullet = new BasicBulletType(3.5f, 11){{ bullet = new LaserBoltBulletType(3.5f, 11){{
width = 6.5f; shootSound = Sounds.laserbolt;
height = 11f; keepVelocity = false;
width = 1.5f;
height = 5f;
hitEffect = despawnEffect = Fx.hitBulletColor;
trailWidth = 1.2f;
trailLength = 4;
shootEffect = Fx.shootSmallColor;
smokeEffect = Fx.hitLaserColor;
backColor = trailColor = Pal.yellowBoltFront;
hitColor = Pal.yellowBoltFront;
frontColor = Color.white;
lifetime = 70f; lifetime = 70f;
shootEffect = Fx.shootSmall;
smokeEffect = Fx.shootSmallSmoke;
buildingDamageMultiplier = 0.01f; buildingDamageMultiplier = 0.01f;
homingPower = 0.04f; homingPower = 0.04f;
}}; }};
@@ -2799,7 +2823,7 @@ public class UnitTypes{
rotateSpeed = 0.8f; rotateSpeed = 0.8f;
floorMultiplier = 0.3f; floorMultiplier = 0.3f;
immunities.addAll(StatusEffects.burning, StatusEffects.melting); immunities.addAll(StatusEffects.burning, StatusEffects.melting);
float xo = 231f/2f, yo = 231f/2f; float xo = 231f/2f, yo = 231f/2f;
treadRects = new Rect[]{new Rect(27 - xo, 152 - yo, 56, 73), new Rect(24 - xo, 51 - 9 - yo, 29, 17), new Rect(59 - xo, 18 - 9 - yo, 39, 19)}; treadRects = new Rect[]{new Rect(27 - xo, 152 - yo, 56, 73), new Rect(24 - xo, 51 - 9 - yo, 29, 17), new Rect(59 - xo, 18 - 9 - yo, 39, 19)};

1
core/src/mindustry/graphics/Pal.java
View File

@@ -72,6 +72,7 @@ public class Pal{
stoneGray = Color.valueOf("8f8f8f"), stoneGray = Color.valueOf("8f8f8f"),
engine = Color.valueOf("ffbb64"), engine = Color.valueOf("ffbb64"),
yellowBoltFront = Color.valueOf("ffd27e"),
health = Color.valueOf("ff341c"), health = Color.valueOf("ff341c"),
heal = Color.valueOf("98ffa9"), heal = Color.valueOf("98ffa9"),
bar = Color.slate, bar = Color.slate,

25
core/src/mindustry/world/blocks/defense/turrets/BaseTurret.java
View File

@@ -47,9 +47,24 @@ public class BaseTurret extends Block{
coolant = findConsumer(c -> c instanceof ConsumeCoolant); coolant = findConsumer(c -> c instanceof ConsumeCoolant);
} }
//just makes things a little more convenient checkInitCoolant();
if(!disableOverlapCheck){
placeOverlapRange = Math.max(placeOverlapRange, range + placeOverlapMargin);
}
fogRadius = Math.max(Mathf.round(range / tilesize * fogRadiusMultiplier), fogRadius);
super.init();
}
@Override
public void reinitializeConsumers(){
checkInitCoolant();
super.reinitializeConsumers();
}
void checkInitCoolant(){
if(coolant != null){ if(coolant != null){
//TODO coolant fix
coolant.update = false; coolant.update = false;
coolant.booster = true; coolant.booster = true;
coolant.optional = true; coolant.optional = true;
@@ -57,12 +72,6 @@ public class BaseTurret extends Block{
//json parsing does not add to consumes //json parsing does not add to consumes
if(!hasConsumer(coolant)) consume(coolant); if(!hasConsumer(coolant)) consume(coolant);
} }
if(!disableOverlapCheck){
placeOverlapRange = Math.max(placeOverlapRange, range + placeOverlapMargin);
}
fogRadius = Math.max(Mathf.round(range / tilesize * fogRadiusMultiplier), fogRadius);
super.init();
} }
@Override @Override