mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-04 08:39:05 +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:
@@ -908,17 +908,17 @@ public abstract class Player {
|
||||
|
||||
if (System.currentTimeMillis() - restoreStatsDelay > 60000) {
|
||||
restoreStatsDelay = System.currentTimeMillis();
|
||||
for (int level = 0; level < playerLevel.length; level++) {
|
||||
if (playerLevel[level] < getLevelForXP(playerXP[level])) {
|
||||
if (level != 5) { // prayer doesn't restore
|
||||
playerLevel[level] += 1;
|
||||
getPacketSender().setSkillLevel(level, playerLevel[level], playerXP[level]);
|
||||
getPlayerAssistant().refreshSkill(level);
|
||||
for (int skill = 0; skill < playerLevel.length; skill++) {
|
||||
if (playerLevel[skill] < getLevelForXP(playerXP[skill])) {
|
||||
if (skill != 5) { // prayer doesn't restore
|
||||
playerLevel[skill] += 1;
|
||||
getPacketSender().setSkillLevel(skill, playerLevel[skill], playerXP[skill]);
|
||||
getPlayerAssistant().refreshSkill(skill);
|
||||
}
|
||||
} else if (playerLevel[level] > getLevelForXP(playerXP[level])) {
|
||||
playerLevel[level] -= 1;
|
||||
getPacketSender().setSkillLevel(level, playerLevel[level], playerXP[level]);
|
||||
getPlayerAssistant().refreshSkill(level);
|
||||
} else if (playerLevel[skill] > getLevelForXP(playerXP[skill])) {
|
||||
playerLevel[skill] -= 1;
|
||||
getPacketSender().setSkillLevel(skill, playerLevel[skill], playerXP[skill]);
|
||||
getPlayerAssistant().refreshSkill(skill);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1632,7 +1632,7 @@ public abstract class Player {
|
||||
crystalBowArrowCount, playerMagicBook, teleGfx, teleEndAnimation,
|
||||
teleHeight, teleX, teleY, rangeItemUsed, killingNpcIndex,
|
||||
totalDamageDealt, globalDamageDealt, oldNpcIndex, fightMode, attackTimer,
|
||||
bowSpecShot;
|
||||
bowSpecShot, ectofuntusWorshipped;
|
||||
public boolean magicFailed, oldMagicFailed;
|
||||
/**
|
||||
* End
|
||||
@@ -2083,6 +2083,11 @@ public abstract class Player {
|
||||
if (checkRangeDistance()) {
|
||||
distance = gatherRangeDistance(distance);
|
||||
}
|
||||
|
||||
return ((objectX-playerX <= distance && objectX-playerX >= -distance) && (objectY-playerY <= distance && objectY-playerY >= -distance));
|
||||
}
|
||||
|
||||
public boolean goodObjectDistance(int objectX, int objectY, int playerX, int playerY, int distance) {
|
||||
return ((objectX-playerX <= distance && objectX-playerX >= -distance) && (objectY-playerY <= distance && objectY-playerY >= -distance));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user