summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-31 21:31:27 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-31 21:31:27 +0000
commitd7e2caa88bf3d1eb29e95f1edcaed01d02057940 (patch)
treedd0e8b4af039fc54a2c264db7dfa461ea010ee15
parent0c3fe037b7df653d91b03bc19526dbc8b7e641cb (diff)
downloadhercules-d7e2caa88bf3d1eb29e95f1edcaed01d02057940.tar.gz
hercules-d7e2caa88bf3d1eb29e95f1edcaed01d02057940.tar.bz2
hercules-d7e2caa88bf3d1eb29e95f1edcaed01d02057940.tar.xz
hercules-d7e2caa88bf3d1eb29e95f1edcaed01d02057940.zip
Added item effects for Mercenary potions.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13160 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/Changelog.txt2
-rw-r--r--db/item_db.txt10
2 files changed, 7 insertions, 5 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index e979e3176..2ce220389 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -40,6 +40,8 @@
2385 Recuvative_Armor Should trigger HP/SP return with magical kills as well.
=======================
+2008/08/31
+ * Rev. 13160 Added item effects for Mercenary potions. [L0ne_W0lf]
2008/08/29
* Rev. 13153 Couple small corrections to the mob database. [L0ne_W0lf]
2008/08/25
diff --git a/db/item_db.txt b/db/item_db.txt
index 6eed61424..832a4d8fd 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -3529,8 +3529,8 @@
12181,SpearMercenary_Scroll9,Spearman Mercenary Summon Scroll Level 9,2,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ createmercenary 6035,1800000; },{},{}
12182,SpearMercenary_Scroll10,Spearman Mercenary Summon Scroll Level 10,2,2,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ createmercenary 6036,1800000; },{},{}
12183,Holy_Arrow_Quiver,Holy Arrow Quiver,2,2,,250,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem 1772,500; },{},{}
-12184,Mercenary_Red_Potion,Mercenary's Red Potion,2,500,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12185,Mercenary_Blue_Potion,Mercenary's Blue Potion,2,1000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12184,Mercenary_Red_Potion,Mercenary's Red Potion,2,500,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_heal 1000,0; },{},{}
+12185,Mercenary_Blue_Potion,Mercenary's Blue Potion,2,1000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_heal 0,100; },{},{}
12186,Red_Box,Old Red Box,2,50000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_RedBox),1; },{},{}
12187,Green_Box,Old Green Box,2,50000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GreenBox),1; },{},{}
12188,Moon_Snack,Fantastic Moon Snack,2,20,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 50,50; },{},{}
@@ -3585,9 +3585,9 @@
12238,New_Year_Rice_Cake_1,New Year Rice Cake,0,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ if(rand(1000)<100) sc_start SC_DPoison,10000,0; sc_start SC_Poison,50000,0; },{},{}
12239,New_Year_Rice_Cake_2,New Year Rice Cake,0,20,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ if(rand(1000)<100) sc_start SC_DPoison,10000,0; sc_start SC_Poison,50000,0; },{},{}
12240,Old_Yellow_Box,Old Yellow Box,2,20,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_YellowBox),1; },{},{}
-12241,M_Center_Potion,Concentration Potion,2,800,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ASPDPOTION0,1800000,0; },{},{}
-12242,M_Awakening_Potion,Awakening Potion,2,1500,,150,,,,,0xFFF7FEEF,7,2,,,40,,,{ sc_start SC_ASPDPOTION1,1800000,0; },{},{}
-12243,M_Berserk_Potion,Berserk Potion,2,3000,,200,,,,,0x01E646A6,7,2,,,85,,,{ sc_start SC_ASPDPOTION2,1800000,0; },{},{}
+12241,M_Center_Potion,Concentration Potion,2,800,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ mercenary_sc_start SC_ASPDPOTION0,1800000,0; },{},{}
+12242,M_Awakening_Potion,Awakening Potion,2,1500,,150,,,,,0xFFF7FEEF,7,2,,,40,,,{ mercenary_sc_start SC_ASPDPOTION1,1800000,0; },{},{}
+12243,M_Berserk_Potion,Berserk Potion,2,3000,,200,,,,,0x01E646A6,7,2,,,85,,,{ mercenary_sc_start SC_ASPDPOTION2,1800000,0; },{},{}
12244,Old_Gift_Box,Old Gift Box,2,20,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_OldGiftBox),1; },{},{}
//St. Patrick's Day Event (2007)
12245,Green_Ale_US,Green Ale,0,5000,,500,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 100,0; },{},{}