From dc3f561868be76e4290c6e8f6428cbfa8da571d4 Mon Sep 17 00:00:00 2001 From: Gptaqbc <56596815+Gptaqbc@users.noreply.github.com> Date: Sun, 10 Nov 2019 19:46:24 -0500 Subject: [PATCH] =?UTF-8?q?Faster=20shop=20restocking=20-=20Brought=20back?= =?UTF-8?q?=20normal=20stack=20of=20items=20in=20shops=20=E2=80=A6=20(#164?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Faster shop restocking - Brought back normal stack of items in shops - Added chat message to camoe transport system Faster shop restocking - Brought back normal stack of items in shops - Added chat message to camoe transport system * Fixed typo Fixed typo --- 2006Redone Server/data/cfg/shops.cfg | 6 +++--- .../game/content/skills/core/Woodcutting.java | 19 ++++++++++++++++++- .../redone/game/items/impl/LightSources.java | 2 +- .../redone/game/players/PlayerAssistant.java | 2 +- .../src/redone/game/shops/ShopHandler.java | 5 +++-- 5 files changed, 26 insertions(+), 8 deletions(-) diff --git a/2006Redone Server/data/cfg/shops.cfg b/2006Redone Server/data/cfg/shops.cfg index 81a95dc9..09564332 100644 --- a/2006Redone Server/data/cfg/shops.cfg +++ b/2006Redone Server/data/cfg/shops.cfg @@ -49,9 +49,9 @@ shop = 48 Kjut's_Kebabs 2 2 1971 1000 shop = 49 Flynn's Mace Shop 2 2 1422 10 1420 10 1424 8 1428 6 1430 4 shop = 50 Ali's_Discount_Wares 2 2 1931 30 1935 10 1823 30 1833 10 1837 10 1925 10 4593 10 4591 10 970 10 946 10 590 10 1265 10 2138 10 shop = 51 Betty's_Magic_emporium 2 2 554 300 555 300 556 300 557 100 558 100 562 30 560 10 221 100 579 10 1017 10 -shop = 52 Aubury_Magic_Shop 2 2 554 5000000 555 5000000 556 5000000 557 5000000 558 5000000 559 5000000 562 5000000 560 5000000 -shop = 53 Wizards_Guild_Shop 2 2 554 5000000 555 5000000 556 5000000 557 5000000 558 5000000 559 5000000 562 5000000 561 5000000 560 5000000 563 5000000 565 5000000 1387 5000000 1383 5000000 1381 5000000 1385 5000000 -shop = 54 Lundails_Rune_Shop 2 2 554 5000000 555 5000000 556 5000000 557 5000000 558 5000000 559 5000000 561 5000000 562 5000000 563 5000000 564 5000000 560 5000000 +shop = 52 Aubury_Magic_Shop 2 2 554 5000 555 5000 556 5000 557 5000 558 5000 559 5000 562 250 560 250 +shop = 53 Wizards_Guild_Shop 2 2 554 5000 555 5000 556 5000 557 5000 558 5000 559 5000 562 250 561 250 560 250 563 250 565 250 1387 2 1383 2 1381 2 1385 2 +shop = 54 Lundails_Rune_Shop 2 2 554 200 555 200 556 200 557 200 558 140 559 140 561 250 562 250 563 250 564 20 565 250 560 250 shop = 55 Battle_Runes 2 2 554 100 555 100 556 100 557 100 559 100 558 100 562 30 560 30 shop = 56 Tutab's_Magic_Market 2 2 554 1000 555 1000 556 1000 557 1000 563 100 221 10 4006 10 4023 10 shop = 57 Void_Knight_Magic_Store 2 2 554 1000 555 1000 556 1000 557 1000 558 1000 559 1000 562 300 560 300 diff --git a/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java b/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java index 1b994523..5ca9ddf1 100644 --- a/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java +++ b/2006Redone Server/src/redone/game/content/skills/core/Woodcutting.java @@ -96,10 +96,28 @@ public class Woodcutting { } public static void handleCanoe(final Client player, final int objectId) { + Boolean gotAxe = false; if (player.playerLevel[player.playerWoodcutting] < 12) { player.getActionSender().sendMessage("You need a woodcutting level of at least 12 to use the canoe station."); return; } + + for (int axes[] : Axe_Settings) { + int type = axes[0]; + if ( player.getItemAssistant().playerHasItem(type) || player.playerEquipment[player.playerWeapon] == type) + { + gotAxe = true; + } + } + if (gotAxe) + { + player.getActionSender().sendMessage("You swing your axe at the station."); + } + else + { + player.getActionSender().sendMessage("You need an axe to cut the station."); + return; + } for (int axes[] : Axe_Settings) { int type = axes[0]; int level = axes[1]; @@ -107,7 +125,6 @@ public class Woodcutting { if (player.playerLevel[player.playerWoodcutting] >= level && player.getItemAssistant().playerHasItem(type) || player.playerLevel[player.playerWoodcutting] >= level && player.playerEquipment[player.playerWeapon] == type) { player.turnPlayerTo(player.objectX, player.objectY); player.startAnimation(anim); - player.getActionSender().sendMessage("You swing your axe at the station."); CycleEventHandler.getSingleton().addEvent(player, new CycleEvent() { @Override public void execute(CycleEventContainer container) { diff --git a/2006Redone Server/src/redone/game/items/impl/LightSources.java b/2006Redone Server/src/redone/game/items/impl/LightSources.java index 6763efee..5aa810b9 100644 --- a/2006Redone Server/src/redone/game/items/impl/LightSources.java +++ b/2006Redone Server/src/redone/game/items/impl/LightSources.java @@ -76,7 +76,7 @@ public class LightSources { return true; } } - c.getActionSender().sendMessage("It's recommened that you get a light source to continue."); + c.getActionSender().sendMessage("It's recommended that you get a light source to continue."); brightness1(c); return false; } diff --git a/2006Redone Server/src/redone/game/players/PlayerAssistant.java b/2006Redone Server/src/redone/game/players/PlayerAssistant.java index ea2285dc..117488ee 100644 --- a/2006Redone Server/src/redone/game/players/PlayerAssistant.java +++ b/2006Redone Server/src/redone/game/players/PlayerAssistant.java @@ -2444,7 +2444,7 @@ public class PlayerAssistant { if (!player.hasBankpin) { player.getActionSender() .sendMessage( - "You do not, have a bank pin it is highly recommened you set one."); + "You do not, have a bank pin it is highly recommended you set one."); } } } diff --git a/2006Redone Server/src/redone/game/shops/ShopHandler.java b/2006Redone Server/src/redone/game/shops/ShopHandler.java index 32eecff0..bd853833 100644 --- a/2006Redone Server/src/redone/game/shops/ShopHandler.java +++ b/2006Redone Server/src/redone/game/shops/ShopHandler.java @@ -5,6 +5,7 @@ import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; +import redone.game.players.Client; import redone.game.players.PlayerHandler; import redone.util.Misc; @@ -16,7 +17,7 @@ public class ShopHandler { public static int MaxShops = 200; public static int MaxShopItems = 200; - public static int MaxShowDelay = 10; + public static int MaxShowDelay = 2; public static int MaxSpecShowDelay = 60; public static int TotalShops = 0; public static int[][] ShopItems = new int[MaxShops][MaxShopItems]; @@ -48,7 +49,7 @@ public class ShopHandler { switch(itemId) { default: - return 5000; + return 1000; } }