mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-05 16:49:06 +00:00
Mr Extremez
d876a923b9
* Clean up part 1 - Removed lots of dead code - Removed unncessary files not in use - Cleaned up small bits of code - Removed a few warnings - Server.java ---> GameEngine.java - Constants.java ---> GameConstants.java * Cape Dye Rewrote cape dying * Packaging - redone ----> com.rebotted * PacketSender/clean up - ActionSender ---> PacketSender - Moved many more packets to packetsender - Cleaned up more dead code * Merge Client/Player - Merged Client.java with Player.java (both were doing same thing so redundant to have both) - Removed some more dead code - Tidy a few small things up * Quests/more clean up - Removed more dead code - Made quests static in order to clean them up a bit * More cleanup - Removed some more of the dead quest code - Correcting naming of some of the shop variables
210 lines
7.4 KiB
Java
210 lines
7.4 KiB
Java
package com.rebotted.game.content.music;
|
|
|
|
import com.rebotted.game.players.Player;
|
|
import com.rebotted.util.Misc;
|
|
|
|
/**
|
|
* http://runescape.wikia.com/wiki/Music Good resource song id = 2 absx/64 = 1
|
|
* absy/64 = 0
|
|
*/
|
|
|
|
public class Music {
|
|
|
|
public static int[][] MUSIC_DATA = { // all the songs added
|
|
{ 50, 51, 2 },
|
|
{ 49, 51, 2 }, // Flour mill place
|
|
{ 48, 50, 3 },
|
|
{ 46, 56, 8 },
|
|
// {51, 60, 9},
|
|
{ 46, 50, 12 },
|
|
{ 31, 74, 16 },// mime event
|
|
// {46, 50, 49},
|
|
{ 52, 57, 14 }, { 47, 52, 15 }, { 45, 53, 18 }, { 45, 54, 18 },
|
|
{ 47, 50, 35 },
|
|
{ 50, 150, 139 },// harmony 2
|
|
{ 46, 54, 23 },// goblin village
|
|
// {47, 50, 36},
|
|
{ 51, 50, 36 }, { 47, 51, 49 }, { 51, 49, 50 }, { 44, 75, 52 },
|
|
{ 46, 53, 54 }, { 49, 54, 111 }, { 51, 60, 255 }, // scape sad
|
|
{ 45, 75, 57 }, { 47, 47, 62 },// Newbie Melody, Tutorial Island
|
|
// corrupted
|
|
{ 47, 48, 62 },// Newbie Melody, Tutorial Island
|
|
{ 48, 47, 62 },// Newbie Melody, Tutorial Island
|
|
{ 48, 48, 62 },// Newbie Melody, Tutorial Island
|
|
{ 48, 148, 144 },// underground, underground
|
|
{ 49, 48, 62 },// Newbie Melody, Tutorial Island
|
|
{ 50, 49, 64 }, { 49, 49, 64 }, { 46, 57, 355 }, // troubled
|
|
{ 43, 75, 52 },// Miracle Dance, Mind Altar
|
|
// {51, 48, 69}, // this song is currently corrupt! Do not play!
|
|
// {46, 52, 107}, // falador different
|
|
{ 46, 52, 72 }, // falador
|
|
{ 50, 50, 76 }, { 48, 49, 358 }, // Vision - wizard's tower
|
|
{ 46, 49, 92 },// karamja
|
|
{ 45, 49, 92 },// karamja diff region
|
|
{ 51, 54, 93 }, // Edgeville
|
|
{ 46, 55, 96 }, // this song is currently corrupt! Do not play!
|
|
// -seems
|
|
// fine
|
|
// {45, 49, 55},
|
|
{ 46, 60, 52 }, { 48, 54, 98 }, { 47, 49, 105 }, // tommorrow
|
|
{ 50, 52, 106 }, { 51, 51, 123 }, { 50, 53, 125 }, // Varrock But
|
|
// Laggyyyy
|
|
// {50, 53, 157}, //Varrock
|
|
{ 46, 51, 127 }, { 48, 53, 141 }, { 41, 75, 52 },// Down to Earth,
|
|
// Earth Altar
|
|
{ 42, 75, 52 },// Zealot, Water Altar
|
|
{ 48, 51, 151 }, { 51, 52, 157 }, { 51, 53, 157 }, { 52, 50, 47 },// duel
|
|
// arena
|
|
{ 52, 51, 122 }, // Duel Arena Hospital - Shine
|
|
{ 41, 40, 588 }, // Pest Control - In-game
|
|
{ 41, 41, 587 }, // Pest Control - Lobby
|
|
{ 40, 75, 52 },// Quest, Fire Altar
|
|
{ 55, 51, 380 },// Barrows
|
|
{ 50, 55, 169 }, { 49, 154, 144 }, // varrock sewers repeated
|
|
{ 50, 154, 144 }, // Varrock Sewers
|
|
{ 48, 154, 144 }, // EdgeVille dungeon
|
|
{ 48, 153, 144 }, // EdgeVilledungeon
|
|
{ 48, 150, 144 },// draynor sewers
|
|
{ 48, 151, 144 },// draynor sewers
|
|
{ 43, 43, 206 }, // monkey madness
|
|
{ 48, 55, 169 }, // Wilderness North of Edge
|
|
{ 38, 80, 469 }, // Tzhaar cave
|
|
{ 49, 57, 43 }, // wilderness 3 carrallanger
|
|
{ 42, 53, 184 }, { 49, 53, 175 }, { 50, 54, 177 }, { 42, 43, 9 },// anywhere
|
|
{ 43, 44, 9 },// anywhere again
|
|
{ 45, 42, 190 },// marooneed - crash island
|
|
{ 43, 42, 160 },// island life - works
|
|
{ 44, 49, 172 },// jungle island
|
|
{ 43, 50, 6 },// jolly r
|
|
{ 43, 49, 174 },// landlubber
|
|
{ 43, 50, 327 },// trawler
|
|
{ 42, 50, 115 },// jungly2
|
|
// {46, 49, 180},
|
|
// {45, 52, 186}, ARRIVAL CORRUPTED
|
|
{ 42, 54, 7 },// overture
|
|
{ 54, 54, 357 }, // village canfis center 3496 3489
|
|
// {0, 0, 282}, //Stillness myreque hideout
|
|
{ 53, 54, 48 }, // morytania path to Paterdomus
|
|
{ 54, 53, 347 }, // waterlogged south of canfis 3506, 3435
|
|
{ 45, 52, 72 }, { 40, 51, 191 },// knightly
|
|
{ 41, 51, 32 },// baroque
|
|
{ 40, 52, 152 }, // ballad of enchantment ardounge
|
|
{ 47, 54, 152 }, // ballad of enchantment edgeville prayer 3051 3490
|
|
{ 39, 75, 52 },// Heart and Mind, Body Altar
|
|
{ 47, 153, 325 },// Cave Background, Dwarven Mines
|
|
{ 46, 153, 325 },// Cave Background, Dwarven Mines
|
|
{ 47, 152, 325 },// Cave Background, Dwarven Mines
|
|
{ 49, 50, 327 }, { 39, 47, 83 },// big chords
|
|
{ 40, 48, 187 },// magic dance
|
|
{ 39, 48, 187 },// magic dance watchtower not sure if correct song
|
|
{ 45, 57, 185 }, // mad eadgar - doesn't play
|
|
// {40, 48, 153},//in the manor
|
|
{ 47, 53, 49 }, // Wander
|
|
{ 48, 52, 333 }, { 50, 56, 337 },
|
|
// {40, 74, 419},
|
|
{ 47, 56, 121 }, { 39, 49, 148 }, // emotion 2524, 3168
|
|
{ 39, 50, 17 }, // attack1 2515, 3230
|
|
{ 39, 54, 32 }, // voyage 2528, 3497
|
|
{ 39, 54, 82 }, // waterfall 2511, 3463
|
|
{ 40, 54, 319 }, // theme coal trucks
|
|
{ 38, 48, 80 }, // Soundscape, Castle Wars
|
|
{ 37, 148, 28 }, // Attack 5 - Castle Wars, Sara Portal
|
|
{ 43, 54, 60 }, // Lightwalk - Camelot
|
|
{ 44, 53, 119 }, // fishing catherby
|
|
{ 39, 54, 33 }, // gnome village coords = 2478, 3437
|
|
{ 38, 53, 329 }, // tree spirits
|
|
{ 38, 54, 126 }, // Gnome King
|
|
{ 37, 54, 130 }, // Gnome Ball plays a little bit out of region
|
|
// 2402,
|
|
// 3488
|
|
{ 40, 53, 328 }, // March
|
|
// {29, 81, 537},//Dogs of War - Stronghold of Security - Vault of
|
|
// War
|
|
// {31, 81, 558},//Food for Thought - Stronghold of Security -
|
|
// Catacomb
|
|
// of Famine
|
|
// {33, 82, 559},//Malady - Stronghold of Security - Pit of
|
|
// Pestilence
|
|
// {36, 81, 560},//Dance of Death - Stronghold of Security -
|
|
// Sepulchre
|
|
// of Death
|
|
{ 41, 58, 141 }, // Relleka Rock Crabs
|
|
{ 41, 53, 60 }, // Lasting - Range guild
|
|
{ 41, 54, 140 } // Talking forest
|
|
};
|
|
|
|
/**
|
|
* Checks how many areas we have loaded.
|
|
*
|
|
* @param c
|
|
* Client.
|
|
*/
|
|
public static void checkMusic(Player c) {
|
|
for (int[] aMUSIC_DATA : MUSIC_DATA) {
|
|
if (c.getX() / 64 == aMUSIC_DATA[0]
|
|
&& c.getY() / 64 == aMUSIC_DATA[1]/*
|
|
* && player . getPlayList (
|
|
* ) . auto
|
|
*/) {
|
|
if (c.getTemporary("CURRENT_SONG") == null
|
|
|| (Integer) c.getTemporary("CURRENT_SONG") != aMUSIC_DATA[2]) {
|
|
c.getPacketSender().sendMessage(
|
|
"@gre@Play Music Has Music:@bla@ " + aMUSIC_DATA[0]
|
|
+ " : " + aMUSIC_DATA[1]);
|
|
}
|
|
}
|
|
}
|
|
c.getPacketSender().sendMessage(
|
|
"@red@Play Music No Music:@bla@ " + c.getX() / 64 + " : "
|
|
+ c.getY() / 64);
|
|
}
|
|
|
|
/**
|
|
* Checks which song is played in which region.
|
|
*
|
|
* @param c
|
|
* the player.
|
|
*/
|
|
public static void playMusic(Player c) {
|
|
for (int[] aMUSIC_DATA : MUSIC_DATA) {
|
|
if (c.getX() / 64 == aMUSIC_DATA[0]
|
|
&& c.getY() / 64 == aMUSIC_DATA[1]/*
|
|
* && player .
|
|
* getPlayList ( ) .
|
|
* auto
|
|
*/) {
|
|
if (c.getTemporary("CURRENT_SONG") == null
|
|
|| (Integer) c.getTemporary("CURRENT_SONG") != aMUSIC_DATA[2]) {
|
|
c.getPlayList();
|
|
if (c.getPlayList().auto) {
|
|
c.addTemporary("CURRENT_SONG", aMUSIC_DATA[2]);
|
|
c.getPacketSender().sendSong(aMUSIC_DATA[2]);
|
|
}
|
|
int[] edgeVilleSongs = { 98, 111, 127, 157, 106 };
|
|
int toPlay = Misc.random(4);
|
|
if (aMUSIC_DATA[0] == 48 && aMUSIC_DATA[1] == 54) {
|
|
aMUSIC_DATA[2] = edgeVilleSongs[toPlay];
|
|
}
|
|
int[] karamjaSongs = { 327, 6 };
|
|
int songPlaying = Misc.random(1);
|
|
if (aMUSIC_DATA[0] == 43 && aMUSIC_DATA[1] == 50) {
|
|
aMUSIC_DATA[2] = karamjaSongs[songPlaying];
|
|
}
|
|
int[] waterfall = { 82, 32 };
|
|
int songToPlay = Misc.random(1);
|
|
if (aMUSIC_DATA[0] == 39 && aMUSIC_DATA[1] == 54) {
|
|
aMUSIC_DATA[2] = waterfall[songToPlay];
|
|
}
|
|
/*
|
|
* int[] battlefield = {148, 17}; int randomSong =
|
|
* Misc.random(1); if (aMUSIC_DATA[0] == 39 &&
|
|
* aMUSIC_DATA[1] == 50) { aMUSIC_DATA[2] =
|
|
* battlefield[randomSong]; }
|
|
*/
|
|
c.getPlayList().playSong(aMUSIC_DATA[2]);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|