summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorJedzkie <jedzkie13@rocketmail.com>2015-12-26 19:56:18 +0800
committerHaru <haru@dotalux.com>2016-01-09 18:45:14 +0100
commita0f25125a6239894a86d51ae8dcf6a06a4d0a380 (patch)
treeed58fa16b74e46268cd8701948ce69e5bd5bb95d /db
parentd9d0e6275f579674735cf774069c27844a840397 (diff)
downloadhercules-a0f25125a6239894a86d51ae8dcf6a06a4d0a380.tar.gz
hercules-a0f25125a6239894a86d51ae8dcf6a06a4d0a380.tar.bz2
hercules-a0f25125a6239894a86d51ae8dcf6a06a4d0a380.tar.xz
hercules-a0f25125a6239894a86d51ae8dcf6a06a4d0a380.zip
Added support for MC_CARTDECORATE skill.
*This skill is supported only by 2015-08-05aRagexeRE clients onwards.* Closes #1025 as merged Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'db')
-rw-r--r--db/pre-re/skill_db.txt2
-rw-r--r--db/pre-re/skill_require_db.txt2
-rw-r--r--db/pre-re/skill_tree.conf1
-rw-r--r--db/re/skill_db.txt2
-rw-r--r--db/re/skill_require_db.txt2
-rw-r--r--db/re/skill_tree.conf1
6 files changed, 6 insertions, 4 deletions
diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt
index 5f8553127..dd72963cd 100644
--- a/db/pre-re/skill_db.txt
+++ b/db/pre-re/skill_db.txt
@@ -1024,7 +1024,7 @@
//2541,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_UGLYDANCE,Ugly Dance 2
//2542,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_TETANY,Tetany
//2543,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_RAY_OF_PROTECTION,Ray of Protection
-//2544,0,0,0,0,0,0,??,0,no,0,0,0,none,0, MC_CARTDECORATE,Decorate Cart
+2544,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0, MC_CARTDECORATE,Change Cart 2
//2545,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_ATKMAX#Maximum Attack#
//2546,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_ATKMIN#Minimal Attack#
//2547,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_MATKMAX#Maximum Magic Attack#
diff --git a/db/pre-re/skill_require_db.txt b/db/pre-re/skill_require_db.txt
index 8b09f085e..87c11bc48 100644
--- a/db/pre-re/skill_require_db.txt
+++ b/db/pre-re/skill_require_db.txt
@@ -816,7 +816,7 @@
//2542,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_TETANY#Tentay#
//2543,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_RAY_OF_PROTECTION#Ray of Protection#
-//2544,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
+2544,0,0,40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Change Cart 2#
// Rebellion
2551,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_GLITTERING_GREED#Flip The Coin Greed#
diff --git a/db/pre-re/skill_tree.conf b/db/pre-re/skill_tree.conf
index 9f07d9805..805e7929c 100644
--- a/db/pre-re/skill_tree.conf
+++ b/db/pre-re/skill_tree.conf
@@ -217,6 +217,7 @@ Merchant: {
MC_MAMMONITE: 10
MC_CARTREVOLUTION: 1
MC_CHANGECART: 1
+ MC_CARTDECORATE: 1
MC_LOUD: 1
ALL_BUYING_STORE: {
MaxLevel: 1
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index eb875fc56..0821d41b2 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -1036,7 +1036,7 @@
//2541,0,0,0,0,0,0,??,0,no,0,0,0,none,0, NPC_UGLYDANCE,Ugly Dance 2
//2542,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_TETANY,Tetany
//2543,0,0,0,0,0,0,??,0,no,0,0,0,none,0, ALL_RAY_OF_PROTECTION,Ray of Protection
-//2544,0,0,0,0,0,0,??,0,no,0,0,0,none,0, MC_CARTDECORATE,Decorate Cart
+2544,0,6,4,0,0x1,0,1,1,no,0,0x1,0,none,0, MC_CARTDECORATE,Change Cart 2
//2545,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_ATKMAX#Maximum Attack#
//2546,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_ATKMIN#Minimal Attack#
//2547,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //GM_ITEM_MATKMAX#Maximum Magic Attack#
diff --git a/db/re/skill_require_db.txt b/db/re/skill_require_db.txt
index 1e7cd23d2..a2e763dc2 100644
--- a/db/re/skill_require_db.txt
+++ b/db/re/skill_require_db.txt
@@ -820,7 +820,7 @@
//2542,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_TETANY#Tentay#
//2543,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //ALL_RAY_OF_PROTECTION#Ray of Protection#
-//2544,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Cart Decorate#
+2544,0,0,40,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //MC_CARTDECORATE#Change Cart 2#
// Rebellion
2551,0,0,1,0,0,0,99,0,0,none,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 //RL_GLITTERING_GREED#Flip The Coin Greed#
diff --git a/db/re/skill_tree.conf b/db/re/skill_tree.conf
index f27f6e67a..6e040420b 100644
--- a/db/re/skill_tree.conf
+++ b/db/re/skill_tree.conf
@@ -217,6 +217,7 @@ Merchant: {
MC_MAMMONITE: 10
MC_CARTREVOLUTION: 1
MC_CHANGECART: 1
+ MC_CARTDECORATE: 1
MC_LOUD: 1
ALL_BUYING_STORE: {
MaxLevel: 1