summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
authorcelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-30 14:56:27 +0000
committercelest <celest@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-30 14:56:27 +0000
commit463858e6ec5dc19949a023bd9fb0fa69c1815a92 (patch)
treea2c06a6af32f2ba4a66e28db0b12d666d5b7980a /npc/other
parent5775899bef44b8a80e8992d7741fc4d82bf18486 (diff)
downloadhercules-463858e6ec5dc19949a023bd9fb0fa69c1815a92.tar.gz
hercules-463858e6ec5dc19949a023bd9fb0fa69c1815a92.tar.bz2
hercules-463858e6ec5dc19949a023bd9fb0fa69c1815a92.tar.xz
hercules-463858e6ec5dc19949a023bd9fb0fa69c1815a92.zip
- Added cooldown time for Emergency Recall
- Fixed some typos git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@425 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/wedding.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/other/wedding.txt b/npc/other/wedding.txt
index f5eea044b..78bbbc1d8 100644
--- a/npc/other/wedding.txt
+++ b/npc/other/wedding.txt
@@ -363,8 +363,8 @@ L_WeddingSystem:
L_Marry:
mes "[Marry Happy]";
mes "If you wish to get married you must first register.";
- mes "Male is ^FF00FF@costgroomA^000000 zeny and female is ^FF00FF@costbrideA^000000 zeny";
- if((countitem(2338) > 0) || (countitem(7170) > 0) || (@outfit == 1)) mes "But only ^FF00FF@costgroomB^000000 zeny for male and ^FF00FF@costbrideB^000000 zeny for female if you already have registered before";
+ mes "Male is ^FF00FF" + @costgroomA + "^000000 zeny and female is ^FF00FF" + @costbrideA + "^000000 zeny";
+ if((countitem(2338) > 0) || (countitem(7170) > 0) || (@outfit == 1)) mes "But only ^FF00FF" + @costgroomB + "^000000 zeny for male and ^FF00FF" + @costbrideB + "^000000 zeny for female if you already have registered before";
mes "Both male and female must have registered,";
mes "and both must have paid fees, have Diamond Rings and be on same party!";
mes "The Bride will get a Wedding Dress, while the Groom will get a Chinese Tuxedo";
@@ -383,7 +383,7 @@ L_Marry:
mes "[Marry Happy]";
if(sex == 1) mes "No problem sir, please fill out your name here.";
if(sex == 0) mes "No problem miss, please fill out your name here.";
- mes "And I'll need to collect a @costgroomA zeny fee for your wedding fees and outfit.";
+ mes "And I'll need to collect a " + @costgroomA + " zeny fee for your wedding fees and outfit.";
next;
mes "[Marry Happy]";
mes "Now You Must Insert The Your Bride's Name";