summaryrefslogtreecommitdiff
path: root/npc/merchants/clothes_dyer.txt
diff options
context:
space:
mode:
authorkobra_k88 <kobra_k88@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-16 17:55:11 +0000
committerkobra_k88 <kobra_k88@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-11-16 17:55:11 +0000
commitfdd80e74dfdf00ba00f3edd1cf8b32ba25c00109 (patch)
tree5cf4b10595677faf29af9a3eacb170633bd09c03 /npc/merchants/clothes_dyer.txt
parent6f80256e134557926c16ef1fcb89df4bebb4e7fe (diff)
downloadhercules-fdd80e74dfdf00ba00f3edd1cf8b32ba25c00109.tar.gz
hercules-fdd80e74dfdf00ba00f3edd1cf8b32ba25c00109.tar.bz2
hercules-fdd80e74dfdf00ba00f3edd1cf8b32ba25c00109.tar.xz
hercules-fdd80e74dfdf00ba00f3edd1cf8b32ba25c00109.zip
Removed loop from milk trader and added extra input exploit safeguard. Disabled clothes dye for male assassins.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/athena@220 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/merchants/clothes_dyer.txt')
-rw-r--r--npc/merchants/clothes_dyer.txt28
1 files changed, 16 insertions, 12 deletions
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index f0cc8bff8..023a05086 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -47,6 +47,7 @@ M_Menu:
L_Dye:
mes "[Dyer Ginedin Rephere]";
if(Class==0) goto sL_Novice;
+ if(Class==12) goto L_Assassin_M;
mes "Oh... you need my work? Well... okay sounds good.";
next;
mes "[Dyer Ginedin Rephere]";
@@ -70,7 +71,7 @@ Male_dye:
if(Class==8 || Class==15) goto L_Priest_Monk_M;
if(Class==9 || Class==11 || Class==19 || Class==23) goto L_Wiz_Hunt_Bard_SN_M;
if(Class==10 || Class==18) goto L_BlackSmith_Alchemist_M;
- if(Class==12) goto L_Assassin_M;
+// if(Class==12) goto L_Assassin_M;
if(Class==17) goto L_Rogue_M;
//1 Class
@@ -125,11 +126,13 @@ Male_dye:
set @black, 4;
menu "- Red",L_Dye_Red,"- Green",L_Dye_Green,"- White",L_Dye_White,"- Black",L_Dye_Black,"- Cancel",L_End;
L_Assassin_M:
- set @blue, 1;
- set @red, 2;
- set @green, 3;
- set @black, 4;
- menu "- Red",L_Dye_Red,"- Blue",L_Dye_Blue,"- Green",L_Dye_Green,"- Black",L_Dye_Black,"- Cancel",L_End;
+ mes "I'm am sorry but I currently cannot dye male Assassin clothing.";
+ close;
+// set @blue, 1;
+// set @red, 2;
+// set @green, 3;
+// set @black, 4;
+// menu "- Red",L_Dye_Red,"- Blue",L_Dye_Blue,"- Green",L_Dye_Green,"- Black",L_Dye_Black,"- Cancel",L_End;
L_Rogue_M:
set @red, 2;
set @green, 3;
@@ -310,12 +313,13 @@ L_Dye_Yellow:
L_PriceList:
mes "[Dyer Ginedin Rephere]";
mes "Here is the list of colors you can choose from and their prices:";
- mes " - Red: 10000 zeny, 1 Scarlet Dyestuff";
- mes " - Yellow: 10000 zeny, 1 Lemon Dyestuff";
- mes " - Violet: 10000 zeny, 1 Violet Dyestuff";
- mes " - Orange: 10000 zeny, 1 Orange Dyestuff";
- mes " - Blue: 10000 zeny, 1 CobaltBlue Dyestuff";
- mes " - Green: 10000 zeny, 1 DarkGreen Dyestuff";
+ mes " ";
+ mes " - ^FF4422Red^000000: 10000 zeny, 1 Scarlet Dyestuff";
+ mes " - ^D5A500Yellow^000000: 10000 zeny, 1 Lemon Dyestuff";
+ mes " - ^AA00AAViolet^000000: 10000 zeny, 1 Violet Dyestuff";
+ mes " - ^FF8800Orange^000000: 10000 zeny, 1 Orange Dyestuff";
+ mes " - ^4422FFBlue^000000: 10000 zeny, 1 CobaltBlue Dyestuff";
+ mes " - ^009500Green^000000: 10000 zeny, 1 DarkGreen Dyestuff";
goto M_Menu;
L_End: