summaryrefslogtreecommitdiff
path: root/npc/cities/jawaii.txt
diff options
context:
space:
mode:
authorMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
committerMichieru <michieru@0-mail.com>2013-10-24 12:10:43 +0200
commite3afdc2af4c5e50c79237ee092e25f39b7428e47 (patch)
tree20cfd05dd6fc2e3e53173ef059f045cee1526d58 /npc/cities/jawaii.txt
parent491892212d338903179909b89a5bfc2385e52261 (diff)
downloadhercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.gz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.bz2
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.tar.xz
hercules-e3afdc2af4c5e50c79237ee092e25f39b7428e47.zip
Update to last rAthena npc.
Fix some typos change sc_bleeding to -> sc_blooding Updated RE EXP for quests_brasilis.txt
Diffstat (limited to 'npc/cities/jawaii.txt')
-rw-r--r--npc/cities/jawaii.txt94
1 files changed, 48 insertions, 46 deletions
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index a54e2a487..140681af0 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -25,9 +25,9 @@
//= 2.02 Fixed Classic Suite NPC warping directly above a warp [Evera]
//= 3.0 Rescripted to Aegis 10.3 standard. Contains all Jawaii-related NPCs. [L0ne_W0lf]
//= 3.1 Fixed bugs with getpartnerid() (it never returns 1), fixed some conditons,
-//= replaced getpartnerid() with ispartneron() at some tri-forks [Lupus]
+//= replaced getpartnerid() with ispartneron() at some tri-forks [Lupus]
//= 3.2 Reverted ispartneron() BACK to getpartnerid(). [L0ne_W0lf]
-//= None of the NPCs need the player's partner to be online.
+//= None of the NPCs need the player's partner to be online.
//= 3.3 Just a small fix up on the Bartender. [L0ne_W0lf]
//= 3.3a Just a little typo error. [Samuray22]
//= 3.4 Added missing checkweights. [L0ne_W0lf]
@@ -36,7 +36,7 @@
//= 3.7 Added Izlude RE coordinates. [Euphy]
//============================================================
-// Jawaii
+// Jawaii Transportation
//============================================================
jawaii,239,112,7 script Mariner#toizu 100,{
mes "[Mariner]";
@@ -105,6 +105,8 @@ jawaii,122,263,5 script Mariner#toalbe 100,{
close;
}
+// Generic Jawaii NPCs
+//============================================================
jawaii,188,218,7 script Tavern Lady#Jawaii 80,{
mes "[Lady]";
mes "Oh, dear!";
@@ -237,13 +239,13 @@ jawaii,141,200,3 script Employee#sroom 798,{
next;
if (select("Use.:Cancel.") == 1) {
mes "[Alowa]";
- if (zeny > 999) {
+ if (Zeny > 999) {
mes "T-Thank you ssso much!";
mes "L-Let open the room door";
mes "ffffor you. Thank y-you.";
mes "Ha-have a good time.";
close2;
- set zeny,zeny-1000;
+ set Zeny, Zeny-1000;
warp "jawaii_in",116,64;
end;
}
@@ -256,7 +258,7 @@ jawaii,141,200,3 script Employee#sroom 798,{
mes "[Alowa]";
mes "^666666*Sniff*^000000";
mes "B-but I promise th-that this room is the nicest and cl-cleanest room! P-Please! C-come back!";
- Emotion e_sob;
+ emotion e_sob;
close;
}
@@ -284,7 +286,7 @@ jawaii,108,199,5 script Employee#antroom 74,{
next;
if (select("Use.:Cancel.") == 1) {
mes "[Pine Oran]";
- if (zeny > 999) {
+ if (Zeny > 999) {
mes "Thank you";
mes "for using";
mes "our services.";
@@ -292,7 +294,7 @@ jawaii,108,199,5 script Employee#antroom 74,{
mes "Make yourself";
mes "comfortable.";
close2;
- set zeny,zeny-1000;
+ set Zeny, Zeny-1000;
warp "jawaii_in",129,110;
end;
}
@@ -319,11 +321,11 @@ jawaii,107,189,5 script Employee#horoom 93,{
next;
if (select("Use.:Cancel.") == 1) {
mes "[Sharkie Rania]";
- if (zeny > 999) {
+ if (Zeny > 999) {
mes "Eh, alright.";
mes "Let's get going.";
close2;
- set zeny,zeny-1000;
+ set Zeny, Zeny-1000;
warp "jawaii_in",86,117;
end;
}
@@ -362,11 +364,11 @@ jawaii,112,173,7 script Employee#villroom 93,{
next;
if (select("Use.:Cancel.") == 1) {
mes "[Larks Rania]";
- if (zeny > 999) {
+ if (Zeny > 999) {
mes "Thank you~";
mes "Enjoy your stay.";
close2;
- set zeny,zeny-1000;
+ set Zeny, Zeny-1000;
warp "jawaii_in",87,75;
end;
}
@@ -410,8 +412,8 @@ jawaii,214,168,5 script Honeymoon Helper#Jawaii 71,{
next;
if (select("I shall buy it.:No, thanks.") == 1) {
mes "[Helper]";
- if (zeny > 49999) {
- set zeny,zeny-50000;
+ if (Zeny > 49999) {
+ set Zeny, Zeny-50000;
getitem 681,1; //Memory_Of_Wedding
mes "Thank you very much~!";
mes "Please remember, you";
@@ -453,10 +455,10 @@ jawaii_in,25,94,0 script Employee#jaw1 724,{
close;
OnWelcome:
- Emotion e_kis;
+ emotion e_kis;
end;
OnSolo:
- Emotion e_omg;
+ emotion e_omg;
end;
}
@@ -483,10 +485,10 @@ jawaii_in,25,96,0 script Employee#jaw2 724,{
close;
OnWelcome:
- Emotion e_kis;
+ emotion e_kis;
end;
OnSolo:
- Emotion e_omg;
+ emotion e_omg;
end;
}
@@ -499,7 +501,7 @@ jawaii_in,25,98,0 script Employee#jaw3 724,{
mes "Oh~";
mes "Look at you...";
mes "You look perfect";
- if (sex)
+ if (Sex)
mes "for your wife~";
else
mes "with your husband~";
@@ -513,7 +515,7 @@ jawaii_in,25,98,0 script Employee#jaw3 724,{
mes "Hmm...?";
mes "You don't look like";
mes "you're married, are you?";
- if (sex) {
+ if (Sex) {
next;
mes "[Employee Buffy]";
mes "I'm pretty good";
@@ -527,10 +529,10 @@ jawaii_in,25,98,0 script Employee#jaw3 724,{
close;
OnWelcome:
- Emotion e_kis;
+ emotion e_kis;
end;
OnSolo:
- Emotion e_omg;
+ emotion e_omg;
end;
}
@@ -566,10 +568,10 @@ jawaii_in,25,100,0 script Employee#jaw4 724,{
close;
OnWelcome:
- Emotion e_kis;
+ emotion e_kis;
end;
OnSolo:
- Emotion e_omg;
+ emotion e_omg;
end;
}
@@ -599,10 +601,10 @@ jawaii_in,30,94,4 script Employee#jaw5 724,{
close;
OnWelcome:
- Emotion e_kis;
+ emotion e_kis;
end;
OnSolo:
- Emotion e_omg;
+ emotion e_omg;
end;
}
@@ -624,10 +626,10 @@ jawaii_in,30,96,4 script Employee#jaw6 724,{
close;
OnWelcome:
- Emotion e_kis;
+ emotion e_kis;
end;
OnSolo:
- Emotion e_omg;
+ emotion e_omg;
end;
}
@@ -658,10 +660,10 @@ jawaii_in,30,98,4 script Employee#jaw7 724,{
close;
OnWelcome:
- Emotion e_kis;
+ emotion e_kis;
end;
OnSolo:
- Emotion e_omg;
+ emotion e_omg;
end;
}
@@ -682,10 +684,10 @@ jawaii_in,30,100,4 script Employee#jaw8 724,{
close;
OnWelcome:
- Emotion e_kis;
+ emotion e_kis;
end;
OnSolo:
- Emotion e_omg;
+ emotion e_omg;
end;
}
@@ -723,7 +725,7 @@ jawaii_in,15,104,0 script Waitress#jawaii 80,{
mes "[Waitress]";
mes "Hello,";
mes "how can I help you?";
- Emotion e_kis;
+ emotion e_kis;
next;
switch(select("Give me food.:Bring me drink.:Where's the bar?")) {
case 1:
@@ -734,8 +736,8 @@ jawaii_in,15,104,0 script Waitress#jawaii 80,{
next;
if (select("Yes.:Wha--! It's too expensive!") == 1) {
mes "[Waitress]";
- if (zeny > 999) {
- set zeny,zeny-1000;
+ if (Zeny > 999) {
+ set Zeny, Zeny-1000;
getitem 517,1; //Meat
mes "There you go~";
mes "Enjoy your meal~!";
@@ -760,8 +762,8 @@ jawaii_in,15,104,0 script Waitress#jawaii 80,{
next;
if (select("Yes.:Wha--! It's too expensive!") == 1) {
mes "[Waitress]";
- if (zeny > 999) {
- set zeny,zeny-1000;
+ if (Zeny > 999) {
+ set Zeny, Zeny-1000;
getitem 503,1; //Yelow_Potion
mes "There you go~";
mes "Enjoy your meal~!";
@@ -785,7 +787,7 @@ jawaii_in,15,104,0 script Waitress#jawaii 80,{
close;
}
}
- Emotion e_omg;
+ emotion e_omg;
mes "[Waitress]";
mes "Hey, hey...!";
mes "I have no idea";
@@ -834,7 +836,7 @@ jawaii_in,28,124,0 script Bartender#jaw 46,{
mes "What would you";
mes "like to drink?";
next;
- if (zeny < 99) {
+ if (Zeny < 99) {
set .@r_jaw,rand(1,100);
mes "[Bartender]";
if (.@r_jaw > 29) {
@@ -893,7 +895,7 @@ jawaii_in,28,124,0 script Bartender#jaw 46,{
percentheal -100,0;
end;
}
- if (zeny > 99) set zeny,zeny-100;
+ if (Zeny > 99) set Zeny, Zeny-100;
switch(rand(4)) {
case 1:
mes "[Bartender]";
@@ -1103,7 +1105,7 @@ S_KillChar:
percentheal -100,0;
end;
}
- if (zeny > 99) set zeny,zeny-100;
+ if (Zeny > 99) set Zeny, Zeny-100;
set .@roof_jaw,.@roof_jaw+getarg(0);
mes "[Bartender]";
mes "There you go.";
@@ -1114,7 +1116,7 @@ S_KillChar:
jawaii_in,43,115,0 script Customer#jaw_1 97,{
if (!getpartnerid()) {
- if (zeny > 99) {
+ if (Zeny > 99) {
mes "[Buchi]";
mes "Grrrr...";
mes "Damn! I don't";
@@ -1172,7 +1174,7 @@ jawaii_in,41,106,3 script Customer#Cage 98,{
mes "After all, everyone knows marriage is a sham for desperate, lonely people!";
next;
mes "[Cage]";
- if (sex) {
+ if (Sex) {
mes "I don't trust anybody!";
mes "You're a fool for chaining";
mes "yourself to some gorgeous";
@@ -1355,7 +1357,7 @@ prt_in,173,13,4 script Customer#SoloHan 86,{
mes "...Wha!?";
mes "Oh man!";
mes "Get outta my face!";
- if (sex) {
+ if (Sex) {
mes "You smell like,";
mes "whupped boyfriend";
mes "or something!";
@@ -1428,8 +1430,8 @@ prt_in,170,14,0 script Customer#Bachewcca 89,{
mes "Unfortunately, singles are not allowed on the island. Why don't you go forget your loneliness in the Prontera pub?";
close;
}
- else if (zeny > 99999) {
- set zeny,zeny-100000;
+ else if (Zeny > 99999) {
+ set Zeny, Zeny-100000;
mes "Bon Voyage...!!";
mes "Let me guide";
mes "you to 'Jawaii!'";