mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-04 00:31:54 +00:00
Implement Party Room, A bunch of client side changes, Other stuff (#503)
* Fixup Discord links * Fix required level to chop Dramen tree * More Discord link fixes * Show bots as (store) * Fixup port move to port 8080 as used by file server * Fixup report handler * Some client changes * minor changes Show mod status * Show item value on ground * Mark stores and players differently on mini map * Some tidy up * default to world 1 * Update trade with text * revert nodeID changes * Update RS Guide name * Remove some command aliases * Log bots and players differently * Fixup * minor changes * Fixup colors * Update RSInterface.java * Settings for controlling options * Add memory command * Update server skill magic numbers * Update server skill magic numbers * Update colors for ground item text * Update .gitignore * Update player health value more often * Add in game item/NPC/object search * Item amounts and value displayed * Update examine text * Start with volume off * Fixup tab 7 still showing with other interfaces * Fixup search * Fixup entering numbers after letter in amounts * minor fixup * fix indentation * change type of value * Fixup values shown * Fix when clicking while tab 7 open * Fixup negative amounts * Update some method names * Fixup method name * tidy up method values * Initial move for overlays * Update more method names, variables * Update debug menu * Update experience info area * Update Signlink.java * more refactoring/deob * Tidy up * refresh skills * Update method name, debug display * fixup * Show wrench icon on custom settings tab * alignment * Modify zoom * Use smaller numbers for exp/h * Update interface command * tidy up * Fixup tele location * Fixup if interface doesn't exist * Add some interface options * Update checks * Open bank interface for item search TODO: change title maybe not display in chat change options for items? change command to searchitem - open the bank interface, open a text input interface * re-fix * Show open interface ID * Update bank string shown * Update search function * Scroll zooming * Only fill chat with search if not searching for an item * add comments * Change system update message * Remove fps command * Increase draw distance * fixup * Draw distance option * [Party Room] Fix party room stairs * Add new free slots method to check for stackable items counting as a free slot * [Party Room] Deposit/Withdraw items all working * [Party Room] Fully working * [Party Room] Don't spawn balloons on the table Players cannot pickup the items * Fixup boundary * Drop items in random amounts up to 4 stacks * Update swampy boat to work * Minor fixup * Update Game.java * Move player name up slightly * Update some naming * Tidy up * Add ectoplasm agility shortcuts * Update ObjectsActions.java * Ectofuntus stuff * fixup * Ectofuntus bone grinder get status * auto worship * Allow claiming ecto-tokens * change variable * fixup * Make use of GameConstants.WORLD * Randomize bot passwords * Don't show player shops as online * Update opening oysters * Update GemCutting.java * Dragontooth island transport * Ectofuntus stuff * More constants * Bill teach travel to Mos Le'Harmless and back Also able to explore the whole ship * Use better looking buttons * Update .gitignore
This commit is contained in:
@@ -127,14 +127,14 @@ public class PlayerAssistant {
|
||||
|
||||
private String[][] welcomeMessages = {
|
||||
{"Remember to vote daily to help " + GameConstants.SERVER_NAME + "", "Every vote counts! :)"},
|
||||
{"Not a member of our discord community?", "Join our discord at: https://discord.gg/Nk9WQUK"},
|
||||
{"Not a member of our discord community?", "Join our discord at: https://discord.gg/hZ6VfWG"},
|
||||
{"Do you have any bugs that you would like to report?", "Report them on our discord or message a staff member. :)"},
|
||||
{"Want to help the server grow?", "Remember to vote daily and invite your friends!"}
|
||||
};
|
||||
|
||||
public void showMap() {
|
||||
int posisition = (player.getX() / 64 - 46) + (player.getY() / 64 - 49) * 6;
|
||||
player.getPacketSender().sendConfig(106, posisition);
|
||||
int position = (player.getX() / 64 - 46) + (player.getY() / 64 - 49) * 6;
|
||||
player.getPacketSender().sendConfig(106, position);
|
||||
player.getPacketSender().showInterface(5392);
|
||||
}
|
||||
|
||||
@@ -1019,7 +1019,7 @@ public class PlayerAssistant {
|
||||
for (Player p : PlayerHandler.players) {
|
||||
if (p != null && p.isActive) {
|
||||
Client o = (Client) p;
|
||||
o.getPlayerAssistant().updatePM(player.playerId, 1);
|
||||
o.getPlayerAssistant().updatePM(player.playerId, GameConstants.WORLD);
|
||||
}
|
||||
}
|
||||
boolean pmLoaded = false;
|
||||
@@ -1028,7 +1028,7 @@ public class PlayerAssistant {
|
||||
if (friend != 0) {
|
||||
for (int i2 = 1; i2 < PlayerHandler.players.length; i2++) {
|
||||
Player p = PlayerHandler.players[i2];
|
||||
if (p != null && p.isActive
|
||||
if (p != null && !p.isBot && p.isActive
|
||||
&& Misc.playerNameToInt64(p.playerName) == friend) {
|
||||
Client o = (Client) p;
|
||||
if (player.playerRights >= 2
|
||||
@@ -1037,7 +1037,7 @@ public class PlayerAssistant {
|
||||
&& o.getPlayerAssistant()
|
||||
.isInPM(Misc
|
||||
.playerNameToInt64(player.playerName))) {
|
||||
player.getPacketSender().loadPM(friend, 1);
|
||||
player.getPacketSender().loadPM(friend, GameConstants.WORLD);
|
||||
pmLoaded = true;
|
||||
}
|
||||
break;
|
||||
@@ -1052,7 +1052,7 @@ public class PlayerAssistant {
|
||||
Player p = PlayerHandler.players[i1];
|
||||
if (p != null && p.isActive) {
|
||||
Client o = (Client) p;
|
||||
o.getPlayerAssistant().updatePM(player.playerId, 1);
|
||||
o.getPlayerAssistant().updatePM(player.playerId, GameConstants.WORLD);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1819,7 +1819,7 @@ public class PlayerAssistant {
|
||||
player.getPacketSender().sendMessage("Welcome to @blu@" + GameConstants.SERVER_NAME + "@bla@ - we are currently in Server Stage v@blu@" + GameConstants.TEST_VERSION + "@bla@.");
|
||||
player.getPacketSender().sendMessage("@red@Did you know?@bla@ We're open source and pull requests are welcome!");
|
||||
player.getPacketSender().sendMessage("Source code: github.com/2006-Scape/2006Scape");
|
||||
player.getPacketSender().sendMessage("Discord: discord.gg/4zrA2Wy");
|
||||
player.getPacketSender().sendMessage("Discord: https://discord.gg/hZ6VfWG");
|
||||
player.getDialogueHandler().sendDialogues(3115, 2224);
|
||||
player.isRunning2 = false;
|
||||
player.autoRet = 1;
|
||||
@@ -1972,6 +1972,8 @@ public class PlayerAssistant {
|
||||
if (skill == 5) {
|
||||
player.getPacketSender().sendString("" + player.playerLevel[GameConstants.PRAYER] + "/" + getLevelForXP(player.playerXP[GameConstants.PRAYER]) + "", 687);// Prayer
|
||||
}
|
||||
// Update skill data
|
||||
player.getPacketSender().setSkillLevel(skill, player.playerLevel[skill], player.playerXP[skill]);
|
||||
}
|
||||
|
||||
public int getXPForLevel(int level) {
|
||||
|
||||
Reference in New Issue
Block a user