summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/guides/guides_alb.txt8
-rw-r--r--npc/guides/guides_gef.txt12
-rw-r--r--npc/guides/guides_izl.txt12
-rw-r--r--npc/guides/guides_moc.txt8
-rw-r--r--npc/guides/guides_pron.txt9
-rw-r--r--npc/guides/guides_rachel.txt13
7 files changed, 48 insertions, 16 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 76ee0105c..f2979fbf3 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,8 @@
Date Added
======
2007/08/15
+ * Fixed some loop errors in the guides. [Samuray22]
+ -Thanks to $ephiroth.
* Fixed 'Job_Professer' typo in mage jobchange quest [ultramage]
* Rev. 11016 Corrected a few bugs in the Acolyte Job Quest. (Crashy) [L0ne_W0lf]
2007/08/14
diff --git a/npc/guides/guides_alb.txt b/npc/guides/guides_alb.txt
index c88372a37..3564a34a5 100644
--- a/npc/guides/guides_alb.txt
+++ b/npc/guides/guides_alb.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 1.5
+//= 1.5a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -17,6 +17,8 @@
//= to Muad_Dib
//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.5 Fixed some errors with the loop[Samuray22]
+// -Thanks to $ephiroth.
//============================================================
alberta,23,238,4 script Guide#alb::AlbGuide 105,{
@@ -46,7 +48,9 @@ alberta,23,238,4 script Guide#alb::AlbGuide 105,{
}
set .@loop2,1;
while (.@loop2) {
- next;
+ if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+ else next;
+
switch(select("^FF0000Merchant Guild^000000:Weapon Shop:Tool Shop:Inn:Forge:Cancel")) {
case 1:
mes "[Alberta Guide]";
diff --git a/npc/guides/guides_gef.txt b/npc/guides/guides_gef.txt
index c7ce9f98b..1ef8dd0ed 100644
--- a/npc/guides/guides_gef.txt
+++ b/npc/guides/guides_gef.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 1.4
+//= 1.4a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -15,7 +15,9 @@
//= 1.2 Optimized, updated common guide names [Lupus]
//= 1.2a Small note that the BS guild moved to Einbroch [Poki#3]
//= 1.3 Removed Duplicates [Silent]
-//= 1.4 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.4a Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.4 Fixed some errors with the loop[Samuray22]
+// -Thanks to $ephiroth.
//============================================================
geffen,203,116,0 script Guide#gef::GefGuide 705,{
@@ -39,11 +41,14 @@ geffen,203,116,0 script Guide#gef::GefGuide 705,{
mes "Would you like me";
mes "to mark locations";
mes "on your Mini-Map?";
+ next;
if (select("Yes:No") == 1) set .@compass_check,1;
}
set .@loop2,1;
while (.@loop2) {
- next;
+ if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+ else next;
+// next;
switch(select("^FF0000Magic Acedemy^000000:Forge Shop:Weapon Shop:Tool Shop:Pub:Inn:Geffen Tower:Cancel")) {
case 1:
mes "[Geffen Guide]";
@@ -114,6 +119,7 @@ geffen,203,116,0 script Guide#gef::GefGuide 705,{
mes "location marks displayed";
mes "on your Mini-Map.";
set .@loop2,0;
+ break;
}
}
break;
diff --git a/npc/guides/guides_izl.txt b/npc/guides/guides_izl.txt
index bf3c6c925..2bbd6f8c3 100644
--- a/npc/guides/guides_izl.txt
+++ b/npc/guides/guides_izl.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 1.5
+//= 1.5a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -16,6 +16,8 @@
//= to Muad_Dib
//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
//= 1.5 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.5a Fixed some errors with the loop[Samuray22]
+// -Thanks to $ephiroth.
//============================================================
izlude,121,87,6 script Guide#iz 105,{
@@ -44,7 +46,9 @@ izlude,121,87,6 script Guide#iz 105,{
}
set .@loop2,1;
while(.@loop2) {
- next;
+ if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+ else next;
+
switch(select("^FF0000Swordman Association^000000:Swordman Hall:Arena:Izlude Marina:Weapon Shop:Tool Shop:Cancel")) {
case 1:
mes "[Izlude Guide]";
@@ -105,6 +109,7 @@ izlude,121,87,6 script Guide#iz 105,{
mes "location marks displayed";
mes "on your Mini-Map.";
set .@loop2,0;
+ break;
}
}
break;
@@ -147,10 +152,11 @@ izlude,121,87,6 script Guide#iz 105,{
mes "free to come to me";
mes "if you ever feel lost";
mes "around Izlude, alright?";
+ close2;
set .@loop1,0;
+ break;
}
}
- close2;
cutin "prt_soldier",255;
end;
}
diff --git a/npc/guides/guides_moc.txt b/npc/guides/guides_moc.txt
index 44a091122..b3d4f1f83 100644
--- a/npc/guides/guides_moc.txt
+++ b/npc/guides/guides_moc.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 1.4
+//= 1.4a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -15,6 +15,8 @@
//= 1.2 Optimized, updated common guide names [Lupus]
//= 1.3 Removed Duplicates [Silent]
//= 1.4 rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.4a Fixed some errors with the loop[Samuray22]
+// -Thanks to $ephiroth.
//============================================================
morocc,153,286,6 script Guide#moc::MocGuide 707,{
@@ -44,7 +46,9 @@ morocc,153,286,6 script Guide#moc::MocGuide 707,{
}
set .@loop2,1;
while(.@loop2) {
- next;
+ if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+ else next;
+
switch(select("^FF0000Thief Guild^000000:Weapon Shop:Inn:Pub:Mercenary Guild:Forge:Cancel")) {
case 1:
mes "[Morroc Guide]";
diff --git a/npc/guides/guides_pron.txt b/npc/guides/guides_pron.txt
index 8311f7010..d4b518966 100644
--- a/npc/guides/guides_pron.txt
+++ b/npc/guides/guides_pron.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88; L0ne_W0lf
//===== Current Version: =====================================
-//= 1.6
+//= 1.6a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -18,6 +18,8 @@
//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
//= 1.5 Removed Duplicates [Silent]
//= 1.6 Rescripted to Aegis 10.3 standards. [L0ne_W0lf]
+//= 1.6a Fixed some errors with the loop[Samuray22]
+// -Thanks to $ephiroth.
//============================================================
prontera,154,187,4 script Guide#prt::PrtGuide 105,{
@@ -45,7 +47,9 @@ prontera,154,187,4 script Guide#prt::PrtGuide 105,{
}
set .@loop2,1;
while (.@loop2) {
- next;
+ if (.@wait_button_chk == 0) set .@wait_button_chk,1;
+ else next;
+
switch(select("Swordman Association:^0000FFSanctuary^000000:Prontera Chivalry:Weapon Shop:Tool Shop:Inn:Trading Post:Pub:Library:Job Agency:Prontera Castle:City Hall:Cancel")) {
case 1:
mes "[Prontera Guide]";
@@ -168,6 +172,7 @@ prontera,154,187,4 script Guide#prt::PrtGuide 105,{
mes "location marks displayed";
mes "on your Mini-Map.";
set .@loop2,0;
+ break;
}
}
break;
diff --git a/npc/guides/guides_rachel.txt b/npc/guides/guides_rachel.txt
index 3e450549c..116349689 100644
--- a/npc/guides/guides_rachel.txt
+++ b/npc/guides/guides_rachel.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
-//= 1.2
+//= 1.2a
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -14,7 +14,10 @@
//= 1.1 Change the while loops a bit. [L0ne_W0lf]
//= 1.2 Deleted an Unnecessary "next;" [Samuray22]
// -Thanks to $ephiroth.
+//= 1.2a Fixed some errors with the loop[Samuray22]
+// -Thanks to $ephiroth.
//============================================================
+
rachel,138,146,5 script Rachel Guide 934,{
mes "[Rachel Guide]";
mes "Welcome to the capital of";
@@ -23,8 +26,8 @@ rachel,138,146,5 script Rachel Guide 934,{
mes "If this is the first time for you";
mes "to use the guide services, why";
mes "don't you check the \"Notice\" menu first?";
- set .@loop,1;
- while(.@loop) {
+ set .@loop1,1;
+ while(.@loop1) {
next;
switch(select("Village Guide:Remove Marks from Mini-Map:Notice:Cancel")) {
case 1:
@@ -103,9 +106,11 @@ rachel,138,146,5 script Rachel Guide 934,{
mes "[Rachel Guide]";
mes "Hope you have a wonderfull journey";
mes "in Arunafeltz.";
- set .@loop,0;
+ close2;
+ set .@loop1,0;
break;
}
}
close;
+ end;
}
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-26 17:33:21 +0000