diff options
Diffstat (limited to 'npc/merchants/clothes_dyer.txt')
| -rw-r--r-- | npc/merchants/clothes_dyer.txt | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt index 34c7fb7b2..431a51cab 100644 --- a/npc/merchants/clothes_dyer.txt +++ b/npc/merchants/clothes_dyer.txt @@ -50,7 +50,7 @@ function Dyes; mes .n$; mes "How may I assist you?"; next; - switch(select("- Talk:- Dye Clothing:- Price List:- ^777777Cancel^000000")) { + switch(select("- Talk", "- Dye Clothing", "- Price List", "- ^777777Cancel^000000")) { case 1: mes .n$; mes "Life may have gotten a bit better, but when I look at all of the orders I've received... Whew!"; @@ -89,40 +89,40 @@ function Dyes; // Colors: [1]Orange, [2]Violet, [3]Red, [4]Black, [5]Green, [6]Blue, [7]White, [8]Yellow switch(BaseJob) { case Job_Novice: - if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,3,2,5,3,4,4); + if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(6,1,3,2,5,3,4,4); case Job_Swordman: - if (Sex) Dyes(4,1,6,2,5,3); else Dyes(3,1,5,3,4,4); + if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(3,1,5,3,4,4); case Job_Mage: - if (Sex) Dyes(3,1,2,2,1,3,7,4); else Dyes(3,1,2,2,7,3,4,4); + if (Sex == SEX_MALE) Dyes(3,1,2,2,1,3,7,4); else Dyes(3,1,2,2,7,3,4,4); case Job_Archer: - if (Sex) Dyes(4,1,2,2,5,3); else Dyes(3,1,5,2,7,3,4,4); + if (Sex == SEX_MALE) Dyes(4,1,2,2,5,3); else Dyes(3,1,5,2,7,3,4,4); case Job_Acolyte: - if (Sex) Dyes(6,1,3,2,7,3,4,4); else Dyes(3,1,5,3,4,4); + if (Sex == SEX_MALE) Dyes(6,1,3,2,7,3,4,4); else Dyes(3,1,5,3,4,4); case Job_Merchant: - if (Sex) Dyes(4,1,6,2,5,3); else Dyes(2,1,5,3,4,4); + if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(2,1,5,3,4,4); case Job_Thief: - if (Sex) Dyes(5,1,3,2,7,4); else Dyes(3,1,7,3,4,4); + if (Sex == SEX_MALE) Dyes(5,1,3,2,7,4); else Dyes(3,1,7,3,4,4); case Job_Knight: case Job_Crusader: - if (Sex) Dyes(2,1,3,3,4,4); else Dyes(6,1,7,3,4,4); + if (Sex == SEX_MALE) Dyes(2,1,3,3,4,4); else Dyes(6,1,7,3,4,4); case Job_Priest: case Job_Monk: - if (Sex) Dyes(6,1,5,2,3,3,7,4); else Dyes(3,1,5,2,7,3,4,4); + if (Sex == SEX_MALE) Dyes(6,1,5,2,3,3,7,4); else Dyes(3,1,5,2,7,3,4,4); case Job_Wizard: case Job_Sage: - if (Sex) Dyes(6,1,5,3,4,4); else Dyes(3,1,6,2,7,3,5,4); + if (Sex == SEX_MALE) Dyes(6,1,5,3,4,4); else Dyes(3,1,6,2,7,3,5,4); case Job_Blacksmith: case Job_Alchemist: - if (Sex) Dyes(4,4,5,2,7,3); else Dyes(3,1,5,2,2,3,4,4); + if (Sex == SEX_MALE) Dyes(4,4,5,2,7,3); else Dyes(3,1,5,2,2,3,4,4); case Job_Hunter: case Job_Bard: case Job_Dancer: - if (Sex) Dyes(4,1,6,2,5,3); else Dyes(6,1,5,3,2,4); + if (Sex == SEX_MALE) Dyes(4,1,6,2,5,3); else Dyes(6,1,5,3,2,4); case Job_Assassin: case Job_Rogue: - if (Sex) Dyes(6,1); else Dyes(4,1,8,2,7,3); + if (Sex == SEX_MALE) Dyes(6,1); else Dyes(4,1,8,2,7,3); case Job_SuperNovice: - if (Sex) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4); + if (Sex == SEX_MALE) Dyes(2,1,6,2,5,3,4,4); else Dyes(6,1,3,2,5,3,4,4); default: mes "Wow, I've never seen clothes like that before! I'm sorry, but I don't think I can paint it."; close; @@ -165,7 +165,7 @@ function Dyes { mes "the default for free."; mes "Are you sure?"; next; - switch(select("Yes:No")) { + switch(select("Yes", "No")) { case 1: mes .n$; setlook 7,0; |