2006-Scape/2006Scape
1
0
Fork 0
mirror of https://github.com/2006-Scape/2006Scape.git synced 2026-07-04 16:49:04 +00:00
Code Issues 4.5k Packages Projects Releases 10 Wiki Activity

Implement Party Room, A bunch of client side changes, Other stuff (#503)

Browse Source 
* 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:
Danial
2021-09-29 11:40:34 +13:00
committed by GitHub
parent d30e833dd8
commit 8589277ece
51 changed files with 1756 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/src/main/java/com/rs2/game/objects/ObjectsActions.java
+73 -20
View File
@@ -12,7 +12,6 @@ import com.rs2.game.content.minigames.PestControl;
import com.rs2.game.content.minigames.castlewars.CastleWarObjects;
import com.rs2.game.content.minigames.castlewars.CastleWars;
import com.rs2.game.content.quests.QuestRewards;
import com.rs2.game.content.random.Balloons;
import com.rs2.game.content.random.PartyRoom;
import com.rs2.game.content.randomevents.FreakyForester;
import com.rs2.game.content.skills.agility.AgilityShortcut;
@@ -30,6 +29,7 @@ import com.rs2.game.content.traveling.DesertCactus;
import com.rs2.game.globalworldobjects.ClimbOther;
import com.rs2.game.globalworldobjects.PassDoor;
import com.rs2.game.globalworldobjects.ClimbOther.ClimbData;
import com.rs2.game.items.ItemAssistant;
import com.rs2.game.items.impl.LightSources;
import com.rs2.game.npcs.NpcHandler;
import com.rs2.game.npcs.impl.MilkCow;
@@ -91,8 +91,8 @@ public class ObjectsActions {
if (player.getWerewolfAgility().werewolfCourse(objectType)) {
return;
}
if (objectType >= 115 && objectType <= 121) {
Balloons.popBalloon(player, objectX, objectY);
if (Boundary.isIn(player, Boundary.PARTY_ROOM) && objectType >= 115 && objectType <= 122) {
PartyRoom.popBalloon(player, objectX, objectY);
return;
}
if (objectType >= 5103 && objectType <= 5107) {
@@ -123,6 +123,14 @@ public class ObjectsActions {
return;
}
switch (objectType) {
case 6969: // Swamp Boaty
if (player.objectX == 3523 && player.objectY == 3284)
player.getPlayerAssistant().movePlayer(3499, 3380, 0);
break;
case 6970: // Swamp Boaty
if (player.objectX == 3498 && player.objectY == 3377)
player.getPlayerAssistant().movePlayer(3522, 3284, 0);
break;
case 6615:
if (player.absY == 2809) {
player.getPlayerAssistant().movePlayer(player.absX, 2810, 0);
@@ -130,11 +138,11 @@ public class ObjectsActions {
player.getPlayerAssistant().movePlayer(player.absX, 2809, 0);
}
break;
case 11163:
case Ectofuntus.GRINDER:
Ectofuntus.useBoneGrinder(player);
break;
case 11164:
case Ectofuntus.BIN:
Ectofuntus.emptyBin(player);
break;
case 6:
@@ -752,21 +760,8 @@ public class ObjectsActions {
case 5281:
player.getPlayerAssistant().movePlayer(3666, 3517, 0);
break;
case 5282: // Ectofuntus Worship
if (player.getItemAssistant().playerHasItem(4286) && player.getItemAssistant().playerHasItem(4255))
{
player.startAnimation(1651);
player.getPacketSender().sendMessage("You put some ectoplasm and bonemeal into the Ectofuntus, and worship it.");
player.getItemAssistant().deleteItem(4286, 1);
player.getItemAssistant().deleteItem(4255, 1);
player.getItemAssistant().addItem(1925, 1);
player.getItemAssistant().addItem(1931, 1);
player.getPlayerAssistant().addSkillXP(18, GameConstants.PRAYER);
}
else
{
player.getPacketSender().sendMessage("You'll need ectoplasm and bonemeal to worship the Ectofuntus.");
}
case Ectofuntus.ECTOFUNTUS: // Ectofuntus Worship
Ectofuntus.handleEctofuntus(player);
break;
case 12982:
@@ -961,6 +956,8 @@ public class ObjectsActions {
case 9326:
case 9321:
case 993:
case 9307:
case 9308:
AgilityShortcut.processAgilityShortcut(player);
break;
@@ -2644,6 +2641,50 @@ public class ObjectsActions {
if (player.getItemAssistant().hasFreeSlots(1))
player.getItemAssistant().addItem(2413, 1);
break;
case 11209:
player.getPlayerAssistant().movePlayer(3712, 3496, 1);
break;
case 11210:
player.getPlayerAssistant().movePlayer(3709, 3496, 0);
break;
case 11211:
player.getPlayerAssistant().movePlayer(3684, 2950, 1);
break;
case 11212:
player.getPlayerAssistant().movePlayer(3684, 2953, 0);
break;
case 11289:
if (objectX == 3686 && objectY == 2946)
player.getPlayerAssistant().movePlayer(3687, 2946, 2);
if (objectX == 3686 && objectY == 2950)
player.getPlayerAssistant().movePlayer(3687, 2950, 2);
if (objectX == 3712 && objectY == 3494)
player.getPlayerAssistant().movePlayer(3712, 3493, 2);
if (objectX == 3716 && objectY == 3494)
player.getPlayerAssistant().movePlayer(3716, 3493, 2);
break;
case 11290:
if (objectX == 3686 && objectY == 2946)
player.getPlayerAssistant().movePlayer(3685, 2946, 1);
if (objectX == 3686 && objectY == 2950)
player.getPlayerAssistant().movePlayer(3685, 2950, 1);
if (objectX == 3712 && objectY == 3494)
player.getPlayerAssistant().movePlayer(3712, 3495, 1);
if (objectX == 3716 && objectY == 3494)
player.getPlayerAssistant().movePlayer(3716, 3495, 1);
break;
case 11308:
if (objectX == 3714 && objectY == 3502)
player.getPlayerAssistant().movePlayer(3714, 3503, 1);
if (objectX == 3678 && objectY == 2948)
player.getPlayerAssistant().movePlayer(3677, 2948, 1);
break;
case 11309:
if (objectX == 3714 && objectY == 3502)
player.getPlayerAssistant().movePlayer(3714, 3503, 0);
if (objectX == 3678 && objectY == 2948)
player.getPlayerAssistant().movePlayer(3677, 2948, 0);
break;
}
}
@@ -2764,6 +2805,18 @@ public class ObjectsActions {
case 12537:
Climbing.climbUp(player);
break;
case Ectofuntus.GRINDER:
if (player.ectofuntusBoneCrusherState.equals("Empty")) {
player.getPacketSender().sendMessage("You need to load some bones.");
} else if (player.ectofuntusBoneCrusherState.equals("Loaded")) {
player.getPacketSender().sendMessage(ItemAssistant.getItemName(player.ectofuntusBoneUsed) + " loaded and ready to be grinded.");
} else if (player.ectofuntusBoneCrusherState.equals("Bin")) {
player.getPacketSender().sendMessage("Bonemeal is ready to be collected from the bin.");
} else {
player.getPacketSender().sendMessage("Ghostly forces are playing with the machinery.");
}
break;
case 14921:
case 9390:
2006Scape Server/src/main/java/com/rs2/game/objects/impl/Climbing.java
+1 -1
View File
@@ -422,7 +422,7 @@ public class Climbing {
case 1738:
if (client.objectX == 2728 && client.objectY == 3460
&& client.heightLevel == 0) {
client.getPlayerAssistant().movePlayer(2749, 3462, 1);
client.getPlayerAssistant().movePlayer(2729, 3462, 1);
client.resetWalkingQueue();
} else if (client.objectX == 2746 && client.objectY == 3460
&& client.heightLevel == 0) {