From ad9087c03815b448bfbddc05242eeb6c634e4c91 Mon Sep 17 00:00:00 2001 From: YoyoNow Date: Mon, 26 Oct 2026 13:57:59 +0100 Subject: [PATCH] Remove the breathe wing motion Wings keep the flap motions only; saved breathing wings load as none. --- .../src/de/steamwar/lobby/LobbySystem.properties | 1 - .../src/de/steamwar/lobby/LobbySystem_de.properties | 1 - .../src/de/steamwar/lobby/particle/elements/Wing.java | 11 ++++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/LobbySystem/src/de/steamwar/lobby/LobbySystem.properties b/LobbySystem/src/de/steamwar/lobby/LobbySystem.properties index 8998c79f..e60bb545 100644 --- a/LobbySystem/src/de/steamwar/lobby/LobbySystem.properties +++ b/LobbySystem/src/de/steamwar/lobby/LobbySystem.properties @@ -203,7 +203,6 @@ PARTICLE_CHOICE_COLORING_ALONG_WING = §fFrom the back to the tips PARTICLE_CHOICE_MOTION_NONE = §fNone PARTICLE_CHOICE_MOTION_FLAP_SLOW = §fFlap slowly PARTICLE_CHOICE_MOTION_FLAP_FAST = §fFlap quickly -PARTICLE_CHOICE_MOTION_BREATHE = §fBreathe # Particle types PARTICLE_TYPE_DUST = §fDust diff --git a/LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties b/LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties index 854c16d7..d87f72f0 100644 --- a/LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties +++ b/LobbySystem/src/de/steamwar/lobby/LobbySystem_de.properties @@ -203,7 +203,6 @@ PARTICLE_CHOICE_COLORING_ALONG_WING = §fVom Rücken zu den Spitzen PARTICLE_CHOICE_MOTION_NONE = §fKeine PARTICLE_CHOICE_MOTION_FLAP_SLOW = §fLangsam schlagen PARTICLE_CHOICE_MOTION_FLAP_FAST = §fSchnell schlagen -PARTICLE_CHOICE_MOTION_BREATHE = §fAtmen # Particle types PARTICLE_TYPE_DUST = §fStaub diff --git a/LobbySystem/src/de/steamwar/lobby/particle/elements/Wing.java b/LobbySystem/src/de/steamwar/lobby/particle/elements/Wing.java index 632df278..4fa84f51 100644 --- a/LobbySystem/src/de/steamwar/lobby/particle/elements/Wing.java +++ b/LobbySystem/src/de/steamwar/lobby/particle/elements/Wing.java @@ -33,7 +33,6 @@ public class Wing extends DelegatingParticleElement { NONE, FLAP_SLOW, FLAP_FAST, - BREATHE, } // Wings stand slightly open when idle and open further the faster the player moves @@ -41,7 +40,6 @@ public class Wing extends DelegatingParticleElement { private static final double MOVING_OPEN_DEGREES = 15; private static final double FULL_OPEN_SPEED = 0.6; private static final double FLAP_DEGREES = 25; - private static final double BREATHE_SCALE = 0.08; private double size; private WingDesign wingDesign; @@ -73,7 +71,6 @@ public class Wing extends DelegatingParticleElement { double ticks = particleTickData.getDeg() * 10; double open = Math.toRadians(openDegrees(particleTickData, ticks)); double cos = Math.cos(open), sin = Math.sin(open); - double scale = size * (motion == Motion.BREATHE ? 1 + BREATHE_SCALE * Math.sin(2 * Math.PI * ticks / 40) : 1); double sneak = particleTickData.getPlayer().isSneaking() ? 0.5 : 0; BodyFrame frame = particleTickData.getFrame(); @@ -82,16 +79,16 @@ public class Wing extends DelegatingParticleElement { Location base = particleTickData.getLocation(); for (Vector dVector : wingDesign.getVectors()) { if (hidden()) continue; - double out = dVector.getX() * scale; - Vector local = frame.local(out * cos, 0.6 + dVector.getY() * scale - sneak, -0.5 - Math.abs(out) * sin); + double out = dVector.getX() * size; + Vector local = frame.local(out * cos, 0.6 + dVector.getY() * size - sneak, -0.5 - Math.abs(out) * sin); particleElement.tick(shaded(particleTickData, dVector).withLocation(base.clone().add(local))); } return; } for (Vector dVector : wingDesign.getVectors()) { if (hidden()) continue; - double out = dVector.getX() * scale; - Vector vector = new Vector(out * cos, 0.6 + dVector.getY() * scale - sneak, 0.5 + Math.abs(out) * sin); + double out = dVector.getX() * size; + Vector vector = new Vector(out * cos, 0.6 + dVector.getY() * size - sneak, 0.5 + Math.abs(out) * sin); vector.rotateAroundY(Math.toRadians(BodyMotion.yaw(particleTickData.getPlayer()) * -1)); vector.setX(-vector.getX()); vector.setZ(-vector.getZ());