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

Update how player shop is handled (#501)

Browse Source 
* Update how player shop is handled

* Squashed commit of the following:

commit 5be0778dc9
Author: Danial <admin@redsparr0w.com>
Date:   Sun Sep 19 14:24:12 2021 +1200

    minor fixup

commit ef3b63b54f
Author: Danial <admin@redsparr0w.com>
Date:   Sun Sep 19 14:11:27 2021 +1200

    Add docker compose file for running servers in containers

* Update DialogueHandler.java

* Fix for models out of bounds

* Revert "Squashed commit of the following:"

This reverts commit d27d3c357c.

* Other shop tidy up

Show shops as combat level 0
Remove items from shop when shop logs off
This commit is contained in:
Danial
2021-09-21 00:18:40 +12:00
committed by GitHub
parent 8cceeeddd4
commit 06b509c4d0
9 changed files with 75 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueHandler.java
+11
View File
@@ -2,6 +2,8 @@ package com.rs2.game.dialogues;
import com.rs2.GameConstants;
import com.rs2.GameEngine;
import com.rs2.game.bots.Bot;
import com.rs2.game.bots.BotHandler;
import com.rs2.game.content.quests.QuestAssistant;
import com.rs2.game.content.quests.QuestRewards;
import com.rs2.game.content.randomevents.FreakyForester;
@@ -7516,6 +7518,15 @@ public class DialogueHandler {
player.getDialogueHandler().sendNpcChat(player.talkingNpc, ChatEmotes.HAPPY_JOYFUL, "Thank you again traveller. Happy Easter!");
player.getDialogueHandler().endDialogue();
break;
case 10000:
int coins = BotHandler.checkCoins(player);
sendOption(
player.inPlayerShopArea() ? "Summon Shop" : "@red@Summon Shop", // 9178
"Close Shop", // 9179
coins > 0 ? "Withdraw Money (" + Bot.formatSellPrice(coins) + ")" : "@red@Withdraw Money (0 gp)"// 9180
);
player.dialogueAction = 10000;
break;
}
}
public void chatboxText(String text, String text1, String text2,
2006Scape Server/src/main/java/com/rs2/game/dialogues/DialogueOptions.java
+18
View File
@@ -1,5 +1,7 @@
package com.rs2.game.dialogues;
import com.rs2.game.bots.Bot;
import com.rs2.game.bots.BotHandler;
import com.rs2.game.content.skills.crafting.JewelryMaking;
import com.rs2.game.items.impl.Flowers;
import com.rs2.game.items.impl.Teles;
@@ -93,6 +95,14 @@ public class DialogueOptions {
case 7555: //lostCity 1
player.getDialogueHandler().sendDialogues(3701, player.npcType);
return;
case 10000: // Shop
if (!player.inPlayerShopArea()) {
player.getDialogueHandler().sendStatement("You need to be in a bank zone or trade area for this.");
return;
}
player.getDialogueHandler().sendStatement("You summoned your shop!");
BotHandler.playerShop(player);
return;
}
player.dialogueAction = 0;
player.getPacketSender().closeAllWindows();
@@ -177,6 +187,10 @@ public class DialogueOptions {
case 7555:
player.getDialogueHandler().sendDialogues(3597, player.npcType);
return;
case 10000:
player.getDialogueHandler().sendStatement("You close your shop!");
BotHandler.closeShop(player);
return;
}
player.dialogueAction = 0;
player.getPacketSender().closeAllWindows();
@@ -264,6 +278,10 @@ public class DialogueOptions {
case 7555:
player.getDialogueHandler().sendDialogues(3599, player.npcType);
return;
case 10000:
player.getDialogueHandler().sendStatement("You withdraw " + Bot.formatSellPrice(BotHandler.checkCoins(player)) + " from your shop!");
BotHandler.takeCoins(player);
return;
}
player.dialogueAction = 0;
player.getPacketSender().closeAllWindows();