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

Implemented water filling sounds for filling water vessels from all water sources

Browse Source 
Implemented specific bucket water filling sound when filling from a well
Implemented emptying sounds for emptying vessels
Implemented cow milking sound
Implemented sound when smelting at a furnace
Implemented sound when smelting cannonballs at a furnace
Implemented sound when glassblowing
Fixed herb cleaning sound
Fixed regular wood door opening and closing sounds
Implemented metal door/gate opening and closing sounds
Implemented fence opening and closing sounds
Added Camelot castle main gate in door_configs.json
Fixed Sinclair mansion main gate to be a metal type door in door_configs.json
Implemented drinking sound when drinking from a waterskin in the desert
Implemented desert magic carpet travel take off and landing sound
Implemented desert magic carpet travel jingle/music
Fence around Falador cow farm is now properly identified as a fence and opens correctly
Fence id 34780 is now properly identified as a fence in door_configs.json so it opens correctly
Fence id 8810 is now properly identified as a fence in door_configs.json so it opens correctly
Fence id 2050-2051 is now properly identified as a fence in door_configs.json so it opens correctly
Fence id 1553 now has the correct open id in door_configs.json so it opens correctly
Fixed music tracks Relleka(289), Saga(290), and Borderlands(291) so they now play in their correct locations
Implemented jingle/music for sailing/chartering a ship(Trader crewmembers)
Implemented jingle/music for sailing/chartering a ship from/to Port Sarim/Karamja
Implemented jingle/music for sailing/chartering a ship from/to Port Sarim/Entrana
Implemented jingle/music for sailing/chartering a ship from/to Relleka/Neitiznot
Implemented jingle/music for sailing/chartering a ship from/to Relleka/Jatizso
Implemented jingle/music for sailing/chartering a ship from/to Ardougne/Brimmhaven
Implemented jingle/music for sailing/chartering a ship from/to Port Sarim/Pest control
Fixed the music player to be more authentic. Now when songs end they will repeat instead of playing a random inauthentic song. The loop function now works correctly so the currently playing song will play endlessly without changing as the player moves.
Implemented playJingle function in contentAPI.kt
This commit is contained in:
Zerken
2023-06-21 14:57:01 +00:00
committed by Ryan
parent 1672646e87
commit cef956722a
23 changed files with 141 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/content/global/handlers/iface/GlassInterface.java
+2
View File
@@ -13,6 +13,7 @@ import core.game.world.update.flag.context.Animation;
import core.plugin.Initializable;
import core.plugin.Plugin;
import kotlin.Unit;
import org.rs09.consts.Sounds;
/**
* Represents the glass making interface plugin.
@@ -105,6 +106,7 @@ public final class GlassInterface extends ComponentPlugin {
return true;
}
player.animate(ANIMATION);
player.getAudioManager().send(Sounds.GLASSBLOWING_2724);
player.getInventory().remove(MOLTEN_GLASS);
player.getInventory().add(new Item(glass.getProduct(), 1));
player.getSkills().addExperience(Skills.CRAFTING, glass.getExperience(), true);
Server/src/main/content/global/handlers/item/EmptyOptionPlugin.java
+2
View File
@@ -7,6 +7,7 @@ import core.game.node.entity.player.Player;
import core.game.node.item.Item;
import core.plugin.Initializable;
import core.plugin.Plugin;
import org.rs09.consts.Sounds;
import java.util.HashMap;
@@ -28,6 +29,7 @@ public final class EmptyOptionPlugin extends OptionHandler {
}
if(EmptyItem.emptyItemMap.get(node.getId()) != null){
player.getInventory().remove(node.asItem());
player.getAudioManager().send(Sounds.LIQUID_2401, 1);
player.getInventory().add(EmptyItem.getEmpty(node.getId()));
player.getPacketDispatch().sendMessage(EmptyItem.getEmptyMessage(node.getId()));
} else {
Server/src/main/content/global/handlers/item/withobject/AmmoMouldOnFurnace.kt
+2
View File
@@ -10,6 +10,7 @@ import org.rs09.consts.Items
import core.game.dialogue.SkillDialogueHandler
import core.game.interaction.InteractionListener
import core.game.interaction.IntType
import org.rs09.consts.Sounds
class AmmoMouldOnFurnace : InteractionListener {
private val furnaces = intArrayOf(4304, 6189, 11010, 11666, 12100, 12809, 18497, 26814, 30021, 30510, 36956, 37651) // abstract when smelting converted to kotlin
@@ -39,6 +40,7 @@ class AmmoMouldOnFurnace : InteractionListener {
0 -> {
sendMessage(player,"You heat the steel bar into a liquid state.")
animate(player, 3243) // 899 would be preferable but the arms spaz out
player.audioManager.send(Sounds.FURNACE_2725, 1)
}
3 -> {
sendMessage(player,"You pour the molten metal into your cannonball mould.")
Server/src/main/content/global/handlers/item/withobject/WaterSourceListener.kt
+8
View File
@@ -7,6 +7,7 @@ import core.game.world.update.flag.context.Animation
import org.rs09.consts.Items
import core.game.interaction.InteractionListener
import core.game.interaction.IntType
import org.rs09.consts.Sounds
/**
* Handles filling most water sources.
@@ -44,6 +45,13 @@ class WaterSourceListener : InteractionListener {
animate(player, animation)
sendMessage(player, formatMsgText(used.name, vessel.fillMsg))
addItemOrDrop(player, vessel.output)
if(with.name.contains("well", ignoreCase = true)) {
playAudio(player, getAudio(Sounds.WELL_FILL_2615, 1))
}
else {
playAudio(player, getAudio(Sounds.TAP_FILL_2609, 1))
}
}
return !vessel.autofill || amountInInventory(player, used.id) == 0
}
Server/src/main/content/global/handlers/npc/CowMilkingPlugin.java
+2
View File
@@ -13,6 +13,7 @@ import core.game.world.update.flag.context.Animation;
import core.plugin.Plugin;
import core.plugin.Initializable;
import core.plugin.ClassScanner;
import org.rs09.consts.Sounds;
/**
* Represents the plugin used to milk a cow.
@@ -55,6 +56,7 @@ public final class CowMilkingPlugin extends OptionHandler {
}
player.animate(ANIMATION);
player.getAudioManager().send(Sounds.MILK_COW_372);
player.getPulseManager().run(new Pulse(8, player) {
@Override
public boolean pulse() {
Server/src/main/content/global/skill/herblore/HerbCleanPlugin.java
+1 -2
View File
@@ -19,7 +19,6 @@ import core.tools.RandomFunction;
*/
@Initializable
public final class HerbCleanPlugin extends OptionHandler {
private static final int[] SFX_IDS = new int[] { 5153, 5155, 5157 };
@Override
public Plugin<Object> newInstance(Object arg) throws Throwable {
@@ -42,7 +41,7 @@ public final class HerbCleanPlugin extends OptionHandler {
if (removeItem(player, node.asItem(), Container.INVENTORY)){
player.getSkills().addExperience(Skills.HERBLORE, exp, true);
addItem(player, herb.getProduct().getId(), 1, Container.INVENTORY);
player.getAudioManager().send(SFX_IDS[RandomFunction.random(SFX_IDS.length)], 1);
player.getAudioManager().send(5153, 1);
player.getPacketDispatch().sendMessage("You clean the dirt from the " + herb.getProduct().getName().toLowerCase().replace("clean", "").trim() + " leaf.");
}
player.lock(1);
Server/src/main/content/global/skill/smithing/smelting/SmeltingPulse.java
+2
View File
@@ -15,6 +15,7 @@ import core.game.world.update.flag.context.Animation;
import core.game.world.update.flag.context.Graphics;
import core.tools.RandomFunction;
import core.tools.StringUtils;
import org.rs09.consts.Sounds;
/**
* Represents the pulse used to smelt.
@@ -110,6 +111,7 @@ public class SmeltingPulse extends SkillPulse<Item> {
player.visualize(Animation.create(725), new Graphics(148, 96));
} else {
player.animate(Animation.create(3243)); // Used to be 899 but that looked wonky and broken
player.getAudioManager().send(Sounds.FURNACE_2725, 1);
}
}
}
Server/src/main/content/global/travel/ship/SeamanDialoguePlugin.java
+3
View File
@@ -10,6 +10,8 @@ import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.diary.DiaryType;
import core.game.node.item.Item;
import static core.api.ContentAPIKt.*;
/**
* Represents the dialogue used to handle the sailing from and to karamja.
*
@@ -148,6 +150,7 @@ public class SeamanDialoguePlugin extends DialoguePlugin {
public void travel() {
end();
Ships.PORT_SARIM_TO_KARAMAJA.sail(player);
playJingle(player, 172);
}
@Override
Server/src/main/content/global/travel/ship/ShipCharter.java
+2 -1
View File
@@ -16,7 +16,7 @@ import core.tools.StringUtils;
import java.util.ArrayList;
import java.util.List;
import static core.api.ContentAPIKt.requireQuest;
import static core.api.ContentAPIKt.*;
/**
* Represents a class used to charter ships.
@@ -341,6 +341,7 @@ public final class ShipCharter {
*/
public void sail(final Player player) {
player.lock(7);
playJingle(player, 171);
Location start = player.getLocation();
GameWorld.getPulser().submit(new Pulse(1) {
int count = 0;