summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorJedzkie <jedzkie13@rocketmail.com>2015-12-21 08:49:53 +0800
committerJedzkie <jedzkie13@rocketmail.com>2015-12-21 08:49:53 +0800
commitd02496a043ded53fc715d673c257b29293c05b56 (patch)
tree2d0b57d681bd76b73c43d22e4daa8f68acfdbd1a /db
parentcc5ec4717522c1733d96efaee46e3d05fea41f0a (diff)
downloadhercules-d02496a043ded53fc715d673c257b29293c05b56.tar.gz
hercules-d02496a043ded53fc715d673c257b29293c05b56.tar.bz2
hercules-d02496a043ded53fc715d673c257b29293c05b56.tar.xz
hercules-d02496a043ded53fc715d673c257b29293c05b56.zip
ItemDB Update:
- Added official effect for Jumping Candy (Spark_Candy) (Ref: http://herc.ws/board/topic/1125-please-implement-the-magic-scroll-mental-potion-etc/) Follow up Mercenary Skill update, disable AL_HEAL skill due to mercenary_skill_db doesn't recognize the skill.
Diffstat (limited to 'db')
-rw-r--r--db/const.txt1
-rw-r--r--db/mercenary_skill_db.txt2
-rw-r--r--db/pre-re/item_db.conf14
-rw-r--r--db/re/item_db.conf23
-rw-r--r--db/sc_config.txt2
5 files changed, 25 insertions, 17 deletions
diff --git a/db/const.txt b/db/const.txt
index f0ec7cd55..2d61a01d6 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -1338,6 +1338,7 @@ SC_GM_BATTLE2 627
SC_2011RWC 628
SC_STR_SCROLL 629
SC_INT_SCROLL 630
+SC_STEAMPACK 631
e_gasp 0
e_what 1
diff --git a/db/mercenary_skill_db.txt b/db/mercenary_skill_db.txt
index b7da95bd8..6f939ad7d 100644
--- a/db/mercenary_skill_db.txt
+++ b/db/mercenary_skill_db.txt
@@ -201,7 +201,7 @@
2325,8223,10 //MER_QUICKEN
// M_GALAPAGO
2326,8239,5 //MER_BLESSING
-2326,28,5 //AL_HEAL
+//2326,28,5 //AL_HEAL
// MER_DIABOLIC
2342,8225,5 //MER_CRASH
2342,8202,5 //MS_MAGNUM
diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index 3ed2027cb..e17b1d952 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -78674,7 +78674,7 @@ item_db: (
Type: 18
Buy: 20
Weight: 10
- Script: <" getitem 14586,5; ">
+ Script: <" getitem Spark_Candy, 5; ">
},
{
Id: 13858
@@ -78683,7 +78683,7 @@ item_db: (
Type: 18
Buy: 20
Weight: 10
- Script: <" getitem 14586,10; ">
+ Script: <" getitem Spark_Candy, 10; ">
},
{
Id: 13859
@@ -82169,7 +82169,7 @@ item_db: (
nomail: true
noauction: true
}
- Script: <" getitem 14586,5; ">
+ Script: <" getitem Spark_Candy, 5; ">
},
{
Id: 14050
@@ -82183,11 +82183,11 @@ item_db: (
notrade: true
noselltonpc: true
nocart: true
- nogstorage: true
nomail: true
noauction: true
+ nogstorage: true
}
- Script: <" getitem 14586,10; ">
+ Script: <" getitem Spark_Candy, 10; ">
},
{
Id: 14051
@@ -87824,6 +87824,10 @@ item_db: (
noselltonpc: true
nogstorage: true
}
+ Script: <"
+ specialeffect2 EF_HASTEUP;
+ sc_start2 SC_STEAMPACK, 60000, 20, 25;
+ ">
},
{
Id: 14587
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index f29364f0c..0bd005274 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -100871,11 +100871,11 @@ item_db: (
notrade: true
noselltonpc: true
nocart: true
- nogstorage: true
nomail: true
noauction: true
+ nogstorage: true
}
- Script: <" getitem 14586,5; ">
+ Script: <" getitem Spark_Candy, 5; ">
},
{
Id: 13858
@@ -100889,11 +100889,11 @@ item_db: (
notrade: true
noselltonpc: true
nocart: true
- nogstorage: true
nomail: true
noauction: true
+ nogstorage: true
}
- Script: <" getitem 14586,10; ">
+ Script: <" getitem Spark_Candy, 10; ">
},
{
Id: 13859
@@ -104491,11 +104491,11 @@ item_db: (
notrade: true
noselltonpc: true
nocart: true
- nogstorage: true
nomail: true
noauction: true
+ nogstorage: true
}
- Script: <" getitem 14586,5; ">
+ Script: <" getitem Spark_Candy, 5; ">
},
{
Id: 14050
@@ -104509,11 +104509,11 @@ item_db: (
notrade: true
noselltonpc: true
nocart: true
- nogstorage: true
nomail: true
noauction: true
+ nogstorage: true
}
- Script: <" getitem 14586,10; ">
+ Script: <" getitem Spark_Candy, 10; ">
},
{
Id: 14051
@@ -111478,11 +111478,14 @@ item_db: (
notrade: true
noselltonpc: true
nocart: true
- nogstorage: true
nomail: true
noauction: true
+ nogstorage: true
}
- Script: <" bonus2 bHPLossRate,100,10000; ">
+ Script: <"
+ specialeffect2 EF_HASTEUP;
+ sc_start2 SC_STEAMPACK, 60000, 20, 25;
+ ">
},
{
Id: 14587
diff --git a/db/sc_config.txt b/db/sc_config.txt
index 610f57e98..32dd28078 100644
--- a/db/sc_config.txt
+++ b/db/sc_config.txt
@@ -213,7 +213,7 @@ SC_TARGET_BLOOD, 30
SC_ARMOR_PROPERTY, 29
//SC_REUSE_LIMIT_A, 29
SC_HELLPOWER, 29
-//SC_STEAMPACK, 92
+SC_STEAMPACK, 108
//SC_REUSE_LIMIT_B, 29
//SC_REUSE_LIMIT_C, 29
//SC_REUSE_LIMIT_D, 29