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

A lot of fixes (#242)

Browse Source 
* Fixed stuff related to shop trading

> Refactored stuff to facilitate resolving an issue regarding sellnig item to a full shop
> Removed double value message in shop

* Fixed some stuff related to agility

-Removed a useless obstacle in wilderness course that alowed insane xp gains;
-Added some 'flexibility' to some obstacles at agility pyramid;
-Removed useless vars;
-Added proper xp to obstacles;
-Added bonus xp for completing agility pyramid
-Most likely more;

***Animations still missing: Crossing gaps and jumping gaps***

* resolve conflicts

* delete old files

* A lot of fixes

Christmas Cracker (anim other player & text & admin right & rare protection)
Added check in stack value when withdrawing from bank to prevent losing items when max int value is reached
fixed double message on pickpocketing when in combat
Renamed methods
Removed unused methods
Removed admin restriction when trying to use the cannon
Cleaned KBD drops
Boots of lightness weight reduction is fixed
More...
This commit is contained in:
Gptaqbc
2019-12-07 21:16:18 -05:00
committed by Daniel Ginovker
parent 8e524cdcda
commit 55a35a26b2
13 changed files with 152 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Redone Server/src/com/rebotted/game/items/ItemAssistant.java
+82 -86
View File
@@ -195,32 +195,6 @@ public class ItemAssistant {
return c.playerEquipment[slot] == itemID;
}
public void removeItem(int slot) {
if (c.getOutStream() != null && c != null) {
if (c.playerEquipment[slot] > -1) {
if (addItem(c.playerEquipment[slot], c.playerEquipmentN[slot])) {
c.playerEquipment[slot] = -1;
c.playerEquipmentN[slot] = 0;
sendWeapon(c.playerEquipment[c.playerWeapon],
getItemName(c.playerEquipment[c.playerWeapon]));
resetBonus();
getBonus();
writeBonus();
c.getCombatAssistant().getPlayerAnimIndex();
c.getOutStream().createFrame(34);
c.getOutStream().writeWord(6);
c.getOutStream().writeWord(1688);
c.getOutStream().writeByte(slot);
c.getOutStream().writeWord(0);
c.getOutStream().writeByte(0);
c.flushOutStream();
c.updateRequired = true;
c.setAppearanceUpdateRequired(true);
}
}
}
}
public void addItemToBank(int itemId, int amount) {
itemId++;
for (int i = 0; i < GameConstants.BANK_SIZE; i++) {
@@ -2095,7 +2069,7 @@ public class ItemAssistant {
return freeS;
}
public int getBankQuantitiy(int itemID)
public int getBankQuantity(int itemID)
{
for (int i = 0; i < c.bankItems.length; i++) {
if (c.bankItems[i] == itemID)
@@ -2107,19 +2081,67 @@ public class ItemAssistant {
}
public void fromBank(int itemID, int fromSlot, int amount) {
boolean cantWithdrawCuzMaxStack = false;
if (amount > 0) {
if (c.bankItems[fromSlot] > 0) {
if (!c.takeAsNote) {
if (Item.itemStackable[c.bankItems[fromSlot] - 1]) {
if (c.getItemAssistant().playerHasItem(itemID))
{
for (int i = 0; i <= 27;i++)
{
if (itemID == c.playerItems[i] || (itemID == 995 && c.playerItems[i] - 1 == 995))
{
if ((c.playerItemsN[i] + amount + 1) < -1)
{
cantWithdrawCuzMaxStack = true;
break;
}
}
}
}
if (!cantWithdrawCuzMaxStack)
{
if (!c.takeAsNote) {
if (Item.itemStackable[c.bankItems[fromSlot] - 1]) {
if (c.bankItemsN[fromSlot] > amount) {
if (addItem(c.bankItems[fromSlot] - 1, amount)) {
c.bankItemsN[fromSlot] -= amount;
resetBank();
resetItems(5064);
}
} else {
if (addItem(c.bankItems[fromSlot] - 1,
c.bankItemsN[fromSlot])) {
c.bankItems[fromSlot] = 0;
c.bankItemsN[fromSlot] = 0;
resetBank();
resetItems(5064);
}
}
} else {
while (amount > 0) {
if (c.bankItemsN[fromSlot] > 0) {
if (addItem(c.bankItems[fromSlot] - 1, 1)) {
c.bankItemsN[fromSlot] += -1;
amount--;
} else {
amount = 0;
}
} else {
amount = 0;
}
}
resetBank();
resetItems(5064);
}
} else if (c.takeAsNote && Item.itemIsNote[c.bankItems[fromSlot]]) {
if (c.bankItemsN[fromSlot] > amount) {
if (addItem(c.bankItems[fromSlot] - 1, amount)) {
if (addItem(c.bankItems[fromSlot], amount)) {
c.bankItemsN[fromSlot] -= amount;
resetBank();
resetItems(5064);
}
} else {
if (addItem(c.bankItems[fromSlot] - 1,
c.bankItemsN[fromSlot])) {
if (addItem(c.bankItems[fromSlot], c.bankItemsN[fromSlot])) {
c.bankItems[fromSlot] = 0;
c.bankItemsN[fromSlot] = 0;
resetBank();
@@ -2127,71 +2149,45 @@ public class ItemAssistant {
}
}
} else {
while (amount > 0) {
if (c.bankItemsN[fromSlot] > 0) {
if (addItem(c.bankItems[fromSlot] - 1, 1)) {
c.bankItemsN[fromSlot] += -1;
amount--;
} else {
amount = 0;
c.getPacketSender().sendMessage("This item can't be withdrawn as a note.");
if (Item.itemStackable[c.bankItems[fromSlot] - 1]) {
if (c.bankItemsN[fromSlot] > amount) {
if (addItem(c.bankItems[fromSlot] - 1, amount)) {
c.bankItemsN[fromSlot] -= amount;
resetBank();
resetItems(5064);
}
} else {
amount = 0;
}
}
resetBank();
resetItems(5064);
}
} else if (c.takeAsNote && Item.itemIsNote[c.bankItems[fromSlot]]) {
if (c.bankItemsN[fromSlot] > amount) {
if (addItem(c.bankItems[fromSlot], amount)) {
c.bankItemsN[fromSlot] -= amount;
resetBank();
resetItems(5064);
}
} else {
if (addItem(c.bankItems[fromSlot], c.bankItemsN[fromSlot])) {
c.bankItems[fromSlot] = 0;
c.bankItemsN[fromSlot] = 0;
resetBank();
resetItems(5064);
}
}
} else {
c.getPacketSender().sendMessage("This item can't be withdrawn as a note.");
if (Item.itemStackable[c.bankItems[fromSlot] - 1]) {
if (c.bankItemsN[fromSlot] > amount) {
if (addItem(c.bankItems[fromSlot] - 1, amount)) {
c.bankItemsN[fromSlot] -= amount;
resetBank();
resetItems(5064);
if (addItem(c.bankItems[fromSlot] - 1,
c.bankItemsN[fromSlot])) {
c.bankItems[fromSlot] = 0;
c.bankItemsN[fromSlot] = 0;
resetBank();
resetItems(5064);
}
}
} else {
if (addItem(c.bankItems[fromSlot] - 1,
c.bankItemsN[fromSlot])) {
c.bankItems[fromSlot] = 0;
c.bankItemsN[fromSlot] = 0;
resetBank();
resetItems(5064);
}
}
} else {
while (amount > 0) {
if (c.bankItemsN[fromSlot] > 0) {
if (addItem(c.bankItems[fromSlot] - 1, 1)) {
c.bankItemsN[fromSlot] += -1;
amount--;
while (amount > 0) {
if (c.bankItemsN[fromSlot] > 0) {
if (addItem(c.bankItems[fromSlot] - 1, 1)) {
c.bankItemsN[fromSlot] += -1;
amount--;
} else {
amount = 0;
}
} else {
amount = 0;
}
} else {
amount = 0;
}
resetBank();
resetItems(5064);
}
resetBank();
resetItems(5064);
}
}
else
{
c.getPacketSender().sendMessage("Can't withdraw more of that item!");
}
}
}
}