2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-10 10:20:41 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'add-sfx' into 'master'

Browse source 
Add protect from summoning and antifire/antipoison 30 second ticking sounds.

See merge request 2009scape/2009scape!286
This commit is contained in:
Ceikry 2021-10-01 02:39:49 +00:00
commit b2c5b210d0
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Server/src/main/java/core/game/node/entity/player/Player.java
View file

@ -476,6 +476,7 @@ public class Player extends Entity {
int time = getAttribute("fire:immune",0) - GameWorld.getTicks();
if(time == TickUtilsKt.secondsToTicks(30)){
sendMessage(colorize("%RYou have 30 seconds remaining on your antifire potion."));
getAudioManager().send(3120);
}
if(time == 0){
sendMessage(colorize("%RYour antifire potion has expired."));
@ -488,6 +489,7 @@ public class Player extends Entity {
debug(time + "");
if(time == TickUtilsKt.secondsToTicks(30)){
sendMessage(colorize("%RYou have 30 seconds remaining on your antipoison potion."));
getAudioManager().send(3120);
}
if(time == 0){
sendMessage(colorize("%RYour antipoison potion has expired."));

2
Server/src/main/java/core/game/node/entity/player/link/prayer/PrayerType.java
View file

@ -52,7 +52,7 @@ public enum PrayerType {
STEEL_SKIN(28, 3, 92, 31, PrayerCategory.BABY_BLUE, 2687, new SkillBonus(Skills.DEFENCE, 0.15)),
ULTIMATE_STRENGTH(31, 3, 93, 33, PrayerCategory.GREEN, 2691, new SkillBonus(Skills.STRENGTH, 0.15)),
INCREDIBLE_REFLEXES(34, 3, 94, 35, PrayerCategory.PINK, 2667, new SkillBonus(Skills.ATTACK, 0.15)),
PROTECT_FROM_SUMMONING(35, 2, 1168, 53, PrayerCategory.DARK_BROWN, PrayerCategory.MAGENTA, new Audio(-1)),
PROTECT_FROM_SUMMONING(35, 2, 1168, 53, PrayerCategory.DARK_BROWN, PrayerCategory.MAGENTA, new Audio(4262)),
PROTECT_FROM_MAGIC(37, 3, 95, 37, PrayerCategory.LIGHT_BROWN, 2675),
PROTECT_FROM_MISSILES(40, 3, 96, 39, PrayerCategory.LIGHT_BROWN, 2677),
PROTECT_FROM_MELEE(43, 4, 97, 41, PrayerCategory.LIGHT_BROWN, 2676),