Update to latest hercules.s20170529

3 files changed, 8 insertions, 12 deletions

diff --git a/conf/map/battle/client.conf b/conf/map/battle/client.conf
index a28804d4..e4a646f9 100644
--- a/conf/map/battle/client.conf
+++ b/conf/map/battle/client.conf
@@ -126,6 +126,14 @@ summer_ignorepalette: false
 // Set this to true if your cloth palettes pack doesn't has Hanbok palettes (or has less than the other jobs)
 hanbok_ignorepalette: false
 
+// Do not display cloth colors for the Oktoberfest costume?
+// Set this to true if your cloth palettes pack doesn't has Oktoberfest palettes (or has less than the other jobs)
+oktoberfest_ignorepalette: false
+
+// Do not display cloth colors for the Summer 2 costume?
+// Set this to true if your cloth palettes pack doesn't has Summer 2 palettes (or has less than the other jobs)
+summer2_ignorepalette: false
+
 // Show Hercules version to users when the login?
 display_version: false
 
diff --git a/conf/map/battle/drops.conf b/conf/map/battle/drops.conf
index 547a4ae4..4dbbf8fd 100644
--- a/conf/map/battle/drops.conf
+++ b/conf/map/battle/drops.conf
@@ -146,12 +146,3 @@ drops_by_luk2: 0
 // 1: Only marine spheres drop items.
 // 2: All alchemist summons drop items.
 alchemist_summon_reward: 1
-
-// Make broadcast ** Player1 won Pupa's Pupa Card (chance 0.01%) ***
-// This can be set to any value between 0~10000.
-// Note: It also announces STEAL skill usage with rare items
-// 0 = don't show announces at all
-// 1 = show announces for 0.01% drop chance items
-// 333 = show announces for 3.33% or lower drop chance items
-// 10000 = show announces for all items
-rare_drop_announce: 0
diff --git a/conf/map/battle/items.conf b/conf/map/battle/items.conf
index c7aa9924..f7ffd3f3 100644
--- a/conf/map/battle/items.conf
+++ b/conf/map/battle/items.conf
@@ -86,9 +86,6 @@ item_check: false
 // On officials this is 0, but it's set to 100ms as a measure against bots/macros.
 item_use_interval: 100
 
-// How much time must pass between cash food uses? Default: 60000 (1 min)
-cashfood_use_interval: 60000
-
 // Required level of bNoMagicDamage before Status Changes are blocked (Golden Thief Bug card).
 // For example, if left at 50. An item can give bNoMagicDamage,40;
 // which reduces magic damage by 40%, but does not blocks status changes.