Merge branch 'cabbage-sfx' into 'master'

Add proper sound effects for the explorer's ring and fix leaf-bladed sword's sound effects.

See merge request 2009scape/2009scape!360
This commit is contained in:
Ceikry
2021-12-26 00:25:02 +00:00
6 changed files with 9 additions and 5 deletions
+2
View File
@@ -45,3 +45,5 @@ gradle
Server/worldprops/
Management-Server/managementprops/
/Development-Client/
**/*.swp
**/*.swo
+1
View File
@@ -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.
+1 -1
View File
@@ -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"
},
{
@@ -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
@@ -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()));
Vendored Regular → Executable
View File