yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bind-sfx-1' into 'master'

Browse Source 
Fix sound effects for bind/snare/entangle, and also the essence mine teleport.

See merge request 2009scape/2009scape!277
This commit is contained in:
Ceikry
2021-09-28 13:48:08 +00:00
parent f15d0d3357 6a118b3a32
commit 888eaa12eb
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/node/entity/combat/spell/BindSpell.java
+6 -3
View File
@@ -134,9 +134,12 @@ public final class BindSpell extends CombatSpell {
@Override @Override
public Plugin<SpellType> newInstance(SpellType type) throws Throwable { public Plugin<SpellType> newInstance(SpellType type) throws Throwable {
SpellBook.MODERN.register(12, new BindSpell(SpellType.BIND, 20, 30.0, 151, BIND_START, BIND_PROJECTILE, BIND_END, Runes.NATURE_RUNE.getItem(2), Runes.EARTH_RUNE.getItem(3), Runes.WATER_RUNE.getItem(3))); // TODO: bind/snare/entangle have separate casting and onhit components
SpellBook.MODERN.register(30, new BindSpell(SpellType.SNARE, 50, 60.0, 152, SNARE_START, SNARE_PROJECTILE, SNARE_END, Runes.NATURE_RUNE.getItem(3), Runes.EARTH_RUNE.getItem(4), Runes.WATER_RUNE.getItem(4))); // to their sound effects, in order for splashes to sound distinct, currently
SpellBook.MODERN.register(56, new BindSpell(SpellType.ENTANGLE, 79, 89.0, 153, ENTANGLE_START, ENTANGLE_PROJECTILE, ENTANGLE_END, Runes.NATURE_RUNE.getItem(4), Runes.EARTH_RUNE.getItem(5), Runes.WATER_RUNE.getItem(5))); // these just sound like the spells should on success, even if they splash
SpellBook.MODERN.register(12, new BindSpell(SpellType.BIND, 20, 30.0, 101, BIND_START, BIND_PROJECTILE, BIND_END, Runes.NATURE_RUNE.getItem(2), Runes.EARTH_RUNE.getItem(3), Runes.WATER_RUNE.getItem(3)));
SpellBook.MODERN.register(30, new BindSpell(SpellType.SNARE, 50, 60.0, 186, SNARE_START, SNARE_PROJECTILE, SNARE_END, Runes.NATURE_RUNE.getItem(3), Runes.EARTH_RUNE.getItem(4), Runes.WATER_RUNE.getItem(4)));
SpellBook.MODERN.register(56, new BindSpell(SpellType.ENTANGLE, 79, 89.0, 152, ENTANGLE_START, ENTANGLE_PROJECTILE, ENTANGLE_END, Runes.NATURE_RUNE.getItem(4), Runes.EARTH_RUNE.getItem(5), Runes.WATER_RUNE.getItem(5)));
return this; return this;
} }
Server/src/main/kotlin/rs09/game/content/global/travel/EssenceTeleport.kt
+1 -1
View File
@@ -38,7 +38,7 @@ object EssenceTeleport {
npc.faceTemporary(player, 1) npc.faceTemporary(player, 1)
npc.graphics(Graphics(108)) npc.graphics(Graphics(108))
player.lock() player.lock()
player.audioManager.send(195) player.audioManager.send(125)
Projectile.create(npc, player, 109).send() Projectile.create(npc, player, 109).send()
npc.sendChat("Senventior Disthinte Molesko!") npc.sendChat("Senventior Disthinte Molesko!")
GameWorld.Pulser.submit(object : Pulse(1) { GameWorld.Pulser.submit(object : Pulse(1) {