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

* Updated "Name" fields for 11.2 headgears.

Browse Source 
* Updated NPCs for Al De Baran
- Added Inn NPC for Al De Baran
* Fixed problems with Hahoe/Lion/Bride masks quests.
* Added Zairik's fix for the wizard quest.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10879 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2007-07-13 18:32:28 +00:00
parent 5ba6e5f949
commit 2b54700d14
7 changed files with 1040 additions and 1535 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db/Changelog.txt
View File

@ -49,6 +49,7 @@
----
========================
07/13
* Rev. 10878 Updated "Name" fields for 11.2 headgears. [L0ne_W0lf]
* Rev. 10877 Fixed Blue Drooping Kitty. (Missing comma) Thanks to diedlikeahero [L0ne_W0lf]
07/10
* Rev. 10876 G_Bacsojin will summon G_Spring_Rabbit now instead of Green Iguana. [L0ne_W0lf]

10
db/item_db.txt
View File

@ -1860,11 +1860,11 @@
5170,Feather_Beret,Feather Beret,5,30000,,600,,1,,0,0xFFFFFFFE,7,2,256,,0,1,224,{ bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,10; },{},{}
5171,Valkyrie_Helm,Valkyrie Helm,5,100000,,1000,,5,,1,0xFFFFFFFE,2,2,256,,0,1,225,{ bonus bMdef,5; if(isequipped(2357,2421,2524)) bonus bAllStats,1; },{},{}
5172,Beret,Beret,5,30000,,700,,0,,0,0xFFFFFFFF,7,2,256,,0,0,226,{ bonus2 bSubRace,RC_DemiHuman,10; },{},{}
5173,Judge_Hat,Judge Hat,5,30000,,400,,3,,1,0xFFFFFFFF,7,2,256,,60,1,227,{ if(BaseClass==Job_Taekwon){ bonus bAgi,1; bonus bHPrecovRate,3; } },{},{}
5174,Ayam,A-yam,5,30000,,400,,3,,1,0xFFFFFFFF,7,2,256,,60,1,228,{ if(BaseClass==Job_Taekwon){ bonus bInt,1; bonus bSPrecovRate,3; } },{},{}
5175,Censor_Request,Anonymity Request,5,30000,,100,,0,,0,0xFFFFFFFF,7,2,512,,0,0,229,{ bonus2 bResEff,Eff_Curse,500; bonus bMdef,1; bonus bHit,-5; },{},{}
5176,Hahoe_Mask,Smiling Mask,5,30000,,100,,2,,0,0xFFFFFFFF,7,2,513,,30,0,230,{ if(BaseClass==Job_Taekwon){ bonus bLuk,1; bonus bFlee2,2; } },{},{}
5177,Guardian_Lion_Mask,Lion Masquerade,5,30000,,500,,5,,1,0xFFFFFFFF,7,2,768,,40,1,231,{ if(BaseClass==Job_Taekwon){ bonus bDex,2; bonus bBaseAtk,2*getrefine(); bonus2 bAddEff,Eff_Stun,100; } },{},{}
5173,Judge_Hat,Magistrate Hat,5,30000,,400,,3,,1,0xFFFFFFFF,7,2,256,,60,1,227,{ if(BaseClass==Job_Taekwon){ bonus bAgi,1; bonus bHPrecovRate,3; } },{},{}
5174,Ayam,Ayam,5,30000,,400,,3,,1,0xFFFFFFFF,7,2,256,,60,1,228,{ if(BaseClass==Job_Taekwon){ bonus bInt,1; bonus bSPrecovRate,3; } },{},{}
5175,Censor_Request,Censor Bar,5,30000,,100,,0,,0,0xFFFFFFFF,7,2,512,,0,0,229,{ bonus2 bResEff,Eff_Curse,500; bonus bMdef,1; bonus bHit,-5; },{},{}
5176,Hahoe_Mask,Hahoe Mask,5,30000,,100,,2,,0,0xFFFFFFFF,7,2,513,,30,0,230,{ if(BaseClass==Job_Taekwon){ bonus bLuk,1; bonus bFlee2,2; } },{},{}
5177,Guardian_Lion_Mask,Mythical Lion Mask,5,30000,,500,,5,,1,0xFFFFFFFF,7,2,768,,40,1,231,{ if(BaseClass==Job_Taekwon){ bonus bDex,2; bonus bBaseAtk,2*getrefine(); bonus2 bAddEff,Eff_Stun,100; } },{},{}
5178,Candle_,Candle,5,20,,150,,0,,0,0xFFFFFFFF,7,2,256,,0,1,113,{ bonus bAllStats,1; },{},{}
5179,Golden_Tiara,Golden Tiara,5,0,,100,,0,,0,0xFFFFFFFF,7,2,256,,0,1,232,{ bonus bInt,2; },{},{}
5180,Phrygian_Hat,France Holiday Hat,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,217,{ bonus bVit,1; },{},{}

