summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-06 10:15:27 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-09-06 10:15:27 +0000
commit74b283460a19b508724cd9ea627bf70d0a421e92 (patch)
treec2db95dc856d613f80bd21833389837d2cbe8653 /npc
parentad176fadd0e7e095f91f122776ccaad6f3416540 (diff)
downloadhercules-74b283460a19b508724cd9ea627bf70d0a421e92.tar.gz
hercules-74b283460a19b508724cd9ea627bf70d0a421e92.tar.bz2
hercules-74b283460a19b508724cd9ea627bf70d0a421e92.tar.xz
hercules-74b283460a19b508724cd9ea627bf70d0a421e92.zip
Applied bug fixes for IDs in recent quests. (bugreport:2189)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13193 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/quests/quests_alberta.txt10
-rw-r--r--npc/quests/quests_aldebaran.txt9
-rw-r--r--npc/quests/quests_comodo.txt6
-rw-r--r--npc/quests/quests_geffen.txt4
-rw-r--r--npc/quests/quests_lutie.txt8
-rw-r--r--npc/quests/quests_payon.txt6
7 files changed, 25 insertions, 22 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 174073200..fb1f43f6f 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,7 +1,9 @@
Date Added
======
+2008/09/06
+ * Rev. 13193 Applied bug fixes for IDs in recent quests. (bugreport:2189) [L0ne_W0lf]
2008/09/03
- * Rev. 13187 Fixed inconsitencies in mosk_dun spawns. (bugreport:2165) [L0ne_W0lf]
+ * Rev. 13188 Fixed inconsitencies in mosk_dun spawns. (bugreport:2165) [L0ne_W0lf]
* Rev. 13187 Fixed bug in refiner merchants. (bugreport:2168) [L0ne_W0lf]
2008/09/01
* Rev. 13181 Fixed item requirements for PH D. Hat again. [L0ne_W0lf]
diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt
index be932749b..4f24dec2b 100644
--- a/npc/quests/quests_alberta.txt
+++ b/npc/quests/quests_alberta.txt
@@ -649,7 +649,7 @@ alberta,120,53,1 script Stylish Merchant#new30 51,{
next;
mes "[Zic]";
mes "Just gimmie...";
- mes "2300 ^0000FFCoral Reef^000000.";
+ mes "1200 ^0000FFCoral Reef^000000.";
mes "...Did you know this already?";
close;
}
@@ -899,7 +899,7 @@ alberta,136,79,1 script Hat store girl#new30 71,{
mes "[Tempestra]";
mes "I want to make something special for you because you showed me such kindness, but I don't have anything like that right now.";
next;
- if ((countitem(7086) > 0) && (countitem(614) > 9) && (countitem(999) > 39) && (countitem(1003) > 49) && (countitem(615) > 1)) {
+ if ((countitem(7086) > 0) && (countitem(969) > 9) && (countitem(999) > 39) && (countitem(1003) > 49) && (countitem(984) > 1)) {
mes "[Tempestra]";
mes "Hmm...";
mes "I think I can make a special item from the items you already have.";
@@ -912,10 +912,10 @@ alberta,136,79,1 script Hat store girl#new30 71,{
mes "I think I'll make you a Hat of the Sun God~";
next;
delitem 7086,1; //Symbol_Of_Sun
- delitem 614,10; //Gold
+ delitem 969,10; //Gold
delitem 999,40; //Steel
delitem 1003,50; //Coal
- delitem 615,2; //Oridecon
+ delitem 984,2; //Oridecon
mes "[Tempestra]";
mes "See! Here it is!!";
mes "Haha, I made this quicker than the speed of light!";
@@ -931,7 +931,7 @@ alberta,136,79,1 script Hat store girl#new30 71,{
else {
mes "[Tempestra]";
mes "Hmm...";
- mes "^0000FF1 Amblem of the Sun God^000000";
+ mes "^0000FF1 Emblem of the Sun God^000000";
mes "^0000FF10 Gold^000000";
mes "^0000FF40 Steel^000000";
mes "^0000FF50 Coal^000000";
diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt
index 500a07be5..696941f4e 100644
--- a/npc/quests/quests_aldebaran.txt
+++ b/npc/quests/quests_aldebaran.txt
@@ -41,9 +41,10 @@ aldeba_in,152,166,4 script Trader#01 86,{
next;
switch(select(" Doctor Band : Feather Bonnet : Phantom of Opera : Sakkat ")) {
case 1:
- if ((countitem(2275) > 0) && (countitem(613) > 49) && (Zeny > 3499)) {
+ if ((countitem(2275) > 0) && (countitem(998) > 49) && (countitem(733) > 0) && (Zeny > 3499)) {
delitem 2275,1; //Red_Bandana
- delitem 613,50; //Iron
+ delitem 998,50; //Iron
+ delitem 733,1; //Crystal_Jewel___
set Zeny,Zeny-3500;
mes "[Trader]";
mes "Hm! You don't have a medical license, do you? It's alright, I've heard about a rogue, unlicensed physician who performed medical miracles! But... That might have been a comic book.";
@@ -77,8 +78,8 @@ aldeba_in,152,166,4 script Trader#01 86,{
close;
}
case 3:
- if ((countitem(613) > 19) && (countitem(707) > 0) && (Zeny > 4999)){ //Iron Singing_Plant
- delitem 613,20; //Iron
+ if ((countitem(998) > 19) && (countitem(707) > 0) && (Zeny > 4999)){ //Iron Singing_Plant
+ delitem 998,20; //Iron
delitem 707,1; //Singing_Plant
set Zeny,Zeny-5000;
mes "[Trader]";
diff --git a/npc/quests/quests_comodo.txt b/npc/quests/quests_comodo.txt
index af4b54bdf..d070545e4 100644
--- a/npc/quests/quests_comodo.txt
+++ b/npc/quests/quests_comodo.txt
@@ -348,7 +348,7 @@ comodo,273,137,4 script Traveler#head 702,{
close;
}
case 3:
- if ((countitem(2233) > 0) && (countitem(614) > 0) && (countitem(916) > 79) && (countitem(999) > 19) && (countitem(938) > 799)) {
+ if ((countitem(2233) > 0) && (countitem(969) > 0) && (countitem(949) > 79) && (countitem(999) > 19) && (countitem(938) > 799)) {
mes "[Isac Mari]";
mes "Grief for Greed...";
mes "If you brought all the required items, I'll go ahead and make it for you~";
@@ -373,8 +373,8 @@ comodo,273,137,4 script Traveler#head 702,{
mes "Whew! This is pretty hard!";
next;
delitem 2233,1; //Circlet_
- delitem 614,1; //Gold
- delitem 916,80; //Feather
+ delitem 969,1; //Gold
+ delitem 949,80; //Feather
delitem 999,20; //Steel
delitem 938,800; //Sticky_Mucus
mes "[Isac Mari]";
diff --git a/npc/quests/quests_geffen.txt b/npc/quests/quests_geffen.txt
index 551b61be0..7b1bdd118 100644
--- a/npc/quests/quests_geffen.txt
+++ b/npc/quests/quests_geffen.txt
@@ -135,9 +135,9 @@ geffen_in,30,71,4 script Eric 83,{
mes "These are the things I need for Grandfather's masterpiece.";
close;
case 3:
- if ((countitem(999) > 39) && (countitem(615) > 0) && (countitem(970) > 0) && (countitem(1003) > 0)) {
+ if ((countitem(999) > 39) && (countitem(984) > 0) && (countitem(970) > 0) && (countitem(1003) > 0)) {
delitem 999,40; //Steel
- delitem 615,1; //Oridecon
+ delitem 984,1; //Oridecon
delitem 970,1; //Alchol
delitem 1003,1; //Coal
getitem 5001,1; // Headset
diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt
index 62f20de6b..ac5d08289 100644
--- a/npc/quests/quests_lutie.txt
+++ b/npc/quests/quests_lutie.txt
@@ -186,10 +186,10 @@ xmas,115,297,4 script Vending Machine 111,{
}
break;
case 3:
- if ((countitem(4048) > 849) && (countitem(7068) > 299) && (countitem(1015) > 0)) {
+ if ((countitem(7033) > 849) && (countitem(7068) > 299) && (countitem(1015) > 0)) {
mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
next;
- delitem 4048,850; //Poison_Spore
+ delitem 7033,850; //Poison_Spore
delitem 7068,300; //Burn_Tree
delitem 1015,1; //Thin_N'_Long_Tongue
Emotion e_oh;
@@ -273,12 +273,12 @@ xmas,115,297,4 script Vending Machine 111,{
}
break;
case 7:
- if ((countitem(539) > 119) && (countitem(982) > 0) && (countitem(916) > 329) && (countitem(1036) > 449)) {
+ if ((countitem(539) > 119) && (countitem(982) > 0) && (countitem(949) > 329) && (countitem(1036) > 449)) {
mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000";
next;
delitem 539,120; //Piece_Of_Cake
delitem 982,1; //White_Dyestuffs
- delitem 916,330; //Feather
+ delitem 949,330; //Feather
delitem 1036,450; //Dragon_Scale
Emotion e_oh;
mes "^3355FF*Vroooooom~~*";
diff --git a/npc/quests/quests_payon.txt b/npc/quests/quests_payon.txt
index 2d670516c..ad1bc3297 100644
--- a/npc/quests/quests_payon.txt
+++ b/npc/quests/quests_payon.txt
@@ -92,10 +92,10 @@ payon_in01,18,10,4 script Mystic Lady 76,{
next;
switch(select("Oh Yeah? That sounds good.:No thank you, Ma'am.")) {
case 1:
- if ((countitem(724) > 0) && (countitem(916) > 199) && (countitem(5001) > 0) && (Zeny > 4999)) {
+ if ((countitem(724) > 0) && (countitem(949) > 199) && (countitem(5001) > 0) && (Zeny > 4999)) {
mes "[Mystic Lady]";
delitem 724,1; //Cardinal_Jewel_
- delitem 916,200; //Feather
+ delitem 949,200; //Feather
delitem 5001,1; //Headset
set Zeny,Zeny-5000;
mes "Here, I will give you this pre-made one.";
@@ -237,7 +237,7 @@ payon_in01,56,12,7 script Young man#12 89,{
mes "[Young man]";
mes "1 Helm (with slot).";
mes "1 Angel Wing.";
- mes "5 Fang of Hatii.";
+ mes "5 Fang of Garm.";
mes "That's all I require.";
next;
mes "[Young man]";