revert(content): Send midi regardless of client volume

Was desyncing the music player interface (and shouldn't behave this way anyways)

Author: Pazaz

data/src/scripts/areas/area_karamja/scripts/captain_shanks.rs2

@@ -47,7 +47,7 @@ inv_del(inv, shiloshipticket, 1);
 [proc,set_sail_cairn](string $arrival_mes, coord $destination, int $map_route, int $delay)
 %boat_takeoff = $map_route;
 if_openmain(ship_journey);
-~midi_jingle(^sailing_journey_jingle, ^sailing_journey_jingle_millis);
+midi_jingle(^sailing_journey_jingle, ^sailing_journey_jingle_millis);
 
 
 if_settab(null, 0);

data/src/scripts/general/scripts/quests.rs2

@@ -16,11 +16,11 @@ if ($progress = 0) {
 // Random quest complete jingle.
 def_int $random = random(128);
 if ($random < 32) {       // The least common music that plays when completing a quest.
-    ~midi_jingle(^quest_complete_3_jingle, ^quest_complete_3_millis);
+    midi_jingle(^quest_complete_3_jingle, ^quest_complete_3_millis);
 } else if ($random < 64) {// A less common music that plays when completing a quest.
-    ~midi_jingle(^quest_complete_2_jingle, ^quest_complete_2_millis);
+    midi_jingle(^quest_complete_2_jingle, ^quest_complete_2_millis);
 } else {                 // The most common music that plays when completing a quest.
-    ~midi_jingle(^quest_complete_1_jingle, ^quest_complete_1_millis);
+    midi_jingle(^quest_complete_1_jingle, ^quest_complete_1_millis);
 }
 // Send Quest Scroll
 switch_component ($component) {

data/src/scripts/interface_boat/scripts/sail.rs2

@@ -3,7 +3,7 @@
 
 // todo: should com_0 be set to "You sail to <$place_name>."?
 if_openmain(ship_journey);
-~midi_jingle(^sailing_journey_jingle, ^sailing_journey_jingle_millis);
+midi_jingle(^sailing_journey_jingle, ^sailing_journey_jingle_millis);
 
 // hide all tabs except friends list and ignore list
 if_settab(null, 0);
@@ -34,4 +34,4 @@ if(p_finduid(uid) = false) return;
 
 // todo: should com_0 be set to "You sail to <$place_name>."?
 if_openmain(ship_journey);
-~midi_jingle(^sailing_journey_jingle, ^sailing_journey_jingle_millis);
+midi_jingle(^sailing_journey_jingle, ^sailing_journey_jingle_millis);

data/src/scripts/levelup/scripts/levelup.rs2

@@ -50,7 +50,7 @@ if ($has_unlocks = false) {
     $jingle = db_getfield($unlock_row, levelup:unlocks_jingle, 0);
     $jingle_millis = db_getfield($unlock_row, levelup:unlocks_jingle_millis, 0);
 }
-~midi_jingle($jingle, $jingle_millis);
+midi_jingle($jingle, $jingle_millis);
 // the level up dialogue box
 if_settext(db_getfield($unlock_row, levelup:title, 0), "@dbl@<$message>");
 if_settext(db_getfield($unlock_row, levelup:body, 0), "<db_getfield($unlock_row, levelup:level_prefix, 0)> <tostring($level)>.");

data/src/scripts/minigames/game_duelarena/scripts/duel_arena_finish.rs2

@@ -15,7 +15,7 @@ if (.finduid(%duelpartner) = true) {
     .queue(duel_finish, 0);
 }
 // ur able to get double mes if opponent kills u with knives: https://youtu.be/KRDZJKa1whI?list=PLn23LiLYLb1bQ7Hwp77KoNBjKvpZQTfJT&t=12
-~midi_jingle(^death_jingle_2, ^death_jingle_2_millis);
+midi_jingle(^death_jingle_2, ^death_jingle_2_millis);
 // https://storage.googleapis.com/tannerdino/images/6543.jpg
 // https://youtu.be/gWmwSYxzUfo
 mes("Oh dear you are dead!");
@@ -27,15 +27,15 @@ if (.finduid(%duelpartner) = true) {
         if_settext(duel_win:com_99, "You are victorious!");
         mes("Well done! You have defeated <.displayname>!");
         session_log(^log_moderator, "Won a duel against <.name>");
-        ~midi_jingle(^duel_win_2_jingle, ^duel_win_2_jingle_millis);
+        midi_jingle(^duel_win_2_jingle, ^duel_win_2_jingle_millis);
         ~duel_reset_all;
         ~duel_spoils;
         return;
     } else if (%duelstatus = ^duelstatus_opponent_resigned) {
         if_settext(duel_win:com_99, "You are victorious! Your opponent resigned!"); // 2006
         mes("Well done! <.displayname> resigned!"); // 2006
         session_log(^log_moderator, "Won a duel by forfeit against <.name>");
-        ~midi_jingle(^duel_win_2_jingle, ^duel_win_2_jingle_millis);
+        midi_jingle(^duel_win_2_jingle, ^duel_win_2_jingle_millis);
         ~duel_reset_all;
         ~duel_spoils;
         return;
@@ -46,7 +46,7 @@ if (%duelstatus = ^duelstatus_lost) {
 }
 
 [proc,duel_spoils]
-~midi_jingle(^duel_win_2_jingle, ^duel_win_2_jingle_millis);
+midi_jingle(^duel_win_2_jingle, ^duel_win_2_jingle_millis);
 ~duel_adjust_scoreboard(displayname, ~player_combat_level, .displayname, ~.player_combat_level);
 if_settext(duel_win:displayname, .displayname);
 if_settext(duel_win:combat_level, tostring(~.player_combat_level));

data/src/scripts/minigames/game_duelarena/scripts/duel_arena_start.rs2

@@ -52,7 +52,7 @@ if (.finduid(%duelpartner) = true) {
     hint_player(.uid);
 
     settimer(duel_arena_time_limit, 6000); // 60 minute time limit https://runescape.wiki/w/Update:Assist_System
-    ~midi_jingle(^duel_start_jingle, ^duel_start_jingle_millis);
+    midi_jingle(^duel_start_jingle, ^duel_start_jingle_millis);
     ~duel_arena_countdown;
 }
 

data/src/scripts/minigames/game_trail/scripts/trail_clue_helper.rs2

@@ -75,7 +75,7 @@ return (false);
 [proc,trail_complete]
 ~clear_trail_progress;
 mes("Well done you've completed the Treasure Trail!");
-~midi_jingle(^treasure_hunt_win_jingle, ^treasure_hunt_win_jingle_millis);
+midi_jingle(^treasure_hunt_win_jingle, ^treasure_hunt_win_jingle_millis);
 inv_transmit(trail_rewardinv, trail_reward:inv);
 if_openmain(trail_reward);
 queue(trail_give_reward, 0);

data/src/scripts/minigames/game_trawler/scripts/trawler_start.rs2

@@ -36,7 +36,7 @@ p_teleport(map_findsquare(^trawler_start_center_under, 0, 4, ^map_findsquare_lin
 %boat_takeoff = 11;
 %trawler = ^trawler_sailed;
 if_openmain(ship_journey);
-~midi_jingle(^sailing_journey_jingle, ^sailing_journey_jingle_millis);
+midi_jingle(^sailing_journey_jingle, ^sailing_journey_jingle_millis);
 
 p_delay(20);
 if_close;

data/src/scripts/minigames/game_trawler/scripts/trawler_win.rs2

@@ -43,7 +43,7 @@ if (~inzone_coord_pair_table(trawler_game_zones, coord) = false) {
 mes("Murphy turns the boat towards shore.");
 %boat_takeoff = 12;
 %trawler = ^trawler_finished;
-~midi_jingle(^sailing_journey_jingle, ^sailing_journey_jingle_millis);
+midi_jingle(^sailing_journey_jingle, ^sailing_journey_jingle_millis);
 if_openmain(ship_journey);
 
 p_delay(20);

data/src/scripts/music/scripts/music.rs2

@@ -22,20 +22,6 @@ if (p_finduid(uid) = true) {
     @please_finish;
 }
 
-[proc,midi_jingle](string $jingle, int $length)
-if (%music_volume = 4) {
-    // off
-    return;
-}
-midi_jingle($jingle, $length);
-
-[proc,midi_song](string $song)
-if (%music_volume = 4) {
-    // off
-    return;
-}
-midi_song($song);
-
 [proc,music_getvar](int $var)(int)
 if ($var = 1) {
     return(%music1);
@@ -89,7 +75,7 @@ if ($unlock ! null) {
 
 def_string $name = db_getfield($song, music:name, 0);
 if_settext(music:com_201, $name);
-~midi_song($name);
+midi_song($name);
 
 [label,music_playbyregion](coord $coord)
 // first, search for the song linked to this mapsquare
@@ -122,5 +108,5 @@ if ($unlock ! null) {
 if (%music_mode ! 0) {
     def_string $name = db_getfield($song, music:name, 0);
     if_settext(music:com_201, $name);
-    ~midi_song($name);
+    midi_song($name);
 }