summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-06-01 23:01:54 +0000
committerL0ne_W0lf <L0ne_W0lf@54d463be-8e91-2dee-dedb-b68131a5f0ec>2010-06-01 23:01:54 +0000
commitf1c4780376953eae3c5e38b7615c06e07b178431 (patch)
treef174d175dbf283294387ae724a01ccb8e3756427 /db
parentebab0958bab3daf5834d5805ef3425a11fffc3bb (diff)
downloadhercules-f1c4780376953eae3c5e38b7615c06e07b178431.tar.gz
hercules-f1c4780376953eae3c5e38b7615c06e07b178431.tar.bz2
hercules-f1c4780376953eae3c5e38b7615c06e07b178431.tar.xz
hercules-f1c4780376953eae3c5e38b7615c06e07b178431.zip
* Implemented the Manuk and Splendide item status effects, thanks to Epoque.
* Implemented Manuk and Splendide consumable items. * Added Splendide and Manuk merchants. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14327 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/Changelog.txt1
-rw-r--r--db/const.txt6
-rw-r--r--db/item_db.txt12
3 files changed, 13 insertions, 6 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index eeccc896c..a9f1b1d24 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -9,6 +9,7 @@
13005 Angelic Wing Dagger: NEED INFO.
=======================
2010/06/01
+ * Rev. 14327 Implemented Manuk and Splendide consumable items. [L0ne_W0lf]
* Rev. 14325 Fixed Dark Shadow having Nydhoggr's Shadow's MVP exp reward. (Bugreport:4247) [L0ne_W0lf]
* Corrected the races for Dark Pinguicula and Ancient Tree. (bugreport:4265)
2010/05/31
diff --git a/db/const.txt b/db/const.txt
index 6e0c6f2bd..8410cc2f7 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -837,6 +837,12 @@ SC_JEXPBOOST 292
SC_HELLPOWER 294
SC_INVINCIBLE 295
SC_INVINCIBLEOFF 296
+SC_MANU_ATK 297
+SC_MANU_DEF 298
+SC_SPL_ATK 299
+SC_SPL_DEF 300
+SC_MANU_MATK 301
+SC_SPL_MATK 302
e_gasp 0
e_what 1
diff --git a/db/item_db.txt b/db/item_db.txt
index 0b5dca800..6aa55b569 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -4331,14 +4331,14 @@
12339,Cherish_Box_Ori,Treasure Edition Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12340,Mysterious_Rice_Powder,Chewy Rice Powder,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12341,Special_Alloy_Trap_Box,Special Alloy Trap Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12342,Manuk's_Opportunity,Manuk's Opportunity,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12343,Manuk's_Courage,Manuk's Courage,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MANU_DEF,600000,RG_Manuk;},{},{}
-12344,Pinguicula's_fruit_Jam,Pinguicula's Fruit Jam,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12345,Luciola's_Honey_Jam,Luciola's Honey Jam,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12342,Manuk's_Opportunity,Manuk's Opportunity,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MANU_ATK,600000,10; },{},{}
+12343,Manuk's_Courage,Manuk's Courage,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MANU_DEF,600000,10; },{},{}
+12344,Pinguicula's_fruit_Jam,Pinguicula's Fruit Jam,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SPL_ATK,600000,10; },{},{}
+12345,Luciola's_Honey_Jam,Luciola's Honey Jam,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SPL_DEF,600000,10; },{},{}
12346,Unripe_Acorn,Unripe Acorn,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal -100,0; },{},{}
12347,Acorn_Jelly,Acorn Jelly,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12348,Manuk's_Faith,Manuk's Faith,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
-12349,Cornus'_Tears,Cornus' Tears,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
+12348,Manuk's_Faith,Manuk's Faith,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_MANU_MATK,600000,10; },{},{}
+12349,Cornus'_Tears,Cornus' Tears,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SPL_MATK,600000,10; },{},{}
12350,Angeling_Potion,Angeling Potion,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12351,Shout_Megaphone,Scream Megaphone,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12352,Dun_Tele_Scroll3,Dungeon Teleport Scroll 3,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}