summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-01-26 21:46:50 +0000
committerKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-01-26 21:46:50 +0000
commita05277071781a0f2f6a6f444d61a7957712d96a9 (patch)
tree820eeffcd38e15254b38476eed97ccbc9a731a2a
parentf2aba65dbedee2090d1bc812e6fdeac68a57af62 (diff)
downloadhercules-a05277071781a0f2f6a6f444d61a7957712d96a9.tar.gz
hercules-a05277071781a0f2f6a6f444d61a7957712d96a9.tar.bz2
hercules-a05277071781a0f2f6a6f444d61a7957712d96a9.tar.xz
hercules-a05277071781a0f2f6a6f444d61a7957712d96a9.zip
- Fixed typo on Sprint Set item (bugreport:2679)
- Fixed typo on Poison Bottle Box item (bugreport:2715) - Fixed Kafra coordinates for moc_ruins kafra (bugreport:2714) - Added items 14228 - 14241 (bugreport:2716) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13496 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/item_db.txt18
-rw-r--r--npc/cities/morocc.txt16
-rw-r--r--npc/kafras/kafras_dungeons.txt2
3 files changed, 25 insertions, 11 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index 1e686ef45..4a384ba18 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -1279,7 +1279,7 @@
2437,Combat_Boots,Combat Boots,5,0,,0,,3,,1,0x01000000,7,2,64,,80,1,0,{ bonus bMaxHP,100; bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,1; },{},{}
2438,Cat's_Paw,Cat's Paw,5,20,,300,,0,,0,0xFFFFFFFF,7,2,64,,80,1,0,{ bonus bFlee,5; bonus bAgi,1; },{},{}
2439,Refresh_Shoes,Refresh Shoes,5,20,,0,,9,,0,0xFFFFFFFF,7,2,64,,0,0,0,{ bonus bMaxHPRate,17; bonus bMaxSPRate,8; bonus2 bHPRegenRate,20,10000; bonus2 bSPRegenRate,3,10000; },{},{}
-2440,Sprint_Shoes,Sprint Shoes,5,20,,300,,2,,0,0x00CFDF80,2,2,64,,0,1,0,{ bonus bAGI,1; bonus bSPrecovRate,5; if (isequipped(2387)) { bonus bMaxHPRate,7; bonus bMaxSPRate,7; bonus bCastRate,-3; bonus DelayRate,-15; }; },{},{}
+2440,Sprint_Shoes,Sprint Shoes,5,20,,300,,2,,0,0x00CFDF80,2,2,64,,0,1,0,{ bonus bAGI,1; bonus bSPrecovRate,5; if (isequipped(2387)) { bonus bMaxHPRate,7; bonus bMaxSPRate,7; bonus bCastRate,-3; bonus bDelayRate,-15; }; },{},{}
2441,Beach_Sandals,Beach Sandals,5,20,,200,,0,,0,0xFFFFFFFF,7,2,64,,0,1,0,{ bonus bStr,1; bonus bInt,1; bonus bAgi,1; bonus2 bSubEle,Ele_Fire,10; if (isequipped(2546)) bonus bFlee,5; },{},{}
//2442#Red_Stocking_Boots#
// Garments
@@ -4360,7 +4360,7 @@
13970,Iron_Box,Iron Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 998,10; },{},{}
13971,Steel_Box,Steel Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 999,10; },{},{}
13972,Coal_Box,Coal Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1003,10; },{},{}
-13973,Poison_Bottle_Box,Poison Bottle Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 678,10; },{},{}
+13973,Poison_Bottle_Box,Poison Bottle Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 678,30; },{},{}
13974,Fisherman_Scroll,Fisherman Scroll,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
13975,Diary_Magic_Powder_Box,Diary Magic Powder Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12304,1; },{},{}
13976,Mini_Heart_Magic_Powder_Box,Mini Heart Magic Powder Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12305,1; },{},{}
@@ -4615,6 +4615,20 @@
14225,Quagmire_30_Scroll_Box,Quagmire Scroll 30ea Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,30; },{},{}
14226,Quagmire_50_Scroll_Box,Quagmire Scroll 50ea Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 14594,50; },{},{}
14227,Healing_Staff_Box,Healing Staff Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1638,1; },{},{}
+//14228,Praccsinos_Box,Praccsinos Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2752,1; },{},{}
+//14229#Cherry_Blossoms_Scroll#Cherry Blossoms Scroll
+//14230,Note_Headphones_Box,Note Headphones Box,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 5151,1; },{},{}
+//14231,Novice_Breastplate_Boxes,Novice Breastplate Boxes,2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+14232,Yggdrasil_Berry_Box_10,Yggdrasil Berry Box(10),2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 607,10; },{},{}
+14233,Dead_Branch_Box_10,Dead Branch Box(10),2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 604,10; },{},{}
+14234,Dead_Branch_Box_25,Dead Branch Box(25),2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 604,25; },{},{}
+14235,Field_Manual_Box_2,Field Manual Box(2),2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12208,2; },{},{}
+14236,Steamed_Tongue_Box_20,Steamed Tongue Box(20),2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12202,20; },{},{}
+14237,Steamed_Desert_Scorpions_Box_20,Steamed Desert Scorpions Box(20),2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12203,20; },{},{}
+14238,Stew_Of_Immortality_Box_20,Stew of Immortality Box(20),2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12207,20; },{},{}
+14239,Dragon_Breath_Cocktail_Box_20,Dragon Breath Cocktail Box(20),2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12204,20; },{},{}
+14240,Hwergelmir's_Tonic_Box_20,Hwergelmir's Tonic Box(20),2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12205,20; },{},{}
+14241,Nine_Tail_Dish_Box_20,Nine Tail Dish Box(20),2,,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 12206,20; },{},{}
14242,Beholder_Ring_Box,Beholder Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2753,1; },{},{}
14243,Hallow_Ring_Box,Hallow Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2754,1; },{},{}
14244,Clamorous_Ring_Box,Clamorus Ring Box,2,20,,10,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 2755,1; },{},{}
diff --git a/npc/cities/morocc.txt b/npc/cities/morocc.txt
index 0914909c7..ea6d5a240 100644
--- a/npc/cities/morocc.txt
+++ b/npc/cities/morocc.txt
@@ -45,7 +45,7 @@ OnTouch:
close;
}
-morocc,202,244,0 script Volenteer - Morroc#01 745,{
+morocc,202,244,0 script Volunteer - Morroc#01 745,{
mes "[Morroc Volunteer]";
mes "After that terrible incident wiped out the entire Morroc, Rune-Midgard Kingdom has gathered us valunteers to help restorations.";
next;
@@ -54,7 +54,7 @@ morocc,202,244,0 script Volenteer - Morroc#01 745,{
close;
}
-morocc,88,133,3 script Volenteer - Morroc#02 748,{
+morocc,88,133,3 script Volunteer - Morroc#02 748,{
mes "[Morroc Volunteer]";
mes "We're... We're flooded with work...";
next;
@@ -67,7 +67,7 @@ morocc,88,133,3 script Volenteer - Morroc#02 748,{
close;
}
-morocc,202,110,0 script Volenteer - Morroc#03 730,{
+morocc,202,110,0 script Volunteer - Morroc#03 730,{
mes "[Morroc Volunteer]";
mes "We're still unable to estimate the overall damage.";
next;
@@ -79,7 +79,7 @@ morocc,202,110,0 script Volenteer - Morroc#03 730,{
close;
}
-morocc,268,287,3 script Volenteer - Morroc#04 727,{
+morocc,268,287,3 script Volunteer - Morroc#04 727,{
mes "[Morroc Volunteer]";
mes "As bad as it seems, we can't even ask for more support.";
mes "This sure must be the worst thing ever happened in Rune-Midgard's history.";
@@ -89,7 +89,7 @@ morocc,268,287,3 script Volenteer - Morroc#04 727,{
close;
}
-morocc,37,287,0 script Volenteer - Morroc#05 79,{
+morocc,37,287,0 script Volunteer - Morroc#05 79,{
mes "[Morroc Volunteer]";
mes "The town's all shattered, but the real problem is the towners.";
next;
@@ -101,7 +101,7 @@ morocc,37,287,0 script Volenteer - Morroc#05 79,{
close;
}
-morocc,223,102,0 script Volenteer - Morroc#06::MocVolenteer 741,{
+morocc,223,102,0 script Volunteer - Morroc#06::MocVolunteer 741,{
mes "[Morroc Volunteer]";
mes "Ugh.. It's kinda spooky, here.. Even this dry wind of the desert seems to have a dark nature.";
next;
@@ -127,7 +127,7 @@ morocc,223,102,0 script Volenteer - Morroc#06::MocVolenteer 741,{
next;
mes "[Ringing Voice]";
mes "Be quiet! Can't you see what's going on?!";
- donpcevent "Volenteer - Morroc#06::OnHit";
+ donpcevent "Volunteer - Morroc#06::OnHit";
next;
mes "[Morroc Volunteer]";
mes "Heyyy, you're being too harsh, Senyorita. Your fist may be as fragile as you are, but it sure can hurt somebody.";
@@ -144,7 +144,7 @@ OnHit:
end;
}
-morocc,226,102,4 duplicate(MocVolenteer) Volenteer - Morroc#07 726
+morocc,226,102,4 duplicate(MocVolunteer) Volunteer - Morroc#07 726
moc_ruins,123,154,0 script Young Man#moc01 99,{
mes "[Young Man]";
diff --git a/npc/kafras/kafras_dungeons.txt b/npc/kafras/kafras_dungeons.txt
index a83ba8599..511ce79a5 100644
--- a/npc/kafras/kafras_dungeons.txt
+++ b/npc/kafras/kafras_dungeons.txt
@@ -88,7 +88,7 @@ mjolnir_02,83,362,4 script Kafra Employee::kaf_mjolnir_02 116,{
//<=============================== Morroc Ruins ============================>\\
-moc_ruins,61,156,5 script Kafra Employee::moc_ruins 114,{
+moc_ruins,59,157,5 script Kafra Employee::moc_ruins 114,{
cutin "kafra_04",2;
mes "[Kafra Employee]";
mes "Welcome!";