diff --git a/db/re/item_db.txt b/db/re/item_db.txt index bff0a407cc..337526bcfc 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -7520,6 +7520,13 @@ 14616,STR_Biscuit_Stick,Bar of Strength,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{} 14617,VIT_Biscuit_Stick,Bar of Fitness,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{} 14618,AGI_Biscuit_Stick,Bar of Agility,2,0,,10,,,,,0xFFFFFFFF,63,2,,,,,,{},{},{} +//14626,Indigo_Scroll +//14643,Violet_Scroll +//14664,Bi_Hwang_Scroll +//14665,Jung_Bi_Scroll +//14666,Je_Un_Scroll +//14667,Yong_Kwang_Scroll + // More Armors 15000,Bone_Plate,Bone Plate,5,20,,1000,,60,,1,0x000654E2,18,2,16,,85,1,0,{ bonus bStr,1; bonus bMdef,3; bonus2 bIgnoreDefRate,RC_DemiHuman,10; bonus2 bIgnoreDefRate,RC_Brute,10; bonus3 bAutoSpellWhenHit,"NPC_WIDEBLEEDING",1,10; },{},{} 15001,Odin's_Blessing_I,Odin's Blessing,5,0,,0,,10,,0,0xFFFFFFFE,63,2,16,,0,0,0,{},{},{} diff --git a/npc/re/cities/dicastes.txt b/npc/re/cities/dicastes.txt index 9d890c8795..4596ae58bf 100644 --- a/npc/re/cities/dicastes.txt +++ b/npc/re/cities/dicastes.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Gennosuke Kouga, Muad_Dib //===== Current Version: ===================================== -//= 1.2a +//= 1.3 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -14,11 +14,12 @@ //= 1.1 Standardized. [Euphy] //= 1.2 Updated to match the official script. [Joseph] //= 1.2a Moved Guide to a separate file. [Euphy] +//= 1.3 Updated to match official script [SkittleNugget] //============================================================ -dicastes01,194,159,5 script Excited Galten#a 492,{ - mes "[Excited Galten]"; +dicastes01,194,159,5 script Excited Galten#a 492,{ if (isequipped(2782)) { + mes "[Excited Galten]"; mes "I can't get beautiful"; mes "Ahat's image out of my head."; emotion e_lv; @@ -27,17 +28,18 @@ dicastes01,194,159,5 script Excited Galten#a 492,{ mes "will rule this land."; close; } - mes "¡ø¢²¢£ ¡Ð ¡ò¡ð¡ð"; - mes "¡÷¡ø¡ñ ¡ü ¡ü"; - mes "¡ù¢²¢³ ¢²"; - mes "¡ó¡õ¡ô ¢£ ¡Ð¡û¡ü ¡ò ¡ð¡ö¢£"; - mes "¢¤¡õ¡þ ¡÷ ¡ñ"; + mes "[Excited Galten]"; + mes "¡ø¢²¢£ ¡Ð ¡ò¡ð¡ð"; + mes "¡÷¡ø¡ñ ¡ü ¡ü"; + mes "¡ù¢²¢³ ¢² "; + mes "¡ó¡õ¡ô ¢£ ¡Ð¡û¡ü ¡ò ¡ð¡ö¢£"; + mes "¢¤¡õ¡þ ¡÷ ¡ñ"; close; } dicastes01,202,86,3 script Sentinel#a 492,{ - mes "[Sentinel]"; if (isequipped(2782)) { + mes "[Sentinel]"; mes "El Dicastes, the"; mes "capital city of Sapha."; mes "The land is pretty"; @@ -50,6 +52,7 @@ dicastes01,202,86,3 script Sentinel#a 492,{ mes "Hey, you are an outsider!"; close; } + mes "[Sentinel]"; mes "¡ô¢±¢± ¡û ¡ó¡Ð¡ñ ¢£ ¢¤¡ú"; mes "¡ø¡ó¢² ¢¤ "; mes "¡õ¡ó¡Ð ¢³ ¡Ð¡õ¢£ ¡û ¡ú¡ï"; @@ -63,13 +66,14 @@ dicastes01,202,86,3 script Sentinel#a 492,{ } dicastes01,194,95,5 script Sentinel#b 450,{ - mes "[Sentinel]"; if (isequipped(2782)) { + mes "[Sentinel]"; mes "I permit your entry."; mes "But if you dare to cause trouble"; mes "you won't know what hit you. Beware!"; close; } + mes "[Sentinel]"; mes "¡ø¡ô¡ü ¡ø ¡ó"; mes "¡ø¡ï¡û ¡ó ¡û¢¤¢² ¡÷ ¢£"; mes "¢¤¡ô¡ø ¢³ ¡÷¡û¡ö ¡õ ¡ø"; @@ -78,13 +82,14 @@ dicastes01,194,95,5 script Sentinel#b 450,{ dicastes01,234,158,0 script Training Galten#a 450,{ if (isequipped(2782)) { - mes "[Training Galten]"; + mes "[Training Galten]"; mes "I'll be ready for anything"; mes "if I keep up with my training every day."; close; } - mes "ø¡ô¡ü ¡¡ø¡ô¡ü ¡ø"; - mes "ô ¡ø"; + mes "[Training Galten]"; + mes "¡ó¢£¡ü ¡ú ¡÷¡û¡÷"; + mes "¡ó¡û¢¤ ¢£ ¡õ¡ú¡ü ¡Ð "; next; mes "Don't know what it means."; close; @@ -97,30 +102,30 @@ dicastes01,244,166,0 script Training Galten#b 450,{ mes "hard I am training."; close; } - mes "¡ø¡ô¡ü ¡ø"; - mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø"; + mes "[Training Galten]"; + mes "¡ú¡ü¢³ ¡ò ¢¤¡õ¡ó ¡ù "; + mes "¢²¡ö¡ò ¡û ¡ð¡ò¡ü"; next; mes "Don't know what it means."; close; } dicastes01,272,166,0 script Training Galten#c 450,{ - mes "[Training Galten]"; if (isequipped(2782)) { mes "[Training Galten]"; mes "I am a Sapha warrior."; mes "I am never lazy with my training."; close; } - mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü ¡ø"; - mes "¡ø¡ô¡ü ¡ø"; + mes "[Training Galten]"; + mes "¢²¡ô¡û ¡ø ¡ó¡ð¡ñ"; + mes "¡ø¡ö¢³ ¢² ¡ø¡ö¡û ¡Ð "; next; mes "Don't know what it means."; close; } dicastes01,248,129,0 script Training Galten#d 450,{ - mes "[Training Galten]"; if (isequipped(2782)) { mes "[Training Galten]"; mes "I heard this isn't training"; @@ -128,13 +133,28 @@ dicastes01,248,129,0 script Training Galten#d 450,{ mes "for trainees like me."; close; } - mes "¡ø¡ô¡ü ¡ø ¡ø¡ô¡ü"; - mes "¡ø¡ô¡ü ¡ø¡ ø¡ô¡ü ¡ø"; + mes "[Training Galten]"; + mes "¡û¡û¡ø ¢³ ¡ø¡Ð¢³ ¢² "; + mes "¡þ¢¤¡ó ¡õ ¡ü¡þ¡ï"; + mes "¡ú¡ô¡ó ¢¤ ¡û¡ñ"; next; mes "Don't know what it means."; close; } +dicastes01,271,152,0 script Training Galten#e 450,{ + if (isequipped(2782)){ + mes "[Training Galten]"; + mes "I will get great results"; + mes "if I do my best, right?"; + close; + } + mes "[Training Galten]"; + dialog "¡ø¢²¡û ¡ô ¢£¢³¡ô"; + dialog "¡ü¡ô"; + close; +} + dic_in01,349,282,4 script Waiting Galten#in_1 492,{ if (isequipped(2782)) { mes "[Waiting Galten]"; @@ -223,8 +243,8 @@ dic_in01,29,119,4 script Resting Piom#04 489,{ } dic_in01,91,113,5 script Suspicious Piom#a 489,{ - mes "[Suspicious Piom]"; if (isequipped(2782)) { + mes "[Suspicious Piom]"; mes "Have you heard of the"; mes "rumor about Ahat?"; next; @@ -249,6 +269,7 @@ dic_in01,91,113,5 script Suspicious Piom#a 489,{ mes "I am not going to say anything, either!"; close; } + mes "[Suspicious Piom]"; mes "¡ó¢³¡ó ¡ó ¡ó¡þ¡ö"; mes "¡õ ¢³¢²¡÷ ¡ó¡ó"; next; @@ -264,14 +285,15 @@ dic_in01,91,113,5 script Suspicious Piom#a 489,{ } dic_in01,168,116,5 script Tired Piom#c 491,{ - mes "[Tired Piom]"; if (isequipped(2782)) { + mes "[Tired Piom]"; mes "If you need any"; - mes "information, you'd should try your"; - mes "luck with the Cat Merchant rather than wander around here."; + mes "information, you'd have better"; + mes "luck with the Cat Merchant than wander around here."; mes "But of course you'll have to pay the price."; close; } + mes "[Tired Piom]"; mes "¡þ¡õ¡ð ¢³ ¢³¡þ"; mes "¡þ¡ø¡ð ¡ö ¡ñ¡ú¡ð ¡ò"; mes "¡ï¡ñ¡ú ¡ô ¡ö¡ö¡ò ¡û ¡ó¢¤¡ø ¡ø ¢² ¡ø"; @@ -280,15 +302,16 @@ dic_in01,168,116,5 script Tired Piom#c 491,{ } dic_in01,149,104,5 script Tired Piom#b 455,{ - mes "[Tired Piom]"; if (isequipped(2782)) { - mes "I feel so stiff..."; + mes "[Tired Piom]"; + mes "I feel sof stiff,"; mes "I will need another dose of Bradium."; mes "I think the effects are weaker than before,"; mes "or is it just me?"; emotion e_what; close; } + mes "[Tired Piom]"; mes "¡ð¡Ð¡ú ¡ø ¢²"; mes "¡ö¡õ¡ó ¢¤ ¡ò¡ò¢³ ¡ô ¡ô¡ó¡ñ"; mes "¢£¡ñ¡þ ¡ü ¢²¡û¡ó ¡ò ¡ð¡þ"; @@ -298,29 +321,31 @@ dic_in01,149,104,5 script Tired Piom#b 455,{ } dic_in01,341,113,3 script Tired Piom#a 491,{ - mes "[Tired Piom]"; if (isequipped(2782)) { - mes "Ahat is the one"; - mes "and only Sapha pride."; - mes "We have plenty of Bradium"; - mes "because of him!"; + mes "[Tired Piom]"; + mes "I think I look better in"; + mes "robes than in leather."; + mes "I may have to change to knitting."; + mes "But mining does seem to suit me."; next; - mes "[Thrilled Piom]"; - mes "..."; + mes "[Tired Piom]"; + mes "..." next; - mes "[Thrilled Piom]"; - mes "You don't feel his"; - mes "blessing?"; + emotion e_swt; + mes "[Tired Piom]"; + mes "I'll be rejected again, right?"; close; } + mes "[Tired Piom]"; mes "¡÷¡ò¡û ¡ó ¡ó¡Ð¢±"; mes "¡ó¡õ¡ù ¡þ ¡ò¢±¡ñ ¡õ ¢£"; mes "¡ü¡ð¢¤ ¡ù ¡ò¡ô¡õ ¡ò ¡ñ"; mes "¢³¡ú¢³ ¡Ð ¡ñ¡õ¡ù ¡÷ ¡÷¢±"; next; - mes "[Tired Piom]"; - mes "¡þ"; + mes"[Tired Piom]"; + mes"¡þ"; next; + emotion e_swt; mes "[Tired Piom]"; mes "¡ø¡ú¡ø ¢± ¡ö¡ò"; close; @@ -338,7 +363,7 @@ dic_in01,252,103,3 script Eating Adventurer#tre 711,{ next; mes "[Eating Adventurer]"; mes "I really would like a nice hot meal."; - mes "I go to this great little restaurant in Geffen often, and I really miss that place now."; + mes "I go to this great little restaurant in Geffen often and I really miss that place now."; close; } @@ -356,8 +381,8 @@ dic_in01,32,54,5 script Venknick#el_01 449,{ } dic_in01,372,116,3 script Thrilled Piom#a 490,{ - mes "[Thrilled Piom]"; if (isequipped(2782)) { + mes "[Thrilled Piom]"; mes "Ahat is the one"; mes "and only Sapha pride."; mes "We have plenty of Bradium"; @@ -369,7 +394,9 @@ dic_in01,372,116,3 script Thrilled Piom#a 490,{ mes "[Thrilled Piom]"; mes "You don't feel his"; mes "blessing?"; - close; } + close; + } + mes "[Thrilled Piom]"; mes "¡ò¡õ¢³ ¡õ ¡ô"; mes "¢£¡ó¡ø ¢² ¡ô¡÷"; mes "¡ò¡ô¢³ ¡ù ¢±¡ó¢± ¡õ"; @@ -385,13 +412,14 @@ dic_in01,372,116,3 script Thrilled Piom#a 490,{ } dic_in01,360,125,5 script Serious Venknicka 449,{ - mes "[Serious Venknick]"; if (isequipped(2782)) { + mes "[Serious Venknick]"; mes "A sudden increase in Bradium production."; mes "Why?"; mes "I will have to get more factory lines running."; close; } + mes "[Serious Venknick]"; mes "¡û¡õ¡ñ ¢² ¢²¢¤¡Ð ¢² ¡ü¡ñ¡õ"; mes "¡þ¡ó¡ö ¢²"; mes "¡ö¡÷¡û ¡ú ¡÷¡Ð¢³ ¢³"; @@ -445,9 +473,9 @@ dic_in01,42,250,5 script Guide#diel_1 489,{ close; } -dic_in01,335,34,0 script Talkative Piom#a 490,{ - mes "[Talkative Piom]"; +dic_in01,335,34,5 script Talkative Piom#a 490,{ if (isequipped(2782)) { + mes "[Talkative Piom]"; mes "At my factory"; mes "we not only refine Bradium,"; mes "but we also produce various"; @@ -456,6 +484,7 @@ dic_in01,335,34,0 script Talkative Piom#a 490,{ mes "here too."; close; } + mes "[Talkative Piom]"; mes "¡ü¡ù¢± ¢³"; mes "¡÷¡ø¡ï ¡þ ¡ó¡ó"; mes "¡ñ¡õ¡ò ¡ó ¡÷¡ü¡ù ¡ö"; @@ -466,27 +495,29 @@ dic_in01,335,34,0 script Talkative Piom#a 490,{ } dic_in01,387,30,1 script Manuk Piom#a 454,{ - mes "[Manuk Piom]"; if (isequipped(2782)) { - mes "You! We met in Manuk, didn't we?"; + mes "[Manuk Piom]"; + mes "You, We met in Manuk, didn't we?"; mes "I've come to pick up the weapon I ordered."; close; } + mes "[Manuk Piom]"; mes "¡ü¡ó¡þ ¡ó ¡ï¡ð¢¤ ¡ü ¡ð¢±"; mes "¡ù¡ô¡ï ¡ú ¡ñ¡ù¢³ ¡ó ¡ò¡ö¡ó ¡ô¡ô"; close; } dicastes01,282,210,4 script Free Knit#a 453,{ - mes "[Free Knit]"; if (isequipped(2782)) { + mes "[Free Knit]"; mes "As long as we have a steady"; - mes "supply of Bradium,"; + mes "supply of Bradium"; mes "Saphas can live forever."; mes "Our childhood lasts 10 years,"; mes "which is short."; close; } + mes "[Free Knit]"; mes "¡ñ¡þ¡ð ¡ó ¡ü¡ò¡ö ¡÷"; mes "¢³¡ð¡ï ¢£ ¡ù¡ô¡ò ¡ô ¡ó¡þ¡ñ ¢² ¡ñ¡û¢£ ¢²"; mes "¡ô¡ó¡ð ¡þ ¢£¡ð¢¤ ¡õ ¡û¢³¡ü"; @@ -495,9 +526,9 @@ dicastes01,282,210,4 script Free Knit#a 453,{ close; } -dicastes01,246,210,4 script Free Venknick#a 449,{ - mes "[Free Venknick]"; +dicastes01,246,210,3 script Free Venknick#a 449,{ if (isequipped(2782)) { + mes "[Free Venknick]"; mes "At least we have plenty of Bradium."; mes "Look,"; mes "You can see Bradium"; @@ -511,6 +542,7 @@ dicastes01,246,210,4 script Free Venknick#a 449,{ mes "but why are you interested in it?"; close; } + mes "[Free Venknick]"; mes "¡ô¡ï¢£ ¢¤ ¡÷¡õ¢± ¡ü ¡ñ¡õ"; mes "¡ü¢³"; mes "¡ö¡ù¢¤ ¢² ¡ù¡ó¡ô"; @@ -540,18 +572,17 @@ dicastes01,235,245,4 script Excited Piom#a 490,{ close; } -dicastes01,284,262,4 script Favorable Knit#a 453,{ - mes "[Favorable Knit]"; +dicastes01,284,262,3 script Favorable Knit#a 453,{ if (isequipped(2782)) { - mes "Unlike the Laphine, we Saphas"; + mes "[Favorable Knit]"; + mes "Unlike the Raphine, we Saphas"; mes "are a very close community."; mes "We start by living together in common facilities after we are born."; - next; - mes "[Favorable Knit]"; mes "That is why all Saphas are like family."; mes "We never have any quarrels between classes."; close; } + mes "[Favorable Knit]"; mes "¡ô¢±¡ó ¡õ ¡ú¡÷¡Ð ¡õ"; mes "¡ü¡ï¡Ð ¡õ ¡ô¡ó¡ü ¡ó ¢³"; mes "¡ñ¡ô¡ü ¡þ ¢¤¡ñ¢¤ ¡ô ¡û¡ï¡ù"; @@ -571,6 +602,7 @@ dicastes01,164,180,4 script Limpy Piom#a 489,{ emotion e_dots; close; } + mes "[Limpy Piom]"; mes "¢²¡ô¡þ ¡ù ¡õ¡Ð"; mes "¢³¡ô¡û ¡ú ¡ø"; mes "¢³¡þ¢¤ ¡ó ¡õ¡÷¡Ð"; @@ -592,8 +624,8 @@ dicastes01,191,202,4 script Complaining Galten#fihs 450,{ next; if(select("No:Yes") == 1) { mes "[Complaining Galten]"; - mes "You don't know about the legend behind the statue?"; - mes "Then I don't know what to talk about it with you."; + mes "Then you don't know about the legend behind the statue?"; + mes "Then, I don't know what to talk about with you."; close; } emotion e_gg,0,"Crazy Venknick#fihsing1"; @@ -628,7 +660,7 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 449,{ next; if(select("Give 5000 Zeny.:Don't give 5000 Zeny.") == 2) { mes "[Crazy Venknick]"; - mes "Don't come back with regrets."; + mes "Don't come back with regret."; close; } if (Zeny < 5000) { @@ -644,21 +676,25 @@ dicastes01,202,197,4 script Crazy Venknick#fihsing1 449,{ mes "Thanks."; emotion e_gg,0,"Complaining Galten#fihs"; next; - select("What is the sad legend?"); - emotion e_dots; - select("I asked what the sad legend is about!"); + mes "["+strcharinfo(0)+"]"; + mes "What is the sad legend?"; next; - mes "[Crazy Venknick]"; + emotion e_dots; + mes "["+strcharinfo(0)+"]"; + mes "I asked what the sad legend is about!"; + next; + mes "["+strcharinfo(0)+"]"; mes "I don't believe in legends."; next; emotion e_dots,1; - select("Was I tricked?"); + mes "["+strcharinfo(0)+"]"; + mes "Was I tricked?"; sc_start SC_Blind,20000,0; next; mes "You feel outraged at being tricked."; close; } - mes "[???¨²?¨´ ¡é3 ]"; + mes "[¡ö¡ú¡ù ¢³ ]"; mes "¢²¡û¡ó ¡ó ¡ù¢¤¡ø"; mes "¢¤¡ð¢² ¢± ¡ñ¡ö¢² ¡ø ¡ï¡ö¡ü"; next; diff --git a/npc/re/quests/quests_dicastes.txt b/npc/re/quests/quests_dicastes.txt index 9fe3164dce..4464edf54b 100644 --- a/npc/re/quests/quests_dicastes.txt +++ b/npc/re/quests/quests_dicastes.txt @@ -1139,6 +1139,7 @@ function script unknown_d { } close; } +prt_fild03,144,95,0 script Tree Roots 844,{ unknown_d(12166,902); } prt_fild09,371,255,0 script Reptile Tongues 844,{ unknown_d(12167,903); } prt_fild09,352,241,0 script Scorpion Tails 844,{ unknown_d(12168,904); } pay_fild02,177,108,0 script Stems 844,{ unknown_d(12169,905); } @@ -7373,24 +7374,26 @@ dic_fild01,259,172,3 duplicate(dic_enc#main) Mancho#pa0829 495 dic_in01,353,37,5 duplicate(dic_enc#main) Kareka#pa0829 454 dic_fild01,228,159,4 script Jahbong#pa0829 496,{ - mes "[Jahbong]"; if (countitem(6304) < 1) { + mes "[Jahbong]"; mes "You haven't received a Sapha Certification yet?"; next; mes "[Jahbong]"; mes "Come back to me once you have one. I'll give you something good in exchange."; close; } - set .@cattalkj,rand(1,9); - if (.@cattalkj == 1) mes "Don't touch my back! I might bite you unconsciously."; - else if (.@cattalkj == 2) mes "Pub owner Shay carried something away to make something strange! Be careful!"; - else if (.@cattalkj == 3) mes "We cats can jump 5 times our size. Isn't it cool? But then, don't ask me to jump from here now."; - else if (.@cattalkj == 4) mes "I have to be diligent with my grooming to maintain beautiful fur."; - else if (.@cattalkj == 5) mes "I have to groom myself everyday to maintain shiny fluffy fur. But I don't have very nice fur in the first place. Very sad."; - else if (.@cattalkj == 6) mes "You should receive a Sapha Certification with both paws as a sign of respect. No cat deserves a certification if they don't!"; - else if (.@cattalkj == 7) mes "I don't really talk that much! Ahat looks like... meow meow meooow... sorry."; - else if (.@cattalkj == 8) mes "Meow~~~~~~~~~~"; - else mes "Yarn is a great way to calm a cat."; + mes "[Jahbong]"; + switch (rand(1,9)) { + case 1: mes "Don't touch my back! I might bite you unconsciously."; + case 2: mes "Pub owner Shay carried something away to make something strange! Be careful!"; + case 3: mes "We cats can jump 5 times our size. Isn't it cool? But then, don't ask me to jump from here now."; + case 4: mes "I have to be diligent with my grooming to maintain beautiful fur."; + case 5: mes "I have to groom myself everyday to maintain shiny fluffy fur. But I don't have very nice fur in the first place. Very sad."; + case 6: mes "You should receive a Sapha Certification with both paws as a sign of respect. No cat deserves a certification if they don't!"; + case 7: mes "I don't really talk that much! Ahat looks like... meow meow meooow... sorry."; + case 8: mes "Meow~~~~~~~~~~"; + case 9: mes "Yarn is a great way to calm a cat."; + } next; mes "[Jahbong]"; mes "Why are you here?";