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
2026-07-06 16:49:07 +00:00 · 2019-11-25 11:08:56 -06:00
parent 3d1ae1b288
commit d876a923b9
379 changed files with 80684 additions and 83170 deletions
@@ -0,0 +1,125 @@
+package com.rebotted.game.content.skills.agility;
+
+import com.rebotted.game.players.Player;
+
+public class GnomeAgility {
+
+	private final Player c;
+
+	public GnomeAgility(Player player) {
+		this.c = player;
+	}
+	
+	private static long clickTimer = 0;
+
+	public static final int LOG_OBJECT = 2295, NET1_OBJECT = 2285,
+			TREE_OBJECT = 2313, ROPE_OBJECT = 2312, TREE_BRANCH_OBJECT = 2314,
+			NET2_OBJECT = 2286, PIPES1_OBJECT = 154, PIPES2_OBJECT = 4058;// gnome
+																			// course
+																			// objects
+
+	public boolean gnomeCourse(int objectId) {
+		switch (objectId) {
+		case LOG_OBJECT:
+			if (c.getAgility().hotSpot(2474, 3436)) {
+				c.getAgility().walk(0, -7, c.getAgility().getAnimation(objectId), -1);
+			} else if (c.absX == 2474 && c.absY > 3429 && c.absY < 3436) {
+				c.getPlayerAssistant().movePlayer(2474, 3429, 0);
+			}
+			c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
+			c.getAgility().resetAgilityProgress();
+			c.getAgility().agilityProgress[0] = true;
+			return true;
+
+		case NET1_OBJECT:
+			c.getAgility().climbUp(c.getX(), c.getY() - 2, 1);
+			c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
+			if (c.getAgility().agilityProgress[0] == true) {
+				c.getAgility().agilityProgress[1] = true;
+			}
+			return true;
+
+		case TREE_OBJECT:
+			c.getAgility().climbUp(c.getX(), c.getY() - 3, 2);
+			c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
+			if (c.getAgility().agilityProgress[1] == true) {
+				c.getAgility().agilityProgress[2] = true;
+			}
+			return true;
+
+		case ROPE_OBJECT:
+			if (c.getAgility().hotSpot(2477, 3420)) {
+				c.getAgility().walk(6, 0, c.getAgility().getAnimation(objectId), -1);
+			} else if (c.absY == 3420 && c.absX > 2477 && c.absX < 2483) {// makes
+																			// sure
+																			// they
+																			// don't
+																			// cheat
+			c.getPlayerAssistant().movePlayer(2483, 3420, 2);
+			}
+			c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
+			if (c.getAgility().agilityProgress[2] == true) {
+				c.getAgility().agilityProgress[3] = true;
+			}
+			return true;
+
+		case TREE_BRANCH_OBJECT:
+			c.getAgility().climbDown(c.getX(), c.getY(), 0);
+			c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
+			if (c.getAgility().agilityProgress[3] == true) {
+				c.getAgility().agilityProgress[4] = true;
+			}
+			return true;
+
+		case NET2_OBJECT:
+			if (System.currentTimeMillis() - clickTimer < 1800) {
+				return false;
+			}
+			if (c.getY() == 3425 && System.currentTimeMillis() - clickTimer > 1800) {
+				c.getAgility().climbUp(c.getX(), c.getY() + 2, 0);
+				c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
+				clickTimer = System.currentTimeMillis();
+				if (c.getAgility().agilityProgress[4] == true) {
+					c.getAgility().agilityProgress[5] = true;
+				}
+			}
+			return true;
+
+		case PIPES1_OBJECT:
+			if (c.getAgility().hotSpot(2484, 3430)) {
+				c.getAgility().walk(0, 7, c.getAgility().getAnimation(objectId), 748);
+				if (c.getAgility().agilityProgress[5] == true) {
+					c.getPlayerAssistant().addSkillXP(c.getAgility().getXp(objectId), c.playerAgility);
+					c.getAgility().lapBonus = 1400 / 30;
+					c.getAgility().lapFinished();
+				} else {
+					c.getPlayerAssistant().addSkillXP(
+							c.getAgility().getXp(objectId), c.playerAgility);
+				}
+				c.getAgility().resetAgilityProgress();
+			} else if (c.absY > 3430 && c.absY < 3436 && System.currentTimeMillis() - clickTimer > 1800) {
+				c.getPlayerAssistant().movePlayer(2484, 3437, 0);
+			}
+			return true;
+
+		case PIPES2_OBJECT:
+			if (c.getAgility().hotSpot(2487, 3430)) {
+				c.getAgility().walk(0, 7, c.getAgility().getAnimation(objectId), 748);
+				if (c.getAgility().agilityProgress[5] == true) {
+					c.getPlayerAssistant().addSkillXP(
+							c.getAgility().getXp(objectId), c.playerAgility);
+					c.getAgility().lapBonus = 1400 / 30;
+					c.getAgility().lapFinished();
+				} else {
+					c.getPlayerAssistant().addSkillXP(
+							c.getAgility().getXp(objectId), c.playerAgility);
+				}
+				c.getAgility().resetAgilityProgress();
+			} else if (c.absY > 3430 && c.absY < 3436) {
+				c.getPlayerAssistant().movePlayer(2487, 3437, 0);
+			}
+			return true;
+		}
+		return false;
+	}
+}