diff --git a/.gitignore b/.gitignore index d8699b5df..06e74b15e 100644 --- a/.gitignore +++ b/.gitignore @@ -44,4 +44,6 @@ gradle .idea/ Server/worldprops/ Management-Server/managementprops/ -/Development-Client/ \ No newline at end of file +/Development-Client/ +**/*.swp +**/*.swo diff --git a/CHANGELOG b/CHANGELOG index 3abbbef28..0da84d759 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -79,3 +79,4 @@ - Server configuration language has been changed from JSON to TOML. - Add Family Crest quest. - Add mort myre stems and pears to bloom's effect, and add the sound effect for bloom. +- Add proper sound effects for the explorer's ring and fix leaf-bladed sword's sound effects. diff --git a/Server/data/configs/item_configs.json b/Server/data/configs/item_configs.json index 0b59a5f7f..66e7d27c6 100644 --- a/Server/data/configs/item_configs.json +++ b/Server/data/configs/item_configs.json @@ -121199,7 +121199,7 @@ "high_alchemy": "40800", "destroy": "false", "weapon_interface": "5", - "attack_audios": "2500,2500,2517,2500", + "attack_audios": "2517,2517,2500,2517", "name": "Leaf-bladed sword" }, { diff --git a/Server/src/main/java/core/game/interaction/item/ExplorersRingPlugin.kt b/Server/src/main/java/core/game/interaction/item/ExplorersRingPlugin.kt index 6e1d6d91c..7f4531c3d 100644 --- a/Server/src/main/java/core/game/interaction/item/ExplorersRingPlugin.kt +++ b/Server/src/main/java/core/game/interaction/item/ExplorersRingPlugin.kt @@ -40,6 +40,7 @@ class ExplorersRingPlugin : InteractionListener() { return@on true } player.settings.updateRunEnergy(-50.0) + player.audioManager.send(5035) getStoreFile()[player.username.toLowerCase() + ":run"] = charges + 1 @@ -96,4 +97,4 @@ class ExplorersRingPlugin : InteractionListener() { fun getStoreFile(): JSONObject{ return ServerStore.getArchive("daily-explorer-ring") } -} \ No newline at end of file +} diff --git a/Server/src/main/java/core/game/node/entity/player/link/TeleportManager.java b/Server/src/main/java/core/game/node/entity/player/link/TeleportManager.java index c2fcfbc3f..63804fff0 100644 --- a/Server/src/main/java/core/game/node/entity/player/link/TeleportManager.java +++ b/Server/src/main/java/core/game/node/entity/player/link/TeleportManager.java @@ -582,7 +582,7 @@ public class TeleportManager { public boolean pulse() { if (delay == 0) { if (entity instanceof Player) { - entity.asPlayer().getAudioManager().send(200); + entity.asPlayer().getAudioManager().send(5036); } entity.getAnimator().forceAnimation(new Animation(getSettings().getStartEmote())); entity.graphics(new Graphics(getSettings().getStartGfx())); @@ -590,7 +590,7 @@ public class TeleportManager { entity.getProperties().setTeleportLocation(Location.create(location)); fireRandom(entity, location); if (entity instanceof Player) { - entity.asPlayer().getAudioManager().send(201); + entity.asPlayer().getAudioManager().send(5034); } entity.getAnimator().forceAnimation(new Animation(getSettings().getEndEmote(), Priority.HIGH)); entity.graphics(new Graphics(getSettings().getEndGfx())); diff --git a/gradlew b/gradlew old mode 100644 new mode 100755