Skip to content

Commit af9c140

Browse files
committed
Add particles to projectiles
1 parent 3f3d9cc commit af9c140

File tree

12 files changed

+78
-5
lines changed

12 files changed

+78
-5
lines changed

bin/entity/Entity.class

2 Bytes
Binary file not shown.

bin/entity/Particle.class

32 Bytes
Binary file not shown.

bin/entity/Projectile.class

136 Bytes
Binary file not shown.

bin/object/OBJ_Fireball.class

487 Bytes
Binary file not shown.

bin/object/OBJ_Rock.class

487 Bytes
Binary file not shown.
794 Bytes
Binary file not shown.

src/entity/Entity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,10 @@ public void generateParticle(Entity generator, Entity target) {
164164
int speed = generator.getParticleSpeed();
165165
int maxLife = generator.getParticleMaxLife();
166166

167-
Particle p1 = new Particle(gp, target, color, size, speed, maxLife, -1, -1);
168-
Particle p2 = new Particle(gp, target, color, size, speed, maxLife, 1, -1);
169-
Particle p3 = new Particle(gp, target, color, size, speed, maxLife, -1, 1);
170-
Particle p4 = new Particle(gp, target, color, size, speed, maxLife, 1, 1);
167+
Particle p1 = new Particle(gp, target, color, size, speed, maxLife, -2, -1);
168+
Particle p2 = new Particle(gp, target, color, size, speed, maxLife, 2, -1);
169+
Particle p3 = new Particle(gp, target, color, size, speed, maxLife, -2, 1);
170+
Particle p4 = new Particle(gp, target, color, size, speed, maxLife, 2, 1);
171171
gp.particleList.add(p1);
172172
gp.particleList.add(p2);
173173
gp.particleList.add(p3);

src/entity/Particle.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ public Particle(GamePanel gp, Entity generator, Color color, int size, int speed
3333
public void update() {
3434
life--;
3535

36+
if (life < maxLife / 3) {
37+
yd++;
38+
}
39+
3640
worldX += xd * speed;
3741
worldY += yd * speed;
3842

src/entity/Projectile.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public void update() {
2424

2525
if (monsterIndex != 999) {
2626
gp.player.damageMonster(monsterIndex, attack);
27+
generateParticle(user.projectile, gp.monster[monsterIndex]);
2728
alive = false;
2829
}
2930
}
@@ -33,6 +34,7 @@ public void update() {
3334

3435
if (gp.player.invincible == false && contactPlayer == true) {
3536
damagePlayer(attack);
37+
generateParticle(user.projectile, gp.player);
3638
alive = false;
3739
}
3840
}

src/object/OBJ_Fireball.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package object;
22

3+
import java.awt.Color;
4+
35
import entity.Entity;
46
import entity.Projectile;
57
import main.GamePanel;
@@ -46,4 +48,28 @@ public boolean haveResource(Entity user) {
4648
public void subtractResource(Entity user) {
4749
user.mana -= useCost;
4850
}
51+
52+
public Color getParticleColor() {
53+
Color color = new Color(240, 50, 0);
54+
55+
return color;
56+
}
57+
58+
public int getParticleSize() {
59+
int size = 6;
60+
61+
return size;
62+
}
63+
64+
public int getParticleSpeed() {
65+
int speed = 1;
66+
67+
return speed;
68+
}
69+
70+
public int getParticleMaxLife() {
71+
int maxLife = 20;
72+
73+
return maxLife;
74+
}
4975
}

0 commit comments

Comments
 (0)