summaryrefslogtreecommitdiff
path: root/npc/cities
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-20 05:43:48 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-09-20 05:43:48 +0000
commit36a3a6ea0a2f16329f9d6fba5bab1f5a0a9e9988 (patch)
tree2f7c6bbdb283b98e36dca3e8344f861fc8f21a1f /npc/cities
parent79ea710ca5facb2c20fae16d6107dfa16a0f22bc (diff)
downloadhercules-36a3a6ea0a2f16329f9d6fba5bab1f5a0a9e9988.tar.gz
hercules-36a3a6ea0a2f16329f9d6fba5bab1f5a0a9e9988.tar.bz2
hercules-36a3a6ea0a2f16329f9d6fba5bab1f5a0a9e9988.tar.xz
hercules-36a3a6ea0a2f16329f9d6fba5bab1f5a0a9e9988.zip
fixed typos, added missing NEXT;, optimized Niflheim. Clear nif vars garbage
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8819 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/cities')
-rw-r--r--npc/cities/einbroch.txt19
-rw-r--r--npc/cities/gonryun.txt17
-rw-r--r--npc/cities/louyang.txt2
-rw-r--r--npc/cities/lutie.txt12
-rw-r--r--npc/cities/niflheim.txt119
5 files changed, 43 insertions, 126 deletions
diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt
index c5ca2401f..121bcded2 100644
--- a/npc/cities/einbroch.txt
+++ b/npc/cities/einbroch.txt
@@ -123,6 +123,7 @@ s_Tower2:
s_Apple:
if(Zeny < 20)goto s_NEnough;
+ set Zeny,Zeny - 20;
mes "["+ @Tower_Name$ +"]";
mes "Before I guide you to";
mes "the tower, let me check";
@@ -130,7 +131,6 @@ s_Apple:
mes "your safety before I give";
mes "you the Apple Combo Set.";
next;
- set Zeny,Zeny - 20;
getitem 512,1;
goto s_Tower2;
@@ -221,11 +221,17 @@ s_Goback:
mes "Thank you for using";
mes "our services.";
close2;
- set @towerwarp,rand(1,3);
- if(@towerwarp == 0)warp "einbroch.gat",218,196;
- if(@towerwarp == 1)warp "einbroch.gat",178,172;
- if(@towerwarp == 3)warp "einbroch.gat",172,228;
- end;
+ switch(rand(1,3)){
+ case 0:
+ warp "einbroch.gat",218,196;
+ end;
+ case 1:
+ warp "einbroch.gat",178,172;
+ end;
+ case 3:
+ warp "einbroch.gat",172,228;
+ end;
+ }
OnHide:
specialeffect 16;
@@ -278,7 +284,6 @@ OnUnhide:
misceffect 215;
end;
-
}
einbroch.gat,232,255,5 script Khowropher 847,{
diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt
index 29a30510c..2557c2c71 100644
--- a/npc/cities/gonryun.txt
+++ b/npc/cities/gonryun.txt
@@ -16,9 +16,6 @@
//============================================================
-
-//EventI
-
alberta.gat,245,69,4 script Public Relations#01 776,{
mes "[Waba]";
mes "Hello there! I have traveled far from the Kingdom of Gonryun, my hometown.";
@@ -42,14 +39,14 @@ alberta.gat,245,69,4 script Public Relations#01 776,{
next;
menu "Let's Go!",-, "Actually... I changed my mind, sorry.",M_End;
- if (Zeny < 10000) goto L_NoZeny;
+ if (Zeny < 10000){
+ mes "[Waba]";
+ mes "I am sorry if it seems like a lot, but the ^0000ff10,000 zeny^000000 we request is necessary in order to make the trip.";
+ close;
+ }
set Zeny,Zeny-10000;
warp "gon_fild01.gat",258,82;
end;
- L_NoZeny:
- mes "[Waba]";
- mes "I am sorry if it seems like a lot, but the ^0000ff10,000 zeny^000000 we request is necessary in order to make the trip.";
- close;
M_End:
mes "[Waba]";
mes "Please see me again if you want to visit! I am pleased just to meet an honored guest from the Continent.";
@@ -102,7 +99,7 @@ gonryun.gat,153,64,0 script Public Relations#04 776,{
}
//===============================================================================
-//In h
+//Inn
//===============================================================================
gon_in.gat,153,35,4 script Hotel Manager 702,{
@@ -190,7 +187,7 @@ gonryun.gat,113,127,6 script Guardsman#02 780,{
}
//===============================================================================
-//
+//???
//===============================================================================
gon_in.gat,18,27,4 script Elder's Wife 771,{
diff --git a/npc/cities/louyang.txt b/npc/cities/louyang.txt
index 29772ee64..6d1062348 100644
--- a/npc/cities/louyang.txt
+++ b/npc/cities/louyang.txt
@@ -721,12 +721,12 @@ s_Yes:
mes "I am sorry, but you don't have enough money.";
close;
}
+ set Zeny,Zeny - 500;
mes "Thank for your patronage.";
mes "We are trying to provide you with";
mes "the best service, Please";
mes "come again.";
close2;
- set Zeny,Zeny - 500;
warp "lou_in01.gat",16,19;
end;
diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt
index af9d8d0c2..f7df58d63 100644
--- a/npc/cities/lutie.txt
+++ b/npc/cities/lutie.txt
@@ -683,7 +683,7 @@ Xmas10:
getitem 529,5;
mes "[Jack Frost]";
mes "Wow -Congratulations!!";
- mes "^3355FF- 5 Candy -^000000!";
+ mes "^3355FF- 5 Candy -^000000!";
mes "Dear my friend,";
mes "Please visit me from time to time, and take a chitchat with me.";
mes "See you soon -";
@@ -693,7 +693,7 @@ Xmas10:
getitem 529,10;
mes "[Jack Frost]";
mes "Wow -Congratulations!!";
- mes "^3355FF- 10 Candy -^000000!";
+ mes "^3355FF- 10 Candy -^000000!";
mes "Dear my friend,";
mes "Please visit me from time to time, and take a chitchat with me.";
mes "See you soon -";
@@ -703,7 +703,7 @@ Xmas10:
getitem 530,5;
mes "[Jack Frost]";
mes "Wow -Congratulations!!";
- mes "^3355FF- 5 Candy Cane-^000000!";
+ mes "^3355FF- 5 Candy Cane-^000000!";
mes "Dear my friend,";
mes "Please visit me from time to time, and take a chitchat with me.";
mes "See you soon -";
@@ -713,7 +713,7 @@ Xmas10:
getitem 530,10;
mes "[Jack Frost]";
mes "Wow -Congratulations!!";
- mes "^3355FF- 10 Candy Cane-^000000!";
+ mes "^3355FF- 10 Candy Cane-^000000!";
mes "Dear my friend,";
mes "Please visit me from time to time, and take a chitchat with me.";
mes "See you soon -";
@@ -723,7 +723,7 @@ Xmas10:
getitem 539,1;
mes "[Jack Frost]";
mes "Wow -Congratulations!!";
- mes "^3355FF- 1 Piece_of_Cake-^000000!";
+ mes "^3355FF- 1 Piece of Cake-^000000!";
mes "Dear my friend,";
mes "Please visit me from time to time, and take a chitchat with me.";
mes "See you soon -";
@@ -733,7 +733,7 @@ Xmas10:
getitem 539,2;
mes "[Jack Frost]";
mes "Wow -Congratulations!!";
- mes "^3355FF- 2 Piece_of_Cake-^000000!";
+ mes "^3355FF- 2 Piece of Cake-^000000!";
mes "Dear my friend,";
mes "Please visit me from time to time, and take a chitchat with me.";
mes "See you soon -";
diff --git a/npc/cities/niflheim.txt b/npc/cities/niflheim.txt
index cff870725..865e3031e 100644
--- a/npc/cities/niflheim.txt
+++ b/npc/cities/niflheim.txt
@@ -24,28 +24,6 @@
//= 1.3 Moved Book of Devil and Piano quest to quests/quests_niflheim.txt [Evera]
//============================================================
-//prontera.gat,164,161,4 script Traveler::NifTrav 68,{
-// mes "[Traveler]";
-// mes "I've come across some strange things in my time. Things you'd have to see to believe. Have you heard of Niffleheim, the City of the Dead?";
-// next;
-// menu "Show me, please...",M_show, "Sounds scary...Never mind...",-;
-//
-// mes "[Traveler]";
-// mes "A wise choice by any means...";
-// close;
-//M_show:
-// warp "niflheim.gat",202,171;
-// close;
-//}
-//- script EDNifTrav -1,{
-//OnInit:
-//OnMinute00:
-// disablenpc "NifTrav";
-// end;
-//OnMinute56:
-// enablenpc "NifTrav";
-// end;
-//}
niflheim.gat,52,174,3 script Kirz 796,{
mes "[Kirz]";
@@ -73,29 +51,6 @@ niflheim.gat,130,176,0 duplicate(spirits) Spirit#7 802
niflheim.gat,173,110,0 duplicate(spirits) Spirit#8 802
niflheim.gat,182,167,0 duplicate(spirits) Spirit#9 802
-nif_fild01.gat,213,268,5 script Little Boy 797,{
- mes "[Marius]";
- if(niflheimlost == 1) goto L_alreadydone;
- if(lostgirl == 1) goto L_sure2;
- mes "Sairin...where are you?";
- close;
-L_alreadydone:
- mes "Thank you for helping us!";
- close;
-L_sure2:
- mes "Who are you?";
- mes "...";
- mes "You found Sairin?";
- mes "She ran to Niflheim?";
- next;
- set niflheimlost,1;
- mes "[Marius]";
- mes "Could you tell her that I am on my way?";
- mes "I am a little slow, and its very important that she knows.";
- menu "Yes",L_alreadydone, "No",-;
-
- close;
-}
niflheim.gat,195,211,5 script Gigantia 796,{
mes "[Gigantia]";
@@ -209,57 +164,31 @@ L_book2:
L_book3:
set @nif_t,0;
- set @nif_random1,rand(1,10);
mes "[Ashe Bruce]";
mes "Ahahaha.... I see you are brave!!";
mes "Start reading your prayersahahahah!!";
next;
-L_MENU1:
- menu "Clover.",L_MENU1_1,"Klaatu.",L_MENU1_2,"Kleitos.",L_MENU1_3;
-
- L_MENU1_1:
- goto L_MENU2;
-
- L_MENU1_2:
- set @nif_t,@nif_t + 10;
- goto L_MENU2;
-
- L_MENU1_3:
- goto L_MENU2;
-
-L_MENU2:
- menu "Verit.",L_MENU2_1,"Veritas.",L_MENU2_2,"Verata.",L_MENU2_3;
-
- L_MENU2_1:
- goto L_MENU3;
+ if(select("Clover.:Klaatu.:Kleitos.")==2)
+ set @nif_t,@nif_t + 10;
- L_MENU2_2:
- goto L_MENU3;
+ if(select("Verit.:Veritas.:Verata.")==3)
+ set @nif_t,@nif_t + 10;
- L_MENU2_3:
- set @nif_t,@nif_t + 10;
- goto L_MENU3;
+ if(select("Necktie.:Necklace.:Nero.:^FFFFFFNictu.^000000")==4)
+ set @nif_t,@nif_t + 10;
-L_MENU3:
- menu "Necktie.",L_MENU3_1,"Necklace.",L_MENU3_2,"Nero.",L_MENU3_3,"^FFFFFFNictu.^000000",L_MENU3_4;
-
- L_MENU3_1:
- goto L_score;
-
- L_MENU3_2:
- goto L_score;
-
- L_MENU3_3:
- goto L_score;
-
- L_MENU3_4:
- set @nif_t,@nif_t + 10;
- goto L_score;
-
-
-L_score:
- if (@nif_t == 30) goto L_sucess1;
mes "[Ashe Bruce]";
+ if(@nif_t == 30){
+ if(rand(9)){
+ mes "Your prayers were correctaaahhhh...";
+ mes "but your curse still remainsaaahhhh!!";
+ mes "Haahahahaha.....!!!";
+ close;
+ }
+ mes "Hahahaha!! Your curse has been lifted!!";
+ mes "Gahahahaha.....!!!";
+ close;
+ }
mes "Hahahaha!! Your prayers were wrong!!";
mes "Time to face deathohohohoho,";
mes "May you be cursed forevahahahaha!!";
@@ -272,20 +201,6 @@ L_score:
monster "niflheim.gat",347,259,"Orc Skeleton",1462,1,"mymob";
close;
-L_sucess1:
- if (@nif_random1 == 10) goto L_sucess2;
- mes "[Ashe Bruce]";
- mes "Your prayers were correctaaahhhh...";
- mes "but your curse still remainsaaahhhh!!";
- mes "Haahahahaha.....!!!";
- close;
-
-L_sucess2:
- mes "[Ashe Bruce]";
- mes "Hahahaha!! Your curse has been lifted!!";
- mes "Gahahahaha.....!!!";
- close;
-
L_back:
mes "[Ashe Bruce]";
mes "Ahahahaha! Not bad thinking at alllhhhaahaaa...";