summaryrefslogtreecommitdiff
path: root/npc/quests/skills
diff options
context:
space:
mode:
Diffstat (limited to 'npc/quests/skills')
-rw-r--r--npc/quests/skills/acolyte_skills.txt2
-rw-r--r--npc/quests/skills/archer_skills.txt10
-rw-r--r--npc/quests/skills/blacksmith_skills.txt2
-rw-r--r--npc/quests/skills/crusader_skills.txt4
-rw-r--r--npc/quests/skills/mage_skills.txt10
-rw-r--r--npc/quests/skills/merchant_skills.txt26
-rw-r--r--npc/quests/skills/novice_skills.txt28
-rw-r--r--npc/quests/skills/swordman_skills.txt30
-rw-r--r--npc/quests/skills/thief_skills.txt14
9 files changed, 63 insertions, 63 deletions
diff --git a/npc/quests/skills/acolyte_skills.txt b/npc/quests/skills/acolyte_skills.txt
index a9d76c5b6..6534d2621 100644
--- a/npc/quests/skills/acolyte_skills.txt
+++ b/npc/quests/skills/acolyte_skills.txt
@@ -104,7 +104,7 @@ L_Check:
set HOLYLIGHT, 0;
mes "[Priest]";
mes "You have done well. May God bless you!";
- emotion 21;
+ emotion e_no1;
close;
L_LowLvl:
diff --git a/npc/quests/skills/archer_skills.txt b/npc/quests/skills/archer_skills.txt
index 226d86179..5c2a98012 100644
--- a/npc/quests/skills/archer_skills.txt
+++ b/npc/quests/skills/archer_skills.txt
@@ -30,7 +30,7 @@ L_Other:
mes "Eh?... First time seeing an archer of something? Why don't you just";
mes "go about your business and leave me be. I only talk to high level";
mes "Archer types........";
- emotion 1;
+ emotion e_what;
close;
L_Start:
if (BaseJob==Job_Archer && JobLevel<35) goto L_LowLvl;
@@ -74,17 +74,17 @@ L_Start:
mes "13 Trunks,";
mes "1 Red potion^000000";
set ARWCRFT, 1;
- emotion 5;
+ emotion e_ic;
close;
M_1:
mes "[Roberto]";
mes "................................................................";
- emotion 7;
+ emotion e_ag;
next;
mes "[Roberto]";
mes "Let me teach you this special skill.... It's called, my boot up";
mes "your A........";
- emotion 32;
+ emotion e_pif;
next;
mes "!!!!SMACK!!!!";
percentheal -5,0;
@@ -134,7 +134,7 @@ L_GotSkill:
L_LowLvl:
mes "Hmm?... Do you have something to say to me? Unfortunately I have";
mes "nothing to say to you.....";
- emotion 1;
+ emotion e_what;
next;
mes "[Roberto]";
mes "It's sad but conversations with people who have ^5533FFlow job levels^000000 such";
diff --git a/npc/quests/skills/blacksmith_skills.txt b/npc/quests/skills/blacksmith_skills.txt
index 10976c760..f61877589 100644
--- a/npc/quests/skills/blacksmith_skills.txt
+++ b/npc/quests/skills/blacksmith_skills.txt
@@ -51,7 +51,7 @@ L_nosmith:
mes "Geffen is such a great town.";
mes "Don't you think so too?";
next;
- emotion 23;
+ emotion e_omg;
mes "[Goodday]";
mes "WHAT...";
mes "You don't!";
diff --git a/npc/quests/skills/crusader_skills.txt b/npc/quests/skills/crusader_skills.txt
index 481a5f926..fd215d761 100644
--- a/npc/quests/skills/crusader_skills.txt
+++ b/npc/quests/skills/crusader_skills.txt
@@ -61,7 +61,7 @@ geffen.gat,110,118,3 script Ford 752,{
mes "Time to roll my lucky dice.";
mes "Good luck, I almost never lose.";
//TODO: add DICE emotions? 8)
- emotion 29;
+ emotion e_gg;
next;
if(rand(1,6)!=3) goto L_lose;
emotion 58;
@@ -71,7 +71,7 @@ geffen.gat,110,118,3 script Ford 752,{
mes "[Ford]";
mes "I can't believe I lost!";
mes "I NEVER lose...";
- emotion 28;
+ emotion e_sob;
close;
L_noitems:
diff --git a/npc/quests/skills/mage_skills.txt b/npc/quests/skills/mage_skills.txt
index 1f987e663..fe79c2ca9 100644
--- a/npc/quests/skills/mage_skills.txt
+++ b/npc/quests/skills/mage_skills.txt
@@ -24,7 +24,7 @@ geffen_in.gat,151,119,4 script BLIZZARDRISS 71,{
L_Other:
mes "What new magic spells will I discover today......??";
- emotion 20;
+ emotion e_hmm;
close;
L_Start:
@@ -70,7 +70,7 @@ L_Start:
sM_End:
mes "[BLIZZARDRISS]";
mes "Hmf! Suit yourself. Don't come complaining to me when get beat up by a bunch of spores!!";
- emotion 6;
+ emotion e_an;
close;
M_End:
@@ -93,12 +93,12 @@ L_GetSkill:
set ENRGYCOAT,0;
mes "[BLIZZARDRISS]";
mes "You can now use the spell, 'Energy Coat'!! Use it wisely my friend!";
- emotion 21;
+ emotion e_no1;
close;
L_JobLvl:
mes "Didn't you listen to my explanation? You need a job level of at least 35 to learn 'Energy Coat'.";
- emotion 1;
+ emotion e_what;
close;
L_Items:
@@ -107,7 +107,7 @@ L_GetSkill:
mes " 1 One Carat Diamond,";
mes " 5 Shells,^000000";
mes " and ^5533FF1 Solid shell^000000.";
- emotion 1;
+ emotion e_what;
close;
L_GotSkill:
diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt
index 88a4ffb4d..a5a4780e5 100644
--- a/npc/quests/skills/merchant_skills.txt
+++ b/npc/quests/skills/merchant_skills.txt
@@ -41,7 +41,7 @@ L_Start:
if (CRAZYROAR == 1) goto L_GetSkill;
mes "Oh! Did you come here because you were intrigued by my boisterous voice? My voice is quite loud, isn't it?";
mes "Afterall you did hear it from a far off distance.";
- emotion 1;
+ emotion e_what;
next;
mes "[Necko]";
mes "I'll let you in on something....... My voice is more than just loud..... it's actually quite unique......";
@@ -49,7 +49,7 @@ L_Start:
mes "[Necko]";
if(BaseJob==Job_Merchant && JobLevel < 15) goto L_JobLvl;
mes "You see, I know a skill that lets me shout in a way that actually helps me.... It is the ^3355FFCrazy Uproar^000000 skill!!!";
- emotion 5;
+ emotion e_ic;
next;
mes "[Necko]";
mes "Crazy Uproar uses your loud voice to boost your battle spirit!";
@@ -101,7 +101,7 @@ L_GetSkill:
mes "Raaaaaawwwwrrrrrrrrrrr!....... Ha ha!! Execellent. Your voice is now finely tuned for ^3355FFCrazy Uproar^000000. Good job.";
skill 155,1,0;
set CRAZYROAR, 0;
- emotion 21;
+ emotion e_no1;
close;
L_Items:
@@ -192,7 +192,7 @@ L_Start:
if (CARTREVO == 1) goto L_GetSkill;
mes "[Gershaun]";
mes "Hmm... a young merchant. You must use carts too right? Since to have to do all of that vending..... But is that all you use your cart for?";
- emotion 20;
+ emotion e_hmm;
next;
mes "[Gershaun]";
mes "I researched some ways of using the cart differently. One way involved cooking ramen and another involved jump-roping (don't ask).";
@@ -203,7 +203,7 @@ L_Start:
M_0:
mes "[Gershuan]";
mes "You KNOW what I MEAN!! HOW the HECK would YOU KNOW what I MEAN????";
- emotion 23;
+ emotion e_omg;
close;
M_1:
mes "[Gershuan]";
@@ -212,15 +212,15 @@ L_Start:
mes "[Gershuan]";
mes "Then I crossed paths with a very strong monster! I knew immediately that my life was in danger!";
mes "I thought to myself, 'Why me! A weaponless, amorless merchant!?'";
- emotion 0;
+ emotion e_gasp;
next;
mes "[Gershuan]";
mes "I was scared to death... hoping that this would not be the end of me. With what strength I had left, I tried a desperation move.....";
- emotion 19;
+ emotion e_swt2;
next;
mes "[Gershuan]";
mes "I used my cart to attack the monster!!";
- emotion 0;
+ emotion e_gasp;
next;
mes "[Gershuan]";
mes "Just like that the monster was defeated!! Finally I had found another exellent use for the cart! A WEAPON!!!";
@@ -228,7 +228,7 @@ L_Start:
mes "[Gershuan]";
mes "I called my new found discovery ^3355FF'Cart Revolution'^000000!";
mes "By using ^FF553312 sp^000000 you can spin your cart around your body doing major damage to an enemy!";
- emotion 5;
+ emotion e_ic;
next;
mes "[Gershuan]";
mes "The heavier your cart is, the more damage it will do. Would you like to learn this skill?";
@@ -259,7 +259,7 @@ L_Start:
sM_1:
mes "[Sushi King Gershuan]";
mes "Stupid!! You're waaay to young to even try your hand at sushi!!";
- emotion 6;
+ emotion e_an;
close;
L_GetSkill:
@@ -280,20 +280,20 @@ L_GetSkill:
next;
mes "[Gershuan]";
mes "Eh....... that was terrible.... Okay, lets try again.....";
- emotion 4;
+ emotion e_swt;
next;
mes "~many hours later~";
next;
mes "[Gershuan]";
mes "YES!!! FINALLY! I could REALLY FEEL the power in that swing!";
mes "Give yourself a good pat on the back becuase you have just mastered Cart Revolution!";
- emotion 21;
+ emotion e_no1;
next;
skill 153,1,0;
set CARTREVO, 0;
mes "[Gershuan]";
mes "Take care of yourself and remember to fill that cart up so that it can do some major damage.";
- emotion 29;
+ emotion e_gg;
close;
L_GotSkill:
diff --git a/npc/quests/skills/novice_skills.txt b/npc/quests/skills/novice_skills.txt
index a149c87b4..9b10239d6 100644
--- a/npc/quests/skills/novice_skills.txt
+++ b/npc/quests/skills/novice_skills.txt
@@ -46,7 +46,7 @@ prt_in.gat,235,133,4 script Nurse Aid 90,{
next;
mes "[Nurse Aid]";
mes "That's why I've decided to teach people how to heal themselves! Would you like me to teach you?";
- emotion 5;
+ emotion e_ic;
next;
menu "Would you??",sM_Yes, "(...she's nuts!...run!!!)",sM_No;
@@ -66,7 +66,7 @@ prt_in.gat,235,133,4 script Nurse Aid 90,{
sM_No:
mes "[Nurse Aid]";
mes "Hey!...Where are you running too??...";
- emotion 4;
+ emotion e_swt;
close;
L_GetAid:
@@ -83,7 +83,7 @@ L_GetAid:
set got_bandage,0;
mes "[Nurse Aid]";
mes "YES! You finally got it. Now you can heal yourself and continue fighting those bad monsters. Well, take care.";
- emotion 21;
+ emotion e_no1;
close;
L_GotAid:
@@ -100,11 +100,11 @@ prt_in.gat,73,87,2 script Bulma 98,{
L_Other:
mes "Yeah... I look great.... Afterall, I'm a Knight of the Prontera Chivalry. Kuhahahaha!";
- emotion 18;
+ emotion e_heh;
next;
mes "[Bulma]";
mes "It hasn't been that long since I became a Knight, but I still look good as one right? What do you think???";
- emotion 20;
+ emotion e_hmm;
close;
L_Novice:
@@ -129,7 +129,7 @@ L_Start:
next;
mes "[Bulma]";
mes "Hmm..... actually I might be able to help you out........";
- emotion 20;
+ emotion e_hmm;
next;
mes "[Bulma]";
mes "What's this? Ha ha, don't look so surprised. What I have to offer will be very useful to you.";
@@ -163,11 +163,11 @@ L_Start:
next;
mes "[Bulma]";
mes "Kekekeke..... Just kidding! The pill actually helps you stay calm, nothing more.";
- emotion 18;
+ emotion e_heh;
next;
mes "[Bulma]";
mes "Well get going... GO! GO! GO! RUN!!!";
- emotion 27;
+ emotion e_go;
set PLAYDEAD, 1;
close;
@@ -194,11 +194,11 @@ L_GetSkill:
mes "[Bulma]";
mes "Ok, lights, camera, ACTION! Yes... yes... YES!! That's it!! As I watch you laying there I TRULLY believe that you are dead.";
mes "What a wonderful performance! BRAVO! BRAVO!";
- emotion 0;
+ emotion e_gasp;
next;
mes "[Bulma]";
mes "With the right motivation and focus you will be able to play dead anywhere at any given moment. Congratulations on mastering this skill.";
- emotion 21;
+ emotion e_no1;
skill 143,1,0;
set PLAYDEAD, 0;
set got_novnametag,0;
@@ -206,11 +206,11 @@ L_GetSkill:
sL_NotRdy:
mes "HEY! What are you doing here? It's irresponsible of you to still be here while your time is running out.........";
- emotion 0;
+ emotion e_gasp;
next;
mes "[Bulma]";
mes "Now GO! Run! Run! RUN!!";
- emotion 27;
+ emotion e_go;
close;
L_GotSkill:
@@ -230,7 +230,7 @@ prt_castle.gat,174,147,2 script Newbie Assistant 84,{
L_NonNov:
mes "What am I doing here? I'm just trying to help out young newbies. You remember how it was to be a newbie... confused.... lost.... heh heh.";
- emotion 1;
+ emotion e_what;
close;
L_Start:
if(FIRSTAID==1 && countitem(930)==0 && got_bandage!=1) goto L_Aid;
@@ -250,7 +250,7 @@ L_Aid:
next;
mes "[Newbie Assistant]";
mes "Her beauty, her grace, sometimes I wish........ (blushes).......... um.... well...err... tell her I said hello.";
- emotion 3;
+ emotion e_lv;
close;
L_Play:
mes "So Bulma sent you uh.... okay here you go.";
diff --git a/npc/quests/skills/swordman_skills.txt b/npc/quests/skills/swordman_skills.txt
index 36185ee11..c362d42ae 100644
--- a/npc/quests/skills/swordman_skills.txt
+++ b/npc/quests/skills/swordman_skills.txt
@@ -31,7 +31,7 @@ prt_in.gat,75,88,5 script Leon 85,{
next;
mes "[Leon]";
mes "Are you here to learn more about the Chivalry, or are you hear to bask in the glory of us Knights? Hahahaha!";
- emotion 18;
+ emotion e_heh;
close;
L_Novice:
@@ -52,7 +52,7 @@ L_Start:
next;
mes "[Leon]";
mes "You must enjoy using ^0000ff'Bash'^000000, huh? Hahaha!";
- emotion 18;
+ emotion e_heh;
next;
mes "[Leon]";
if(sex==1)mes "I like a Swordsman who isn't afraid to use a powerfull skill such as that.";
@@ -109,7 +109,7 @@ L_Start:
next;
mes "[*Sushi King* Leon]";
mes "Mmmmm..... I love sushi!!!";
- emotion 33;
+ emotion e_ok;
close;
L_Check:
@@ -134,7 +134,7 @@ L_Check:
next;
mes "[Leon]";
mes "Yes! That's it! You have just mastered Fatal Blow!";
- emotion 21;
+ emotion e_no1;
next;
skill 145,1,0;
set FATALBLOW,0;
@@ -155,7 +155,7 @@ L_Done:
next;
mes "[Leon]";
mes "Go on and Bash the heck out of those monsters! Hahaha.";
- emotion 18;
+ emotion e_heh;
close;
}
@@ -175,7 +175,7 @@ L_Start:
if (getskilllv(144)>0) goto L_GotSkill;
mes "Oh no! You must have been hurt in battle! Are you ok?";
mes "It must have been a hard fought battle for you to recieve such serious injuries....";
- emotion 19;
+ emotion e_swt2;
next;
mes "[Knight De Thomas]";
mes "Being a Swordsman or Knight comes with a lot of responsiblity and requires a great deal of self sacrifice.";
@@ -208,17 +208,17 @@ L_Start:
mes "[Knight De Thomas]";
mes "Don't you think it's sad that I have to stay in once place everyday without even being able to go outside??";
mes "Please.... find a pair of Moth Wings for my niece?.... (~sniff~sniff~)....";
- emotion 28;
+ emotion e_sob;
next;
mes "[Knight De Thomas]";
mes "If you don't..... I won't teach you anything!! Muahahahaha!!";
- emotion 29;
+ emotion e_gg;
set MOVHPREC, 1;
close;
M_End:
mes "[Knight De Thomas]";
mes "What?? What did you say?.....";
- emotion 1;
+ emotion e_what;
close;
L_Check:
@@ -243,7 +243,7 @@ L_Check:
next;
mes "[Knight De Thomas]";
mes "Congratulations on learning the new skill and thank you for the Moth Wings! ^_^";
- emotion 21;
+ emotion e_no1;
close;
L_NoItems:
@@ -273,7 +273,7 @@ L_Other:
next;
mes "[Juan]";
mes "Who am I? Oh, I'm just a kind knight named Juan. Don't mind me. Hahahaha....";
- emotion 18;
+ emotion e_heh;
close;
L_Start:
@@ -320,7 +320,7 @@ L_Start:
M_1:
mes "[Juan]";
mes "Bleh! Have you been a fool all of your life?? Go away and don't talk to me.";
- emotion 32;
+ emotion e_pif;
close;
M_3:
mes "[Juan]";
@@ -334,7 +334,7 @@ L_Start:
next;
mes "[Juan]";
mes "You can go on your way now.";
- emotion 33;
+ emotion e_ok;
close;
L_Check:
@@ -353,7 +353,7 @@ L_Check:
next;
mes "[Juan]";
mes "Muhahahaha!! Don't hold back young warrior, fight without any fears or regrets!!";
- emotion 29;
+ emotion e_gg;
close;
L_NoItems:
@@ -368,6 +368,6 @@ L_GotSkill:
mes "You have the eyes of a person who has seen death first hand!!";
mes "But, because of Berserk, I'm sure you have been able to escape it many times as well.";
- emotion 0;
+ emotion e_gasp;
close;
}
diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt
index b6f5fabee..5e678ba60 100644
--- a/npc/quests/skills/thief_skills.txt
+++ b/npc/quests/skills/thief_skills.txt
@@ -187,18 +187,18 @@ L_Sand:
next;
mes "[Alcouskou]";
mes "THROW IT AT ME!!!";
- emotion 27;
+ emotion e_go;
next;
mes "[Alcouskou]";
mes "(AHHH!! My EYES!!! Son of a)......... ya see how effective that was........ (JEEZE that STINGS!!).......";
- emotion 23;
+ emotion e_omg;
next;
mes "[Alcouskou]";
mes "Anyways that's all there is too it....... (CRAP that's a lot of sand!!).... So yeah, Sand Attack, use it as a last resort...... (AWW MAN!!)";
next;
mes "[Alcouskou]";
mes "Oh and it does Earth Property damage....... (I gota finda better way to teach this).........";
- emotion 4;
+ emotion e_swt;
skill 149,1,0;
set SANDATTACK, 0;
set BAGNFNTY, 0;
@@ -216,7 +216,7 @@ L_Sand:
close;
L_GotSand:
mes "Oh your back... hopefully not to throw anymore sand in my eyes, heh heh.... heh........ heh..............";
- emotion 4;
+ emotion e_swt;
close;
L_Back:
@@ -271,7 +271,7 @@ L_Find:
next;
mes "[Alcouskou]";
mes "Very good. You have chosen some fine stones. This tells me that you have now perfected the Find Stone skill.";
- emotion 21;
+ emotion e_no1;
skill 151,1,0;
set FINDSTONE, 0;
next;
@@ -306,13 +306,13 @@ L_Fling:
next;
mes "[Alcouskou]";
mes "Open your eyes! SEE THE TARGET!! Throw the stone at the target as if you were hurrling yourself towards it! DO IT NOW!!";
- emotion 27;
+ emotion e_go;
next;
mes "!!Whooooossshh!!................. !!Thwack!!";
next;
mes "[Alcouskou]";
mes "Haha! Excellent! It's a bullseye. You have now masterd Stone Fling, congratulations.";
- emotion 21;
+ emotion e_no1;
skill 152,1,0;
set STONEFLING, 0;
next;