summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorJedzkie <jedzkie13@rocketmail.com>2015-12-20 14:04:07 +0800
committerJedzkie <jedzkie13@rocketmail.com>2015-12-20 14:04:07 +0800
commit03d6b89105558cfb8f157fcdc8c5e14427f9ffef (patch)
treee728f0d368261ea983fa106fabfab46780627c81 /db
parent55c98b69b783fc9e52116943cb40d13c4462c97c (diff)
downloadhercules-03d6b89105558cfb8f157fcdc8c5e14427f9ffef.tar.gz
hercules-03d6b89105558cfb8f157fcdc8c5e14427f9ffef.tar.bz2
hercules-03d6b89105558cfb8f157fcdc8c5e14427f9ffef.tar.xz
hercules-03d6b89105558cfb8f157fcdc8c5e14427f9ffef.zip
ItemDB Update:
- Added official effect of Combat Pill and Advanced Combat Pill.
Diffstat (limited to 'db')
-rw-r--r--db/const.txt3
-rw-r--r--db/re/item_db.conf12
2 files changed, 14 insertions, 1 deletions
diff --git a/db/const.txt b/db/const.txt
index 56437d2e2..a9c15685d 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1333,6 +1333,9 @@ SC_TIME_ACCESSORY 623
SC_MAGICAL_FEATHER 624
SC_BLOSSOM_FLUTTERING 625
+SC_GM_BATTLE 626
+SC_GM_BATTLE2 627
+
e_gasp 0
e_what 1
e_ho 2
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index f9cb7dd2a..cf587b344 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -86563,14 +86563,22 @@ item_db: (
Type: 2
Buy: 20
Weight: 150
+ Script: <"
+ specialeffect2 EF_POTION_BERSERK;
+ sc_start2 SC_GM_BATTLE, 600000, 5, 3;
+ ">
},
{
Id: 12792
AegisName: "P_Combat_Pill"
Name: "Advanced Magic Battle Serum"
- Type: 11
+ Type: 2
Buy: 20
Weight: 150
+ Script: <"
+ specialeffect2 EF_POTION_BERSERK;
+ sc_start2 SC_GM_BATTLE2, 600000, 10, 5;
+ ">
},
{
Id: 12793
@@ -86578,6 +86586,7 @@ item_db: (
Name: "Magic Battle Serum Box"
Type: 11
Buy: 20
+ Script: <" getitem Combat_Pill, 10; ">
},
{
Id: 12794
@@ -86585,6 +86594,7 @@ item_db: (
Name: "Advanced Magic Battle Serum Box"
Type: 11
Buy: 20
+ Script: <" getitem P_Combat_Pill, 10; ">
},
{
Id: 12795