diff options
| author | masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-12 16:49:16 +0000 |
|---|---|---|
| committer | masao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-12 16:49:16 +0000 |
| commit | a56813476c822a9cf7a543a9e419255b70680bf0 (patch) | |
| tree | 552c86c47f9d313d50ad78e884d7be72d5c60b20 | |
| parent | 468a088ab8caca5b9916b1fc223bbab395468900 (diff) | |
| download | hercules-a56813476c822a9cf7a543a9e419255b70680bf0.tar.gz hercules-a56813476c822a9cf7a543a9e419255b70680bf0.tar.bz2 hercules-a56813476c822a9cf7a543a9e419255b70680bf0.tar.xz hercules-a56813476c822a9cf7a543a9e419255b70680bf0.zip | |
- Added 2 new Shops to Comodo. bugreport:5732
- Added check for Baby Warlock to Magic Book Quest. bugreport:5527
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16104 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | npc/merchants/shops.txt | 2 | ||||
| -rw-r--r-- | npc/quests/magic_books.txt | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index 2a8d6a2aa..9f49c05f5 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -90,6 +90,8 @@ comodo,296,125,4 shop Souvenir Vendor#cmd 101,965:-1,964:-1 cmd_fild07,257,126,5 shop Tool Dealer#cmd2 83,1770:-1,501:-1,502:-1,503:-1,504:-1,645:-1,656:-1,601:-1,602:-1,611:-1,1065:-1 cmd_fild07,250,98,2 shop Weapon Dealer#cmd2 49,1401:-1,1404:-1,1407:-1,1451:-1,1454:-1,1457:-1,1460:-1,1463:-1,1410:-1 cmd_fild07,277,85,4 shop Armor Dealer#cmd2 101,2226:-1,2228:-1,2103:-1,2105:-1,2405:-1,2503:-1,2505:-1,2305:-1,2321:-1,2307:-1,2309:-1,2335:-1,2312:-1,2314:-1,2316:-1 +comodo,106,213,5 shop Tropic Fruit Dealer 724,6258:-1 +comodo,196,162,3 shop Harive#candy 479,11513:-1,6144:-1 //======================================================= // Einbroch diff --git a/npc/quests/magic_books.txt b/npc/quests/magic_books.txt index b9ff298cf..40af631a1 100644 --- a/npc/quests/magic_books.txt +++ b/npc/quests/magic_books.txt @@ -23,13 +23,13 @@ geffen_in,176,105,4 script Magic Book Master Velof 64,{ mes "You're overweight with items. Please lose some item weight first.";
close;
}
- if (Upper == 2) {
+ if ((Upper == 2) && (Class != Job_Baby_Warlock)) {
mes "[Magic Book Master Velof]";
mes "What are you, a baby?";
mes "I'm not here to babysit. Get lost!";
close;
}
- if (Class != Job_Warlock || Class != Job_Warlock_T) {
+ if ((Class != Job_Warlock) && (Class != Job_Warlock_T) && (Class != Job_Baby_Warlock)) {
mes "[Magic Book Master Velof]";
mes "Ha ha, are you also seeking new knowledge?";
next;
@@ -45,7 +45,7 @@ geffen_in,176,105,4 script Magic Book Master Velof 64,{ mes "Learn the spell first. I've got so many things to tell you.";
close;
}
- if ((getskilllv(2230) > 0) && (Class == Job_Warlock) || (Class == Job_Warlock_T)) {
+ if ((getskilllv(2230) > 0) && (Class == Job_Warlock) || (Class == Job_Warlock_T) || (Class == Job_Baby_Warlock)) {
mes "[Magic Book Master Velof]";
mes "Welcome, my friend.";
mes "Congratulations on entering a brand new world of magic.";
@@ -283,7 +283,7 @@ geffen_in,175,112,4 script Lea 123,{ mes "You're overweight with items. Please lose some item weight first.";
close;
}
- if ((wm_book > 0) && (Class == Job_Warlock) || (Class == Job_Warlock_T)) {
+ if ((wm_book > 0) && (Class == Job_Warlock) || (Class == Job_Warlock_T) || (Class == Job_Baby_Warlock)) {
mes "[Lea]";
mes "You can only read books here. If you'd like to borrow any books, please receive an approval from 1 manager and 1 High Mage.";
next;
@@ -1673,7 +1673,7 @@ mid_camp,255,244,4 script Galfos 735,{ mes "I'm not here to babysit. Get lost!";
close;
}
- if ((Class != Job_Warlock) && (Class != Job_Warlock_T)) {
+ if ((Class != Job_Warlock) && (Class != Job_Warlock_T) && (Class != Job_Baby_Warlock)) {
mes "[Galfos]";
mes "My right arm feels hot while my left arm feels cold. I can never get used to this weird weather!";
close;
|