Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Added 2 new Shops to Comodo. bugreport:5732

Browse Source 
- Added check for Baby Warlock to Magic Book Quest. bugreport:5527

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16104 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
masao87 2012-05-12 16:49:16 +00:00
parent e31be3cd2c
commit 2b95b5bfef
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/merchants/shops.txt
View File

@ -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,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,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 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 // Einbroch

10
npc/quests/magic_books.txt
View File

@ -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."; mes "You're overweight with items. Please lose some item weight first.";
close; close;
} }
if (Upper == 2) { if ((Upper == 2) && (Class != Job_Baby_Warlock)) {
mes "[Magic Book Master Velof]"; mes "[Magic Book Master Velof]";
mes "What are you, a baby?"; mes "What are you, a baby?";
mes "I'm not here to babysit. Get lost!"; mes "I'm not here to babysit. Get lost!";
close; 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 "[Magic Book Master Velof]";
mes "Ha ha, are you also seeking new knowledge?"; mes "Ha ha, are you also seeking new knowledge?";
next; 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."; mes "Learn the spell first. I've got so many things to tell you.";
close; 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 "[Magic Book Master Velof]";
mes "Welcome, my friend."; mes "Welcome, my friend.";
mes "Congratulations on entering a brand new world of magic."; 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."; mes "You're overweight with items. Please lose some item weight first.";
close; 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 "[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."; 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; next;
@ -1673,7 +1673,7 @@ mid_camp,255,244,4 script Galfos 735,{
mes "I'm not here to babysit. Get lost!"; mes "I'm not here to babysit. Get lost!";
close; close;
} }
if ((Class != Job_Warlock) && (Class != Job_Warlock_T)) { if ((Class != Job_Warlock) && (Class != Job_Warlock_T) && (Class != Job_Baby_Warlock)) {
mes "[Galfos]"; mes "[Galfos]";
mes "My right arm feels hot while my left arm feels cold. I can never get used to this weird weather!"; mes "My right arm feels hot while my left arm feels cold. I can never get used to this weird weather!";
close; close;