Skip to content

Commit 9e08c98

Browse files
committed
more dread bullets
1 parent b44679a commit 9e08c98

File tree

2 files changed

+25
-2
lines changed

2 files changed

+25
-2
lines changed

src/overblocks/OverblocksMod.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import arc.util.*;
66
import mindustry.content.*;
77
import mindustry.entities.bullet.*;
8-
import mindustry.entities.effect.*;
98
import mindustry.game.EventType.*;
109
import mindustry.mod.*;
1110
import mindustry.world.*;
@@ -46,22 +45,36 @@ public void loadOther(){
4645
Blocks.denseRedStone.asFloor().attributes.set(Attribute.water, -0.1f);
4746
Blocks.carbonStone.asFloor().attributes.set(Attribute.water, -0.1f);
4847

49-
BulletType diseaseSpectreBullet = new BasicBulletType(7f, 70){{
48+
BulletType diseaseSpectreBullet = new BasicBulletType(7f, 60){{
5049
hitSize = 5;
5150
width = 15f;
5251
height = 21f;
5352
frontColor = OBPal.dreadRust;
5453
backColor = OBPal.darkDreadRust;
5554
status = OBStatusEffects.dreadRust;
5655
shootEffect = Fx.shootBig;
56+
statusDuration = 60;
5757
pierceCap = 2;
5858
pierceBuilding = true;
5959
knockback = 0.6f;
6060
ammoMultiplier = 3;
6161
}};
6262

63+
BulletType diseaseFuseBullet = new ShrapnelBulletType(){{
64+
length = 100;
65+
damage = 70f;
66+
ammoMultiplier = 4f;
67+
width = 17f;
68+
toColor = OBPal.dreadRust;
69+
shootEffect = smokeEffect = OBFx.dreadShoot;
70+
statusDuration = 60;
71+
}};
72+
6373
ItemTurret spectre = (ItemTurret) Blocks.spectre;
6474
spectre.ammoTypes.put(OBItems.diseaseVector, diseaseSpectreBullet);
75+
76+
ItemTurret fuse = (ItemTurret) Blocks.fuse;
77+
fuse.ammoTypes.put(OBItems.diseaseVector, diseaseFuseBullet);
6578
}
6679

6780
public void assignColor(Block block, Color color){

src/overblocks/content/OBFx.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import overblocks.graphics.*;
1010

1111
import static arc.graphics.g2d.Draw.color;
12+
import static arc.graphics.g2d.Lines.lineAngle;
1213
import static arc.graphics.g2d.Lines.stroke;
1314
import static arc.math.Angles.randLenVectors;
1415

@@ -40,5 +41,14 @@ public class OBFx {
4041
randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> {
4142
Fill.circle(e.x + x, e.y + y, e.fout() * 1.2f);
4243
});
44+
}),
45+
46+
dreadShoot = new Effect(12f, e -> {
47+
color(Color.white, OBPal.dreadRust, e.fin());
48+
stroke(e.fout() * 1.2f + 0.5f);
49+
50+
randLenVectors(e.id, 7, 25f * e.finpow(), e.rotation, 50f, (x, y) -> {
51+
lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fin() * 5f + 2f);
52+
});
4353
});
4454
}

0 commit comments

Comments
 (0)