2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-09 16:45:44 -07:00
Code Issues Projects Releases Packages Wiki Activity

Better handling of full inventories

Browse source 
Made it possible to alch when inventory is full with non-coin items, if the alch would free up the necessary space
Made it possible to receive a kitten from Gertrude when inventory is full,  if the transaction would free the space for the kitten
Made it possible to receive a kitten from Gertrude when inventory is full even with more than 100 gp, if the pet can be summoned immediately
Gertrude's Quest completion - fixed bug causing loss of kitten with full inventory
Fixed a bug where Gertrude's kitten-giving dialogue will hang if spoken to while having a non-pet familiar out
Fixed typos
This commit is contained in:
Player Name 2024-03-31 14:17:25 +00:00 • committed by Ryan
parent 2948d58934
commit 5c977c0522
3 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Server/src/main/content/global/skill/magic/modern/ModernListeners.kt
View file

@ -239,7 +239,7 @@ class ModernListeners : SpellListener("modern"){
}
val coins = Item(995, item.definition.getAlchemyValue(high))
if (coins.amount > 0 && !player.inventory.hasSpaceFor(coins)) {
if (item.amount > 1 && coins.amount > 0 && !player.inventory.hasSpaceFor(coins)) {
player.sendMessage("Not enough space in your inventory!")
return false
}
@ -258,11 +258,10 @@ class ModernListeners : SpellListener("modern"){
}
playAudio(player, if (high) Sounds.HIGH_ALCHEMY_97 else Sounds.LOW_ALCHEMY_98)
if (coins.amount > 0)
player.inventory.add(coins)
player.dispatch(ItemAlchemizationEvent(item.id, high))
player.inventory.remove(Item(item.id, 1))
if (player.inventory.remove(Item(item.id, 1)) && coins.amount > 0) {
player.inventory.add(coins)
}
removeRunes(player)
addXP(player, if (high) 65.0 else 31.0)
showMagicTab(player)

36
Server/src/main/content/region/misthalin/varrock/dialogue/GertrudeDialogue.java
View file

@ -11,9 +11,13 @@ import core.game.node.entity.player.link.quest.Quest;
import core.game.node.item.Item;
import core.plugin.Initializable;
import core.tools.RandomFunction;
import org.rs09.consts.Items;
import java.util.Map;
import static core.api.ContentAPIKt.freeSlots;
import static core.api.ContentAPIKt.inInventory;
/**
* Represents the gertrude dialogue plugin.
* @author 'Vexia
@ -55,14 +59,14 @@ public final class GertrudeDialogue extends DialoguePlugin {
final Quest quest = player.getQuestRepository().getQuest("Gertrude's Cat");
switch (quest.getStage(player)) {
case 0:
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Hello, are you ok?");
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Hello, are you OK?");
break;
case 10:
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Hello Gertrude.");
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Hello, Gertrude.");
stage = 210;
break;
case 20:
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Hello Gertrude.");
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "Hello, Gertrude.");
stage = 230;
break;
case 30:
@ -94,7 +98,7 @@ public final class GertrudeDialogue extends DialoguePlugin {
final Quest quest = player.getQuestRepository().getQuest("Gertrude's Cat");
switch (stage) {
case 0:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Do I look ok? Those kids drive me crazy.");
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Do I look OK? Those kids drive me crazy.");
stage = 1;
break;
case 1:
@ -260,7 +264,7 @@ public final class GertrudeDialogue extends DialoguePlugin {
stage = 323;
break;
case 323:
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "That's ok, I like to do my bit.");
interpreter.sendDialogues(player, FacialExpression.HALF_GUILTY, "That's OK, I like to do my bit.");
stage = 324;
break;
case 324:
@ -331,7 +335,7 @@ public final class GertrudeDialogue extends DialoguePlugin {
case 503:
boolean has = false;
int[] kittens = new int[] { 1555, 1556, 1557, 1558, 1559, 1560, 7583 };
if (player.getFamiliarManager().hasFamiliar()) {
if (player.getFamiliarManager().hasFamiliar() && player.getFamiliarManager().hasPet()) {
Pet pet = (Pet) player.getFamiliarManager().getFamiliar();
for (int i : kittens) {
if (pet.getItemId() == i) {
@ -362,12 +366,15 @@ public final class GertrudeDialogue extends DialoguePlugin {
case 901:
switch (buttonId) {
case 1:// yes
if (!player.getInventory().contains(995, 100)) {
player.getPacketDispatch().sendMessage("You need a 100 coins to buy a kitten.");
boolean hasMoney = inInventory(player, Items.COINS_995, 100);
if (!hasMoney) {
player.getPacketDispatch().sendMessage("You need 100 coins to buy a kitten.");
end();
break;
} else {
if (player.getInventory().freeSlots() == 0) {
boolean hasExtraMoney = inInventory(player, Items.COINS_995, 101);
boolean hasSpace = freeSlots(player) > 0 || !hasExtraMoney;
if (player.getFamiliarManager().hasFamiliar() && !hasSpace) {
player.getPacketDispatch().sendMessage("You don't have enough inventory space.");
end();
break;
@ -382,7 +389,7 @@ public final class GertrudeDialogue extends DialoguePlugin {
}
break;
case 903:
interpreter.sendDialogues(npc, null, "Ok then, here you go.");
interpreter.sendDialogues(npc, null, "OK then, here you go.");
stage = 904;
break;
case 904:
@ -390,16 +397,15 @@ public final class GertrudeDialogue extends DialoguePlugin {
stage = 905;
break;
case 905:
if (!player.getInventory().containsItem(COINS)) {
end();
return true;
}
if (player.getInventory().remove(COINS)) {
interpreter.sendDialogue("Gertrude gives you another kitten.");
stage = 906;
final Item kitten = getKitten();
if (player.getFamiliarManager().hasFamiliar()) {
player.getInventory().add(kitten);
player.getFamiliarManager().summon(kitten, true);
} else {
player.getFamiliarManager().summon(kitten, true, false);
}
}
break;
case 906:

5
Server/src/main/content/region/misthalin/varrock/quest/gertrude/GertrudesCat.java
View file

@ -83,8 +83,11 @@ public class GertrudesCat extends Quest {
player.getSkills().addExperience(Skills.COOKING, 1525);
player.getPacketDispatch().sendItemZoomOnInterface(kitten.getId(), 240, 277, 3 + 2);
setStage(player, 100);
if (player.getFamiliarManager().hasFamiliar()) {
player.getInventory().add(kitten);
player.getFamiliarManager().summon(kitten, true);
} else {
player.getFamiliarManager().summon(kitten, true, false);
}
final Item cake = new Item(1897);
final Item stew = new Item(2003);
if (!player.getInventory().add(cake)) {