diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/Changelog.txt | 1 | ||||
| -rw-r--r-- | npc/merchants/refine.txt | 20 | ||||
| -rw-r--r-- | npc/other/wedding.txt | 6 |
3 files changed, 14 insertions, 13 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 73e54adff..97ff8537f 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -31,6 +31,7 @@ Other Ppl Date Added ====== 11/30 * Added Lutie shops + * Corrected some typos, thanks to leinsirk10 11/28 * Added missing Niflheim monsters [shadow] diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt index b3e354e68..8900c0fec 100644 --- a/npc/merchants/refine.txt +++ b/npc/merchants/refine.txt @@ -746,7 +746,7 @@ function script repairmain { REPAIR1: mes "[" + @name$ + "]"; mes "You're gonna repair " + getitemname(@broken1) + "."; - mes "To repair this, I need ^ff9999One Steel^000000, and @repairprice Zeny."; + mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny."; mes "Continue?"; next; menu "Yes",-,"No",L_CANCEL_2; @@ -758,7 +758,7 @@ function script repairmain { REPAIR2: mes "[" + @name$ + "]"; mes "You're gonna repair " + getitemname(@broken1) + "."; - mes "To repair this, I need ^ff9999One Steel^000000, and @repairprice Zeny."; + mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny."; mes "Continue?"; next; menu "Yes",-,"No",L_CANCEL_2; @@ -770,7 +770,7 @@ function script repairmain { REPAIR3: mes "[" + @name$ + "]"; mes "You're gonna repair " + getitemname(@broken1) + "."; - mes "To repair this, I need ^ff9999One Steel^000000, and @repairprice Zeny."; + mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny."; mes "Continue?"; next; menu "Yes",-,"No",L_CANCEL_2; @@ -782,7 +782,7 @@ function script repairmain { REPAIR4: mes "[" + @name$ + "]"; mes "You're gonna repair " + getitemname(@broken1) + "."; - mes "To repair this, I need ^ff9999One Steel^000000, and @repairprice Zeny."; + mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny."; mes "Continue?"; next; menu "Yes",-,"No",L_CANCEL_2; @@ -794,7 +794,7 @@ function script repairmain { REPAIR5: mes "[" + @name$ + "]"; mes "You're gonna repair " + getitemname(@broken1) + "."; - mes "To repair this, I need ^ff9999One Steel^000000, and @repairprice Zeny."; + mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny."; mes "Continue?"; next; menu "Yes",-,"No",L_CANCEL_2; @@ -806,7 +806,7 @@ function script repairmain { REPAIR6: mes "[" + @name$ + "]"; mes "You're gonna repair " + getitemname(@broken1) + "."; - mes "To repair this, I need ^ff9999One Steel^000000, and @repairprice Zeny."; + mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny."; mes "Continue?"; next; menu "Yes",-,"No",L_CANCEL_2; @@ -818,7 +818,7 @@ function script repairmain { REPAIR7: mes "[" + @name$ + "]"; mes "You're gonna repair " + getitemname(@broken1) + "."; - mes "To repair this, I need ^ff9999One Steel^000000, and @repairprice Zeny."; + mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny."; mes "Continue?"; next; menu "Yes",-,"No",L_CANCEL_2; @@ -830,7 +830,7 @@ function script repairmain { REPAIR8: mes "[" + @name$ + "]"; mes "You're gonna repair " + getitemname(@broken1) + "."; - mes "To repair this, I need ^ff9999One Steel^000000, and @repairprice Zeny."; + mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny."; mes "Continue?"; next; menu "Yes",-,"No",L_CANCEL_2; @@ -842,7 +842,7 @@ function script repairmain { REPAIR9: mes "[" + @name$ + "]"; mes "You're gonna repair " + getitemname(@broken1) + "."; - mes "To repair this, I need ^ff9999One Steel^000000, and @repairprice Zeny."; + mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny."; mes "Continue?"; next; menu "Yes",-,"No",L_CANCEL_2; @@ -854,7 +854,7 @@ function script repairmain { REPAIR10: mes "[" + @name$ + "]"; mes "You're gonna repair " + getitemname(@broken1) + "."; - mes "To repair this, I need ^ff9999One Steel^000000, and @repairprice Zeny."; + mes "To repair this, I need ^ff9999One Steel^000000, and " + @repairprice + " Zeny."; mes "Continue?"; next; menu "Yes",-,"No",L_CANCEL_2; 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"; |