-Apply EvilPuncker path from tid:71756

-Fix and upd logzeny enumeration type bugreport:6897
-Upd @zeny to send a message when succed bugreport:6886
-Upd ChaosPanic to affect all bugreport:6893
-Upd bloodylust cooldown and disable endure effect bugreport:6547

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16940 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 2 insertions, 1 deletions

diff --git a/sql-files/logs.sql b/sql-files/logs.sql
index c787b60ab..a94106747 100644
--- a/sql-files/logs.sql
+++ b/sql-files/logs.sql
@@ -31,7 +31,7 @@ CREATE TABLE `zenylog` (
   `time` datetime NOT NULL default '0000-00-00 00:00:00',
   `char_id` int(11) NOT NULL default '0',
   `src_id` int(11) NOT NULL default '0',
-  `type` enum('M','T','V','S','N','A','E','B','I','D') NOT NULL default 'S',
+  `type` enum('T','V','P','M','S','N','D','C','A','E','I','B') NOT NULL default 'S',
   `amount` int(11) NOT NULL default '0',
   `map` varchar(11) NOT NULL default '',
   PRIMARY KEY  (`id`),
diff --git a/sql-files/upgrades/upgrade_svn16914.sql b/sql-files/upgrades/upgrade_svn16914.sql
new file mode 100644
index 000000000..2352077ac
--- /dev/null
+++ b/sql-files/upgrades/upgrade_svn16914.sql
@@ -0,0 +1 @@
+ALTER TABLE `zenylog` MODIFY `type` ENUM('T','V','P','M','S','N','D','C','A','E','I','B') NOT NULL DEFAULT 'S';