5
npc/Changelog.txt
View File

@ -1,5 +1,10 @@
Date Added
======
2007/07/11
* Rev. 10878 Updated NPCs for Al De Baran [L0ne_W0lf]
- Added Inn NPC for Al De Baran
* Fixed problems with Hahoe/Lion/Bride masks quests.
* Added Zairik's fix for the wizard quest.
2007/07/11
* Fixed a bug in the socket enchanter [Playtester]
2007/07/10

2408
npc/cities/aldebaran.txt
View File

File diff suppressed because it is too large Load Diff

3
npc/jobs/2-1/wizard.txt
View File

@ -25,6 +25,7 @@
//= 1.8 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
//= 2.1 Changed numbers to constants. [Vicious]
//= 2.2 Merged back JFunc [Lupus] 2.2a Removed extra MES, added missing NEXT
//= 2.3 Bigfoot monster summon corrected [Zairik]
//============================================================
@ -1305,7 +1306,7 @@ OnStart:
monster "job_wiz",120,102,"Hode",1127,1,"EarthRm::OnMyMobDead1";
monster "job_wiz",111,93,"Savage",1166,1,"EarthRm::OnMyMobDead1";
monster "job_wiz",120,93,"Giearth",1121,1,"EarthRm::OnMyMobDead1";
monster "job_wiz",107,98,"Bigfoot",1160,1,"EarthRm::OnMyMobDead1";
monster "job_wiz",107,98,"Bigfoot",1060,1,"EarthRm::OnMyMobDead1";
monster "job_wiz",124,98,"Orc Warrior",1023,1,"EarthRm::OnMyMobDead1";
monster "job_wiz",104,86,"Vitata",1176,1,"EarthRm::OnMyMobDead1";
monster "job_wiz",127,86,"Mantis",1139,1,"EarthRm::OnMyMobDead1";

9
npc/merchants/inn.txt
View File

