From b1fb5a3e833b3bc23b1f8e661e2eb5386785e659 Mon Sep 17 00:00:00 2001 From: MoBrot <90271578+MoBrot@users.noreply.github.com> Date: Thu, 20 Apr 2023 18:37:06 +0200 Subject: [PATCH] Plompa Easter Particles --- src/de/steamwar/lobby/LobbySystem.properties | 1 + src/de/steamwar/lobby/particle/WingDesign.java | 2 ++ .../lobby/particle/decorator/ECAL-Logo.png | Bin 0 -> 159 bytes .../particles/custom/CustomEasterParticle.java | 5 ++++- 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/de/steamwar/lobby/particle/decorator/ECAL-Logo.png diff --git a/src/de/steamwar/lobby/LobbySystem.properties b/src/de/steamwar/lobby/LobbySystem.properties index c250d9c..9139b31 100644 --- a/src/de/steamwar/lobby/LobbySystem.properties +++ b/src/de/steamwar/lobby/LobbySystem.properties @@ -91,6 +91,7 @@ PARTICLE_WINGS_EVIL = §5Purple wings PARTICLE_PLAYER_HAYLIM_AURA = §fHaylim\'s Aura PARTICLE_PLAYER_RONGAMER99091_AURA = §7Smoke Granade +PARTICLE_PLAYER_PLOMPA = §9ECAL PARTICLE_TEAM_PULSE_AURA_1 = §fPulse Aura §cFlame PARTICLE_TEAM_PULSE_AURA_2 = §fPulse Aura §7End Rod diff --git a/src/de/steamwar/lobby/particle/WingDesign.java b/src/de/steamwar/lobby/particle/WingDesign.java index 3c3358b..6954a56 100644 --- a/src/de/steamwar/lobby/particle/WingDesign.java +++ b/src/de/steamwar/lobby/particle/WingDesign.java @@ -51,4 +51,6 @@ public interface WingDesign { WingDesign ECLIPSE = new WingDesignImpl(create("/de/steamwar/lobby/particle/decorator/ECLIPSE-Logo.png")); WingDesign PL = new WingDesignImpl(create("/de/steamwar/lobby/particle/decorator/PL-Logo.png")); + + WingDesign PlompaEasterWings = new WingDesignImpl(create("/de/steamwar/lobby/particle/decorator/ECAL-Logo.png")); } diff --git a/src/de/steamwar/lobby/particle/decorator/ECAL-Logo.png b/src/de/steamwar/lobby/particle/decorator/ECAL-Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..b4c641f84ce7a8db369a27e914137d6ac8256388 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^qCm{g!2~2*EQD=|ububFhGq;{wK zPr=C=TVJ~`E3upYpSNk{|Hge%50!Q->DO%6XnOJE*^>D^J=g#M literal 0 HcmV?d00001 diff --git a/src/de/steamwar/lobby/particle/particles/custom/CustomEasterParticle.java b/src/de/steamwar/lobby/particle/particles/custom/CustomEasterParticle.java index eba7415..0a4206a 100644 --- a/src/de/steamwar/lobby/particle/particles/custom/CustomEasterParticle.java +++ b/src/de/steamwar/lobby/particle/particles/custom/CustomEasterParticle.java @@ -3,6 +3,7 @@ package de.steamwar.lobby.particle.particles.custom; import de.steamwar.lobby.particle.ParticleData; import de.steamwar.lobby.particle.ParticleEnum; import de.steamwar.lobby.particle.ParticleRequirement; +import de.steamwar.lobby.particle.WingDesign; import de.steamwar.lobby.particle.elements.*; import de.steamwar.lobby.particle.elements.custom.HearthBeat; import de.steamwar.lobby.particle.elements.custom.NonMoving; @@ -29,7 +30,9 @@ public enum CustomEasterParticle implements ParticleEnum { new OnlyOthers(new Delayed(new SimpleParticle(Particle.EXPLOSION_HUGE, 0, 0, 0, 0.01, 1), 2)) )))) ), - + Plompa(new ParticleData(Material.PUFFERFISH_BUCKET, "PARTICLE_PLAYER_PLOMPA", ParticleRequirement.specificPlayer(64), + new Always(new Delayed(new NonFlying(new Wing(new SimpleParticle(Particle.END_ROD, 0, 0, 0, 0, 1), 0.15, WingDesign.PlompaEasterWings)), 80))) + ), Pulse_EASTER_1(new ParticleData(Material.RED_CANDLE, "PARTICLE_TEAM_PULSE_AURA_1", ParticleRequirement.easterEventSpecificTeam(210), new Always(new NonMoving(new PulseShimmer(new SimpleParticle(Particle.FLAME, 0, 0, 0, 0, 1), 80, 2)))) ),