From 6afd656a9931e0a59b09b04169f7ace8ce63f821 Mon Sep 17 00:00:00 2001 From: steven1152 Date: Sat, 23 Jun 2018 12:36:46 -0400 Subject: [PATCH] Fix Elin forest NPCs throwing errors (#214) --- scripts/npc/2131001.js | 4 ++-- scripts/npc/2131003.js | 4 ++-- scripts/npc/2131005.js | 4 ++-- scripts/npc/2131006.js | 4 ++-- scripts/npc/2131007.js | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/scripts/npc/2131001.js b/scripts/npc/2131001.js index d122023769..ae9629790e 100644 --- a/scripts/npc/2131001.js +++ b/scripts/npc/2131001.js @@ -19,10 +19,10 @@ function action(mode, type, selection) { cm.sendNext("You don't have enough... I need at least 100."); cm.dispose(); } else { - cm.sendGetNumber("Hey, that's a good idea! I can give you #i4310000#Perfect Pitch for each 100 #i" + exchangeItem + "##t" + exchangeItem + "# you give me. How many do you want? (Current Items: " + cm.getPlayer().itemQuantity(exchangeItem) + ")", java.lang.Math.min(300, cm.getPlayer().itemQuantity(exchangeItem) / 100), 1, java.lang.Math.min(300, cm.getPlayer().itemQuantity(exchangeItem) / 100)); + cm.sendGetNumber("Hey, that's a good idea! I can give you #i4310000#Perfect Pitch for each 100 #i" + exchangeItem + "##t" + exchangeItem + "# you give me. How many do you want? (Current Items: " + cm.itemQuantity(exchangeItem) + ")", java.lang.Math.min(300, cm.itemQuantity(exchangeItem) / 100), 1, java.lang.Math.min(300, cm.itemQuantity(exchangeItem) / 100)); } } else if (status == 2) { - if (selection >= 1 && selection <= cm.getPlayer().itemQuantity(exchangeItem) / 100) { + if (selection >= 1 && selection <= cm.itemQuantity(exchangeItem) / 100) { if (!cm.canHold(4310000, selection)) { cm.sendOk("Please make some space in ETC tab."); } else { diff --git a/scripts/npc/2131003.js b/scripts/npc/2131003.js index bcd563b2ca..1c69b58d66 100644 --- a/scripts/npc/2131003.js +++ b/scripts/npc/2131003.js @@ -19,10 +19,10 @@ function action(mode, type, selection) { cm.sendNext("You don't have enough... I need at least 100."); cm.dispose(); } else { - cm.sendGetNumber("Hey, that's a good idea! I can give you #i4310000#Perfect Pitch for each 100 #i" + exchangeItem + "##t" + exchangeItem + "# you give me. How many do you want? (Current Items: " + cm.getPlayer().itemQuantity(exchangeItem) + ")", java.lang.Math.min(300, cm.getPlayer().itemQuantity(exchangeItem) / 100), 1, java.lang.Math.min(300, cm.getPlayer().itemQuantity(exchangeItem) / 100)); + cm.sendGetNumber("Hey, that's a good idea! I can give you #i4310000#Perfect Pitch for each 100 #i" + exchangeItem + "##t" + exchangeItem + "# you give me. How many do you want? (Current Items: " + cm.itemQuantity(exchangeItem) + ")", java.lang.Math.min(300, cm.itemQuantity(exchangeItem) / 100), 1, java.lang.Math.min(300, cm.itemQuantity(exchangeItem) / 100)); } } else if (status == 2) { - if (selection >= 1 && selection <= cm.getPlayer().itemQuantity(exchangeItem) / 100) { + if (selection >= 1 && selection <= cm.itemQuantity(exchangeItem) / 100) { if (!cm.canHold(4310000, selection)) { cm.sendOk("Please make some space in ETC tab."); } else { diff --git a/scripts/npc/2131005.js b/scripts/npc/2131005.js index 50a6c55fd3..4a1742962c 100644 --- a/scripts/npc/2131005.js +++ b/scripts/npc/2131005.js @@ -19,10 +19,10 @@ function action(mode, type, selection) { cm.sendNext("You don't have enough... I need at least 100."); cm.dispose(); } else { - cm.sendGetNumber("Hey, that's a good idea! I can give you #i4310000#Perfect Pitch for each 100 #i" + exchangeItem + "##t" + exchangeItem + "# you give me. How many do you want? (Current Items: " + cm.getPlayer().itemQuantity(exchangeItem) + ")", java.lang.Math.min(300, cm.getPlayer().itemQuantity(exchangeItem) / 100), 1, java.lang.Math.min(300, cm.getPlayer().itemQuantity(exchangeItem) / 100)); + cm.sendGetNumber("Hey, that's a good idea! I can give you #i4310000#Perfect Pitch for each 100 #i" + exchangeItem + "##t" + exchangeItem + "# you give me. How many do you want? (Current Items: " + cm.itemQuantity(exchangeItem) + ")", java.lang.Math.min(300, cm.itemQuantity(exchangeItem) / 100), 1, java.lang.Math.min(300, cm.itemQuantity(exchangeItem) / 100)); } } else if (status == 2) { - if (selection >= 1 && selection <= cm.getPlayer().itemQuantity(exchangeItem) / 100) { + if (selection >= 1 && selection <= cm.itemQuantity(exchangeItem) / 100) { if (!cm.canHold(4310000, selection)) { cm.sendOk("Please make some space in ETC tab."); } else { diff --git a/scripts/npc/2131006.js b/scripts/npc/2131006.js index d22bb1104f..c2910b80f4 100644 --- a/scripts/npc/2131006.js +++ b/scripts/npc/2131006.js @@ -19,10 +19,10 @@ function action(mode, type, selection) { cm.sendNext("You don't have enough... I need at least 100."); cm.dispose(); } else { - cm.sendGetNumber("Hey, that's a good idea! I can give you #i4310000#Perfect Pitch for each 100 #i" + exchangeItem + "##t" + exchangeItem + "# you give me. How many do you want? (Current Items: " + cm.getPlayer().itemQuantity(exchangeItem) + ")", java.lang.Math.min(300, cm.getPlayer().itemQuantity(exchangeItem) / 100), 1, java.lang.Math.min(300, cm.getPlayer().itemQuantity(exchangeItem) / 100)); + cm.sendGetNumber("Hey, that's a good idea! I can give you #i4310000#Perfect Pitch for each 100 #i" + exchangeItem + "##t" + exchangeItem + "# you give me. How many do you want? (Current Items: " + cm.itemQuantity(exchangeItem) + ")", java.lang.Math.min(300, cm.itemQuantity(exchangeItem) / 100), 1, java.lang.Math.min(300, cm.itemQuantity(exchangeItem) / 100)); } } else if (status == 2) { - if (selection >= 1 && selection <= cm.getPlayer().itemQuantity(exchangeItem) / 100) { + if (selection >= 1 && selection <= cm.itemQuantity(exchangeItem) / 100) { if (!cm.canHold(4310000, selection)) { cm.sendOk("Please make some space in ETC tab."); } else { diff --git a/scripts/npc/2131007.js b/scripts/npc/2131007.js index ea011fb7ed..d145bd0848 100644 --- a/scripts/npc/2131007.js +++ b/scripts/npc/2131007.js @@ -19,10 +19,10 @@ function action(mode, type, selection) { cm.sendNext("You don't have enough... I need at least 100."); cm.dispose(); } else { - cm.sendGetNumber("Hey, that's a good idea! I can give you #i4310000#Perfect Pitch for each 100 #i" + exchangeItem + "##t" + exchangeItem + "# you give me. How many do you want? (Current Items: " + cm.getPlayer().itemQuantity(exchangeItem) + ")", java.lang.Math.min(300, cm.getPlayer().itemQuantity(exchangeItem) / 100), 1, java.lang.Math.min(300, cm.getPlayer().itemQuantity(exchangeItem) / 100)); + cm.sendGetNumber("Hey, that's a good idea! I can give you #i4310000#Perfect Pitch for each 100 #i" + exchangeItem + "##t" + exchangeItem + "# you give me. How many do you want? (Current Items: " + cm.itemQuantity(exchangeItem) + ")", java.lang.Math.min(300, cm.itemQuantity(exchangeItem) / 100), 1, java.lang.Math.min(300, cm.itemQuantity(exchangeItem) / 100)); } } else if (status == 2) { - if (selection >= 1 && selection <= cm.getPlayer().itemQuantity(exchangeItem) / 100) { + if (selection >= 1 && selection <= cm.itemQuantity(exchangeItem) / 100) { if (!cm.canHold(4310000, selection)) { cm.sendOk("Please make some space in ETC tab."); } else {