summaryrefslogtreecommitdiff
path: root/npc/cities/jawaii.txt
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2015-12-18 05:22:33 +0100
committerHaru <haru@dotalux.com>2015-12-18 05:22:33 +0100
commit8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a (patch)
tree54669433655bb853309ea1cae12da049622324fa /npc/cities/jawaii.txt
parent53abb8cdf92cd3d153b0a3d5b99b55cbd631f36c (diff)
parent0828824948c77bbfc357e08e8a5a0a96671b1ca6 (diff)
downloadhercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.gz
hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.bz2
hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.xz
hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.zip
Merge branch 'dastgir-ScriptCleanup2' into hercules
Closes #920 as merged
Diffstat (limited to 'npc/cities/jawaii.txt')
-rw-r--r--npc/cities/jawaii.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt
index ac470827a..2ac6b57b2 100644
--- a/npc/cities/jawaii.txt
+++ b/npc/cities/jawaii.txt
@@ -416,7 +416,7 @@ jawaii,214,168,5 script Honeymoon Helper#Jawaii 1_F_LIBRARYGIRL,{
mes "[Helper]";
if (Zeny > 49999) {
Zeny -= 50000;
- getitem 681,1; //Memory_Of_Wedding
+ getitem Memory_Of_Wedding,1;
mes "Thank you very much~!";
mes "Please remember, you";
mes "should use this with your";
@@ -717,7 +717,7 @@ OnTouch:
}
jawaii_in,15,104,0 script Waitress#jawaii 1_F_PUBGIRL,{
- if (checkweight(1201,1) == 0) {
+ if (checkweight(Knife,1) == 0) {
mes "^3355FF * Wait a minute! *";
mes "You're carrying too many items with you right now. Please store some of your things into Kafra Storage and try again.^000000";
close;
@@ -739,7 +739,7 @@ jawaii_in,15,104,0 script Waitress#jawaii 1_F_PUBGIRL,{
mes "[Waitress]";
if (Zeny > 999) {
Zeny -= 1000;
- getitem 517,1; //Meat
+ getitem Meat,1;
mes "There you go~";
mes "Enjoy your meal~!";
close;
@@ -765,7 +765,7 @@ jawaii_in,15,104,0 script Waitress#jawaii 1_F_PUBGIRL,{
mes "[Waitress]";
if (Zeny > 999) {
Zeny -= 1000;
- getitem 503,1; //Yelow_Potion
+ getitem Yellow_Potion,1; //Yelow_Potion
mes "There you go~";
mes "Enjoy your meal~!";
close;