#52 Remove bank to all/from bank features. + Testing

GameServer/src/org/moparscape/msc/gs/npchandler/Certer.java

@@ -60,66 +60,22 @@ public class Certer implements NpcHandler {
 													String[] options = new String[] {
 															"One", "Two",
 															"Three", "Four",
-															"Five",
+															"Five"};
-															"All to bank" };
 													owner.setMenuHandler(new MenuHandler(
 															options) {
-														public void handleReply(
+														public void handleReply(int certAmount, String reply) {
-																int certAmount,
-																String reply) {
 															owner.resetPath();
-															int certID = certerDef
+															int certID = certerDef.getCertID(index);
-																	.getCertID(index);
+															if (certID < 0) {
-															if (certID < 0) { // This
-																// shouldn't
-																// happen
 																return;
 															}
-															int itemID = certerDef
+															int itemID = certerDef.getItemID(index);
-																	.getItemID(index);
 															if (certAmount == 5) {
-																certAmount = owner
+																certAmount = owner.getInventory().countId(certID);
-																		.getInventory()
-																		.countId(
-																				certID);
 																if (certAmount <= 0) {
-																	owner.getActionSender()
+																	owner.getActionSender().sendMessage("You don't have any "+ names[index] + " certificates");
-																			.sendMessage(
-																					"You don't have any "
-																							+ names[index]
-																							+ " certificates");
 																	return;
 																}
-																// MIGHT
-																// BE
-																// SMART
-																// TO
-																// CHECK
-																// THEIR
-																// BANK
-																// ISN'T
-																// FULL
-																InvItem bankItem = new InvItem(
-																		itemID,
-																		certAmount * 5);
-																if (owner
-																		.getInventory()
-																		.remove(new InvItem(
-																				certID,
-																				certAmount)) > -1) {
-																	owner.getActionSender()
-																			.sendMessage(
-																					"You exchange the certificates, "
-																							+ bankItem
-																									.getAmount()
-																							+ " "
-																							+ bankItem
-																									.getDef()
-																									.getName()
-																							+ " is added to your bank");
-																	owner.getBank()
-																			.add(bankItem);
-																}
 															} else {
 																certAmount += 1;
 																int itemAmount = certAmount * 5;
@@ -183,8 +139,7 @@ public class Certer implements NpcHandler {
 															"Five", "Ten",
 															"Fifteen",
 															"Twenty",
-															"Twentyfive",
+															"Twentyfive"};
-															"All from bank" };
 													owner.setMenuHandler(new MenuHandler(
 															options) {
 														public void handleReply(
@@ -201,10 +156,6 @@ public class Certer implements NpcHandler {
 															int itemID = certerDef
 																	.getItemID(index);
 															if (certAmount == 5) {
-																certAmount = (int) (owner
-																		.getBank()
-																		.countId(
-																				itemID) / 5);
 																int itemAmount = certAmount * 5;
 																if (itemAmount <= 0) {
 																	owner.getActionSender()
@@ -214,28 +165,6 @@ public class Certer implements NpcHandler {
 																							+ " to cert");
 																	return;
 																}
-																if (owner
-																		.getBank()
-																		.remove(itemID,
-																				itemAmount) > -1) {
-																	owner.getActionSender()
-																			.sendMessage(
-																					"You exchange the "
-																							+ certerDef
-																									.getType()
-																							+ ", "
-																							+ itemAmount
-																							+ " "
-																							+ EntityHandler
-																									.getItemDef(
-																											itemID)
-																									.getName()
-																							+ " is taken from your bank");
-																	owner.getInventory()
-																			.add(new InvItem(
-																					certID,
-																					certAmount));
-																}
 															} else {
 																certAmount += 1;
 																int itemAmount = certAmount * 5;

GameServer/src/org/moparscape/msc/gs/phandler/PlayerLogin.java

@@ -236,6 +236,8 @@ public class PlayerLogin implements PacketHandler {
 				//189 + 11 = Range Testing.
 				player.getInventory().add(new InvItem(189));
 				player.getInventory().add(new InvItem(11, 100));
+				player.getInventory().add(new InvItem(517, 100));
+				//end of test items
 				player.getActionSender().sendInventory();
 				player.setChangingAppearance(true);
 				sender.sendAppearanceScreen();