Skip to content

Commit cf7beaa

Browse files
committed
BloodKillCosmetic追加
1 parent 0052390 commit cf7beaa

File tree

5 files changed

+34
-7
lines changed

5 files changed

+34
-7
lines changed

src/main/java/com/github/elic0de/thejpspit/cosmetics/CosmeticManager.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.github.elic0de.thejpspit.cosmetics.impl.death.BloodDeathCosmetic;
44
import com.github.elic0de.thejpspit.cosmetics.impl.death.CatCosmetic;
5+
import com.github.elic0de.thejpspit.cosmetics.impl.kill.BloodKillCosmetic;
56
import com.github.elic0de.thejpspit.cosmetics.impl.kill.FireCosmetic;
67
import com.github.elic0de.thejpspit.cosmetics.type.DeathCosmetic;
78
import com.github.elic0de.thejpspit.cosmetics.type.KillCosmetic;
@@ -19,6 +20,7 @@ public class CosmeticManager {
1920
public CosmeticManager() {
2021
killCosmetics = new ImmutableClassToInstanceMap.Builder<KillCosmetic>()
2122
.put(FireCosmetic.class, new FireCosmetic())
23+
.put(BloodKillCosmetic.class, new BloodKillCosmetic())
2224
.build();
2325

2426
deathCosmetics = new ImmutableClassToInstanceMap.Builder<DeathCosmetic>()
@@ -32,9 +34,9 @@ public CosmeticManager() {
3234
.build();
3335
}
3436

35-
public void onKill(PitPlayer player) {
37+
public void onKill(PitPlayer player, PitPlayer target) {
3638
for (KillCosmetic cosmetic : killCosmetics.values()) {
37-
cosmetic.onKill(player);
39+
cosmetic.onKill(player, target);
3840
}
3941
}
4042

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.github.elic0de.thejpspit.cosmetics.impl.kill;
2+
3+
import com.github.elic0de.thejpspit.cosmetics.Cosmetic;
4+
import com.github.elic0de.thejpspit.cosmetics.CosmeticData;
5+
import com.github.elic0de.thejpspit.cosmetics.type.KillCosmetic;
6+
import com.github.elic0de.thejpspit.player.PitPlayer;
7+
import org.bukkit.Material;
8+
import xyz.xenondevs.particle.ParticleBuilder;
9+
import xyz.xenondevs.particle.ParticleEffect;
10+
11+
@CosmeticData(id = "bloodkill", name = "あか", description = "あかかかかk", icon = Material.RED_DYE, coin = 50)
12+
public class BloodKillCosmetic extends Cosmetic implements KillCosmetic {
13+
14+
@Override
15+
public void onKill(PitPlayer player, PitPlayer target) {
16+
if (canExecute(player)) {
17+
new ParticleBuilder(ParticleEffect.REDSTONE, target.getPlayer().getLocation())
18+
.setAmount(15)
19+
.setOffsetY(1f)
20+
.setSpeed(0.1f)
21+
.display();
22+
}
23+
}
24+
}
25+

src/main/java/com/github/elic0de/thejpspit/cosmetics/impl/kill/FireCosmetic.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
public class FireCosmetic extends Cosmetic implements KillCosmetic {
1313

1414
@Override
15-
public void onKill(PitPlayer player) {
15+
public void onKill(PitPlayer player, PitPlayer target) {
1616
if (canExecute(player)) {
17-
new ParticleBuilder(ParticleEffect.FLAME, player.getPlayer().getLocation())
18-
.setAmount(5)
17+
new ParticleBuilder(ParticleEffect.FLAME, target.getPlayer().getLocation())
18+
.setAmount(10)
1919
.setOffsetY(1f)
2020
.setSpeed(0.1f)
2121
.display();

src/main/java/com/github/elic0de/thejpspit/cosmetics/type/KillCosmetic.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66
public interface KillCosmetic extends AbstractCosmetic {
77

8-
default void onKill(PitPlayer player) {
8+
default void onKill(PitPlayer player, PitPlayer target) {
99
}
1010
}

src/main/java/com/github/elic0de/thejpspit/game/Game.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public void death(PitPlayer player) {
100100
);
101101
}
102102
});
103-
pit.getCosmeticManager().onKill(killer);
103+
pit.getCosmeticManager().onKill(killer, player);
104104
pit.getCosmeticManager().onDeath(player);
105105

106106
player.setLastDamager(null);

0 commit comments

Comments
 (0)