Update to latest hercules.s20170529

7 files changed, 19 insertions, 20 deletions

diff --git a/conf/char/char-server.conf b/conf/char/char-server.conf
index 0f226488..db433244 100644
--- a/conf/char/char-server.conf
+++ b/conf/char/char-server.conf
@@ -50,6 +50,7 @@ char_configuration: {
 		// Server Communication username and password.
 		userid: "s1"
 		passwd: "p1"
+
 		// Login Server IP
 		// The character server connects to the login server using this IP address.
 		// NOTE: This is useful when you are running behind a firewall or are on
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.
diff --git a/conf/messages.conf b/conf/messages.conf
index 19dc23df..8244abf2 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -60,7 +60,7 @@
 32: PvP On.
 33: GvG Off.
 34: GvG On.
-//35 FREE
+35: This job has no alternate body styles.
 36: Appearance changed.
 37: An invalid number was specified.
 38: Invalid location number, or name.
@@ -73,7 +73,8 @@
 45: Guild level change failed.
 46: %s recalled!
 47: Base level can't go any higher.
-//48-52 FREE
+48: Any work in progress (NPC dialog, manufacturing ...) quit and try again.
+//49-52 FREE
 53: '%s' stats:
 54: No player found in map '%s'.
 55: 1 player found in map '%s'.
@@ -467,12 +468,7 @@
 538: Hack on trade: character '%s' (account: %d) try to trade more items that he has.
 539: This player has %d of a kind of item (id: %d), and tried to trade %d of them.
 540: This player has been definitively blocked.
-// Rare Items Drop/Steal announce
-541: '%s' got %s's %s (chance: %0.02f%%)
-//541: %.0s%.0sSomeone got %s
-542: '%s' stole %s's %s (chance: %0.02f%%)
-//542: %.0s%.0sSomeone stole %s
-//543-545 FREE
+//541-545 FREE
 // @showmobs
 546: Please enter a mob name/id (usage: @showmobs <mob name/id>)
 547: Invalid mob name %s!
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 3b8091ad..a7571d58 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -65,6 +65,7 @@ item_db: (
 	Delay: Delay to use item      (int, defaults to 0)
 	FloorLifeTime: Delay to remove item from ground (int, default flooritem_lifetime)
 	KeepAfterUse: true/false      (boolean, defaults to false)
+	DropAnnounce: true/false      (boolean, defaults to false)
 	AllowPickup: true/false       (boolean, defaults to true)
 	Charm: true/false             (boolean, defaults to false)
 	MaxFloorOffset: [x, y]        (int, defaults to 8)
diff --git a/sql-files/upgrades/index.txt b/sql-files/upgrades/index.txt
index dcdf9260..768800cb 100644
--- a/sql-files/upgrades/index.txt
+++ b/sql-files/upgrades/index.txt
@@ -3,7 +3,9 @@
 2013-03-05--01-05.sql
 2013-03-06--00-00.sql
 2013-03-09--01-56.sql
+2013-03-27--18-35.sql
 2013-04-16--01-24.sql
+2013-04-16--02-15.sql
 2013-10-09--21-38.sql
 2013-10-10--16-36.sql
 2013-10-27--16-47.sql
@@ -27,9 +29,12 @@
 2014-11-03--00-45.sql
 2015-07-08--13-08.sql
 2015-08-27--20-42.sql
+2015-12-16--12-57.sql
 2015-12-17--15-58.sql
 2016-03-10--22-18.sql
 2016-07-08--02-42.sql
 2016-07-08--02-51.sql
 2016-10-03--20-27.sql
 2016-10-26--10-29.sql
+2017-03-02--11-40.sql
+2017-03-05--08-09.sql