Cleanup part 1 (#213)

* 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
This commit is contained in:
Mr Extremez
2019-11-25 11:08:56 -06:00
committed by Daniel Ginovker
parent 3d1ae1b288
commit d876a923b9
379 changed files with 80684 additions and 83170 deletions
@@ -0,0 +1,186 @@
package com.rebotted.game.content.guilds;
import com.rebotted.GameConstants;
import com.rebotted.game.content.quests.QuestAssistant;
import com.rebotted.game.globalworldobjects.PassDoor;
import com.rebotted.game.objects.impl.Climbing;
import com.rebotted.game.objects.impl.UseOther;
import com.rebotted.game.players.Player;
/**
* Guilds Class
* @author Andrew (I'm A Boss on Rune-Server, Mr Extremez on Moparscape & Runelocus)
*/
public class Guilds {
private static boolean hasCompletedLegends = false;
public static void attemptGuild(Player player, int objectId) {
if (!GameConstants.GUILDS) {
player.getPacketSender().sendMessage("Guilds are currently disabled.");
return;
}
if (checkRequirements(player, objectId)) {
player.getPacketSender().sendMessage("You pass through the guild.");
movePlayer(player, objectId);
}
}
public static void movePlayer(Player player, int objectId) {
switch (objectId) {
case 2514: // Range Guild
if (player.absX == 2659 && player.absY == 3438) {
PassDoor.passThroughDoor(player, objectId, 1, 2, 9, -1, 1, 0);
} else if (player.absX == 2658 && player.absY == 3437) {
PassDoor.passThroughDoor(player, objectId, 1, 2, 9, -1, 1, 0);
} else if (player.absX == 2658 && player.absY == 3439) {
PassDoor.passThroughDoor(player, objectId, 1, 2, 9, 1, -1, 0);
} else if (player.absX == 2657 && player.absY == 3438) {
PassDoor.passThroughDoor(player, objectId, 1, 2, 9, 1, -1, 0);
}
break;
case 1805: // Champions Guild
if (player.absY == 3362 && player.absX != 3192 && player.absX != 3190) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY + 1, 0);
} else if (player.absY == 3363 && player.absX != 3192 && player.absX != 3190) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY - 1, 0);
}
break;
case 2641: // Monastery
if (player.heightLevel == 0) {
Climbing.climbUp(player);
} else if (player.heightLevel == 1) {
Climbing.climbDown(player);
}
break;
case 2712: // Cooks Guild
if (player.absY == 3443) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY + 1, 0);
} else if (player.absY == 3444) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY - 1, 0);
}
break;
case 2647: // Crafting Guild
if (player.absY == 3289) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY - 1, 0);
} else if (player.absY == 3288) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY + 1, 0);
}
break;
case 2113: // Mining Guild
UseOther.useDown(player, objectId);
break;
case 1755: // Mining Guild
UseOther.useUp(player, objectId);
break;
case 2025: // Fishing Guild
if (player.absY == 3393) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY + 1, 0);
} else if (player.absY == 3394) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY - 1, 0);
}
break;
case 1600: // Wizards Guild
case 1601:
if (player.absX == 2597) {
player.getPlayerAssistant().movePlayer(player.absX - 1, player.absY, 0);
} else if (player.absX == 2596) {
player.getPlayerAssistant().movePlayer(player.absX + 1, player.absY, 0);
}
break;
case 2624: // Heroes Guild
case 2625:
if (player.absX == 2902) {
player.getPlayerAssistant().movePlayer(player.absX - 1, player.absY, 0);
} else if (player.absX == 2901) {
player.getPlayerAssistant().movePlayer(player.absX + 1, player.absY, 0);
}
break;
case 2392: // Legends Guild
case 2391:
if (player.absY == 3349) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY + 1, 0);
} else if (player.absY == 3350) {
player.getPlayerAssistant().movePlayer(player.absX, player.absY - 1, 0);
}
break;
default:
player.getPacketSender().sendMessage(
"You can't access this guild from here.");
break;
}
}
public static boolean checkRequirements(Player player, int objectId) {
switch (objectId) {
case 1805: // Champions Guild
int requiredQP = Math.min(32, QuestAssistant.MAXIMUM_QUESTPOINTS);
if (player.questPoints < requiredQP) {
player.getDialogueHandler().sendStatement("You need " + requiredQP + " quest points to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 2392:
case 2391:
if (hasCompletedLegends == false && player.playerRights < 3) {
player.getDialogueHandler().sendStatement("You need to complete Legends Quest to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 2641: // Prayer Guild
if (player.getPlayerAssistant().getLevelForXP(player.playerXP[5]) < 31) {
player.getDialogueHandler().sendStatement("You need 31 prayer to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 2712: // Cooking Guild
if (player.playerLevel[player.playerCooking] < 32 || player.playerEquipment[player.playerHat] != 1949) {
player.getDialogueHandler().sendStatement("You need 32 cooking and a chefs hat to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 2647: // Crafting Guild
if (player.playerLevel[player.playerCrafting] < 40 || player.playerEquipment[player.playerChest] != 1757) {
player.getDialogueHandler().sendStatement("You need 40 Crafting and a Brown Apron to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 2113: // Mining Guild
if (player.playerLevel[player.playerMining] < 60) {
player.getDialogueHandler().sendStatement("You need 60 Mining to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 2025: // Fishing Guild
if (player.playerLevel[player.playerFishing] < 68) {
player.getDialogueHandler().sendStatement("You need 68 Fishing to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 1600:
case 1601: // Wizards Guild
if (player.playerLevel[player.playerMagic] < 66) {
player.getDialogueHandler().sendStatement("You need 66 Magic to enter this guild!");
player.nextChat = 0;
return false;
}
break;
case 2514:
if (player.playerLevel[player.playerRanged] < 40) { // Ranging Guild
player.getDialogueHandler().sendStatement("You need 40 Range to enter this guild!");
player.nextChat = 0;
return false;
}
break;
}
return true;
}
}
@@ -0,0 +1,361 @@
package com.rebotted.game.content.guilds.impl;
import com.rebotted.event.CycleEvent;
import com.rebotted.event.CycleEventContainer;
import com.rebotted.event.CycleEventHandler;
import com.rebotted.game.content.combat.range.RangeData;
import com.rebotted.game.players.Player;
import com.rebotted.util.Misc;
/**
* Rangers Guild
* @author Aintaro
* @edit Haile N.
*/
public class RangersGuild {
public final int
ARROWS_REQ = 882,
HIT_CHANCE = 55,
RANGED_LV = 4;
public final String
MISSED = "Missed!",
BLACK = "Hit Black!",
YELLOW = "Hit Yellow!",
BLUE = "Hit Blue!",
RED = "Hit Red!",
BULLSEYE = "Bulls-Eye";
public int
arrowsLeft = 0,
playerScore = 0,
hitChance;
public boolean isFiringTarget;
private Player c;
public RangersGuild(Player player) {
this.c = player;
}
public void fireAtTarget() {
if(isFiringTarget) {
return;
}
hitChance = Misc.random(HIT_CHANCE)+Misc.random(c.playerLevel[RANGED_LV]);
if (arrowsLeft != 0) {
for (int bowId : RangeData.BOWS) {
if(c.playerEquipment[c.playerWeapon] == bowId) {
c.usingBow = true;
if (c.playerEquipment[c.playerArrows] == ARROWS_REQ && c.usingBow) {
if (isInTargetArea()) {
if (hitChance >= 10) {
c.getPacketSender().closeAllWindows();
c.startAnimation(426);
isFiringTarget = true;
//c.getPlayerAction().setAction(true);
//c.getPlayerAction().canWalk(false);
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
@Override
public void execute(CycleEventContainer container) {
if (hitChance >= 10 && hitChance <= 20) {
playerScore += 10;
sendConfiguration(80 + Misc.random(10), -60 + Misc.random(90));
c.getPacketSender().sendFrame126(BLACK, 567);
c.getPlayerAssistant().addSkillXP(5, 4);
c.getItemAssistant().deleteArrow();
//c.getPlayerAction().setAction(false);
//c.getPlayerAction().canWalk(true);
} else if (hitChance >= 20 && hitChance < 30) {
playerScore += 20;
sendConfiguration(-70 + Misc.random(10),10 - Misc.random(40));
c.getPacketSender().sendFrame126(BLUE,567);
c.getPlayerAssistant().addSkillXP(10, 4);
c.getItemAssistant().deleteArrow();
//c.getPlayerAction().setAction(false);
//c.getPlayerAction().canWalk(true);
} else if (hitChance >= 30 && hitChance < 50) {
playerScore += 30;
sendConfiguration(-30 - Misc.random(15),10 - Misc.random(25));
c.getPacketSender().sendFrame126(RED, 567);
c.getPlayerAssistant().addSkillXP(15, 4);
c.getItemAssistant().deleteArrow();
//c.getPlayerAction().setAction(false);
//c.getPlayerAction().canWalk(true);
} else if (hitChance >= 50 && hitChance < 75) {
playerScore += 50;
sendConfiguration(5 - Misc.random(20),0 - Misc.random(20));
c.getPacketSender().sendFrame126(YELLOW, 567);
c.getPlayerAssistant().addSkillXP(15, 4);
c.getItemAssistant().deleteArrow();
//c.getPlayerAction().setAction(false);
//c.getPlayerAction().canWalk(true);
} else if (hitChance >= 75) {
playerScore += 100;
sendConfiguration(0, 0);
c.getPacketSender().sendFrame126(BULLSEYE, 567);
c.getPlayerAssistant().addSkillXP(50, 4);
c.getItemAssistant().deleteArrow();
//c.getPlayerAction().setAction(false);
//c.getPlayerAction().canWalk(true);
} else {
c.getPacketSender().sendFrame126(MISSED, 567);
sendConfiguration(1200, 1200);
c.getItemAssistant().deleteArrow();
//c.getPlayerAction().setAction(false);
//c.getPlayerAction().canWalk(true);
}
container.stop();
}
@Override
public void stop() {
isFiringTarget = false;
}
}, 3);
}
} else {
c.getDialogueHandler().sendStatement("You can't shoot from here.");
}
} else {
c.getDialogueHandler().sendStatement("You need some bronze arrows and a bow to shoot the target.");
c.nextChat = 0;
}}}
} else {
c.getDialogueHandler().sendStatement("You should talk to the competition judge.");
c.nextChat = 0;
}
}
private void sendConfiguration(int xPos, int yPos) {
switch (arrowsLeft) {
case 1:
arrowsLeft--;
c.getPacketSender().sendFrame70(1200, 1200, 538);
c.getPacketSender().sendFrame70(1200, 1200, 557);
c.getPacketSender().sendFrame70(1200, 1200, 559);
c.getPacketSender().sendFrame70(1200, 1200, 560);
c.getPacketSender().sendFrame70(1200, 1200, 561);
c.getPacketSender().sendFrame70(1200, 1200, 562);
c.getPacketSender().sendFrame70(1200, 1200, 563);
c.getPacketSender().sendFrame70(1200, 1200, 564);
c.getPacketSender().sendFrame70(1200, 1200, 565);
c.getPacketSender().sendFrame70(1200, 1200, 566);
c.getPacketSender().sendFrame126("" + playerScore, 551);
c.getPacketSender().sendFrame70(xPos, yPos, 536);
c.getPacketSender().showInterface(446);
break;
case 2:
arrowsLeft--;
c.getPacketSender().sendFrame70(0, 0, 538);
c.getPacketSender().sendFrame70(1200, 1200, 557);
c.getPacketSender().sendFrame70(1200, 1200, 559);
c.getPacketSender().sendFrame70(1200, 1200, 560);
c.getPacketSender().sendFrame70(1200, 1200, 561);
c.getPacketSender().sendFrame70(1200, 1200, 562);
c.getPacketSender().sendFrame70(1200, 1200, 563);
c.getPacketSender().sendFrame70(1200, 1200, 564);
c.getPacketSender().sendFrame70(1200, 1200, 565);
c.getPacketSender().sendFrame70(1200, 1200, 566);
c.getPacketSender().sendFrame126("" + playerScore, 551);
c.getPacketSender().sendFrame70(xPos, yPos, 536);
c.getPacketSender().showInterface(446);
break;
case 3:
arrowsLeft--;
c.getPacketSender().sendFrame70(0, 0, 538);
c.getPacketSender().sendFrame70(0, 0, 557);
c.getPacketSender().sendFrame70(1200, 1200, 559);
c.getPacketSender().sendFrame70(1200, 1200, 560);
c.getPacketSender().sendFrame70(1200, 1200, 561);
c.getPacketSender().sendFrame70(1200, 1200, 562);
c.getPacketSender().sendFrame70(1200, 1200, 563);
c.getPacketSender().sendFrame70(1200, 1200, 564);
c.getPacketSender().sendFrame70(1200, 1200, 565);
c.getPacketSender().sendFrame70(1200, 1200, 566);
c.getPacketSender().sendFrame126("" + playerScore, 551);
c.getPacketSender().sendFrame70(xPos, yPos, 536);
c.getPacketSender().showInterface(446);
break;
case 4:
arrowsLeft--;
c.getPacketSender().sendFrame70(0, 0, 538);
c.getPacketSender().sendFrame70(0, 0, 557);
c.getPacketSender().sendFrame70(0, 0, 559);
c.getPacketSender().sendFrame70(1200, 1200, 560);
c.getPacketSender().sendFrame70(1200, 1200, 561);
c.getPacketSender().sendFrame70(1200, 1200, 562);
c.getPacketSender().sendFrame70(1200, 1200, 563);
c.getPacketSender().sendFrame70(1200, 1200, 564);
c.getPacketSender().sendFrame70(1200, 1200, 565);
c.getPacketSender().sendFrame70(1200, 1200, 566);
c.getPacketSender().sendFrame126("" + playerScore, 551);
c.getPacketSender().sendFrame70(xPos, yPos, 536);
c.getPacketSender().showInterface(446);
break;
case 5:
arrowsLeft--;
c.getPacketSender().sendFrame70(0, 0, 538);
c.getPacketSender().sendFrame70(0, 0, 557);
c.getPacketSender().sendFrame70(0, 0, 559);
c.getPacketSender().sendFrame70(0, 0, 560);
c.getPacketSender().sendFrame70(1200, 1200, 561);
c.getPacketSender().sendFrame70(1200, 1200, 562);
c.getPacketSender().sendFrame70(1200, 1200, 563);
c.getPacketSender().sendFrame70(1200, 1200, 564);
c.getPacketSender().sendFrame70(1200, 1200, 565);
c.getPacketSender().sendFrame70(1200, 1200, 566);
c.getPacketSender().sendFrame126("" + playerScore, 551);
c.getPacketSender().sendFrame70(xPos, yPos, 536);
c.getPacketSender().showInterface(446);
break;
case 6:
arrowsLeft--;
c.getPacketSender().sendFrame70(0, 0, 538);
c.getPacketSender().sendFrame70(0, 0, 557);
c.getPacketSender().sendFrame70(0, 0, 559);
c.getPacketSender().sendFrame70(0, 0, 560);
c.getPacketSender().sendFrame70(0, 0, 561);
c.getPacketSender().sendFrame70(1200, 1200, 562);
c.getPacketSender().sendFrame70(1200, 1200, 563);
c.getPacketSender().sendFrame70(1200, 1200, 564);
c.getPacketSender().sendFrame70(1200, 1200, 565);
c.getPacketSender().sendFrame70(1200, 1200, 566);
c.getPacketSender().sendFrame126("" + playerScore, 551);
c.getPacketSender().sendFrame70(xPos, yPos, 536);
c.getPacketSender().showInterface(446);
break;
case 7:
arrowsLeft--;
c.getPacketSender().sendFrame70(0, 0, 538);
c.getPacketSender().sendFrame70(0, 0, 557);
c.getPacketSender().sendFrame70(0, 0, 559);
c.getPacketSender().sendFrame70(0, 0, 560);
c.getPacketSender().sendFrame70(0, 0, 561);
c.getPacketSender().sendFrame70(0, 0, 562);
c.getPacketSender().sendFrame70(1200, 1200, 563);
c.getPacketSender().sendFrame70(1200, 1200, 564);
c.getPacketSender().sendFrame70(1200, 1200, 565);
c.getPacketSender().sendFrame70(1200, 1200, 566);
c.getPacketSender().sendFrame126("" + playerScore, 551);
c.getPacketSender().sendFrame70(xPos, yPos, 536);
c.getPacketSender().showInterface(446);
break;
case 8:
arrowsLeft--;
c.getPacketSender().sendFrame70(0, 0, 538);
c.getPacketSender().sendFrame70(0, 0, 557);
c.getPacketSender().sendFrame70(0, 0, 559);
c.getPacketSender().sendFrame70(0, 0, 560);
c.getPacketSender().sendFrame70(0, 0, 561);
c.getPacketSender().sendFrame70(0, 0, 562);
c.getPacketSender().sendFrame70(0, 0, 563);
c.getPacketSender().sendFrame70(1200, 1200, 564);
c.getPacketSender().sendFrame70(1200, 1200, 565);
c.getPacketSender().sendFrame70(1200, 1200, 566);
c.getPacketSender().sendFrame126("" + playerScore, 551);
c.getPacketSender().sendFrame70(xPos, yPos, 536);
c.getPacketSender().showInterface(446);
break;
case 9:
arrowsLeft--;
c.getPacketSender().sendFrame70(0, 0, 538);
c.getPacketSender().sendFrame70(0, 0, 557);
c.getPacketSender().sendFrame70(0, 0, 559);
c.getPacketSender().sendFrame70(0, 0, 560);
c.getPacketSender().sendFrame70(0, 0, 561);
c.getPacketSender().sendFrame70(0, 0, 562);
c.getPacketSender().sendFrame70(0, 0, 563);
c.getPacketSender().sendFrame70(0, 0, 564);
c.getPacketSender().sendFrame70(1200, 1200, 565);
c.getPacketSender().sendFrame70(1200, 1200, 566);
c.getPacketSender().sendFrame126("" + playerScore, 551);
c.getPacketSender().sendFrame70(xPos, yPos, 536);
c.getPacketSender().showInterface(446);
break;
case 10:
arrowsLeft--;
c.getPacketSender().sendFrame70(0, 0, 538);
c.getPacketSender().sendFrame70(0, 0, 557);
c.getPacketSender().sendFrame70(0, 0, 559);
c.getPacketSender().sendFrame70(0, 0, 560);
c.getPacketSender().sendFrame70(0, 0, 561);
c.getPacketSender().sendFrame70(0, 0, 562);
c.getPacketSender().sendFrame70(0, 0, 563);
c.getPacketSender().sendFrame70(0, 0, 564);
c.getPacketSender().sendFrame70(0, 0, 565);
c.getPacketSender().sendFrame126("" + playerScore, 551);
c.getPacketSender().sendFrame70(xPos, yPos, 536);
c.getPacketSender().showInterface(446);
break;
}
}
public boolean isInTargetArea() {
if (c.absX >= 2669 && c.absX <= 2674 && c.absY >= 3415 && c.absY <= 3421) {
return true;
}
return false;
}
public void exchangePoints() {
if (arrowsLeft == 0 && playerScore > 0) {
if(c.getItemAssistant().freeSlots() > 0) {
int ticketsAmt = playerScore / 10;
c.getItemAssistant().addItem(1464, ticketsAmt);
c.getDialogueHandler().sendNpcChat2("Well done. Your score is : " + playerScore + ".", "You have earned " + ticketsAmt + " Archery tickets.", c.talkingNpc, "Tutor");
playerScore = 0;
c.nextChat = 0;
} else {
c.getDialogueHandler().sendStatement("You need 1 free slot to exchange tickets.");
c.nextChat = 0;
}
} else {
c.getDialogueHandler().sendStatement("You still have " + arrowsLeft + " shots left.");
c.nextChat = 0;
}
}
public void howAmIDoing() {
if (playerScore == 0) {
c.getDialogueHandler().sendNpcChat2("You haven't started yet. Stand behind the hay bales and", "shoot those arrows at the targets.", c.talkingNpc, "Tutor");
c.nextChat = 0;
} else {
c.getDialogueHandler().sendNpcChat2("Your score is : " + playerScore, "Your doing very well!", c.talkingNpc, "Tutor");
c.nextChat = 0;
}
}
public void buyArrows() {
if (arrowsLeft == 0) {
if (c.getItemAssistant().playerHasItem(995, 200)) {
if (c.getItemAssistant().freeSlots() > 1) {
arrowsLeft = 10;
c.getItemAssistant().deleteItem(995, 200);
c.getItemAssistant().addItem(ARROWS_REQ, 10);
c.getItemAssistant().addItem(841, 1);
c.getDialogueHandler().sendStatement("The archer hands you 10 bronze arrows and a bow.");
c.nextChat = 0;
} else {
c.getDialogueHandler().sendStatement("You need 2 free slots to receive arrows and a bow.");
}
} else {
c.getDialogueHandler().sendStatement("You need at least 200 gp to buy 10 arrows and a bow.");
c.nextChat = 0;
}
} else {
c.getDialogueHandler().sendStatement("You still have " + arrowsLeft + " shots left.");
c.nextChat = 0;
}
}
}