summaryrefslogtreecommitdiff
path: root/conf/battle
diff options
context:
space:
mode:
authorMichieru <Michieru@users.noreply.github.com>2014-08-09 22:12:21 +0200
committerMichieru <Michieru@users.noreply.github.com>2014-08-09 22:12:21 +0200
commit607d77fa39b4b1797d8b074362939c8fbbfb2dd7 (patch)
treede9bccefb82420f849212d87683fae44251a0889 /conf/battle
parent6b57cb1d876dae9952932bb27759561daefbc938 (diff)
parent5145cd14bbb5416e29decc830296c661295cc2b3 (diff)
downloadhercules-607d77fa39b4b1797d8b074362939c8fbbfb2dd7.tar.gz
hercules-607d77fa39b4b1797d8b074362939c8fbbfb2dd7.tar.bz2
hercules-607d77fa39b4b1797d8b074362939c8fbbfb2dd7.tar.xz
hercules-607d77fa39b4b1797d8b074362939c8fbbfb2dd7.zip
Merge pull request #316 from Jedzkie/master
- sc_config.txt update: Removed some white spaces. Fixed cash mount cannot be dispelled and removed on death. Fixed some cash items must not removed when mado is taken off. Fixed +20 Foods cannot be dispelled. - Increase max hair style from 27 to 29 (to support the new 2 kRO hairstyles) - Fixed item combo for Woe Greave, WoE Manteau and WoE Plate not adding Vit. - Removed extra 'Cigar' in skill_changematerial_db.txt
Diffstat (limited to 'conf/battle')
-rw-r--r--conf/battle/client.conf4
-rw-r--r--conf/battle/items.conf4
2 files changed, 4 insertions, 4 deletions
diff --git a/conf/battle/client.conf b/conf/battle/client.conf
index 069dea1a5..5089fa4a5 100644
--- a/conf/battle/client.conf
+++ b/conf/battle/client.conf
@@ -21,7 +21,7 @@ min_chat_delay: 0
// Valid range of dyes and styles on the client.
min_hair_style: 0
-max_hair_style: 27
+max_hair_style: 29
min_hair_color: 0
max_hair_color: 8
min_cloth_color: 0
@@ -30,7 +30,7 @@ max_cloth_color: 4
// When set to yes, the damage field in packets sent from woe maps will be set
// to -1, making it impossible for GMs, Bots and Hexed clients to know the
// actual damage caused by attacks. (Note 1)
-hide_woe_damage: no
+hide_woe_damage: yes
// "hair style" number that identifies pet.
// NOTE: The client uses the "hair style" field in the mob packet to tell them apart from mobs.
diff --git a/conf/battle/items.conf b/conf/battle/items.conf
index 3a4eb8083..2b342f4f2 100644
--- a/conf/battle/items.conf
+++ b/conf/battle/items.conf
@@ -79,10 +79,10 @@ autospell_stacking: no
// Will disabled consumables (disabled by map_zone_db.conf) be consumed when trying to use them?
// 1 (official): yes
// 0: no
-item_restricted_consumption_type:1
+item_restricted_consumption_type: 1
// Enable all NPC to allow changing of equipments while interacting? (Note 1)
// Script commands 'enable_items/disable_items' will not be override. (see doc/script_commands.txt)
// 1 : yes(official)
// 0 : no
-item_enabled_npc:1
+item_enabled_npc: 1