Converted tanners to Kotlin

Fixed snake hide tanning Fixed interaction with Canifis tanner
2024-05-31 09:49:31 +00:00
parent 66b1efdaa3
commit da6f05f8ce
9 changed files with 202 additions and 300 deletions
@@ -1,136 +0,0 @@
-package content.global.handlers.iface;
-
-import core.game.dialogue.DialoguePlugin;
-import content.global.skill.crafting.TanningProduct;
-import core.game.node.entity.npc.NPC;
-import core.game.node.entity.player.Player;
-import core.plugin.Initializable;
-import core.game.node.item.Item;
-
-/**
- * Represents the ellis dialogue plugin.
- * @author 'Vexia
- * @version 1.0
- */
-@Initializable
-public final class EllisDialogue extends DialoguePlugin {
-
-	/**
-	 * Constructs a new {@code EllisDialogue} {@code Object}.
-	 */
-	public EllisDialogue() {
-		/**
-		 * empty.
-		 */
-	}
-
-	/**
-	 * Constructs a new {@code EllisDialogue} {@code Object}.
-	 * @param player the player.
-	 */
-	public EllisDialogue(Player player) {
-		super(player);
-	}
-
-	@Override
-	public DialoguePlugin newInstance(Player player) {
-		return new EllisDialogue(player);
-	}
-
-	@Override
-	public boolean open(Object... args) {
-		npc = (NPC) args[0];
-		npc("Greetings friend I am a manufacturer of leather.");
-		stage = 0;
-		return true;
-	}
-
-	@Override
-	public boolean handle(int interfaceId, int buttonId) {
-		switch (stage) {
-		case 0:
-			player.getInventory().refresh();
-			Item items[] = player.getInventory().toArray();
-			for (int i = 0; i < items.length; i++) {
-				if (items[i] == null) {
-					continue;
-				}
-				if (TanningProduct.forItemId(items[i].getId()) != null) {
-					npc("I see you have brought me some hides.", "Would you like me to tan them for you?");
-					stage = 100;
-					return true;
-				}
-			}
-			options("Can I buy some leather?", "Leather is rather weak stuff.");
-			stage = 1;
-			break;
-		case 1:
-			switch (buttonId) {
-			case 1:
-				player("Can I buy some leather then?");
-				stage = 10;
-				break;
-			case 2:
-				player("Leather is rather weak stuff.");
-				stage = 3000;
-				break;
-			}
-			break;
-		case 10:
-			npc("I make leather from animal hides. Bring me some cowhides", "and one gold coin per hide, and I'll tan them into soft", "leather for you.");
-			stage = 2000;
-			break;
-		case 2000:
-			end();
-			break;
-		case 3000:
-			npc("Normal leather may be quite weak, but it's very cheap - I", "make it from cowhides for only 1 gp per hide - and it's so", "easy to craft that anyone can work with it.");
-			stage = 3001;
-			break;
-		case 3001:
-			npc("Alternatively you could try hard leather. It's not so easy", "to craft, but I only charge 3 gp per cowhide to prepare it,", "and it makes much sturdier armour.");
-			stage = 3002;
-			break;
-		case 3002:
-			player("Thanks; I'll bear it in mind.");
-			stage = 3003;
-			break;
-		case 3003:
-			end();
-			break;
-		case 100:
-			options("Yes please.", "No thanks.");
-			stage = 101;
-			break;
-		case 101:
-			switch (buttonId) {
-			case 1:
-				player("Yes please.");
-				stage = 210;
-				break;
-			case 2:
-				player("No thanks.");
-				stage = 200;
-				break;
-			}
-			break;
-		case 210:
-			end();
-			TanningProduct.open(player, 2824);
-			break;
-		case 200:
-			npc("Very well, sir, as you wish.");
-			stage = 201;
-			break;
-		case 201:
-			end();
-			break;
-		}
-		return true;
-	}
-
-	@Override
-	public int[] getIds() {
-		return new int[] { 2824 };
-	}
-}
@@ -15,7 +15,7 @@ public enum TanningProduct {
 	SOFT_LEATHER(1, 1739, 1741),
 	HARD_LEATHER(2, 1739, 1743),
 	SNAKESKIN(3, 6287, 6289),
-	SNAKESKIN2(4, 6287, 6289),
+	SNAKESKIN2(4, 7801, 6289),
 	GREEN_DHIDE(5, 1753, 1745),
 	BLUEDHIDE(6, 1751, 2505),
 	REDDHIDE(7, 1749, 2507),
@@ -120,9 +120,9 @@ public enum TanningProduct {
 		} else if (def == HARD_LEATHER) {
 			coins = 3;
 		} else if (def == SNAKESKIN) {
-			coins = 20;
-		} else if (def == SNAKESKIN2) {
 			coins = 15;
+		} else if (def == SNAKESKIN2) {
+			coins = 20;
 		} else {
 			coins = 20;
 		}