From 505237f5957995ff6cf0f9490703cca2db5339d2 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Mon, 2 Mar 2020 22:51:59 -0600 Subject: [PATCH 1/2] Rewrote the hunter clothing interface into a dialog tree. Original hunter interface is nearly unfixable. --- .../inter/FurClothingInterface.java | 189 +++++++++++++++++- 1 file changed, 181 insertions(+), 8 deletions(-) diff --git a/Server/src/plugin/interaction/inter/FurClothingInterface.java b/Server/src/plugin/interaction/inter/FurClothingInterface.java index c22409a10..3a8be6ccd 100644 --- a/Server/src/plugin/interaction/inter/FurClothingInterface.java +++ b/Server/src/plugin/interaction/inter/FurClothingInterface.java @@ -15,6 +15,8 @@ import org.crandor.net.packet.out.ContainerPacket; import org.crandor.plugin.InitializablePlugin; import org.crandor.plugin.Plugin; +import java.util.AbstractMap; + /** * Represents the plugin related to the custom fur clothing interface. * @author 'Vexia @@ -68,16 +70,17 @@ public final class FurClothingInterface extends ComponentPlugin { * Method used to open the fur clothing interface. * @param player the player. */ - public static void open(final Player player) { - player.getInterfaceManager().open(new Component(477)); - PacketRepository.send(ContainerPacket.class, new ContainerContext(player, 477, 75, 91, new Container(21, ITEMS), true)); - } + //public static void open(final Player player) { + // player.getInterfaceManager().open(new Component(477)); + // PacketRepository.send(ContainerPacket.class, new ContainerContext(player, 477, 75, 91, new Container(21, ITEMS), true)); + //} /** * Represents fur clothing. * @author 'Vexia * @version 1.0 */ + public enum FurClothing { POLAR(new Item[][] { { new Item(10117, 2), new Item(10065), new Item(995, 20) }, { new Item(10117, 2), new Item(10067), new Item(995, 20) } }, 0, 1), COMMON(new Item[][] { { new Item(10121, 2), new Item(10053), new Item(995, 20) }, { new Item(10121, 2), new Item(10055), new Item(995, 20) } }, 2, 3), FELDIP(new Item[][] { { new Item(10119, 2), new Item(10057), new Item(995, 20) }, { new Item(10119, 2), new Item(10059), new Item(995, 20) } }, 4, 5), DESERT(new Item[][] { { new Item(10123, 2), new Item(10061), new Item(995, 20) }, { new Item(10123, 2), new Item(10063), new Item(995, 20) } }, 6, 7), LARUPIA(new Item[][] { { new Item(10095), new Item(10045), new Item(995, 500) }, { new Item(10095), new Item(10043), new Item(995, 100) }, { new Item(10095), new Item(10041), new Item(995, 100) } }, 10, 11, 12), GRAAHK(new Item[][] { { new Item(10099), new Item(10051), new Item(995, 750) }, { new Item(10099), new Item(10049), new Item(995, 150) }, { new Item(10099), new Item(10047), new Item(995, 150) } }, 13, 14, 15), KYATT(new Item[][] { { new Item(10103), new Item(10039), new Item(995, 1000) }, { new Item(10103), new Item(10037), new Item(995, 250) }, { new Item(10103), new Item(10035), new Item(995, 250) } }, 16, 17, 18), DARK_KEBBIT(new Item[][] { { new Item(10115, 2), new Item(10075), new Item(995, 600) } }, 8), SPOTTED_KEBBIT(new Item[][] { { new Item(10125, 2), new Item(10069), new Item(995, 400) } }, 9), DASHING_KEBBIT(new Item[][] { { new Item(10127, 2), new Item(10071), new Item(995, 800) } }, 19); @@ -309,15 +312,18 @@ public final class FurClothingInterface extends ComponentPlugin { end(); break; case 30: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Certainly. Take a look at my range of made-to-oder", "items. If you can supply the furs, I'll gladly make any of", "these for you."); + interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Certainly. Take a look at my range of made-to-order", "items. If you can supply the furs, I'll gladly make any of", "these for you."); stage = 31; break; case 31: - end(); - FurClothingInterface.open(player); + interpreter.sendOptions("Select a type of gear:","Polar Camouflage","Wood Camouflage","Jungle Camouflage","Desert Camouflage","More..."); + stage = 45; break; + //end(); + //FurClothingInterface.open(player); + //break; case 41: - interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Well, soem more colourful feathers might be useful. For", "some surreal reason, all I normally seem to get offered", "are large quantities of rather beaten-up looking chicken", "feathers."); + interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Well, some more colourful feathers might be useful. For", "some surreal reason, all I normally seem to get offered", "are large quantities of rather beaten-up looking chicken", "feathers."); stage = 42; break; case 42: @@ -333,11 +339,178 @@ public final class FurClothingInterface extends ComponentPlugin { end(); npc.openShop(player); break; + case 45: + switch(buttonId){ + case 1: + interpreter.sendOptions("Select one.","Polar camo top","Polar camo bottom"); + stage = 451; + break; + case 2: + interpreter.sendOptions("Select one.", "Wood camo top","Wood camo bottom"); + stage = 452; + break; + case 3: + interpreter.sendOptions("Select one.","Jungle camo top","Jungle camo bottom"); + stage = 453; + break; + case 4: + interpreter.sendOptions("Select one.","Desert camo top","Desert camo bottom"); + stage = 454; + break; + case 5: + interpreter.sendOptions("Select a type of gear:","Larupia","Graahk","Kyatt","Other"); + stage = 46; + break; + } + break; + case 46: + switch(buttonId){ + case 1: + interpreter.sendOptions("Select one.", "Larupia hat", "Larupia top", "Larupia legs"); + stage = 461; + break; + case 2: + interpreter.sendOptions("Select one.", "Graahk headdress", "Graahk top", "Graahk legs"); + stage = 462; + break; + case 3: + interpreter.sendOptions("Select one.", "Kyatt hat", "Kyatt top", "Kyatt legs"); + stage = 463; + break; + case 4: + interpreter.sendOptions("Select one.", "Gloves of silence", "Spotted cape", "Spottier cape"); + stage = 464; + break; + } + break; + case 451: { + FurClothing clothing = FurClothing.POLAR; + switch (buttonId) { + case 1: + clothing.buy(player, 0, 1); + break; + case 2: + clothing.buy(player, 1, 1); + break; + } + end(); + break; } + case 452: { + FurClothing clothing = FurClothing.COMMON; + switch (buttonId) { + case 1: + clothing.buy(player, 0,1); + break; + case 2: + clothing.buy(player,1,1); + break; + } + end(); + break; + } + case 453: { + FurClothing clothing = FurClothing.FELDIP; + switch (buttonId) { + case 1: + clothing.buy(player,0,1); + break; + case 2: + clothing.buy(player,1,1); + break; + } + end(); + break; + } + case 454: { + FurClothing clothing = FurClothing.DESERT; + switch (buttonId){ + case 1: + clothing.buy(player,0,1); + break; + case 2: + clothing.buy(player,1,1); + break; + } + end(); + break; + } + case 461: { + FurClothing clothing = FurClothing.LARUPIA; + switch(buttonId){ + case 1: + clothing.buy(player,0,1); + break; + case 2: + clothing.buy(player,1,1); + break; + case 3: + clothing.buy(player,2,1); + break; + } + end(); + break; + } + case 462: { + FurClothing clothing = FurClothing.GRAAHK; + switch(buttonId){ + case 1: + clothing.buy(player,0,1); + break; + case 2: + clothing.buy(player,1,1); + break; + case 3: + clothing.buy(player,2,1); + break; + } + end(); + break; + } + case 463: { + FurClothing clothing = FurClothing.KYATT; + switch(buttonId){ + case 1: + clothing.buy(player,0,1); + break; + case 2: + clothing.buy(player,1,1); + break; + case 3: + clothing.buy(player,2,1); + break; + } + end(); + break; + } + case 464:{ + switch(buttonId){ + case 1:{ + FurClothing clothing = FurClothing.DARK_KEBBIT; + clothing.buy(player, 0, 1); + break; + } + case 2:{ + FurClothing clothing = FurClothing.SPOTTED_KEBBIT; + clothing.buy(player,0,1); + break; + } + case 3:{ + FurClothing clothing = FurClothing.DASHING_KEBBIT; + clothing.buy(player,0,1); + break; + } + } + end(); + break; + } + } + return true; } + @Override public int[] getIds() { return new int[] { 554 }; From 832085b738dee258b5426de6d2f66123eaa5c924 Mon Sep 17 00:00:00 2001 From: Ceikry Date: Mon, 2 Mar 2020 23:26:21 -0600 Subject: [PATCH 2/2] Added dagon'hai robes to dagon'hai monks drop tables --- Server/server.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Server/server.sql b/Server/server.sql index 964f77ec4..791cebca5 100644 --- a/Server/server.sql +++ b/Server/server.sql @@ -19487,9 +19487,9 @@ INSERT INTO `npc_drops` (`npc_id`, `default`, `main`, `charm`) VALUES (7133, '', '{2741,1,1,0.0,RARE}~{1147,1,1,0.0,VERY_RARE}~{31,1,1,0.0,RARE}', ''), (7134, '', '{2723,1,1,0.0,RARE}~{12158,10,10,0.0,RARE}~{1147,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (7135, '', '{2739,1,1,0.0,RARE}', ''), -(7138, '', '{557,10,10,0.0,COMMON}~{557,18,18,0.0,COMMON}~{556,10,36,0.0,COMMON}~{559,10,36,0.0,COMMON}~{554,10,36,0.0,COMMON}~{555,10,18,0.0,COMMON}~{558,10,10,0.0,COMMON}~{558,18,18,0.0,COMMON}~{561,4,4,0.0,UNCOMMON}~{562,4,4,0.0,UNCOMMON}~{563,3,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{565,2,2,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{1444,1,1,0.0,UNCOMMON}~{1379,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{1333,1,1,0.0,UNCOMMON}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}', ''), -(7139, '', '{557,10,10,0.0,COMMON}~{557,18,18,0.0,COMMON}~{556,10,36,0.0,COMMON}~{559,10,36,0.0,COMMON}~{554,10,36,0.0,COMMON}~{555,10,18,0.0,COMMON}~{558,10,10,0.0,COMMON}~{558,18,18,0.0,COMMON}~{561,4,4,0.0,UNCOMMON}~{562,4,4,0.0,UNCOMMON}~{563,3,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{565,2,2,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{1444,1,1,0.0,UNCOMMON}~{1379,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{1333,1,1,0.0,UNCOMMON}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}', ''), -(7140, '', '{557,10,10,0.0,COMMON}~{557,18,18,0.0,COMMON}~{556,10,36,0.0,COMMON}~{559,10,36,0.0,COMMON}~{554,10,36,0.0,COMMON}~{555,10,18,0.0,COMMON}~{558,10,10,0.0,COMMON}~{558,18,18,0.0,COMMON}~{561,4,4,0.0,UNCOMMON}~{562,4,4,0.0,UNCOMMON}~{563,3,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{565,2,2,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{1444,1,1,0.0,UNCOMMON}~{1379,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{1333,1,1,0.0,UNCOMMON}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}', ''), +(7138, '', '{14497,1,1,0.0,VERY_RARE}~{14499,1,1,0.0,VERY_RARE}~{14501,1,1,0.0,VERY_RARE}~{557,10,10,0.0,COMMON}~{557,18,18,0.0,COMMON}~{556,10,36,0.0,COMMON}~{559,10,36,0.0,COMMON}~{554,10,36,0.0,COMMON}~{555,10,18,0.0,COMMON}~{558,10,10,0.0,COMMON}~{558,18,18,0.0,COMMON}~{561,4,4,0.0,UNCOMMON}~{562,4,4,0.0,UNCOMMON}~{563,3,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{565,2,2,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{1444,1,1,0.0,UNCOMMON}~{1379,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{1333,1,1,0.0,UNCOMMON}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}', ''), +(7139, '', '{14497,1,1,0.0,VERY_RARE}~{14499,1,1,0.0,VERY_RARE}~{14501,1,1,0.0,VERY_RARE}~{557,10,10,0.0,COMMON}~{557,18,18,0.0,COMMON}~{556,10,36,0.0,COMMON}~{559,10,36,0.0,COMMON}~{554,10,36,0.0,COMMON}~{555,10,18,0.0,COMMON}~{558,10,10,0.0,COMMON}~{558,18,18,0.0,COMMON}~{561,4,4,0.0,UNCOMMON}~{562,4,4,0.0,UNCOMMON}~{563,3,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{565,2,2,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{1444,1,1,0.0,UNCOMMON}~{1379,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{1333,1,1,0.0,UNCOMMON}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}', ''), +(7140, '', '{14497,1,1,0.0,VERY_RARE}~{14499,1,1,0.0,VERY_RARE}~{14501,1,1,0.0,VERY_RARE}~{557,10,10,0.0,COMMON}~{557,18,18,0.0,COMMON}~{556,10,36,0.0,COMMON}~{559,10,36,0.0,COMMON}~{554,10,36,0.0,COMMON}~{555,10,18,0.0,COMMON}~{558,10,10,0.0,COMMON}~{558,18,18,0.0,COMMON}~{561,4,4,0.0,UNCOMMON}~{562,4,4,0.0,UNCOMMON}~{563,3,3,0.0,UNCOMMON}~{564,2,2,0.0,UNCOMMON}~{565,2,2,0.0,UNCOMMON}~{1442,1,1,0.0,UNCOMMON}~{1444,1,1,0.0,UNCOMMON}~{1379,1,1,0.0,UNCOMMON}~{1213,1,1,0.0,UNCOMMON}~{1333,1,1,0.0,UNCOMMON}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}', ''), (7142, '{526,1,1,0.0,ALWAYS}', '{5318,4,6,0.0,COMMON}~{5319,4,4,0.0,COMMON}~{5324,4,4,0.0,UNCOMMON}~{5322,3,4,0.0,UNCOMMON}~{5320,3,3,0.0,RARE}~{5323,1,4,0.0,RARE}~{5321,2,4,0.0,RARE}~{556,6,6,0.0,COMMON}~{557,3,6,0.0,COMMON}~{554,2,2,0.0,COMMON}~{1446,1,1,0.0,COMMON}~{1458,1,1,0.0,UNCOMMON}~{565,1,4,0.0,RARE}~{561,1,1,0.0,RARE}~{562,1,2,0.0,RARE}~{1203,1,1,0.0,COMMON}~{1339,1,1,0.0,RARE}~{884,12,12,0.0,COMMON}~{9140,2,18,0.0,COMMON}~{882,125,125,0.0,UNCOMMON}~{886,1,11,0.0,UNCOMMON}~{199,1,1,0.0,RARE}~{995,1,1,0.0,COMMON}~{995,2,2,0.0,COMMON}~{1987,3,3,0.0,COMMON}~{2347,1,1,0.0,UNCOMMON}~{1947,1,1,0.0,RARE}~{1947,4,4,0.0,RARE}~{440,1,1,0.0,RARE}~{2801,1,1,0.0,RARE}~{1115,1,1,0.0,RARE}~{2353,1,1,0.0,RARE}~{2434,1,1,0.0,RARE}~{173,1,1,0.0,RARE}', ''), (7158, '', '{1205,1,1,0.0,UNCOMMON}~{1139,1,1,0.0,UNCOMMON}~{556,1,10,0.0,COMMON}~{554,1,11,0.0,COMMON}~{555,1,8,0.0,COMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,UNCOMMON}~{203,1,1,0.0,UNCOMMON}~{205,1,1,0.0,UNCOMMON}~{211,1,1,0.0,UNCOMMON}~{209,1,1,0.0,UNCOMMON}~{213,1,1,0.0,UNCOMMON}~{2485,1,1,0.0,UNCOMMON}~{215,1,1,0.0,RARE}~{207,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{995,10,30,0.0,COMMON}~{454,2,2,0.0,COMMON}~{225,1,1,0.0,UNCOMMON}~{223,1,1,0.0,UNCOMMON}~{1621,1,1,0.0,UNCOMMON}~{1617,1,1,0.0,UNCOMMON}~{1607,1,1,0.0,RARE}~{31,1,1,0.0,RARE}', ''), (7159, '', '{1165,1,1,0.0,COMMON}~{1181,1,1,0.0,UNCOMMON}~{1391,1,1,0.0,UNCOMMON}~{1121,1,1,0.0,RARE}~{1333,1,1,0.0,VERY_RARE}~{209,1,1,0.0,COMMON}~{199,1,1,0.0,COMMON}~{201,1,1,0.0,COMMON}~{203,1,1,0.0,COMMON}~{205,1,1,0.0,COMMON}~{207,1,1,0.0,RARE}~{215,1,1,0.0,RARE}~{211,1,1,0.0,RARE}~{213,1,1,0.0,RARE}~{2485,1,1,0.0,RARE}~{217,1,1,0.0,RARE}~{448,2,3,0.0,COMMON}~{454,1,2,0.0,UNCOMMON}~{564,1,2,0.0,COMMON}~{561,1,20,0.0,COMMON}~{562,1,18,0.0,COMMON}~{557,1,22,0.0,COMMON}~{31,1,1,0.0,RARE}', ''),