From 070df790b8d1283d89e4386ff3e63d5e4ee233e0 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Thu, 9 Feb 2023 17:46:37 -0800 Subject: [PATCH] Move umbrella to Gwen's shop (makes permanent) --- .../cityinterior/accessoryshop/DealerNPC.java | 1 + .../magic/clothing_boutique/OutfitLender2NPC.java | 12 +++++++----- .../cityinterior/accessoryshop/DealerNPCTest.java | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/games/stendhal/server/maps/deniran/cityinterior/accessoryshop/DealerNPC.java b/src/games/stendhal/server/maps/deniran/cityinterior/accessoryshop/DealerNPC.java index 366588fc55..6333e91a74 100644 --- a/src/games/stendhal/server/maps/deniran/cityinterior/accessoryshop/DealerNPC.java +++ b/src/games/stendhal/server/maps/deniran/cityinterior/accessoryshop/DealerNPC.java @@ -74,6 +74,7 @@ public class DealerNPC implements ZoneConfigurator { //~ + " will have some accessories for you."); final OutfitShopsList shops = OutfitShopsList.get(); final OutfitShopInventory inventory = new OutfitShopInventory(); + inventory.put("umbrella", "detail=7", 600); inventory.put("sword", "detail=8", 100000); inventory.put("knife", "detail=9", 100000); inventory.put("spear", "detail=10", 100000); diff --git a/src/games/stendhal/server/maps/magic/clothing_boutique/OutfitLender2NPC.java b/src/games/stendhal/server/maps/magic/clothing_boutique/OutfitLender2NPC.java index fd0f1ce84e..209e4af606 100644 --- a/src/games/stendhal/server/maps/magic/clothing_boutique/OutfitLender2NPC.java +++ b/src/games/stendhal/server/maps/magic/clothing_boutique/OutfitLender2NPC.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2018 - Stendhal * + * (C) Copyright 2003-2023 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -83,7 +83,8 @@ public class OutfitLender2NPC implements ZoneConfigurator { // NOTE: use negative numbers for layers that should not be drawn (use 998 for body layer) final Pair GOBLIN_FACE = new Pair(new Outfit(null, null, 988, -1, -1, -1, -1, -1, null), true); final Pair THING_FACE = new Pair(new Outfit(null, null, 987, -1, -1, -1, -1, -1, null), true); - final Pair Umbrella = new Pair(new Outfit(null, null, null, null, null, null, null, null, 7), true); + // umbrella moved to Gwen's shop in Deniran City + //~ final Pair Umbrella = new Pair(new Outfit(null, null, null, null, null, null, null, null, 7), true); // these outfits must replace the current outfit (what's null simply isn't there) final Pair PURPLE_SLIME = new Pair(new Outfit(993, -1, -1, -1, -1, -1, -1, -1, null), false); @@ -96,7 +97,7 @@ public class OutfitLender2NPC implements ZoneConfigurator { outfitTypes.put("goblin face", GOBLIN_FACE); outfitTypes.put("thing face", THING_FACE); - outfitTypes.put("umbrella", Umbrella); + //~ outfitTypes.put("umbrella", Umbrella); outfitTypes.put("purple slime", PURPLE_SLIME); outfitTypes.put("green slime", GREEN_SLIME); outfitTypes.put("red slime", RED_SLIME); @@ -199,7 +200,7 @@ public class OutfitLender2NPC implements ZoneConfigurator { priceList.put("blue slime", (int) (N * 3000)); priceList.put("green slime", (int) (N * 3000)); priceList.put("gingerbread man", (int) (N * 1200)); - priceList.put("umbrella", (int) (N * 300)); + //~ priceList.put("umbrella", (int) (N * 300)); priceList.put("black cat", (int) (N * 4500)); priceList.put("white cat", (int) (N * 4500)); @@ -212,7 +213,8 @@ public class OutfitLender2NPC implements ZoneConfigurator { ConversationStates.ATTENDING, "Please tell me which outfit you would like," + " ask to #hire a #goblin #face," - + " #hire a #thing #face, #hire a #umbrella," + //~ + " #hire a #thing #face, #hire a #umbrella," + + " #hire a #thing #face," + " #hire a #purple #slime outfit, #hire a #green #slime," + " #hire a #red #slime, #hire a #blue #slime," + " #hire a #gingerbread #man outfit," diff --git a/tests/games/stendhal/server/maps/deniran/cityinterior/accessoryshop/DealerNPCTest.java b/tests/games/stendhal/server/maps/deniran/cityinterior/accessoryshop/DealerNPCTest.java index fa0f6e10ef..c7959de1e4 100644 --- a/tests/games/stendhal/server/maps/deniran/cityinterior/accessoryshop/DealerNPCTest.java +++ b/tests/games/stendhal/server/maps/deniran/cityinterior/accessoryshop/DealerNPCTest.java @@ -46,7 +46,7 @@ public class DealerNPCTest extends SpeakerNPCTestHelper { assertEquals( //~ "I'm sorry but my shop is not quite set up yet. Come back in the future and I" //~ + " will have some accessories for you.", - "You can #buy axe1, axe2, bone, bow, knife, shield, spear, and sword.", + "You can #buy axe1, axe2, bone, bow, knife, shield, spear, sword, and umbrella.", getReply(gwen)); en.step(player, "bye"); }