summaryrefslogtreecommitdiff
path: root/npc/pre-re
diff options
context:
space:
mode:
Diffstat (limited to 'npc/pre-re')
-rw-r--r--npc/pre-re/jobs/1-1/mage.txt91
-rw-r--r--npc/pre-re/jobs/1-1/merchant.txt9
-rw-r--r--npc/pre-re/jobs/novice/novice.txt4
-rw-r--r--npc/pre-re/quests/quests_payon.txt35
-rw-r--r--npc/pre-re/scripts.conf1
5 files changed, 88 insertions, 52 deletions
diff --git a/npc/pre-re/jobs/1-1/mage.txt b/npc/pre-re/jobs/1-1/mage.txt
index 47ae792fe..684c7335e 100644
--- a/npc/pre-re/jobs/1-1/mage.txt
+++ b/npc/pre-re/jobs/1-1/mage.txt
@@ -437,50 +437,50 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
switch(select("Jellopy.", "Fluff.", "Milk.", "Ready to Mix.")) {
case 1:
while(1) {
- input .@input;
+ input(.@input, 0);
if (.@input > 10000) {
next;
mes "[Mixing Machine]";
mes "Error: Item limit exceeded. Please enter values less than 10,000 try again.";
next;
+ continue;
}
- else {
- if (countitem(Jellopy) > 0) .@mixitem1_1 += .@input;
- .@progress = 2;
- break;
- }
+ if (countitem(Jellopy) > 0)
+ .@mixitem1_1 += .@input;
+ .@progress = 2;
+ break;
}
break;
case 2:
while(1) {
- input .@input;
+ input(.@input, 0);
if (.@input > 10000) {
next;
mes "[Mixing Machine]";
mes "Error: Item limit exceeded. Please enter values less than 10,000 try again.";
next;
+ continue;
}
- else {
- if (countitem(Fluff) > 0) .@mixitem1_2 += .@input;
- .@progress = 2;
- break;
- }
+ if (countitem(Fluff) > 0)
+ .@mixitem1_2 += .@input;
+ .@progress = 2;
+ break;
}
break;
case 3:
while(1) {
- input .@input;
+ input(.@input, 0);
if (.@input > 10000) {
next;
mes "[Mixing Machine]";
mes "Error: Item limit exceeded. Please enter values less than 10,000 try again.";
next;
+ continue;
}
- else {
- if (countitem(Milk) > 0) .@mixitem1_3 += .@input;
- .@progress = 2;
- break;
- }
+ if (countitem(Milk) > 0)
+ .@mixitem1_3 += .@input;
+ .@progress = 2;
+ break;
}
break;
@@ -499,40 +499,39 @@ geffen_in,164,112,4 script Mixing Machine HIDDEN_NPC,{
mes "the Magic Powder.";
next;
while(1) {
- input .@input;
- if (.@input < 1000 || .@input > 9999) {
+ input(.@input);
+ if (.@input == 0) {
mes "[Mixing Machine]";
- if (.@input == 0) {
- mes "Do you want to skip this Menu?";
- next;
- if (select("Yes.", "No.") == 1) {
- break;
- }
- }
- else {
- mes "Invalid Serial Number.";
- mes "Please try again.";
- next;
+ mes "Do you want to skip this Menu?";
+ next;
+ if (select("Yes.", "No.") == 1) {
+ break;
}
+ continue;
}
- else {
+ if (.@input < 1000 || .@input > 9999) {
mes "[Mixing Machine]";
- mes "The Serial Number is #" + .@input + ", correct?";
+ mes "Invalid Serial Number.";
+ mes "Please try again.";
next;
- if (select("Confirm.", "Cancel.") == 1) {
- if (.@input == 8472)
- .@magic_powder = 1;
- else if (.@input == 3735)
- .@magic_powder = 2;
- else if (.@input == 2750)
- .@magic_powder = 3;
- else if (.@input == 5429)
- .@magic_powder = 4;
- else
- .@magic_powder = 5;
- }
- break;
+ continue;
}
+ mes "[Mixing Machine]";
+ mes "The Serial Number is #" + .@input + ", correct?";
+ next;
+ if (select("Confirm.", "Cancel.") == 1) {
+ if (.@input == 8472)
+ .@magic_powder = 1;
+ else if (.@input == 3735)
+ .@magic_powder = 2;
+ else if (.@input == 2750)
+ .@magic_powder = 3;
+ else if (.@input == 5429)
+ .@magic_powder = 4;
+ else
+ .@magic_powder = 5;
+ }
+ break;
}
mes "[Mixing Machine]";
mes "Choose a";
diff --git a/npc/pre-re/jobs/1-1/merchant.txt b/npc/pre-re/jobs/1-1/merchant.txt
index 2d1cd9ba3..b6ce65b3d 100644
--- a/npc/pre-re/jobs/1-1/merchant.txt
+++ b/npc/pre-re/jobs/1-1/merchant.txt
@@ -705,7 +705,7 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
next;
while(1) {
while(1) {
- input .@input;
+ input(.@input);
if (.@input == 0) {
mes "[Union Staff Kay]";
mes "Are you sure that you wanna cancel?";
@@ -714,14 +714,15 @@ alberta_in,28,29,2 script Merchant Guildsman#mer 4_M_01,{
close;
}
next;
+ continue;
}
- else if (.@input < 1000000 || .@input > 5000000) {
+ if (.@input < 1000000 || .@input > 5000000) {
mes "[Union Staff Kay]";
mes "Hey hey. That number's not valid! Enter a value from 1000000 to 5000000. got it?";
next;
- } else {
- break;
+ continue;
}
+ break;
}
mes "[Union Staff Kay]";
if (.@where_village == 1)
diff --git a/npc/pre-re/jobs/novice/novice.txt b/npc/pre-re/jobs/novice/novice.txt
index 356eaae7d..bbae29988 100644
--- a/npc/pre-re/jobs/novice/novice.txt
+++ b/npc/pre-re/jobs/novice/novice.txt
@@ -82,8 +82,8 @@ new_1-2,100,29,4 script Receptionist#nv1 4_M_04,{
mes "Hello, you look to be new here.";
mes "What is your name?";
next;
- input .@charname$;
- if (.@charname$!=strcharinfo(PC_NAME)) {
+ input(.@charname$);
+ if (.@charname$ != strcharinfo(PC_NAME)) {
mes "[Training Grounds Receptionist]";
mes "Sorry, but I don't think I heard";
mes "you correctly";
diff --git a/npc/pre-re/quests/quests_payon.txt b/npc/pre-re/quests/quests_payon.txt
new file mode 100644
index 000000000..210e5d819
--- /dev/null
+++ b/npc/pre-re/quests/quests_payon.txt
@@ -0,0 +1,35 @@
+//================= Hercules Script =======================================
+//= _ _ _
+//= | | | | | |
+//= | |_| | ___ _ __ ___ _ _| | ___ ___
+//= | _ |/ _ \ '__/ __| | | | |/ _ \/ __|
+//= | | | | __/ | | (__| |_| | | __/\__ \
+//= \_| |_/\___|_| \___|\__,_|_|\___||___/
+//================= License ===============================================
+//= This file is part of Hercules.
+//= http://herc.ws - http://github.com/HerculesWS/Hercules
+//=
+//= Copyright (C) 2013-2019 Hercules Dev Team
+//= Copyright (C) JohnnyPlayy
+//=
+//= Hercules is free software: you can redistribute it and/or modify
+//= it under the terms of the GNU General Public License as published by
+//= the Free Software Foundation, either version 3 of the License, or
+//= (at your option) any later version.
+//=
+//= This program is distributed in the hope that it will be useful,
+//= but WITHOUT ANY WARRANTY; without even the implied warranty of
+//= MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+//= GNU General Public License for more details.
+//=
+//= You should have received a copy of the GNU General Public License
+//= along with this program. If not, see <http://www.gnu.org/licenses/>.
+//=========================================================================
+//= Quest NPCs located in Payon
+//================= Description ===========================================
+//= Quests related to Payon City.
+//================= Current Version =======================================
+//= 1.0
+//=========================================================================
+
+payon_in01,56,12,7 duplicate(Young man#12) Young man#1 4_M_ORIENT02
diff --git a/npc/pre-re/scripts.conf b/npc/pre-re/scripts.conf
index d00d6ffba..18cf1c32c 100644
--- a/npc/pre-re/scripts.conf
+++ b/npc/pre-re/scripts.conf
@@ -110,3 +110,4 @@
"npc/pre-re/quests/quests_lighthalzen.txt",
"npc/pre-re/quests/quests_nameless.txt",
"npc/pre-re/quests/quests_veins.txt",
+"npc/pre-re/quests/quests_payon.txt",
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-09-17 23:13:17 +0000