Skip to content

Commit ad856dc

Browse files
committed
Less cursed shenanigans
1 parent d0ca32d commit ad856dc

File tree

2 files changed

+5
-29
lines changed

2 files changed

+5
-29
lines changed

src/progressed/content/bullets/PMBullets.java

+1-19
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import arc.graphics.*;
44
import blackhole.entities.bullet.*;
5-
import blackhole.entities.effect.SwirlEffect.*;
65
import mindustry.content.*;
76
import mindustry.entities.bullet.*;
87
import mindustry.entities.effect.*;
@@ -117,24 +116,7 @@ public static void load(){
117116
float life = EnergyFx.kugelblitzGrow.lifetime;
118117
chargeEffect = new MultiEffect(
119118
new WrapEffect(
120-
new RepeatEffect(EnergyFx.kugelblitzCharge, (life - EnergyFx.kugelblitzCharge.lifetime - 1f) / times, times){
121-
@Override
122-
protected void add(float x, float y, float rotation, Color color, Object data){
123-
var entity = BlackHoleEffectState.create();
124-
entity.effect = this;
125-
entity.rotation = baseRotation + rotation;
126-
entity.data = data;
127-
entity.lifetime = lifetime;
128-
entity.set(x, y);
129-
entity.color.set(color);
130-
if(followParent && data instanceof Posc p){
131-
entity.parent = p;
132-
entity.rotWithParent = rotWithParent;
133-
}
134-
entity.add();
135-
}
136-
}.followParent(true).rotWithParent(true),
137-
Color.black, 48f
119+
new RepeatEffect(EnergyFx.kugelblitzCharge, (life - EnergyFx.kugelblitzCharge.lifetime - 1f) / times, times), Color.black, 48f
138120
),
139121
EnergyFx.kugelblitzGrow
140122
);

src/progressed/entities/effect/RepeatEffect.java

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package progressed.entities.effect;
22

3-
import arc.graphics.g2d.*;
3+
import arc.graphics.*;
4+
import arc.util.*;
45
import mindustry.entities.*;
56

67
public class RepeatEffect extends Effect{
@@ -21,16 +22,9 @@ public void init(){
2122
}
2223

2324
@Override
24-
public void render(EffectContainer e){
25-
var cont = e.inner();
26-
float life = e.time;
25+
public void create(float x, float y, float rotation, Color color, Object data){
2726
for(int i = 0; i < times; i++){
28-
float del = i * interval;
29-
if(life > del && life <= del + effect.lifetime){
30-
cont.set(e.id + i, e.color, life - del, effect.lifetime, e.rotation, e.x, e.y, e.data);
31-
Draw.z(effect.layer);
32-
effect.render(cont);
33-
}
27+
Time.run(i * interval, () -> effect.create(x, y, rotation, color, data));
3428
}
3529
}
3630
}

0 commit comments

Comments
 (0)