mirror of
https://github.com/2006-Scape/2006Scape.git
synced 2026-07-06 00:32:01 +00:00
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
committed by
Daniel Ginovker
Daniel Ginovker
parent
3d1ae1b288
commit
d876a923b9
@@ -0,0 +1,190 @@
|
||||
package com.rebotted.game.content.skills.crafting;
|
||||
|
||||
import com.rebotted.event.CycleEvent;
|
||||
import com.rebotted.event.CycleEventContainer;
|
||||
import com.rebotted.event.CycleEventHandler;
|
||||
import com.rebotted.game.items.ItemAssistant;
|
||||
import com.rebotted.game.players.Player;
|
||||
|
||||
/**
|
||||
* @author Tom
|
||||
*/
|
||||
|
||||
public class Pottery {
|
||||
|
||||
public static int unFire = 896;
|
||||
public static int Fire = 899;
|
||||
public static int softClay = 1761;
|
||||
|
||||
public static void showUnfire(Player c) {
|
||||
c.getPacketSender().sendChatInterface(8938);
|
||||
c.getPacketSender().sendFrame126("What would you like to make?", 8879);
|
||||
c.getPacketSender().sendFrame246(8941, 120, 1787); // first
|
||||
c.getPacketSender().sendFrame246(8942, 150, 1789); // second
|
||||
c.getPacketSender().sendFrame246(8943, 150, 1791); // third
|
||||
c.getPacketSender().sendFrame246(8944, 120, 5352); // 4th
|
||||
c.getPacketSender().sendFrame246(8945, 150, 4438); // 5th
|
||||
c.getPacketSender().sendFrame126("Pot", 8949);
|
||||
c.getPacketSender().sendFrame126("Pie Dish", 8953);
|
||||
c.getPacketSender().sendFrame126("Bowl", 8957);
|
||||
c.getPacketSender().sendFrame126("Plant pot", 8961);
|
||||
c.getPacketSender().sendFrame126("Pot lid", 8965);
|
||||
c.showedUnfire = true;
|
||||
}
|
||||
|
||||
public static void showFire(Player c) {
|
||||
c.getPacketSender().sendChatInterface(8938);
|
||||
c.getPacketSender().sendFrame126("What would you like to make?", 8879);
|
||||
c.getPacketSender().sendFrame246(8941, 120, 1931); // first
|
||||
c.getPacketSender().sendFrame246(8942, 150, 2313); // second
|
||||
c.getPacketSender().sendFrame246(8943, 150, 1923); // third
|
||||
c.getPacketSender().sendFrame246(8944, 120, 5350); // 4th
|
||||
c.getPacketSender().sendFrame246(8945, 150, 4440); // 5th
|
||||
c.getPacketSender().sendFrame126("Pot", 8949);
|
||||
c.getPacketSender().sendFrame126("Pie Dish", 8953);
|
||||
c.getPacketSender().sendFrame126("Bowl", 8957);
|
||||
c.getPacketSender().sendFrame126("Plant pot", 8961);
|
||||
c.getPacketSender().sendFrame126("Pot lid", 8965);
|
||||
c.showedFire = true;
|
||||
}
|
||||
|
||||
public static void makeUnfire(final Player c, final int id,
|
||||
final double xp, final int level, int amount) {
|
||||
c.getPacketSender().closeAllWindows();
|
||||
c.doAmount = amount;
|
||||
c.isPotCrafting = true;
|
||||
if (c.getItemAssistant().playerHasItem(softClay)
|
||||
&& c.playerLevel[12] >= level && c.isPotCrafting == true) {
|
||||
c.startAnimation(unFire);
|
||||
c.getItemAssistant().deleteItem(softClay, 1);
|
||||
c.getItemAssistant().addItem(id, 1);
|
||||
c.getPacketSender().sendMessage(
|
||||
"You make the soft clay into a "
|
||||
+ ItemAssistant.getItemName(id) + ".");
|
||||
c.getPlayerAssistant().addSkillXP(xp, c.playerCrafting);
|
||||
c.doAmount--;
|
||||
}
|
||||
CycleEventHandler.getSingleton().addEvent(c, new CycleEvent() {
|
||||
|
||||
@Override
|
||||
public void execute(CycleEventContainer container) {
|
||||
if (c.getItemAssistant().playerHasItem(softClay)
|
||||
&& c.playerLevel[12] >= level && !(c.doAmount <= 0)
|
||||
&& c.isPotCrafting == true) {
|
||||
c.startAnimation(unFire);
|
||||
c.getItemAssistant().deleteItem(softClay, 1);
|
||||
c.getItemAssistant().addItem(id, 1);
|
||||
c.getPacketSender().sendMessage(
|
||||
"You make the soft clay into a "
|
||||
+ ItemAssistant.getItemName(id) + ".");
|
||||
c.getPlayerAssistant().addSkillXP(xp, c.playerCrafting);
|
||||
c.doAmount--;
|
||||
}
|
||||
|
||||
if (c.playerLevel[12] < level) {
|
||||
container.stop();
|
||||
c.getPacketSender().sendMessage(
|
||||
"You need a crafting level of " + level
|
||||
+ " to make this.");
|
||||
}
|
||||
|
||||
if (!c.getItemAssistant().playerHasItem(softClay)) {
|
||||
container.stop();
|
||||
c.getPacketSender().sendMessage(
|
||||
"You need soft clay to do this.");
|
||||
}
|
||||
|
||||
if (c.isPotCrafting == false) {
|
||||
container.stop();
|
||||
}
|
||||
|
||||
if (c.doAmount <= 0) {
|
||||
container.stop();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stop() {
|
||||
c.isPotCrafting = false;
|
||||
c.startAnimation(65535);
|
||||
}
|
||||
}, 3);
|
||||
}
|
||||
|
||||
public static void makeFire(final Player player, final int startId,
|
||||
final int finishId, final int level, final double xp, int amount) {
|
||||
player.getPacketSender().closeAllWindows();
|
||||
player.doAmount = amount;
|
||||
player.isPotCrafting = true;
|
||||
if (player.getItemAssistant().playerHasItem(startId)
|
||||
&& player.playerLevel[12] >= level && player.isPotCrafting == true) {
|
||||
player.getItemAssistant().deleteItem(startId, 1);
|
||||
player.getItemAssistant().addItem(finishId, 1);
|
||||
player.startAnimation(Fire);
|
||||
player.getPacketSender().sendSound(469, 100, 0);
|
||||
player.getPacketSender().sendMessage(
|
||||
"You put a " + ItemAssistant.getItemName(startId)
|
||||
+ " into the oven.");
|
||||
player.getPacketSender().sendMessage(
|
||||
"You retrieve the " + ItemAssistant.getItemName(finishId)
|
||||
+ " from the oven.");
|
||||
player.getPlayerAssistant().addSkillXP(xp, player.playerCrafting);
|
||||
player.doAmount--;
|
||||
}
|
||||
|
||||
if (player.playerLevel[12] < level) {
|
||||
player.getPacketSender().sendMessage(
|
||||
"You need a crafting level of " + level + " to make this.");
|
||||
}
|
||||
|
||||
if (!player.getItemAssistant().playerHasItem(startId)
|
||||
&& player.playerLevel[12] >= level) {
|
||||
player.getPacketSender().sendMessage(
|
||||
"You need an " + ItemAssistant.getItemName(startId)
|
||||
+ " to do this.");
|
||||
}
|
||||
|
||||
CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() {
|
||||
|
||||
@Override
|
||||
public void execute(CycleEventContainer container) {
|
||||
if (player.getItemAssistant().playerHasItem(startId)
|
||||
&& player.playerLevel[12] >= level
|
||||
&& player.isPotCrafting == true && !(player.doAmount <= 0)) {
|
||||
player.getItemAssistant().deleteItem(startId, 1);
|
||||
player.getItemAssistant().addItem(finishId, 1);
|
||||
player.startAnimation(Fire);
|
||||
player.getPacketSender().sendSound(469, 100, 0);
|
||||
player.getPacketSender().sendMessage(
|
||||
"You put a " + ItemAssistant.getItemName(startId)
|
||||
+ " into the oven.");
|
||||
player.getPacketSender().sendMessage(
|
||||
"You retrieve the "
|
||||
+ ItemAssistant.getItemName(finishId)
|
||||
+ " from the oven.");
|
||||
player.getPlayerAssistant().addSkillXP(xp, player.playerCrafting);
|
||||
player.doAmount--;
|
||||
}
|
||||
|
||||
if (player.isPotCrafting == false
|
||||
|| !player.getItemAssistant().playerHasItem(startId)
|
||||
|| player.playerLevel[12] < level) {
|
||||
container.stop();
|
||||
}
|
||||
|
||||
if (player.doAmount <= 0) {
|
||||
container.stop();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stop() {
|
||||
player.isPotCrafting = false;
|
||||
player.startAnimation(65535);
|
||||
}
|
||||
}, 5);
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user