summaryrefslogtreecommitdiff
path: root/npc/cities
diff options
context:
space:
mode:
Diffstat (limited to 'npc/cities')
-rw-r--r--npc/cities/izlude.txt13
-rw-r--r--npc/cities/morocc.txt7
-rw-r--r--npc/cities/niflheim.txt34
-rw-r--r--npc/cities/prontera.txt22
4 files changed, 37 insertions, 39 deletions
diff --git a/npc/cities/izlude.txt b/npc/cities/izlude.txt
index 1b3c82649..15dbb0330 100644
--- a/npc/cities/izlude.txt
+++ b/npc/cities/izlude.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.4
+//= 1.5
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -13,8 +13,9 @@
//= 1.1 fixed 2 zeny bugs/checks [Lupus]
//= 1.2 Fixed a lot of typo’s [Nexon]
//= 1.3 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
-//= 1.4 Added a Jawaii related npc [MasterOfMuppets]
-//= 1.4a Fixed a small bug to the Jawaii warper, thanks to reddozen and Silent [MasterOfMuppets]
+//= 1.4 Added a Jawaii related npc. 1.4a Fixed a small bug to
+//= the Jawaii warper, thanks to reddozen and Silent [MasterOfMuppets]
+//= 1.5 Replaced iz_move_alberta with MISC_QUEST & 16 [Lupus]
//============================================================
@@ -828,7 +829,7 @@ M_Menu:
close;
sM_1:
- if (iz_move_alberta == 1) goto sM_2;
+ if (MISC_QUEST & 16) goto sM_2;
mes "[Edgar]";
mes "Okay...";
mes "You don't want to walk AND you've";
@@ -843,7 +844,7 @@ M_Menu:
next;
menu "Alrighty~?",-,"Bah, what a rip off!!",sm_1b;
- set iz_move_alberta,1;
+ set MISC_QUEST,MISC_QUEST | 16;
if(Zeny < 250) goto sl_NoZeny;
set Zeny, Zeny - 250;
warp "alberta.gat",195,164;
@@ -978,8 +979,6 @@ s_Go:
}
else if(Zeny < 100000)
{
-
-
mes "[Marry Happy]";
mes "I've explained about the trip to 'Jawaii'.";
mes "You'll need 100,000 z.";
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index 6d9c52ca3..2f329318d 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -448,9 +448,10 @@ moc_fild16.gat,199,212,4 script Hashisid 48,{
moc_fild16.gat,195,281,4 script Assassin Guardian#1::SinGuard 707,{
mes "[Assassin Guardian]";
- if(BaseJob == Job_Assassin) mes "Welcome.";
- if(BaseJob == Job_Assassin) close;
-
+ if(BaseJob == Job_Assassin) {
+ mes "Welcome.";
+ close;
+ }
set @temp, rand(1,4);
if(@temp == 1) mes "........";
if(@temp == 2) mes "Hmmm..........";
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt
index 83fce64f0..45c768c75 100644
--- a/npc/cities/niflheim.txt
+++ b/npc/cities/niflheim.txt
@@ -4,7 +4,7 @@
//= Fyrien, Dizzy, PKGINGO
//= Official NPCs translated and re-edited by Celest
//===== Current Version: =====================================
-//= 1.08
+//= 1.1
//===== Compatible With: =====================================
//= Any eAthena Version; Niflheim Required
//===== Description: =========================================
@@ -19,6 +19,7 @@
//= 1.07 Fixed typos [Nexon]
//= 1.08 Commented "Traveler" out as it is not official & we have correct Bungee quest in.
//= Also removed TODO, as they are already done. [Vicious_Pucca]
+//= 1.1 Replaced nif_q_done with MISC_QUEST & 32. nif_t -> @nif_t [Lupus]
//============================================================
//prontera.gat,164,161,4 script Traveler::NifTrav 68,{
@@ -247,7 +248,7 @@ L_book2:
close;
L_book3:
- set nif_t,0;
+ set @nif_t,0;
set @nif_random1,rand(1,10);
mes "[Aesop Bruce]";
mes "Ahahaha.... I see you are brave!!";
@@ -260,7 +261,7 @@ L_MENU1:
goto L_MENU2;
L_MENU1_2:
- set nif_t,nif_t + 10;
+ set @nif_t,@nif_t + 10;
goto L_MENU2;
L_MENU1_3:
@@ -276,7 +277,7 @@ L_MENU2:
goto L_MENU3;
L_MENU2_3:
- set nif_t,nif_t + 10;
+ set @nif_t,@nif_t + 10;
goto L_MENU3;
L_MENU3:
@@ -292,12 +293,12 @@ L_MENU3:
goto L_score;
L_MENU3_4:
- set nif_t,nif_t + 10;
+ set @nif_t,@nif_t + 10;
goto L_score;
L_score:
- if (nif_t == 30) goto L_sucess1;
+ if (@nif_t == 30) goto L_sucess1;
mes "[Aesop Bruce]";
mes "Hahahaha!! Your prayers were wrong!!";
mes "Time to face deathohohohoho,";
@@ -341,7 +342,7 @@ niflheim.gat,224,243,3 script Alager 795,{
mes "I'm going to eat you...";
next;
mes "-Chomp bite slurp-";
- if (nif_quest1 == 1 || nif_q_done == 1) goto L_end;
+ if (nif_quest1 == 1 || (MISC_QUEST & 32)) goto L_end;
percentheal -60,0;
next;
mes "[Alager]";
@@ -375,7 +376,7 @@ nif_in.gat,105,81,3 script Grey 794,{
mes "^FF0000The beautiful melody surrounding thy soul,^000000";
mes "^FF0000Is the key from Lord Death's wrath.^000000";
next;
- if (nif_quest2 == 1 || nif_q_done == 1) goto L_end;
+ if (nif_quest2 == 1 || (MISC_QUEST & 32)) goto L_end;
set @nif_random,rand(1,4);
mes "[Grey]";
mes "Heh, let me give you a little exam!";
@@ -441,7 +442,7 @@ nif_in.gat,31,20,3 script Kurtz 794,{
mes "Business nowadays is really bad...";
mes "Back when I used to be alive,";
mes "my business was this bad too~!";
- if (nif_quest3 == 1 || nif_q_done == 1) close;
+ if (nif_quest3 == 1 || (MISC_QUEST & 32)) close;
next;
mes "[Kurtz]";
mes "Hey! You there! Dump this for me";
@@ -456,8 +457,7 @@ nif_in.gat,31,20,3 script Kurtz 794,{
}
niflheim.gat,169,71,5 script #1 111,2,2{
- if (nif_q_done == 1) end;
- if (nif_quest4 == 1) end;
+ if (MISC_QUEST & 32 || nif_quest4 == 1) end;
mes "- In the nearby tombs -";
mes "- you see something -";
@@ -474,7 +474,7 @@ L_end:
}
niflheim.gat,208,103,5 script #2 111,2,2{
- if (nif_q_done == 1) end;
+ if (MISC_QUEST & 32) end;
if (nif_quest5 == 1) goto L_key2;
if (nif_quest5 >= 2) end;
@@ -505,14 +505,14 @@ L_end:
nif_in.gat,115,181,5 script #4 111,3,3{
mes "- You see a huge old piano -";
- if (nif_q_done==0) mes "- with a few keys missing -";
- if (nif_q_done==1) mes "- with one key missing -";
- if (nif_q_done==0 && countitem(7184) > 5) goto L_event;//Items: Piano Key,
+ if ((MISC_QUEST & 32)==0) mes "- with a few keys missing -";
+ if (MISC_QUEST & 32) mes "- with one key missing -";
+ if ((MISC_QUEST & 32)==0 && countitem(7184) > 5) goto L_event;//Items: Piano Key,
close;
L_event:
delitem 7184,6;//Items: Piano Key,
- set nif_q_done, 1;
+ set MISC_QUEST,MISC_QUEST | 32;
//clear auxiliary vars now
set nif_quest1, 0;
set nif_quest2, 0;
@@ -530,7 +530,7 @@ L_event:
}
nif_in.gat,118,151,5 script #5 111,3,3{
- if (nif_q_done != 1) end;
+ if((MISC_QUEST & 32)==0) end;
mes "- The very moment the long shadow -";
mes "- of your body falls on the piano -";
diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt
index af76c62d1..22701b18b 100644
--- a/npc/cities/prontera.txt
+++ b/npc/cities/prontera.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.5a
+//= 1.6
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -14,6 +14,7 @@
//= Spellchecked [massdriller]
//= 1.4 Optimized. Novices > 20 BaseJob can go to Culvert, too [Lupus]
//= 1.5a Added a Jawaii related npc [MasterOfMuppets]
+//= 1.6 Replaced sewer_prt with (MISC_QUEST & 8) [Lupus]
//============================================================
@@ -126,14 +127,8 @@ prontera.gat,102,287,5 script Shuger 98,{
// ------------------------------------------------------------------------------------------- Culvert -------------------------------------------------------------------------------\\
// Culvert Guardian ----------------------------------------------------
prt_fild05.gat,270,212,5 script Culvert Guardian 105,{
- if(sewer_prt == 1) goto L_WARP;
mes "[Culvert Guardian]";
- mes "Sorry, but only volunteers for the Culvert Campaign can go inside.";
- mes "Speak with the ^000077Recruiter^000000 about volunteering. He's located in the ^ff0000Prontera Chivalry^000000.";
- close;
-
- L_WARP:
- mes "[Culvert Guardian]";
+ if(MISC_QUEST & 8) {
mes "Here you are. The entrance of the Culvert. Are you sure you want to Go inside?";
next;
menu "Sure.",-,"Quit.",M_END;
@@ -141,12 +136,16 @@ prt_fild05.gat,270,212,5 script Culvert Guardian 105,{
warp "prt_sewb1.gat",131,247;
M_END:
close;
+ }
+ mes "Sorry, but only volunteers for the Culvert Campaign can go inside.";
+ mes "Speak with the ^000077Recruiter^000000 about volunteering. He's located in the ^ff0000Prontera Chivalry^000000.";
+ close;
}
// Recruiter -----------------------------------------------------------
prt_in.gat,88,105,2 script Recruiter 105,{
- if(sewer_prt == 1) goto L_WARP;
mes "[Recruiter]";
+ if(MISC_QUEST & 8) goto L_WARP;
mes "Let me inform about the official Notice from the Capital Defence Headquarter of Rune-Midgard Kingdom";
next;
mes "[Recruiter]";
@@ -188,14 +187,13 @@ prt_in.gat,88,105,2 script Recruiter 105,{
next;
mes "[Recruiter]";
mes "3 Red Potions, 1 Milk, and 1 Orange Potion for an emergency.";
- set sewer_prt,1;
+ set MISC_QUEST,MISC_QUEST | 8;
getitem 501,3;
getitem 519,1;
getitem 502,1;
next;
-
- L_WARP:
mes "[Recruiter]";
+ L_WARP:
mes "Are you ready? I will warp you to the Culvert.";
next;
warp "prt_fild05.gat",274,208;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-14 22:10:45 +0000