@ -32,6 +32,7 @@
//= - Corrected Morroc NPCs. [L0ne_W0lf]
//= 1.7 Corrected Payon NPC. [L0ne_W0lf]
//= 1.8 Corrected Geffen NPC. [L0ne_W0lf]
//= 1.9 Added the Inn for Al De baran [L0ne_W0lf]
//============================================================
@ -91,6 +92,14 @@ morocc_in,80,100,5 script Inn Employee::Manar 53,{
warp "morocc_in",79,123; end;
}
//====================== Aldebaran ===================================
aldeba_in,92,58,5 script Inn Maid 53,{
callfunc "F_InnMaid","[Rilim]","Al De Baran Inn","aldeba_in",92,50;
warp "aldeba_in",92,112; end;
}
//======================== Rachel ====================================
ra_in01,376,69,4 script Inn Keeper 931,{

139
npc/quests/newgears/2006_headgear.txt
View File

@ -8,8 +8,8 @@
//= SVN eA
//===== Description: =========================================
//= [Aegis Conversion]
//= Anonymous Mask, Feather Beret, Valk. Helm, Smiling Mask,
//= Lion Masquerade, Bride Mask, Judge Hat and A-Yam Hat
//= Censor Bar, Feather Beret, Valk. Helm, Hahoe Mask,
//= Mythical Lion Mask, Bride Mask, Magistrate Hat and Ayam
//===== Additional Comments: =================================
//= NPC id's and dialog are custom, please replace
//= 1.0a fixed typos, added missing names, more cleaned and
@ -17,10 +17,11 @@
//= 1.0b fixed Helm of Valkyries ingredients
//= 1.0c corrected item names according to item_db [Lupus]
//= 1.1 Full update. EuRO (?) dialogs, and positions. [L0ne_W0lf]
//= 1.2 Fixed bugs in the Hahoe/Lion/Bride Mask NPC. [L0ne_W0lf]
//= Fixed some of the names to iRO.
//============================================================
//===================== Anonymous Mask =====================================================
//===================== Censor Bar =====================================================
rachel,91,273,8 script ? 930,{
if (countitem(983) > 0 && countitem(7111) > 99 && countitem(938) > 98 && Zeny > 99999) {
mes "[?]";
@ -558,71 +559,21 @@ hugel,147,130,3 script Ghenirhemin 897,{
mes "when you show me your money. Hahahaha!";
close;
}
//======================= Smiling Mask / Lion Masquerade / Bride Mask ===============================
//======================= Hahoe Mask / Mythical Lion Mask / Bride Mask ===============================
payon,135,320,3 script Chungwolmang 97,{
if (moza_tal == 2) {
if (countitem(7015) > 19 && countitem(952) > 99 && countitem(1028) > 99 || countitem(1048) > 499 && countitem(1053) > 1 && countitem(980) > 0 || countitem(1049) > 19 && countitem(1059) > 499 && countitem(1054) > 1 && countitem(1024) > 99) {
mes "[Chungwolmang]";
mes "Oh, you have brought everything";
mes "to make a Mythical Lion Mask. Excellent.";
mes "Please give me the materials. I will make the mask right away.";
next;
if (select("Give him the items.:Don't give him the items.") == 1) {
mes "[Chungwolmang]";
mes "Great, I like your unhesitating attitude!";
mes "Alright then, I will make the mask as quickly as I can!";
next;
mes "[Chungwolmang]";
mes "- Fumble Fumble Fumble -";
mes "- Fumble Fumble Fumble -";
mes "- Fumble Fumble Fumble -";
mes "- Thud Thud Thud Thud -";
next;
mes "[Chungwolmang]";
mes "- Fumble Fumble Fumble -";
mes "- Fumble Fumble Fumble -";
mes "- Fumble Fumble Fumble -";
mes "- Thud Thud Thud Thud -";
next;
if (countitem(7015) > 19 && countitem(952) > 99 && countitem(1028) > 99) {
delitem 7015,20; //Bookclip_In_Memory
delitem 952,100; //Cactus_Needle
delitem 1028,100; //Wild_Boar's_Mane
getitem 5176,1; //Smiling_Mask
}
else if (countitem(1049) > 19 && countitem(1059) > 499 && countitem(1054) > 1 && countitem(1024) > 99) {
delitem 1049,20; //Skirt_Of_Virgin
delitem 1059,500; //Transparent_Cloth
delitem 1054,2; //Lip_Of_Ancient_Fish
delitem 1024,100; //Chinese_Ink
getitem 5169,1; //Bride_Mask
}
else if (countitem(1048) > 499 && countitem(1053) > 1 && countitem(980) > 0) {
delitem 1048,500; //Slender_Snake
delitem 1053,2; //Tooth_Of_Ancient_Fish
delitem 980,1; //Orange_Dyestuffs
getitem 5177,1; //Lion_Masquerade
}
set moza_tal,0;
mes "[Chungwolmang]";
mes "Wow, it was a piece of cake!";
mes "You know, I am not an artisan only in title.";
mes "Hahaha, here, take your Mythical Lion Mask.";
mes "I hope that you will wear it with pride, hahaha!";
next;
mes "[Chungwolmang]";
mes "Aright, I need to take a rest";
mes "until I have next customer. Hahaha, bye!";
close;
}
mes "[Chungwolmang]";
mes "Err? Don't you want Mythical Lion Mask?";
mes "Alright then...coward.";
close;
if (countitem(7015) > 19 && countitem(952) > 99 && countitem(1028) > 99) {
//Hahoe_Mask: Bookclip_In_Memory, Cactus_Needle, Wild_Boar's_Mane
callsub S_MakeMask,5176,7015,20,952,100,1028,100,0,0;
}
if (countitem(1048) > 499 && countitem(1053) > 1 && countitem(980) > 0) {
//Guardian_Lion_Mask: Slender_Snake, Tooth_Of_Ancient_Fishm Orange_Dyestuffs
callsub S_MakeMask,5177,1048,500,1053,2,980,1,0,0;
}
if (countitem(1049) > 19 && countitem(1059) > 499 && countitem(1054) > 1 && countitem(1024) > 99) {
//Bride_Mask: Skirt_Of_Virgin, Transparent_Cloth, Lip_Of_Ancient_Fish, Chinese_Ink
callsub S_MakeMask,5169,1049,20,1059,500,1054,2,1024,100;
}
mes "[Chungwolmang]";
mes "Well well, have you not gathered the materials yet?";
mes "You'd better hurry because I can't wait so long!";
@ -688,9 +639,6 @@ payon,135,320,3 script Chungwolmang 97,{
next;
switch(select("Hahoe Mask:Bride Mask:Mythical Lion Mask")) {
case 1:
delitem 7201,500; //Log
delitem 7200,10; //Flexible_String
set moza_tal,2;
mes "[Chungwolmang]";
mes "Great, you want Hahoe Mask, eh? That's easy!";
mes "Then you need to bring... ^FF000020 Bookclip in Memory^000000,";
@ -699,6 +647,7 @@ payon,135,320,3 script Chungwolmang 97,{
mes "Bring the exact amount of materials, then I will give you the mask right away.";
break;
case 2:
mes "[Chungwolmang]";
mes "Great, you want Bride Mask, eh? That's easy!";
mes "Then you need to bring... ^FF000020 Skirt of Virgin^000000,";
mes "^FF0000500 Fabric^000000, ^FF00002 Ancient Lips^000000,";
@ -706,6 +655,7 @@ payon,135,320,3 script Chungwolmang 97,{
mes "Bring the exact amount of materials, then I will give you the mask right away.";
break;
case 3:
mes "[Chungwolmang]";
mes "Great, you want Mythical Lion Mask, eh? That's easy!";
mes "Then you need to bring... ^FF0000500 Horrendous Hair^000000,";
mes "^FF00002 Ancient Tooth^000000, and";
@ -713,6 +663,9 @@ payon,135,320,3 script Chungwolmang 97,{
mes "Bring the exact amount of materials, then I will give you the mask right away.";
break;
}
delitem 7201,500; //Log
delitem 7200,10; //Flexible_String
set moza_tal,2;
next;
mes "[Chungwolmang]";
mes "...Why are you eyeing at me?";
@ -799,9 +752,55 @@ payon,135,320,3 script Chungwolmang 97,{
mes "I need a ^FF0000Four Leaf Clover^000000!";
mes "Somebody, please bring me a Four Leaf Clover!";
close;
S_MakeMask:
mes "[Chungwolmang]";
mes "Oh, you have brought everything";
mes "to make a "+getitemname(getarg(0))+". Excellent.";
mes "Please give me the materials. I will make the mask right away.";
next;
if (select("Give him the items.:Don't give him the items.") == 1) {
mes "[Chungwolmang]";
mes "Great, I like your unhesitating attitude!";
mes "Alright then, I will make the mask as quickly as I can!";
next;
mes "[Chungwolmang]";
mes "- Fumble Fumble Fumble -";
mes "- Fumble Fumble Fumble -";
mes "- Fumble Fumble Fumble -";
mes "- Thud Thud Thud Thud -";
next;
mes "[Chungwolmang]";
mes "- Fumble Fumble Fumble -";
mes "- Fumble Fumble Fumble -";
mes "- Fumble Fumble Fumble -";
mes "- Thud Thud Thud Thud -";
next;
delitem getarg(1),getarg(2);
delitem getarg(3),getarg(4);
delitem getarg(5),getarg(6);
delitem getarg(7),getarg(8);
getitem getarg(0),1;
set moza_tal,0;
mes "[Chungwolmang]";
mes "Wow, it was a piece of cake!";
mes "You know, I am not an artisan only in title.";
mes "Hahaha, here, take your "+getitemname(getarg(0))+".";
mes "I hope that you will wear it with pride, hahaha!";
next;
mes "[Chungwolmang]";
mes "Aright, I need to take a rest";
mes "until I have next customer. Hahaha, bye!";
close;
}
mes "[Chungwolmang]";
mes "Err? Don't you want "+getitemname(getarg(0))+"?";
mes "Alright then...coward.";
close;
}
//====================== Judge Hat / A-Yam Hat =============================================
//====================== Magistrate Hat / Ayam =============================================
payon_in03,139,124,3 script Han Garam 88,{
if (moza_korea == 2 && countitem(954) > 299 && countitem(733) > 4 && countitem(975) > 0 && countitem(7166) > 49) {
mes "[Han Garam]";