diff options
| author | DracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-01 10:59:14 +0000 |
|---|---|---|
| committer | DracoRPG <DracoRPG@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-09-01 10:59:14 +0000 |
| commit | e5c848926d7edf3453e792a319ed61ac151474c9 (patch) | |
| tree | 88d56b210ad27a59e010d7857aae578fd540d355 /npc/cities | |
| parent | c4d9efd6f8bfab76639e7613175c7af201646f6a (diff) | |
| download | hercules-e5c848926d7edf3453e792a319ed61ac151474c9.tar.gz hercules-e5c848926d7edf3453e792a319ed61ac151474c9.tar.bz2 hercules-e5c848926d7edf3453e792a319ed61ac151474c9.tar.xz hercules-e5c848926d7edf3453e792a319ed61ac151474c9.zip | |
Various NPC fixes
* LUPUS, REMEMBER TO ACTUALLY ADD THE DIVORCE NPC, THANKS :P *
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@8571 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/cities')
| -rw-r--r-- | npc/cities/lighthalzen.txt | 8 | ||||
| -rw-r--r-- | npc/cities/valkyrie.txt | 13 |
2 files changed, 10 insertions, 11 deletions
diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index fded46eda..a18b4db36 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -1952,7 +1952,7 @@ lhz_in01.gat,73,188,4 script Guide#03 862,{ lhz_in01.gat,34,226,4 script Rekenber Guard#01 867,{
- if(getequipid(10) == 2241 && getequipid(9) == 2243)goto s_Staff;
+ if(isequipped(2241) && isequipped(2243)) goto s_Staff;
mes "[Rekenber Guard]";
mes "This is a restricted";
mes "area! Please show";
@@ -1987,7 +1987,7 @@ s_Staff: lhz_in01.gat,19,129,0 script LhzHiddenTrg1::LhzTrig -1,1,1{
OnTouch:
- if(getequipid(10) == 2241 && getequipid(9) == 2243)goto s_Staff;
+ if(isequipped(2241) && isequipped(2243)) goto s_Staff;
mes "[Rekenber Guard]";
mes "This area is restricted";
mes "to the public! Who are you";
@@ -2015,7 +2015,7 @@ lhz_in01.gat,24,131,2 duplicate(LhzTrig) Rekenber Guard#02 867 lhz_in01.gat,25,141,4 script Regenschirm Guard 868,{
- if(getequipid(10) == 2241 && getequipid(9) == 2243)goto s_Staff;
+ if(isequipped(2241) && isequipped(2243)) goto s_Staff;
mes "[Regenschirm Guard]";
mes "This area is restricted";
mes "to the public! Who are you";
@@ -2038,7 +2038,7 @@ s_Staff: close;
s_Yes:
- if(getequipid(7) == 2657 || getequipid(8) == 2657)goto s_Auth;
+ if(isequipped(2657)) goto s_Auth;
mes "[Regenschirm Guard]";
mes "I'm sorry but I can't let";
mes "staff without proper autorization";
diff --git a/npc/cities/valkyrie.txt b/npc/cities/valkyrie.txt index 164196ff9..64cf99a7e 100644 --- a/npc/cities/valkyrie.txt +++ b/npc/cities/valkyrie.txt @@ -36,13 +36,13 @@ yuno_in02.gat,93,207,0 script Book of Ymir 111,{ mes "...The entrance to the Hall of Honor is open to everyone who will move forward, into their next lives.";
mes "It is there to help heroes decide what they want to do, and can access every place in this world.";
next;
- mes "[Book of Ymir]"
+ mes "[Book of Ymir]";
mes "In the Hall of Honor, everything is perfectly prepared for heroes.";
mes "It is rumored that any wish that cannot be fulfilled in our reality can be realized in the Hall of Honor.";
next;
- switch(select("Stop reading.:Continue reading.")) {
+ switch(select("Stop reading.","Continue reading.")) {
case 1:
- mes "[Book of Ymir]"
+ mes "[Book of Ymir]";
mes ". . . . .";
close;
break;
@@ -56,11 +56,10 @@ yuno_in02.gat,93,207,0 script Book of Ymir 111,{ break;
}
}
- if(Upper==2 || baseClass == Job_Taekwon || BaseJob == Job_Gunslinger || BaseJob == Job_Ninja){
-
- }
-) goto L_IGNORE; //don't allow Taekwondo classes, Baby Classes, and GS/NJ
+ if(Upper==2 || baseClass == Job_Taekwon || BaseJob == Job_Gunslinger || BaseJob == Job_Ninja)
+ goto L_IGNORE; //don't allow Taekwondo classes, Baby Classes, and GS/NJ
if(valkyrie_Q >= 1) goto L_CONT;
+
L_IGNORE:
mes ". . . . .";
close;
|