Improve naming 5 - Sounds

game/src/main/kotlin/content/area/asgarnia/falador/Doric.kts

@@ -18,7 +18,7 @@ import content.quest.refreshQuestJournal
 import content.quest.questComplete
 import content.entity.player.dialogue.*
 import content.entity.player.dialogue.type.*
-import content.entity.sound.playJingle
+import content.entity.sound.jingle
 
 val floorItems: FloorItems by inject()
 
@@ -143,7 +143,7 @@ suspend fun SuspendableContext<Player>.takeOre() {
 
 fun Context<Player>.questComplete() {
     player["dorics_quest"] = "completed"
-    player.playJingle("quest_complete_1")
+    player.jingle("quest_complete_1")
     player.experience.add(Skill.Mining, 1300.0)
     player.inventory.add("coins", 180)
     player.refreshQuestJournal()

game/src/main/kotlin/content/area/asgarnia/falador/GiantMole.kts

@@ -3,7 +3,7 @@ package content.area.asgarnia.falador
 import com.github.michaelbull.logging.InlineLogger
 import content.entity.combat.attackers
 import content.entity.combat.hit.npcCombatDamage
-import content.entity.gfx.areaGraphic
+import content.entity.gfx.areaGfx
 import content.entity.player.inv.inventoryItem
 import content.entity.sound.areaSound
 import content.skill.firemaking.Light.hasLightSource
@@ -105,7 +105,7 @@ fun giantMoleBurrow(mole: NPC) {
         }
         mole.anim("giant_mole_burrow")
         areaSound("giant_mole_burrow_down", mole.tile)
-        areaGraphic("burrow_dust", tileToDust)
+        areaGfx("burrow_dust", tileToDust)
         pause(1)
         val newLocation = gianMoleSpawns.random(mole)
         mole.tele(newLocation!!)

game/src/main/kotlin/content/area/asgarnia/falador/SirVyvin.kts

@@ -22,20 +22,20 @@ import content.entity.player.dialogue.type.choice
 import content.entity.player.dialogue.type.npc
 import content.entity.player.dialogue.type.player
 import content.entity.player.dialogue.type.statement
-import content.entity.sound.playSound
+import content.entity.sound.sound
 import java.util.concurrent.TimeUnit
 
 val floorItems: FloorItems by inject()
 val npcs: NPCs by inject()
 val lineValidator: LineValidator by inject()
 
 objectOperate("Open", "cupboard_the_knights_sword_closed") {
-    player.playSound("cupboard_open")
+    player.sound("cupboard_open")
     target.replace("cupboard_the_knights_sword_opened", ticks = TimeUnit.MINUTES.toTicks(3))
 }
 
 objectOperate("Shut", "cupboard_the_knights_sword_opened") {
-    player.playSound("cupboard_close")
+    player.sound("cupboard_close")
     target.replace("cupboard_the_knights_sword_closed")
 }
 

game/src/main/kotlin/content/area/asgarnia/falador/SquireAsrol.kts

@@ -3,7 +3,7 @@ package content.area.asgarnia.falador
 import content.entity.player.bank.ownsItem
 import content.entity.player.dialogue.*
 import content.entity.player.dialogue.type.*
-import content.entity.sound.playJingle
+import content.entity.sound.jingle
 import content.quest.quest
 import content.quest.refreshQuestJournal
 import content.quest.questComplete
@@ -190,7 +190,7 @@ suspend fun SuspendableContext<Player>.completed() {
 
 fun Context<Player>.questComplete() {
     player["the_knights_sword"] = "completed"
-    player.playJingle("quest_complete_1")
+    player.jingle("quest_complete_1")
     player.experience.add(Skill.Smithing, 12725.0)
     player.refreshQuestJournal()
     player.inc("quest_points")

game/src/main/kotlin/content/area/asgarnia/taverley/Kaqemeex.kts

@@ -19,7 +19,7 @@ import content.entity.player.dialogue.type.npc
 import content.entity.player.dialogue.*
 import content.entity.player.dialogue.type.choice
 import content.entity.player.dialogue.type.player
-import content.entity.sound.playJingle
+import content.entity.sound.jingle
 
 npcOperate("Talk-to", "kaqemeex") {
     when (player.quest("druidic_ritual")) {
@@ -172,7 +172,7 @@ suspend fun SuspendableContext<Player>.completed() {
 
 fun Context<Player>.questComplete() {
     player["druidic_ritual"] = "completed"
-    player.playJingle("quest_complete_1")
+    player.jingle("quest_complete_1")
     player.experience.add(Skill.Herblore, 250.0)
     player.refreshQuestJournal()
     player.inc("quest_points", 4)

game/src/main/kotlin/content/area/kandarin/ourania/OuraniaAltar.kts

@@ -17,7 +17,7 @@ import world.gregs.voidps.engine.inv.transact.TransactionError
 import world.gregs.voidps.engine.inv.transact.operation.AddItem.add
 import world.gregs.voidps.engine.inv.transact.operation.RemoveItemLimit.removeToLimit
 import world.gregs.voidps.type.random
-import content.entity.sound.playSound
+import content.entity.sound.sound
 
 val drops: DropTables by inject()
 val logger = InlineLogger()
@@ -55,7 +55,7 @@ objectOperate("Craft-rune", "ourania_altar") {
             player.exp(Skill.Runecrafting, experience)
             player.anim("bind_runes")
             player.gfx("bind_runes")
-            player.playSound("bind_runes")
+            player.sound("bind_runes")
             player.message("You bind the temple's power into runes.", ChatType.Filter)
             if (usedArdougneCloak) {
                 player.message("Your Ardougne cloak seems to shimmer with power.", ChatType.Filter)

game/src/main/kotlin/content/area/kharidian_desert/al_kharid/duel_arena/Nurses.kt

@@ -12,7 +12,7 @@ import content.entity.player.dialogue.Uncertain
 import content.entity.player.dialogue.type.PlayerChoice
 import content.entity.player.dialogue.type.npc
 import content.entity.player.dialogue.type.player
-import content.entity.sound.playSound
+import content.entity.sound.sound
 
 internal suspend fun PlayerChoice.fighters(): Unit = option<Uncertain>("Do you see a lot of injured fighters?") {
     npc<Neutral>("Yes I do. Thankfully we can cope with almost anything. Jaraah really is a wonderful surgeon, his methods are a little unorthodox but he gets the job done.")
@@ -25,7 +25,7 @@ internal suspend fun TargetInteraction<Player, NPC>.heal() {
     val heal = player.levels.getMax(Skill.Constitution)
     if (player.levels.get(Skill.Constitution) < heal) {
         target.anim("pick_pocket")
-        player.playSound("heal")
+        player.sound("heal")
         player.levels.restore(Skill.Constitution, heal)
         player.message("You feel a little better.")
         return

game/src/main/kotlin/content/area/misthalin/barbarian_village/Gudrun.kts

@@ -33,7 +33,7 @@ import content.quest.startCutscene
 import content.quest.stopCutscene
 import content.entity.player.dialogue.*
 import content.entity.player.dialogue.type.*
-import content.entity.sound.playJingle
+import content.entity.sound.jingle
 
 val objects: GameObjects by inject()
 
@@ -491,7 +491,7 @@ suspend fun SuspendableContext<Player>.finishQuest() {
 }
 
 fun Context<Player>.questComplete() {
-    player.playJingle("quest_complete_3")
+    player.jingle("quest_complete_3")
     player["gunnars_ground"] = "completed"
     player.inc("quest_points", 5)
     player.experience.add(Skill.Crafting, 300.0)

game/src/main/kotlin/content/area/misthalin/lumbridge/Cook.kts

@@ -16,7 +16,7 @@ import content.quest.refreshQuestJournal
 import content.quest.questComplete
 import content.entity.player.dialogue.*
 import content.entity.player.dialogue.type.*
-import content.entity.sound.playJingle
+import content.entity.sound.jingle
 
 npcOperate("Talk-to", "cook_lumbridge") {
     when (player.quest("cooks_assistant")) {
@@ -114,7 +114,7 @@ suspend fun SuspendableContext<Player>.completed() {
 
 fun Context<Player>.questComplete() {
     player["cooks_assistant"] = "completed"
-    player.playJingle("quest_complete_1")
+    player.jingle("quest_complete_1")
     player.inventory.add("sardine_noted", 20)
     player.experience.add(Skill.Cooking, 300.0)
     player.inventory.add("coins", 500)

game/src/main/kotlin/content/area/misthalin/lumbridge/LumbridgeChurch.kts

@@ -28,18 +28,18 @@ import content.entity.player.dialogue.Happy
 import content.entity.player.dialogue.type.npc
 import content.entity.player.dialogue.type.statement
 import content.entity.proj.shoot
-import content.entity.sound.playJingle
-import content.entity.sound.playMidi
-import content.entity.sound.playSound
+import content.entity.sound.jingle
+import content.entity.sound.midi
+import content.entity.sound.sound
 import content.quest.*
 import java.util.concurrent.TimeUnit
 
 val npcs: NPCs by inject()
 
 objectOperate("Play", "lumbridge_organ") {
     player.anim("play_organ")
-    player.playMidi("church_organ")
-    player.playJingle("ambient_church_happy")
+    player.midi("church_organ")
+    player.jingle("ambient_church_happy")
     player["tinkle_the_ivories_task"] = true
 }
 
@@ -52,7 +52,7 @@ objectOperate("Close", "restless_ghost_coffin_headless", "restless_ghost_coffin"
     target.replace("restless_ghost_coffin_closed")
     player.animDelay("close_chest")
     player.message("You close the coffin.")
-    player.playSound("coffin_close")
+    player.sound("coffin_close")
 }
 
 objectOperate("Search", "restless_ghost_coffin_headless", "restless_ghost_coffin") {
@@ -115,7 +115,7 @@ suspend fun Interaction<Player>.returnSkull() {
 fun Context<Player>.questComplete() {
     player["restless_ghost_coffin"] = "skull"
     player["the_restless_ghost"] = "completed"
-    player.playJingle("quest_complete_1")
+    player.jingle("quest_complete_1")
     player.experience.add(Skill.Prayer, 1125.0)
     player.refreshQuestJournal()
     player.inc("quest_points")
@@ -137,7 +137,7 @@ itemOnObjectOperate("muddy_skull", "restless_ghost_coffin_closed") {
 objectOperate("Open", "restless_ghost_coffin_closed") {
     player.message("You open the coffin.")
     player.animDelay("open_chest")
-    player.playSound("coffin_open")
+    player.sound("coffin_open")
     target.replace("coffin_restless_ghost_2", ticks = TimeUnit.MINUTES.toTicks(3))
     if (!player.questCompleted("the_restless_ghost")) {
         spawnGhost()
@@ -147,7 +147,7 @@ objectOperate("Open", "restless_ghost_coffin_closed") {
 objectOperate("Search", "restless_ghost_coffin_closed") {
     player.message("You open the coffin.")
     player.animDelay("open_chest")
-    player.playSound("coffin_open")
+    player.sound("coffin_open")
     target.replace("coffin_restless_ghost_2", ticks = TimeUnit.MINUTES.toTicks(3))
     if (!player.questCompleted("the_restless_ghost")) {
         spawnGhost()
@@ -157,11 +157,11 @@ objectOperate("Search", "restless_ghost_coffin_closed") {
 suspend fun Interaction<Player>.spawnGhost() {
     val ghostExists = npcs[ghostSpawn.zone].any { it.id == "restless_ghost" }
     if (!ghostExists) {
-        player.playSound("coffin_open")
-        player.playSound("rg_ghost_approach")
+        player.sound("coffin_open")
+        player.sound("rg_ghost_approach")
         player.shoot("restless_ghost", ghostSpawn, height = 30, endHeight = 0, flightTime = 50)
         delay(1)
-        player.playSound("bigghost_appear")
+        player.sound("bigghost_appear")
         delay(1)
         val ghost = npcs.add("restless_ghost", ghostSpawn, Direction.SOUTH) ?: return
         ghost.animDelay("restless_ghost_awakens")

game/src/main/kotlin/content/area/misthalin/varrock/Delrith.kts

@@ -40,11 +40,11 @@ import content.entity.player.dialogue.type.player
 import content.entity.player.dialogue.type.statement
 import content.entity.combat.combatPrepare
 import content.entity.effect.transform
-import content.entity.gfx.areaGraphic
+import content.entity.gfx.areaGfx
 import content.entity.world.music.playTrack
 import content.entity.proj.shoot
-import content.entity.sound.playJingle
-import content.entity.sound.playSound
+import content.entity.sound.jingle
+import content.entity.sound.sound
 import content.quest.*
 import content.quest.free.demon_slayer.DemonSlayerSpell
 
@@ -168,8 +168,8 @@ suspend fun SuspendableContext<Player>.cutscene() {
     player.clearCamera()
     player.turnCamera(Tile(3227, 3369).add(offset), 100, 232, 232)
     player.moveCamera(Tile(3227, 3365).add(offset), 500, 232, 232)
-    player.playSound("summon_npc")
-    player.playSound("demon_slayer_table_explosion")
+    player.sound("summon_npc")
+    player.sound("demon_slayer_table_explosion")
     delay(1)
     table.anim("demon_slayer_table_light")
     delay(1)
@@ -180,14 +180,14 @@ suspend fun SuspendableContext<Player>.cutscene() {
     delay(1)
     player.shakeCamera(0, 0, 0, 0, 0)
     for ((_, target) in targets) {
-        areaGraphic("demon_slayer_spell_impact", target.add(offset))
+        areaGfx("demon_slayer_spell_impact", target.add(offset))
     }
     delay(2)
     npcs.index(delrith)
     delrith.anim("delrith_appear")
     delay(2)
-    player.playSound("demon_slayer_break_table", delay = 10)
-    player.playSound("demon_slayer_delrith_appear")
+    player.sound("demon_slayer_break_table", delay = 10)
+    player.sound("demon_slayer_delrith_appear")
     player.turnCamera(Tile(3227, 3369).add(offset), 400, 1, 1)
     player["demon_slayer_summoned"] = true
     delay(5)
@@ -266,7 +266,7 @@ npcOperate("*", "delrith") {
         }
         if (correct) {
             target.anim("delrith_death")
-            player.playSound("demon_slayer_delrith_banished")
+            player.sound("demon_slayer_delrith_banished")
             statement("Delrith is sucked into the vortex...", clickToContinue = false)
             delay(14)
             npcs.remove(target)
@@ -293,8 +293,8 @@ npcLevelChange("delrith", Skill.Constitution) { npc ->
 fun Context<Player>.questComplete() {
     player.anim("silverlight_showoff")
     player.gfx("silverlight_sparkle")
-    player.playSound("equip_silverlight")
-    player.playJingle("quest_complete_1")
+    player.sound("equip_silverlight")
+    player.jingle("quest_complete_1")
     player["demon_slayer"] = "completed"
     player.inc("quest_points", 3)
     DemonSlayerSpell.clear(player)

game/src/main/kotlin/content/area/misthalin/varrock/GypsyAris.kts

@@ -35,8 +35,8 @@ import content.entity.effect.clearTransform
 import content.entity.effect.transform
 import content.entity.world.music.playTrack
 import content.entity.sound.areaSound
-import content.entity.sound.playJingle
-import content.entity.sound.playSound
+import content.entity.sound.jingle
+import content.entity.sound.sound
 
 npcOperate("Talk-to", "gypsy_aris") {
     when (player.quest("demon_slayer")) {
@@ -173,13 +173,13 @@ npcTimerTick("demon_slayer_crystal_ball") { npc ->
 suspend fun ChoiceBuilder<NPCOption<Player>>.hereYouGo(): Unit = option<Talk>("Okay, here you go.") {
     player.inventory.remove("coins", 1)
     npc<Happy>("Come closer and listen carefully to what the future holds, as I peer into the swirling mists o the crystal ball.")
-    player.playSound("demon_slayer_crystal_ball_start")
+    player.sound("demon_slayer_crystal_ball_start")
     target.softTimers.start("demon_slayer_crystal_ball")
     npc<Talk>("I can see images forming. I can see you.")
     npc<Uncertain>("You are holding a very impressive-looking sword. I'm sure I recognise it...")
     npc<Uncertain>("There is a big, dark shadow appearing now.")
     target.softTimers.stop("demon_slayer_crystal_ball")
-    player.playSound("demon_slayer_crystal_ball_end")
+    player.sound("demon_slayer_crystal_ball_end")
     npc<Afraid>("Aaargh!")
     player<Quiz>("Are you all right?")
     npc<Afraid>("It's Delrith! Delrith is coming!")
@@ -223,7 +223,7 @@ suspend fun SuspendableContext<Player>.cutscene() {
     player.turnCamera(Tile(3229, 3367).add(offset), 250)
     player.shakeCamera(type = 1, intensity = 0, movement = 10, speed = 10, cycle = 0)
     player.shakeCamera(type = 3, intensity = 0, movement = 90, speed = 1, cycle = 0)
-    player.playSound("rumbling")
+    player.sound("rumbling")
     delay(1)
     player.open("fade_in")
     npc<Talk>("gypsy_aris","Wally managed to arrive at the stone circle just as Delrith was summoned by a cult of chaos druids...")
@@ -233,7 +233,7 @@ suspend fun SuspendableContext<Player>.cutscene() {
     player.turnCamera(Tile(3227, 3367).add(offset), height = 200, constantSpeed = 2, variableSpeed = 10)
     player.turnCamera(Tile(3227, 3367).add(offset), height = 100, constantSpeed = 1, variableSpeed = 10)
     player.shakeCamera(type = 3, intensity = 0, movement = 0, speed = 0, cycle = 0)
-    player.playSound("rumbling")
+    player.sound("rumbling")
     npc<Angry>("wally", "Die, foul demon!", clickToContinue = false)
     player.tele(Tile(3225, 3363).add(offset), clearInterfaces = false)
 
@@ -242,14 +242,14 @@ suspend fun SuspendableContext<Player>.cutscene() {
     player.walkOverDelay(Tile(3227, 3367).add(offset), forceWalk = false)
     player.face(Direction.NORTH)
     player.anim("wally_demon_slay")
-    player.playSound("demon_slayer_wally_sword", delay = 10)
+    player.sound("demon_slayer_wally_sword", delay = 10)
     delay(4)
 
     player.clearCamera()
     player.moveCamera(Tile(3227, 3369).add(offset), height = 100, constantSpeed = 2, variableSpeed = 10)
     player.shakeCamera(type = 1, intensity = 0, movement = 10, speed = 5, cycle = 0)
     player.shakeCamera(type = 3, intensity = 0, movement = 2, speed = 50, cycle = 0)
-    player.playSound("rumbling")
+    player.sound("rumbling")
     npc<Quiz>("wally", "Now, what was that incantation again?")
     randomiseOrder(player)
     npc<Frustrated>("wally", "${getWord(player, 1)}... ${getWord(player, 2)}... ${getWord(player, 3)}... ${getWord(player, 4)}... ${getWord(player, 5)}!")
@@ -259,11 +259,11 @@ suspend fun SuspendableContext<Player>.cutscene() {
     player.clearCamera()
     player.shakeCamera(type = 1, intensity = 0, movement = 0, speed = 0, cycle = 0)
     player.shakeCamera(type = 3, intensity = 0, movement = 0, speed = 0, cycle = 0)
-    player.playSound("rumbling")
+    player.sound("rumbling")
     player.moveCamera(Tile(3225, 3363).add(offset), height = 500)
     player.turnCamera(Tile(3227, 3367).add(offset), height = 200)
-    player.playSound("equip_silverlight")
-    player.playJingle("quest_complete_1")
+    player.sound("equip_silverlight")
+    player.jingle("quest_complete_1")
     player.face(Direction.SOUTH_WEST)
     player.anim("silverlight_showoff")
     player.gfx("silverlight_sparkle")