From a22d29d0cb2f6cc74840caa61b812feca5eee590 Mon Sep 17 00:00:00 2001 From: masao87 Date: Sun, 1 Jul 2012 14:13:56 +0000 Subject: - Fixed a bug in Eden Group Quests where a variable was set which was supposed to be converted and give the player certain gears. bugreport:6143 - Fixed an Priest Quest cutin which would result in getting an missing file error of the MvP Mistress Card illustration. bugreport:6144 - Fixed EXP Values in Eden Group Quest Boards 86 - 90 and 91 - 99. Source: http://irowiki.org/wiki/Eden_Group_Leveling_Quests * 3 Hours cooldown isn't added yet since some testing is needed. bugreport:6110 - Some minor paranthesis fix in Knight Jobchange Quest. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16362 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/2-1/knight.txt | 4 +- npc/jobs/2-1/priest.txt | 6 +- npc/quests/eden/86-90.txt | 205 +++++++++++++++++++++++++++++++++++++--- npc/quests/eden/91-99.txt | 64 ++++++------- npc/quests/eden/eden_quests.txt | 4 +- npc/quests/quests_13_1.txt | 5 +- 6 files changed, 234 insertions(+), 54 deletions(-) (limited to 'npc') diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index 6700dd85f..bd4771e25 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -2204,7 +2204,7 @@ prt_in,87,92,4 script Sir Gray#knt 119,{ close; } else { - if (Zeny > 73999 && countitem(999) > 0 && BaseJob == Job_Knight) { + if ((Zeny > 73999) && (countitem(999) > 0) && (BaseJob == Job_Knight)) { mes "[Sir Gray]"; mes "You are ready!"; mes "You must know the"; @@ -2228,7 +2228,7 @@ prt_in,87,92,4 script Sir Gray#knt 119,{ mes "You attained a reliable item."; mes "It'll be a good companion on your adventures."; delitem 999,1; //Steel - set zeny,zeny-74000; + set Zeny, Zeny - 74000; getitem 1163,1; //Claymore close; } diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt index 3819e093d..8aadc429b 100644 --- a/npc/jobs/2-1/priest.txt +++ b/npc/jobs/2-1/priest.txt @@ -1391,7 +1391,7 @@ OnTouch: mes "[Deviruchi]"; mes "But how about this...? Now, isn't this an attractive sight? A nice, shiny new card. Mint condition. Not too many people have this you know. But I happen to have soooo many, my pockets hurt."; next; - cutin "�̽�Ʈ����ī��.bmp",4; + cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",4; mes "[Deviruchi]"; mes "Isn't it everyone's dream to have one of these? Think about it, being a Priest can only bring you suffering..."; next; @@ -1401,7 +1401,7 @@ OnTouch: mes "This card can"; mes "can be yours..."; next; - cutin "�̽�Ʈ����ī��.bmp",255; + cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",255; mes "[Deviruchi]"; mes "Theoretically!"; mes "BWAHAHAHAHAHAHAHA!"; @@ -1410,7 +1410,7 @@ OnTouch: warp "mjolnir_05",200,200; end; } - cutin "�̽�Ʈ����ī��.bmp",255; + cutin "¹Ì½ºÆ®·¹½ºÄ«µå.bmp",255; mes "[Deviruchi]"; mes "Did..."; mes "Did you just tell"; diff --git a/npc/quests/eden/86-90.txt b/npc/quests/eden/86-90.txt index 799ec994f..9aac942ba 100644 --- a/npc/quests/eden/86-90.txt +++ b/npc/quests/eden/86-90.txt @@ -20,7 +20,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "- this bulletin board. -"; close; } - if (BaseLevel < 86 || BaseLevel > 90) { + if (BaseLevel < 86) { mes "- This missions can only be -"; mes "- read by those who are -"; mes "- of the correct level. -"; @@ -29,6 +29,185 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "- my level. -"; close; } + if (BaseLevel > 90) { + if (checkquest(4167,HUNTING) == 2) { + mes "You hunted all 30 Dragon Tail."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4167; + getexp 76000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4168,HUNTING) == 2) { + mes "You hunted all 30 Spring Rabbit."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4168; + getexp 82000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4169,HUNTING) == 2) { + mes "You hunted all 30 Pest."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4169; + getexp 82000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4170,HUNTING) == 2) { + mes "You hunted all 30 Bathory."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4170; + getexp 72000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4171,HUNTING) == 2) { + mes "You hunted all 30 Alarm."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4171; + getexp 76000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4172,HUNTING) == 2) { + mes "You hunted all 30 Baba Yaga."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4172; + getexp 72000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4173,HUNTING) == 2) { + mes "You hunted all 30 Hyegun."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4173; + getexp 117000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4174,HUNTING) == 2) { + mes "You hunted all 30 Firelock Soldier."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4174; + getexp 82000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4175,HUNTING) == 2) { + mes "You hunted all 30 Zipper Bear."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4175; + getexp 120000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4176,HUNTING) == 2) { + mes "You hunted all 30 Earth Petite."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4176; + getexp 72000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4177,HUNTING) == 2) { + mes "You hunted all 30 Rafflesia."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4177; + getexp 72000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4178,HUNTING) == 2) { + mes "You hunted all 30 Venomous."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4178; + getexp 72000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4179,HUNTING) == 2) { + mes "You hunted all 30 Pitman."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4179; + getexp 86000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else if (checkquest(4180,HUNTING) == 2) { + mes "You hunted all 30 Yellow Novus."; + mes "Thank you very much."; + next; + mes "I know it isn't much but here's a small gift."; + mes "I hope that it helps you at least a little bit."; + next; + erasequest 4180; + getexp 80000,0; + mes "Wooohoo!"; + mes "Good luck."; + close; + } else { + mes "- This missions can only be -"; + mes "- read by those who are -"; + mes "- of the correct level. -"; + mes "- There might be another -"; + mes "- board somewhere for -"; + mes "- my level. -"; + close; + } + } mes "- Many hunting missions -"; mes "- are on the bulletin board. -"; next; @@ -67,7 +246,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4168; - getexp 76000,0; + getexp 82000,0; mes "Wooohoo!"; mes "Good luck."; close; @@ -90,7 +269,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4169; - getexp 76000,0; + getexp 82000,0; mes "Wooohoo!"; mes "Good luck."; close; @@ -116,7 +295,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4170; - getexp 76000,0; + getexp 72000,0; mes "Wooohoo!"; mes "Good luck."; close; @@ -165,7 +344,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4172; - getexp 76000,0; + getexp 72000,0; mes "Wooohoo!"; mes "Good luck."; close; @@ -188,7 +367,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4173; - getexp 76000,0; + getexp 117000,0; mes "Wooohoo!"; mes "Good luck."; close; @@ -211,7 +390,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4174; - getexp 76000,0; + getexp 82000,0; mes "Wooohoo!"; mes "Good luck."; close; @@ -234,7 +413,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4175; - getexp 76000,0; + getexp 120000,0; mes "Wooohoo!"; mes "Good luck."; close; @@ -260,7 +439,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4176; - getexp 76000,0; + getexp 72000,0; mes "Wooohoo!"; mes "Good luck."; close; @@ -283,7 +462,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4177; - getexp 76000,0; + getexp 72000,0; mes "Wooohoo!"; mes "Good luck."; close; @@ -306,7 +485,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4178; - getexp 76000,0; + getexp 72000,0; mes "Wooohoo!"; mes "Good luck."; close; @@ -329,7 +508,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4179; - getexp 76000,0; + getexp 86000,0; mes "Wooohoo!"; mes "Good luck."; close; @@ -352,7 +531,7 @@ moc_para01,48,175,3 script Mission [86 - 90] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4180; - getexp 76000,0; + getexp 80000,0; mes "Wooohoo!"; mes "Good luck."; close; diff --git a/npc/quests/eden/91-99.txt b/npc/quests/eden/91-99.txt index 4c9dc0baa..04944a10d 100644 --- a/npc/quests/eden/91-99.txt +++ b/npc/quests/eden/91-99.txt @@ -38,7 +38,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4181; - getexp 94000,94000; + getexp 90000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -50,7 +50,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4182; - getexp 94000,94000; + getexp 94000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -62,7 +62,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4183; - getexp 94000,94000; + getexp 114000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -74,7 +74,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4184; - getexp 94000,94000; + getexp 96000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -86,7 +86,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4185; - getexp 94000,94000; + getexp 96000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -98,7 +98,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4186; - getexp 94000,94000; + getexp 146000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -110,7 +110,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4187; - getexp 94000,94000; + getexp 96000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -122,7 +122,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4188; - getexp 94000,94000; + getexp 102000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -134,7 +134,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4189; - getexp 94000,94000; + getexp 110000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -146,7 +146,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4190; - getexp 94000,94000; + getexp 102000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -158,7 +158,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4191; - getexp 94000,94000; + getexp 108000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -170,7 +170,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4192; - getexp 94000,94000; + getexp 110000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -182,7 +182,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4193; - getexp 94000,94000; + getexp 138000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -194,7 +194,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4194; - getexp 94000,94000; + getexp 118000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -206,7 +206,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4195; - getexp 94000,94000; + getexp 96000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -218,7 +218,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4196; - getexp 94000,94000; + getexp 134000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -247,7 +247,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4181; - getexp 94000,94000; + getexp 90000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -270,7 +270,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4182; - getexp 94000,94000; + getexp 94000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -293,7 +293,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4183; - getexp 94000,94000; + getexp 114000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -319,7 +319,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4184; - getexp 94000,94000; + getexp 96000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -342,7 +342,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4185; - getexp 94000,94000; + getexp 96000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -365,7 +365,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4186; - getexp 94000,94000; + getexp 146000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -391,7 +391,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4187; - getexp 94000,94000; + getexp 96000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -414,7 +414,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4188; - getexp 94000,94000; + getexp 102000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -437,7 +437,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4189; - getexp 94000,94000; + getexp 110000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -463,7 +463,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4190; - getexp 94000,94000; + getexp 102000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -486,7 +486,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4191; - getexp 94000,94000; + getexp 108000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -512,7 +512,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4192; - getexp 94000,94000; + getexp 110000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -535,7 +535,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4193; - getexp 94000,94000; + getexp 138000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -558,7 +558,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4194; - getexp 94000,94000; + getexp 118000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -581,7 +581,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4195; - getexp 94000,94000; + getexp 96000,311000; mes "Wooohoo!"; mes "Good luck."; close; @@ -604,7 +604,7 @@ moc_para01,48,177,3 script Mission [91 - 99] 857,{ mes "I hope that it helps you at least a little bit."; next; erasequest 4196; - getexp 94000,94000; + getexp 134000,311000; mes "Wooohoo!"; mes "Good luck."; close; diff --git a/npc/quests/eden/eden_quests.txt b/npc/quests/eden/eden_quests.txt index 437ad7d7d..dc8cacf9c 100644 --- a/npc/quests/eden/eden_quests.txt +++ b/npc/quests/eden/eden_quests.txt @@ -2701,8 +2701,8 @@ moc_para01,112,96,5 script Administrator Michael 967,{ getitem 1650,1; //P_Staff1 getitem 2457,1; //Para_Team_Boots2 getitem 15010,1; //Para_Team_Uniform2 - set Para_Team_Hat,Para_Team_Hat+1; - set Para_Team_Manteau,Para_Team_Manteau+1; + getitem 5583,1; //Para_Team_Hat + getitem 2560,1; //Para_Team_Manteau next; mes "[Michael]"; mes "Check your supplies again and look after it."; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 74384edab..29b0671a6 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 2.2 +//= 2.3 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -39,6 +39,7 @@ //= 2.0 Added Mid Camp Warper, translated from the Official [Slim] //= 2.1 Fixed some typos [tr0n] //= 2.2 A little optimization (-25kb). [Euphy] +//= 2.3 Updated to match the new Izlude Map. [Masao] //============================================================ // Onward to the New World @@ -677,7 +678,7 @@ geffen,90,67,3 script Promotional Staff#gef 100,{ } } -izlude,99,136,5 script Promotional Staff#iz 100,{ +izlude,101,173,6 script Promotional Staff#iz 100,{ if (ep13_ryu > 8) { mes "[Promotional Staff]"; mes "I bless you for your future! May it be full of happiness!"; -- cgit v1.2.3-70-g09d2