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

Fixed the delay on banking a non stackable item (#341)

Browse Source 
Brought back old code as what I previously did affected the time it takes to bank items.
This commit is contained in:
Gptaqbc
2019-12-30 23:25:01 -05:00
committed by Daniel Ginovker
parent 1b5f185944
commit e88c5eaca8
2 changed files with 463 additions and 464 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java
+397 -398
View File
@@ -84,11 +84,11 @@ public class ItemAssistant {
c.getPacketSender().sendMessage("You find a " + getItemName(reward) + "."); c.getPacketSender().sendMessage("You find a " + getItemName(reward) + ".");
} }
public void updateInventory() { public void updateInventory() {
this.resetItems(3214); this.resetItems(3214);
} }
public void destroyInterface(int itemId) { public void destroyInterface(int itemId) {
itemId = c.droppedItem; itemId = c.droppedItem;
String itemName = getItemName(c.droppedItem); String itemName = getItemName(c.droppedItem);
String[][] info = { String[][] info = {
@@ -98,7 +98,7 @@ public class ItemAssistant {
{ itemName, "14184" } };// make some kind of c.getItemInfo { itemName, "14184" } };// make some kind of c.getItemInfo
c.getPacketSender().sendFrame34(itemId, 0, 14171, 1); c.getPacketSender().sendFrame34(itemId, 0, 14171, 1);
for (int i = 0; i < info.length; i++) for (int i = 0; i < info.length; i++)
c.getPacketSender().sendFrame126(info[i][0], Integer.parseInt(info[i][1])); c.getPacketSender().sendFrame126(info[i][0], Integer.parseInt(info[i][1]));
c.getPacketSender().sendChatInterface(14170); c.getPacketSender().sendChatInterface(14170);
} }
@@ -135,12 +135,12 @@ public class ItemAssistant {
return freeSlots() >= slots; return freeSlots() >= slots;
} }
public void replaceItem(int itemToReplace, int replaceWith) { public void replaceItem(int itemToReplace, int replaceWith) {
if(playerHasItem(itemToReplace)) { if(playerHasItem(itemToReplace)) {
deleteItem(itemToReplace, 1); deleteItem(itemToReplace, 1);
addItem(replaceWith, 1); addItem(replaceWith, 1);
} }
} }
public static int getTotalAmountEquipment(Client c) { public static int getTotalAmountEquipment(Client c) {
int total = 0; int total = 0;
@@ -385,13 +385,13 @@ public class ItemAssistant {
*/ */
public void clearBank() { public void clearBank() {
try { try {
for (int i = 0; i < c.bankItems[i]; i++) { for (int i = 0; i < c.bankItems[i]; i++) {
c.bankItems[i] = 0; c.bankItems[i] = 0;
c.bankItemsN[i] = 0; c.bankItemsN[i] = 0;
} }
resetTempItems(); resetTempItems();
resetBank(); resetBank();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@@ -456,25 +456,25 @@ public class ItemAssistant {
public int getUntradePrice(int item) { public int getUntradePrice(int item) {
switch (item) { switch (item) {
case 2518: case 2518:
case 2524: case 2524:
case 2526: case 2526:
return 100000; return 100000;
case 2520: case 2520:
case 2522: case 2522:
return 150000; return 150000;
} }
return 0; return 0;
} }
public boolean specialCase(int itemId) { public boolean specialCase(int itemId) {
switch (itemId) { switch (itemId) {
case 2518: case 2518:
case 2520: case 2520:
case 2522: case 2522:
case 2524: case 2524:
case 2526: case 2526:
return true; return true;
} }
return false; return false;
} }
@@ -511,7 +511,7 @@ public class ItemAssistant {
} else { } else {
c.playerItemsN[i] = GameConstants.MAXITEM_AMOUNT; c.playerItemsN[i] = GameConstants.MAXITEM_AMOUNT;
} }
if (c.getOutStream() != null) { if (c.getOutStream() != null && c != null) {
c.getOutStream().createFrameVarSizeWord(34); c.getOutStream().createFrameVarSizeWord(34);
c.getOutStream().writeWord(3214); c.getOutStream().writeWord(3214);
c.getOutStream().writeByte(i); c.getOutStream().writeByte(i);
@@ -526,7 +526,7 @@ public class ItemAssistant {
c.flushOutStream(); c.flushOutStream();
} }
i = 30; i = 30;
Weight.updateWeight(c); Weight.calcWeight(c, item, "additem");
return true; return true;
} }
} }
@@ -544,8 +544,7 @@ public class ItemAssistant {
} }
resetItems(3214); resetItems(3214);
i = 30; i = 30;
Weight.calcWeight(c, item, "additem");
Weight.updateWeight(c);
return true; return true;
} }
} }
@@ -607,29 +606,29 @@ public class ItemAssistant {
newWeapon = newWeapon.trim(); newWeapon = newWeapon.trim();
if (weaponName.equals("Unarmed")) { if (weaponName.equals("Unarmed")) {
c.getPacketSender().setSidebarInterface(0, 5855); // punch, c.getPacketSender().setSidebarInterface(0, 5855); // punch,
// kick, // kick,
// block // block
c.getPacketSender().sendFrame126(weaponName, 5857); c.getPacketSender().sendFrame126(weaponName, 5857);
} else if (weaponName.endsWith("whip")) { } else if (weaponName.endsWith("whip")) {
c.getPacketSender().setSidebarInterface(0, 12290); // flick, c.getPacketSender().setSidebarInterface(0, 12290); // flick,
// lash, // lash,
// deflect // deflect
c.getPacketSender().sendFrame246(12291, 200, weapon); c.getPacketSender().sendFrame246(12291, 200, weapon);
c.getPacketSender().sendFrame126(weaponName, 12293); c.getPacketSender().sendFrame126(weaponName, 12293);
} else if (weaponName.endsWith("bow") || weaponName.endsWith("10") } else if (weaponName.endsWith("bow") || weaponName.endsWith("10")
|| weaponName.endsWith("full") || weaponName.endsWith("full")
|| weaponName.startsWith("seercull")) { || weaponName.startsWith("seercull")) {
c.getPacketSender().setSidebarInterface(0, 1764); // accurate, c.getPacketSender().setSidebarInterface(0, 1764); // accurate,
// rapid, // rapid,
// longrange // longrange
c.getPacketSender().sendFrame246(1765, 200, weapon); c.getPacketSender().sendFrame246(1765, 200, weapon);
c.getPacketSender().sendFrame126(weaponName, 1767); c.getPacketSender().sendFrame126(weaponName, 1767);
} else if (weaponName.startsWith("Staff") } else if (weaponName.startsWith("Staff")
|| weaponName.endsWith("staff") || weaponName.endsWith("wand")) { || weaponName.endsWith("staff") || weaponName.endsWith("wand")) {
c.getPacketSender().setSidebarInterface(0, 328); // spike, c.getPacketSender().setSidebarInterface(0, 328); // spike,
// impale, // impale,
// smash, // smash,
// block // block
c.getPacketSender().sendFrame246(329, 200, weapon); c.getPacketSender().sendFrame246(329, 200, weapon);
c.getPacketSender().sendFrame126(weaponName, 331); c.getPacketSender().sendFrame126(weaponName, 331);
} else if (newWeapon.startsWith("dart") } else if (newWeapon.startsWith("dart")
@@ -637,50 +636,50 @@ public class ItemAssistant {
|| newWeapon.startsWith("javelin") || newWeapon.startsWith("javelin")
|| weaponName.equalsIgnoreCase("toktz-xil-ul")) { || weaponName.equalsIgnoreCase("toktz-xil-ul")) {
c.getPacketSender().setSidebarInterface(0, 4446); // accurate, c.getPacketSender().setSidebarInterface(0, 4446); // accurate,
// rapid, // rapid,
// longrange // longrange
c.getPacketSender().sendFrame246(4447, 200, weapon); c.getPacketSender().sendFrame246(4447, 200, weapon);
c.getPacketSender().sendFrame126(weaponName, 4449); c.getPacketSender().sendFrame126(weaponName, 4449);
} else if (newWeapon.startsWith("dagger") } else if (newWeapon.startsWith("dagger")
|| newWeapon.contains("sword")) { || newWeapon.contains("sword")) {
c.getPacketSender().setSidebarInterface(0, 2276); // stab, c.getPacketSender().setSidebarInterface(0, 2276); // stab,
// lunge, // lunge,
// slash, // slash,
// block // block
c.getPacketSender().sendFrame246(2277, 200, weapon); c.getPacketSender().sendFrame246(2277, 200, weapon);
c.getPacketSender().sendFrame126(weaponName, 2279); c.getPacketSender().sendFrame126(weaponName, 2279);
} else if (newWeapon.startsWith("pickaxe")) { } else if (newWeapon.startsWith("pickaxe")) {
c.getPacketSender().setSidebarInterface(0, 5570); // spike, c.getPacketSender().setSidebarInterface(0, 5570); // spike,
// impale, // impale,
// smash, // smash,
// block // block
c.getPacketSender().sendFrame246(5571, 200, weapon); c.getPacketSender().sendFrame246(5571, 200, weapon);
c.getPacketSender().sendFrame126(weaponName, 5573); c.getPacketSender().sendFrame126(weaponName, 5573);
} else if (newWeapon.startsWith("axe") } else if (newWeapon.startsWith("axe")
|| newWeapon.startsWith("battleaxe")) { || newWeapon.startsWith("battleaxe")) {
c.getPacketSender().setSidebarInterface(0, 1698); // chop, c.getPacketSender().setSidebarInterface(0, 1698); // chop,
// hack, // hack,
// smash, // smash,
// block // block
c.getPacketSender().sendFrame246(1699, 200, weapon); c.getPacketSender().sendFrame246(1699, 200, weapon);
c.getPacketSender().sendFrame126(weaponName, 1701); c.getPacketSender().sendFrame126(weaponName, 1701);
} else if (newWeapon.startsWith("halberd")) { } else if (newWeapon.startsWith("halberd")) {
c.getPacketSender().setSidebarInterface(0, 8460); // jab, c.getPacketSender().setSidebarInterface(0, 8460); // jab,
// swipe, // swipe,
// fend // fend
c.getPacketSender().sendFrame246(8461, 200, weapon); c.getPacketSender().sendFrame246(8461, 200, weapon);
c.getPacketSender().sendFrame126(weaponName, 8463); c.getPacketSender().sendFrame126(weaponName, 8463);
} else if (newWeapon.startsWith("Scythe")) { } else if (newWeapon.startsWith("Scythe")) {
c.getPacketSender().setSidebarInterface(0, 8460); // jab, c.getPacketSender().setSidebarInterface(0, 8460); // jab,
// swipe, // swipe,
// fend // fend
c.getPacketSender().sendFrame246(8461, 200, weapon); c.getPacketSender().sendFrame246(8461, 200, weapon);
c.getPacketSender().sendFrame126(weaponName, 8463); c.getPacketSender().sendFrame126(weaponName, 8463);
} else if (newWeapon.startsWith("spear")) { } else if (newWeapon.startsWith("spear")) {
c.getPacketSender().setSidebarInterface(0, 4679); // lunge, c.getPacketSender().setSidebarInterface(0, 4679); // lunge,
// swipe, // swipe,
// pound, // pound,
// block // block
c.getPacketSender().sendFrame246(4680, 200, weapon); c.getPacketSender().sendFrame246(4680, 200, weapon);
c.getPacketSender().sendFrame126(weaponName, 4682); c.getPacketSender().sendFrame126(weaponName, 4682);
} else if (newWeapon.toLowerCase().contains("mace")) { } else if (newWeapon.toLowerCase().contains("mace")) {
@@ -690,14 +689,14 @@ public class ItemAssistant {
} else if (c.playerEquipment[c.playerWeapon] == 4153) { } else if (c.playerEquipment[c.playerWeapon] == 4153) {
c.getPacketSender().setSidebarInterface(0, 425); // war hamer c.getPacketSender().setSidebarInterface(0, 425); // war hamer
// equip. // equip.
c.getPacketSender().sendFrame246(426, 200, weapon); c.getPacketSender().sendFrame246(426, 200, weapon);
c.getPacketSender().sendFrame126(weaponName, 428); c.getPacketSender().sendFrame126(weaponName, 428);
} else { } else {
c.getPacketSender().setSidebarInterface(0, 2423); // chop, c.getPacketSender().setSidebarInterface(0, 2423); // chop,
// slash, // slash,
// lunge, // lunge,
// block // block
c.getPacketSender().sendFrame246(2424, 200, weapon); c.getPacketSender().sendFrame246(2424, 200, weapon);
c.getPacketSender().sendFrame126(weaponName, 2426); c.getPacketSender().sendFrame126(weaponName, 2426);
} }
@@ -874,241 +873,241 @@ public class ItemAssistant {
} }
switch (itemId) { switch (itemId) {
case 8839: case 8839:
case 8840: case 8840:
case 8842: case 8842:
case 11663: case 11663:
case 11664: case 11664:
case 11665: case 11665:
c.attackLevelReq = 42; c.attackLevelReq = 42;
c.rangeLevelReq = 42; c.rangeLevelReq = 42;
c.strengthLevelReq = 42; c.strengthLevelReq = 42;
c.magicLevelReq = 42; c.magicLevelReq = 42;
c.defenceLevelReq = 42; c.defenceLevelReq = 42;
return; return;
case 10551: case 10551:
case 2503: case 2503:
case 2501: case 2501:
case 2499: case 2499:
case 1135: case 1135:
c.defenceLevelReq = 40; c.defenceLevelReq = 40;
return; return;
case 1133: case 1133:
c.defenceLevelReq = 20; c.defenceLevelReq = 20;
c.rangeLevelReq = 20; c.rangeLevelReq = 20;
return; return;
case 11235: case 11235:
case 6522: case 6522:
c.rangeLevelReq = 60; c.rangeLevelReq = 60;
break; break;
case 1097: case 1097:
c.rangeLevelReq = 20; c.rangeLevelReq = 20;
break; break;
case 864: case 864:
case 863: case 863:
c.rangeLevelReq = 1; c.rangeLevelReq = 1;
break; break;
case 865: case 865:
c.rangeLevelReq = 5; c.rangeLevelReq = 5;
break; break;
case 866: case 866:
c.rangeLevelReq = 20; c.rangeLevelReq = 20;
break; break;
case 867: case 867:
c.rangeLevelReq = 30; c.rangeLevelReq = 30;
break; break;
case 868: case 868:
c.rangeLevelReq = 40; c.rangeLevelReq = 40;
break; break;
case 6524: case 6524:
c.defenceLevelReq = 60; c.defenceLevelReq = 60;
break; break;
case 11284: case 11284:
c.defenceLevelReq = 75; c.defenceLevelReq = 75;
return; return;
case 6889: case 6889:
case 6914: case 6914:
c.magicLevelReq = 60; c.magicLevelReq = 60;
break; break;
case 10828: case 10828:
c.defenceLevelReq = 55; c.defenceLevelReq = 55;
break; break;
case 11724: case 11724:
case 11726: case 11726:
case 11728: case 11728:
c.defenceLevelReq = 65; c.defenceLevelReq = 65;
break; break;
case 847: case 847:
case 849: case 849:
c.rangeLevelReq = 20; c.rangeLevelReq = 20;
break; break;
case 843: case 843:
case 845: case 845:
c.rangeLevelReq = 5; c.rangeLevelReq = 5;
break; break;
case 851: case 851:
case 853: case 853:
c.rangeLevelReq = 30; c.rangeLevelReq = 30;
break; break;
case 855: case 855:
case 857: case 857:
c.rangeLevelReq = 40; c.rangeLevelReq = 40;
break; break;
case 859: case 859:
case 861: case 861:
c.rangeLevelReq = 50; c.rangeLevelReq = 50;
break; break;
case 3749: case 3749:
case 3751: case 3751:
case 3755: case 3755:
case 3753: case 3753:
c.defenceLevelReq = 45; c.defenceLevelReq = 45;
break; break;
case 7462: case 7462:
case 7461: case 7461:
c.defenceLevelReq = 40; c.defenceLevelReq = 40;
break; break;
case 8846: case 8846:
c.defenceLevelReq = 5; c.defenceLevelReq = 5;
break; break;
case 8847: case 8847:
c.defenceLevelReq = 10; c.defenceLevelReq = 10;
break; break;
case 8848: case 8848:
c.defenceLevelReq = 20; c.defenceLevelReq = 20;
break; break;
case 8849: case 8849:
c.defenceLevelReq = 30; c.defenceLevelReq = 30;
break; break;
case 8850: case 8850:
c.defenceLevelReq = 40; c.defenceLevelReq = 40;
break; break;
case 7460: case 7460:
c.defenceLevelReq = 40; c.defenceLevelReq = 40;
break; break;
case 837: case 837:
c.rangeLevelReq = 61; c.rangeLevelReq = 61;
break; break;
case 4151: // if you don't want to use names case 4151: // if you don't want to use names
c.attackLevelReq = 70; c.attackLevelReq = 70;
return; return;
case 6724: // seercull case 6724: // seercull
c.rangeLevelReq = 60; // idk if that is correct c.rangeLevelReq = 60; // idk if that is correct
return; return;
case 6523: case 6523:
case 6525: case 6525:
case 6527: case 6527:
c.attackLevelReq = 60; c.attackLevelReq = 60;
return; return;
case 6526: case 6526:
c.attackLevelReq = 60; c.attackLevelReq = 60;
c.magicLevelReq = 60; c.magicLevelReq = 60;
return; return;
case 4156: case 4156:
c.defenceLevelReq = 20; c.defenceLevelReq = 20;
c.slayerLevelReq = 25; c.slayerLevelReq = 25;
return; return;
case 1391: case 1391:
case 1393: case 1393:
case 1395: case 1395:
case 1397: case 1397:
case 1399: case 1399:
case 3053: case 3053:
c.attackLevelReq = 30; c.attackLevelReq = 30;
c.magicLevelReq = 30; c.magicLevelReq = 30;
return; return;
case 4158: case 4158:
c.slayerLevelReq = 55; c.slayerLevelReq = 55;
c.attackLevelReq = 50; c.attackLevelReq = 50;
return; return;
case 4153: case 4153:
c.attackLevelReq = 50; c.attackLevelReq = 50;
c.strengthLevelReq = 50; c.strengthLevelReq = 50;
return; return;
case 6528: case 6528:
c.strengthLevelReq = 60; c.strengthLevelReq = 60;
return; return;
case 4161: case 4161:
c.slayerLevelReq = 20; c.slayerLevelReq = 20;
return; return;
case 4168: case 4168:
c.slayerLevelReq = 60; c.slayerLevelReq = 60;
return; return;
case 6696: case 6696:
c.slayerLevelReq = 22; c.slayerLevelReq = 22;
return; return;
case 8923: case 8923:
c.slayerLevelReq = 35; c.slayerLevelReq = 35;
return; return;
case 7159: case 7159:
c.slayerLevelReq = 37; c.slayerLevelReq = 37;
return; return;
case 6708: case 6708:
c.slayerLevelReq = 42; c.slayerLevelReq = 42;
return; return;
case 4170: case 4170:
c.slayerLevelReq = 55; c.slayerLevelReq = 55;
return; return;
case 4162: case 4162:
c.slayerLevelReq = 75; c.slayerLevelReq = 75;
return; return;
case 7421: case 7421:
case 7422: case 7422:
case 7423: case 7423:
case 7424: case 7424:
case 7425: case 7425:
case 7426: case 7426:
case 7427: case 7427:
case 7428: case 7428:
case 7429: case 7429:
case 7430: case 7430:
case 7431: case 7431:
case 7432: case 7432:
c.slayerLevelReq = 57; c.slayerLevelReq = 57;
return; return;
case 4212: case 4212:
case 4214: case 4214:
case 4215: case 4215:
case 4216: case 4216:
case 4217: case 4217:
case 4218: case 4218:
case 4219: case 4219:
case 4220: case 4220:
case 4221: case 4221:
case 4222: case 4222:
case 4223: case 4223:
c.agilityLevelReq = 50; c.agilityLevelReq = 50;
c.rangeLevelReq = 70; c.rangeLevelReq = 70;
return; return;
case 4150: case 4150:
case 4160: case 4160:
case 4172: case 4172:
case 4174: case 4174:
c.slayerLevelReq = 55; c.slayerLevelReq = 55;
return; return;
case 1015: case 1015:
c.defenceLevelReq = 1; c.defenceLevelReq = 1;
return; return;
case 6664: case 6664:
c.slayerLevelReq = 32; c.slayerLevelReq = 32;
return; return;
case 4551: case 4551:
c.defenceLevelReq = 5; c.defenceLevelReq = 5;
return; return;
case 7051: case 7051:
c.slayerLevelReq = 33; c.slayerLevelReq = 33;
return; return;
case 4166: case 4166:
c.slayerLevelReq = 15; c.slayerLevelReq = 15;
return; return;
case 4164: case 4164:
c.slayerLevelReq = 10; c.slayerLevelReq = 10;
return; return;
} }
} }
@@ -1149,78 +1148,78 @@ public class ItemAssistant {
public void addSpecialBar(int weapon) { public void addSpecialBar(int weapon) {
switch (weapon) { switch (weapon) {
case 4151: // whip case 4151: // whip
c.getPacketSender().sendFrame171(0, 12323); c.getPacketSender().sendFrame171(0, 12323);
specialAmount(weapon, c.specAmount, 12335); specialAmount(weapon, c.specAmount, 12335);
break; break;
case 859: // magic bows case 859: // magic bows
case 861: case 861:
case 11235: case 11235:
c.getPacketSender().sendFrame171(0, 7549); c.getPacketSender().sendFrame171(0, 7549);
specialAmount(weapon, c.specAmount, 7561); specialAmount(weapon, c.specAmount, 7561);
break; break;
case 4587: // dscimmy case 4587: // dscimmy
c.getPacketSender().sendFrame171(0, 7599); c.getPacketSender().sendFrame171(0, 7599);
specialAmount(weapon, c.specAmount, 7611); specialAmount(weapon, c.specAmount, 7611);
break; break;
case 3204: // d hally case 3204: // d hally
c.getPacketSender().sendFrame171(0, 8493); c.getPacketSender().sendFrame171(0, 8493);
specialAmount(weapon, c.specAmount, 8505); specialAmount(weapon, c.specAmount, 8505);
break; break;
case 1377: // d battleaxe case 1377: // d battleaxe
c.getPacketSender().sendFrame171(0, 7499); c.getPacketSender().sendFrame171(0, 7499);
specialAmount(weapon, c.specAmount, 7511); specialAmount(weapon, c.specAmount, 7511);
break; break;
case 4153: // gmaul case 4153: // gmaul
c.getPacketSender().sendFrame171(0, 7474); c.getPacketSender().sendFrame171(0, 7474);
specialAmount(weapon, c.specAmount, 7486); specialAmount(weapon, c.specAmount, 7486);
break; break;
case 1249: // dspear case 1249: // dspear
c.getPacketSender().sendFrame171(0, 7674); c.getPacketSender().sendFrame171(0, 7674);
specialAmount(weapon, c.specAmount, 7686); specialAmount(weapon, c.specAmount, 7686);
break; break;
case 1215:// dragon dagger case 1215:// dragon dagger
case 1231: case 1231:
case 5680: case 5680:
case 5698: case 5698:
case 1305: // dragon long case 1305: // dragon long
case 11694: case 11694:
case 11698: case 11698:
case 11700: case 11700:
case 11730: case 11730:
case 11696: case 11696:
c.getPacketSender().sendFrame171(0, 7574); c.getPacketSender().sendFrame171(0, 7574);
specialAmount(weapon, c.specAmount, 7586); specialAmount(weapon, c.specAmount, 7586);
break; break;
case 1434: // dragon mace case 1434: // dragon mace
c.getPacketSender().sendFrame171(0, 7624); c.getPacketSender().sendFrame171(0, 7624);
specialAmount(weapon, c.specAmount, 7636); specialAmount(weapon, c.specAmount, 7636);
break; break;
default: default:
c.getPacketSender().sendFrame171(1, 7624); // mace c.getPacketSender().sendFrame171(1, 7624); // mace
// interface // interface
c.getPacketSender().sendFrame171(1, 7474); // hammer, gmaul c.getPacketSender().sendFrame171(1, 7474); // hammer, gmaul
c.getPacketSender().sendFrame171(1, 7499); // axe c.getPacketSender().sendFrame171(1, 7499); // axe
c.getPacketSender().sendFrame171(1, 7549); // bow interface c.getPacketSender().sendFrame171(1, 7549); // bow interface
c.getPacketSender().sendFrame171(1, 7574); // sword c.getPacketSender().sendFrame171(1, 7574); // sword
// interface // interface
c.getPacketSender().sendFrame171(1, 7599); // scimmy sword c.getPacketSender().sendFrame171(1, 7599); // scimmy sword
// interface, // interface,
// for most // for most
// swords // swords
c.getPacketSender().sendFrame171(1, 8493); c.getPacketSender().sendFrame171(1, 8493);
c.getPacketSender().sendFrame171(1, 12323); // whip c.getPacketSender().sendFrame171(1, 12323); // whip
// interface // interface
break; break;
} }
} }
@@ -1251,33 +1250,33 @@ public class ItemAssistant {
public void updateSpecialBar() { public void updateSpecialBar() {
if (c.usingSpecial) { if (c.usingSpecial) {
c.getPacketSender().sendFrame126( c.getPacketSender().sendFrame126(
"" ""
+ (c.specAmount >= 2 ? "@yel@S P" + (c.specAmount >= 2 ? "@yel@S P"
: "@bla@S P") : "@bla@S P")
+ "" + ""
+ (c.specAmount >= 3 ? "@yel@ E" + (c.specAmount >= 3 ? "@yel@ E"
: "@bla@ E") : "@bla@ E")
+ "" + ""
+ (c.specAmount >= 4 ? "@yel@ C I" + (c.specAmount >= 4 ? "@yel@ C I"
: "@bla@ C I") : "@bla@ C I")
+ "" + ""
+ (c.specAmount >= 5 ? "@yel@ A L" + (c.specAmount >= 5 ? "@yel@ A L"
: "@bla@ A L") : "@bla@ A L")
+ "" + ""
+ (c.specAmount >= 6 ? "@yel@ A" + (c.specAmount >= 6 ? "@yel@ A"
: "@bla@ A") : "@bla@ A")
+ "" + ""
+ (c.specAmount >= 7 ? "@yel@ T T" + (c.specAmount >= 7 ? "@yel@ T T"
: "@bla@ T T") : "@bla@ T T")
+ "" + ""
+ (c.specAmount >= 8 ? "@yel@ A" + (c.specAmount >= 8 ? "@yel@ A"
: "@bla@ A") : "@bla@ A")
+ "" + ""
+ (c.specAmount >= 9 ? "@yel@ C" + (c.specAmount >= 9 ? "@yel@ C"
: "@bla@ C") : "@bla@ C")
+ "" + ""
+ (c.specAmount >= 10 ? "@yel@ K" + (c.specAmount >= 10 ? "@yel@ K"
: "@bla@ K"), c.specBarId); : "@bla@ K"), c.specBarId);
} else { } else {
c.getPacketSender().sendFrame126( c.getPacketSender().sendFrame126(
"@bla@S P E C I A L A T T A C K", c.specBarId); "@bla@S P E C I A L A T T A C K", c.specBarId);
@@ -1663,7 +1662,7 @@ public class ItemAssistant {
c.flushOutStream(); c.flushOutStream();
c.updateRequired = true; c.updateRequired = true;
c.setAppearanceUpdateRequired(true); c.setAppearanceUpdateRequired(true);
Weight.updateWeight(c); Weight.calcWeight(c, wearID, "deleteitem");
} }
} }
} }
@@ -1800,7 +1799,7 @@ public class ItemAssistant {
if (!CastleWars.deleteCastleWarsItems(c, itemID)) { if (!CastleWars.deleteCastleWarsItems(c, itemID)) {
return false; return false;
} }
if (c.otherBank) { if (c.otherBank == true) {
c.getPacketSender().closeAllWindows(); c.getPacketSender().closeAllWindows();
c.getPacketSender().sendMessage("You can't bank while viewing someones bank!"); c.getPacketSender().sendMessage("You can't bank while viewing someones bank!");
c.otherBank = false; c.otherBank = false;
@@ -2073,11 +2072,11 @@ public class ItemAssistant {
public int freeBankSlots() { public int freeBankSlots() {
int freeS = 0; int freeS = 0;
for (int i = 0; i < GameConstants.BANK_SIZE; i++) { for (int i = 0; i < GameConstants.BANK_SIZE; i++) {
if (c.bankItems[i] <= 0) { if (c.bankItems[i] <= 0) {
freeS++; freeS++;
}
} }
}
return freeS; return freeS;
} }
@@ -2101,9 +2100,9 @@ public class ItemAssistant {
} }
if (amount > 0) { if (amount > 0) {
if (c.bankItems[fromSlot] > 0) { if (c.bankItems[fromSlot] > 0) {
if (c.getItemAssistant().playerHasItem(itemID)) if (c.getItemAssistant().playerHasItem(itemID))
{ {
for (int i = 0; i <= 27;i++) for (int i = 0; i <= 27;i++)
{ {
if (itemID == c.playerItems[i] || (itemID == 995 && c.playerItems[i] - 1 == 995)) if (itemID == c.playerItems[i] || (itemID == 995 && c.playerItems[i] - 1 == 995))
{ {
@@ -2114,7 +2113,7 @@ public class ItemAssistant {
} }
} }
} }
} }
if (!cantWithdrawCuzMaxStack) if (!cantWithdrawCuzMaxStack)
{ {
if (!c.takeAsNote) { if (!c.takeAsNote) {
@@ -2368,7 +2367,7 @@ public class ItemAssistant {
} }
} }
resetItems(3214); resetItems(3214);
Weight.updateWeight(c); Weight.calcWeight(c, id, "deleteitem");
} }
public void deleteItem(int id, int slot, int amount) { public void deleteItem(int id, int slot, int amount) {
@@ -2383,7 +2382,7 @@ public class ItemAssistant {
c.playerItems[slot] = 0; c.playerItems[slot] = 0;
} }
resetItems(3214); resetItems(3214);
Weight.updateWeight(c); Weight.calcWeight(c, id, "deleteitem");
} }
} }
2006Redone Server/src/com/rebotted/game/items/Weight.java
+57 -57
View File
@@ -8,62 +8,62 @@ import com.rebotted.game.players.Player;
*/ */
public class Weight extends ItemDefinitions { public class Weight extends ItemDefinitions {
/** /**
* Calculates the weight when doing actions * Calculates the weight when doing actions
* *
* @param c * @param c
* @param item * @param item
* @param action * @param action
* - deleteitem, additem, equip, unequip. * - deleteitem, additem, equip, unequip.
*/ */
private static void calcWeight(Player c, int item, String action) { public static void calcWeight(Player c, int item, String action) {
if (action.equalsIgnoreCase("deleteitem")) { if (action.equalsIgnoreCase("deleteitem")) {
if (getWeight(item) > 99.20) { if (getWeight(item) > 99.20) {
c.weight -= getWeight(item) / 100; c.weight -= getWeight(item) / 100;
if (c.weight < 0) { if (c.weight < 0) {
c.weight = 0.0; c.weight = 0.0;
} }
c.getPacketSender().writeWeight((int) c.weight); c.getPacketSender().writeWeight((int) c.weight);
return; return;
} }
c.weight -= getWeight(item) / 10; c.weight -= getWeight(item) / 10;
if (c.weight < 0) { if (c.weight < 0) {
c.weight = 0.0; c.weight = 0.0;
} }
c.getPacketSender().writeWeight((int) c.weight); c.getPacketSender().writeWeight((int) c.weight);
} else if (action.equalsIgnoreCase("additem")) { } else if (action.equalsIgnoreCase("additem")) {
if (getWeight(item) > 99.20) { if (getWeight(item) > 99.20) {
c.weight += getWeight(item) / 100; c.weight += getWeight(item) / 100;
c.getPacketSender().writeWeight((int) c.weight); c.getPacketSender().writeWeight((int) c.weight);
return; return;
} }
c.weight += getWeight(item) / 10; c.weight += getWeight(item) / 10;
c.getPacketSender().writeWeight((int) c.weight); c.getPacketSender().writeWeight((int) c.weight);
} }
} }
/** /**
* Updates the weight for inventory and equipment. * Updates the weight for inventory and equipment.
* *
* @param player * @param player
*/ */
public static void updateWeight(Player player) { public static void updateWeight(Player player) {
if (player != null) { if (player != null) {
player.weight = 0; player.weight = 0;
// Inventory items // Inventory items
for (int playerItem : player.playerItems) { for (int playerItem : player.playerItems) {
if (playerItem > -1) {// inventory if (playerItem > -1) {// inventory
calcWeight(player, playerItem, "addItem"); calcWeight(player, playerItem, "addItem");
} }
} }
// Equiped items // Equiped items
for (int element : player.playerEquipment) { for (int element : player.playerEquipment) {
if (element > -1) {// equipment if (element > -1) {// equipment
if (element == 88) player.weight -= 4.5; if (element == 88) player.weight -= 4.5;
else calcWeight(player, element, "addItem"); else calcWeight(player, element, "addItem");
} }
} }
player.getPacketSender().writeWeight((int) player.weight); }
} player.getPacketSender().writeWeight((int) player.weight);
} }
} }