summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2019-03-11 21:50:51 +0300
committerAndrei Karas <akaras@inbox.ru>2019-03-11 21:51:00 +0300
commit8ddf21dfab5fe831cd73b7eb307f64111739c52a (patch)
tree6fa4e22f7b49cc26f33ce3ee7d8b71490bfb73d6
parentafe1a978877edec665313b3aff30160e05a2450b (diff)
downloadserverdata-8ddf21dfab5fe831cd73b7eb307f64111739c52a.tar.gz
serverdata-8ddf21dfab5fe831cd73b7eb307f64111739c52a.tar.bz2
serverdata-8ddf21dfab5fe831cd73b7eb307f64111739c52a.tar.xz
serverdata-8ddf21dfab5fe831cd73b7eb307f64111739c52a.zip
Update from hercules
map/battle/skill.conf - new parameter. constants.conf - depricated some constants.
-rw-r--r--conf/map/battle/skill.conf5
-rw-r--r--db/constants.conf10
2 files changed, 13 insertions, 2 deletions
diff --git a/conf/map/battle/skill.conf b/conf/map/battle/skill.conf
index 64bba68b..da8d1906 100644
--- a/conf/map/battle/skill.conf
+++ b/conf/map/battle/skill.conf
@@ -330,3 +330,8 @@ bowling_bash_area: 0
// punch a hole into SG it will for example create a "suck in" effect.
// If you disable this setting, the knockback direction will be completely random (eAthena style).
stormgust_knockback: true
+
+// Magic Rod's animation behavior (Note 1)
+// 0 : (official) Magic Rod's animation occurs every time it is used.
+// 1 : Magic Rod's animation would not occur unless a spell was absorbed. (old behavior)
+magicrod_type: 0
diff --git a/db/constants.conf b/db/constants.conf
index c778d20a..71e88720 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3736,8 +3736,14 @@ constants_db: {
UDT_MAXSP: 6
UDT_MASTERAID: 7
UDT_MASTERCID: 8
- UDT_MAPIDXY: 9
- UDT_WALKTOXY: 10
+ UDT_MAPIDXY: {
+ Value: 9
+ Deprecated: true // for setunitdata use *unitwarp, for getunitdata use *getmapxy
+ }
+ UDT_WALKTOXY: {
+ Value: 10
+ Deprecated: true // use *unitwalk
+ }
UDT_SPEED: 11
UDT_MODE: 12
UDT_AI: 13