4 files changed, 525 insertions, 501 deletions
diff --git a/src/map/Makefile.in b/src/map/Makefile.in
index 55712cc69..6147285e9 100644
--- a/src/map/Makefile.in
+++ b/src/map/Makefile.in
@@ -50,7 +50,7 @@ MAP_OBJ = $(addprefix obj_sql/, $(patsubst %c,%o,$(MAP_C)))
 MAP_H = atcommand.h battle.h battleground.h buyingstore.h channel.h chat.h \
         chrif.h clif.h date.h duel.h elemental.h guild.h homunculus.h HPMmap.h \
         instance.h intif.h irc-bot.h itemdb.h log.h mail.h map.h mapreg.h \
-        mercenary.h mob.h npc.h packets.h packets_struct.h party.h path.h \
+        mercenary.h mob.h npc.h packets.h packets_keys.h packets_struct.h party.h path.h \
         pc.h pc_groups.h pet.h quest.h rodex.h script.h searchstore.h skill.h \
         status.h storage.h trade.h unit.h vending.h
 MAP_PH =
diff --git a/src/map/clif.c b/src/map/clif.c
index 171e0c71e..de0f0573f 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -19928,9 +19928,10 @@ void packetdb_loaddb(void) {
 	memset(packet_db,0,sizeof(packet_db));
 
 #define packet(id, size, ...) packetdb_addpacket((id), (size), ##__VA_ARGS__, 0xFFFF)
-#define packetKeys(a,b,c) do { clif->cryptKey[0] = (a); clif->cryptKey[1] = (b); clif->cryptKey[2] = (c); } while(0)
 #include "packets.h" /* load structure data */
 #undef packet
+#define packetKeys(a,b,c) do { clif->cryptKey[0] = (a); clif->cryptKey[1] = (b); clif->cryptKey[2] = (c); } while(0)
+#include "packets_keys.h"
 #undef packetKeys
 }
 void clif_bc_ready(void) {
diff --git a/src/map/packets.h b/src/map/packets.h
index c471e8a6b..7af6974e2 100644
--- a/src/map/packets.h
+++ b/src/map/packets.h
@@ -18,7 +18,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-//Included directly by clif.h in packet_loaddb()
+//Included directly by clif.c in packet_loaddb()
 
 #ifndef MAP_PACKETS_H
 #define MAP_PACKETS_H
@@ -27,10 +27,6 @@
 	#define packet(a,b,...)
 #endif
 
-#ifndef packetKeys
-	#define packetKeys(a,b,c)
-#endif
-
 /*
  * packet syntax
  * - packet(packet_id,length)
@@ -6107,498 +6103,4 @@ packet(0x96e,-1,clif->ackmergeitems);
 	packet(0x0964,6,clif->pTakeItem,2);  // CZ_ITEM_PICKUP
 #endif
 
-
-/* PacketKeys: http://herc.ws/board/topic/1105-hercules-wpe-free-june-14th-patch/ */
-#if PACKETVER >= 20110817
-	packetKeys(0x053D5CED,0x3DED6DED,0x6DED6DED); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20110824
-	packetKeys(0x35C91401,0x262A5556,0x28FA03AA); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20110831
-	packetKeys(0x3AD67ED0,0x44703C69,0x6F876809); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20110906
-	packetKeys(0x3AD67ED0,0x44703C69,0x6F876809); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20111005
-	packetKeys(0x291E6762,0x77CD391A,0x60AC2F16); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20111012
-	packetKeys(0x7F3C2D29,0x59B01DE6,0x1DBB44CA); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20111021
-	packetKeys(0x357D55DC,0x5A8D759F,0x245C30F5); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20111025
-	packetKeys(0x50AE1A63,0x3CE579B5,0x29C10406); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20111102
-	packetKeys(0x5324329D,0x5D545D52,0x06137269); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20111109
-	packetKeys(0x0B642BDA,0x6ECB1D1C,0x61C7454B); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20111122
-	packetKeys(0x3B550F07,0x1F666C7C,0x60304EF5); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20111207
-	packetKeys(0x2A610886,0x3E09165E,0x57C11888); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20111214
-	packetKeys(0x5151306B,0x7AE32886,0x53060628); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20111220
-	packetKeys(0x05D53871,0x7D0027B4,0x29975333); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20111228
-	packetKeys(0x0FF87E93,0x6CFF7860,0x3A3D1DEC); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120104
-	packetKeys(0x262034A1,0x674542A5,0x73A50BA5); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120111
-	packetKeys(0x2B412AFC,0x4FF94487,0x6705339D); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120120
-	packetKeys(0x504345D0,0x3D427B1B,0x794C2DCC); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120202
-	packetKeys(0x2CFC0A71,0x2BA91D8D,0x087E39E0); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120207
-	packetKeys(0x1D373F5D,0x5ACD604D,0x1C4D7C4D); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120214
-	packetKeys(0x7A255EFA,0x30977276,0x2D4A0448); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120229
-	packetKeys(0x520B4C64,0x2800407D,0x47651458); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120307
-	packetKeys(0x382A6DEF,0x5CBE7202,0x61F46637); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120314
-	packetKeys(0x689C1729,0x11812639,0x60F82967); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120321
-	packetKeys(0x21F9683F,0x710C5CA5,0x1FD910E9); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120328
-	packetKeys(0x75B8553B,0x37F20B12,0x385C2B40); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120404
-	packetKeys(0x0036310C,0x2DCD0BED,0x1EE62A78); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120410
-	packetKeys(0x01581359,0x452D6FFA,0x6AFB6E2E); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120418
-	packetKeys(0x01540E48,0x13041224,0x31247924); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120424
-	packetKeys(0x411D1DBB,0x4CBA4848,0x1A432FC4); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120509
-	packetKeys(0x16CF3301,0x1F472B9B,0x0B4A3CD2); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120515
-	packetKeys(0x4A715EF9,0x79103E4F,0x405C1238); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120525
-	packetKeys(0x70EB4CCB,0x0487713C,0x398D4B08); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120605
-	packetKeys(0x68CA3080,0x31B74BDD,0x505208F1); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120612
-	packetKeys(0x32E45D64,0x35643564,0x35643564); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120618
-	packetKeys(0x261F261F,0x261F261F,0x261F261F); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120702
-	packetKeys(0x25733B31,0x53486CFD,0x398649BD); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20120716
-	packetKeys(0x76052205,0x22052205,0x22052205); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20130320
-	packetKeys(0x3F094C49,0x55F86C1E,0x58AA359A); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20130514
-	packetKeys(0x75794A38,0x58A96BC1,0x296E6FB8); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20130522
-	packetKeys(0x6948050B,0x06511D9D,0x725D4DF1); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20130529
-	packetKeys(0x023A6C87,0x14BF1F1E,0x5CC70CC9); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20130605
-	packetKeys(0x646E08D9,0x5F153AB5,0x61B509B5); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20130612
-	packetKeys(0x6D166F66,0x3C000FCF,0x295B0FCB); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20130618
-	packetKeys(0x434115DE,0x34A10FE9,0x6791428E); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20130626
-	packetKeys(0x38F453EF,0x6A040FD8,0X65BD6668); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20130703
-	packetKeys(0x4FF90E23,0x0F1432F2,0x4CFA1EDA); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20130807
-	packetKeys(0x7E241DE0,0x5E805580,0x3D807D80); /* Thanks to Shakto */
-#endif
-
-#if PACKETVER >= 20130814
-	packetKeys(0x23A23148,0x0C41420E,0x53785AD7); /* Themon */
-#endif
-
-#if PACKETVER >= 20131218
-	packetKeys(0x6A596301,0x76866D0E,0x32294A45);
-#endif
-
-#if PACKETVER >= 20131223
-	packetKeys(0x631C511C,0x111C111C,0x111C111C);
-#endif
-
-#if PACKETVER >= 20131230
-	packetKeys(0x611B7097,0x01F957A1,0x768A0FCB);
-#endif
-
-// 2014 Packet Keys
-
-#if PACKETVER >= 20140115
-	packetKeys(0x63224335,0x0F3A1F27,0x6D217B24); /* Thanks to Yommy */
-#endif
-
-#if PACKETVER >= 20140205
-	packetKeys(0x63DC7BDC,0x7BDC7BDC,0x7BDC7BDC); /* Themon */
-#endif
-
-#if PACKETVER >= 20140305
-	packetKeys(0x116763F2,0x41117DAC,0x7FD13C45); /* Themon */
-#endif
-
-#if PACKETVER >= 20140402
-	packetKeys(0x15D3271C,0x004D725B,0x111A3A37); /* Themon */
-#endif
-
-#if PACKETVER >= 20140416
-	packetKeys(0x04810281,0x42814281,0x42814281); /* Themon */
-#endif
-
-#if PACKETVER >= 20141016
-	packetKeys(0x2DFF467C,0x444B37EE,0x2C1B634F); /* YomRawr */
-#endif
-
-#if PACKETVER >= 20141022
-	packetKeys(0x290551EA,0x2B952C75,0x2D67669B); /* YomRawr */
-#endif
-
-// 2015 Packet Keys
-
-#if PACKETVER == 20150107
-	packetKeys(0x6C494A14,0x4DDB6427,0x3E6D7B65); /* 4144 */
-#endif
-
-#if PACKETVER == 20150114
-	packetKeys(0x21C96102,0x13142934,0x1ABF4EA3); /* 4144 */
-#endif
-
-#if PACKETVER == 20150128
-	packetKeys(0x77CA2D55,0x28B608F0,0x75B47957); /* 4144 */
-#endif
-
-#if PACKETVER == 20150204
-	packetKeys(0x134529DB,0x5B4F6CEF,0x29EF11EF); /* 4144 */
-#endif
-
-#if PACKETVER == 20150225
-	packetKeys(0x57FD4B7B,0x19CC16FB,0x0D255D72); /* 4144 */
-#endif
-
-#if PACKETVER == 20150226
-	packetKeys(0x57FD4B7B,0x19CC16FB,0x0D255D72); /* 4144 */
-#endif
-
-#if PACKETVER == 20150311
-	packetKeys(0x48C45D97,0x06CE09B0,0x5836642F); /* 4144 */
-#endif
-
-#if PACKETVER == 20150325
-	packetKeys(0x68F62B8C,0x337C3468,0x38FC0AC7); /* 4144 */
-#endif
-
-#if PACKETVER == 20150401
-	packetKeys(0x207F3A08,0x57E6160C,0x02A60382); /* 4144 */
-#endif
-
-#if PACKETVER == 20150422
-	packetKeys(0x10D22CE2,0x69E279E2,0x79E279E2); /* 4144 */
-#endif
-
-#if PACKETVER == 20150429
-	packetKeys(0x2BF61A71,0x565D5DDF,0x0FB90019); /* 4144 */
-#endif
-
-#if PACKETVER == 20150507
-	packetKeys(0x55B54373,0x58967821,0x67F41832); /* 4144 */
-#endif
-
-#if PACKETVER >= 20150513
-	packetKeys(0x62C86D09,0x75944F17,0x112C133D); /* Dastgir */
-#endif
-
-#if PACKETVER == 20150527
-	packetKeys(0x35AE7BAE,0x3BAE3BAE,0x3BAE3BAE); /* 4144 */
-#endif
-
-#if PACKETVER == 20150617
-	packetKeys(0x250F7E09,0x25416076,0x029A780E); /* 4144 */
-#endif
-
-#if PACKETVER == 20150618
-	packetKeys(0x250F7E09,0x25416076,0x029A780E); /* 4144 */
-#endif
-
-#if PACKETVER == 20150819
-	packetKeys(0x1A2400E0,0x736E5686,0x10F315D5); /* 4144 */
-#endif
-
-#if PACKETVER == 20150826
-	packetKeys(0x77883C56,0x1829359F,0x0DE635B6); /* 4144 */
-#endif
-
-#if PACKETVER >= 20151001
-	packetKeys(0x5CFF4561,0x32514AD1,0x06D126D1); /* Dastgir */
-#endif
-
-#if PACKETVER == 20151007
-	packetKeys(0x3C6447A8,0x032170D7,0x6490476C); /* 4144 */
-#endif
-
-#if PACKETVER == 20151014
-	packetKeys(0x402728A8,0x5D0E309F,0x240018FD); /* 4144 */
-#endif
-
-#if PACKETVER == 20151028
-	packetKeys(0x45B945B9,0x45B945B9,0x45B945B9); /* 4144 */
-#endif
-
-#if PACKETVER >= 20151029
-	packetKeys(0x45B945B9,0x45B945B9,0x45B945B9); /* Dastgir */
-#endif
-
-#if PACKETVER >= 20151104
-	packetKeys(0x4C17382A,0x7ED174C9,0x29961E4F);  /* ossi0110 */
-#endif
-
-#if PACKETVER == 20151118
-	packetKeys(0x734C3241,0x6E846F34,0x731C06D6); /* 4144 */
-#endif
-
-#if PACKETVER == 20151202
-	packetKeys(0x4EDE52DE,0x52DE52DE,0x52DE52DE); /* 4144 */
-#endif
-
-#if PACKETVER >= 20151216
-	packetKeys(0x25DD643D,0x61AC39DE,0x77A8206D); /* Dastgir */
-#endif
-
-#if PACKETVER == 20151223
-	packetKeys(0x347D68D0,0x2C705320,0x7B4A199D); /* 4144 */
-#endif
-
-#if PACKETVER == 20160127
-	packetKeys(0x6B1E7146,0x612C47E6,0x274E56EE); /* 4144 */
-#endif
-
-#if PACKETVER == 20160203
-	packetKeys(0x3E1411AF,0x6C744497,0x7CFA1BDE); /* 4144 */
-#endif
-
-#if PACKETVER == 20160217
-	packetKeys(0x25895A8E,0x09421C19,0x763A2D7A); /* 4144 */
-#endif
-
-#if PACKETVER == 20160302
-	packetKeys(0x7B4441B9,0x5BBC63AF,0x45DA0E71); /* 4144 */
-#endif
-
-#if PACKETVER == 20160309
-	packetKeys(0x21587520,0x353A7706,0x1B722B25); /* 4144 */
-#endif
-
-#if PACKETVER == 20160330
-	packetKeys(0x02050940,0x545336FF,0x7E7D4902); /* 4144 */
-#endif
-
-#if PACKETVER == 20160420
-	packetKeys(0x67D2163A,0x3068215B,0x4835474D); /* 4144 */
-#endif
-
-#if PACKETVER == 20160511
-	packetKeys(0x3C666FE2,0x27E84E3E,0x53E11BA5); /* 4144 */
-#endif
-
-#if PACKETVER == 20160525
-	packetKeys(0x485C45B6,0x47DC6192,0x76B34A36); /* 4144 */
-#endif
-
-#if PACKETVER == 20160608
-	packetKeys(0x11D74609,0x77C43E8A,0x44290F53); /* 4144 */
-#endif
-
-#if PACKETVER == 20160615
-	packetKeys(0x062C5C26,0x6CF47E82,0x4DD53480); /* 4144 */
-#endif
-
-#if PACKETVER == 20160630
-	packetKeys(0x0DF31CCC,0x54281606,0x5C4C6855); /* 4144 */
-#endif
-
-#if PACKETVER == 20160706
-	packetKeys(0x33A766D0,0x743F04F8,0x0FA0276C); /* 4144 */
-#endif
-
-#if PACKETVER == 20160713
-	packetKeys(0x714F2495,0x7DDC6F32,0x3FD8533D); /* 4144 */
-#endif
-
-#if PACKETVER == 20160720
-	packetKeys(0x4F8A19C0,0x2D8E085C,0x37BB67D6); /* 4144 */
-#endif
-
-#if PACKETVER == 20160727
-	packetKeys(0x3C6952AB,0x26E4077F,0x37E25DF7); /* 4144 */
-#endif
-
-#if PACKETVER == 20160831
-	packetKeys(0x564E13B0,0x7F680549,0x382D273B); /* 4144 */
-#endif
-
-#if PACKETVER == 20160907
-	packetKeys(0x32E5237D,0x57BD4DBD,0x5DBD5DBD); /* 4144 */
-#endif
-
-#if PACKETVER == 20160921
-	packetKeys(0x11CD15CD,0x15CD15CD,0x15CD15CD); /* 4144 */
-#endif
-
-#if PACKETVER == 20161012
-	packetKeys(0x5E2311F2,0x14FD012C,0x76EB64F6); /* 4144 */
-#endif
-
-#if PACKETVER == 20161026
-	packetKeys(0x2CB86AE6,0x7D12660E,0x1B004DEB); /* 4144 */
-#endif
-
-#if PACKETVER == 20161109
-	packetKeys(0x0A5277C0,0x2DB17506,0x0E8F26DA); /* 4144 */
-#endif
-
-#if PACKETVER == 20161207
-	packetKeys(0x52D267AA,0x4FE42156,0x1292153E); /* 4144 */
-#endif
-
-#if PACKETVER == 20161214
-	packetKeys(0x4DDE217B,0x07863AE0,0x5B591656); /* 4144 */
-#endif
-
-#if PACKETVER == 20161221
-	packetKeys(0x69CB4F56,0x793C165E,0x673A2354); /* 4144 */
-#endif
-
-#if PACKETVER == 20170125
-	packetKeys(0x066E04FE,0x3004224A,0x04FF0458); /* 4144 */
-#endif
-
-#if PACKETVER == 20170208
-	packetKeys(0x6A764E5F,0x0609570D,0x28AE07FA); /* 4144 */
-#endif
-
-#if PACKETVER == 20170228
-	packetKeys(0x771D4F2B,0x20EF1F4C,0x0D5135C8); /* 4144 */
-#endif
-
-#if PACKETVER == 20170308
-	packetKeys(0x653470A9,0x6B316A71,0x5C712C71); /* 4144 */
-#endif
-
-#if PACKETVER == 20170315
-	packetKeys(0x399A0856,0x56642A94,0x7F77157D); /* 4144 */
-#endif
-
-#if PACKETVER == 20170322
-	packetKeys(0x2050167B,0x01731233,0x40337033); /* 4144 */
-#endif
-
-#if PACKETVER == 20170329
-	packetKeys(0x18B31A80,0x1B0B1D56,0x16857D6A); /* 4144 */
-#endif
-
-#if PACKETVER == 20170405
-	packetKeys(0x1FDE7DAC,0x2F9F5B63,0x3F2062AF); /* 4144 */
-#endif
-
-#if PACKETVER == 20170517
-	packetKeys(0x2CC4749A,0x1FA954DC,0x72276857); /* 4144 */
-#endif
-
-#if defined(OBFUSCATIONKEY1) && defined(OBFUSCATIONKEY2) && defined(OBFUSCATIONKEY3)
-	packetKeys(OBFUSCATIONKEY1,OBFUSCATIONKEY2,OBFUSCATIONKEY3);
-#endif
-
 #endif /* MAP_PACKETS_H */
diff --git a/src/map/packets_keys.h b/src/map/packets_keys.h
new file mode 100644
index 000000000..ad10c4f2e
--- /dev/null
+++ b/src/map/packets_keys.h
@@ -0,0 +1,521 @@
+/**
+ * This file is part of Hercules.
+ * http://herc.ws - http://github.com/HerculesWS/Hercules
+ *
+ * Copyright (C) 2013-2015  Hercules Dev Team
+ *
+ * Hercules is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef MAP_PACKETS_KEYS_H
+#define MAP_PACKETS_KEYS_H
+
+#ifndef packetKeys
+	#define packetKeys(a,b,c)
+#endif
+
+/* PacketKeys: http://herc.ws/board/topic/1105-hercules-wpe-free-june-14th-patch/ */
+#if PACKETVER >= 20110817
+	packetKeys(0x053D5CED,0x3DED6DED,0x6DED6DED); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20110824
+	packetKeys(0x35C91401,0x262A5556,0x28FA03AA); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20110831
+	packetKeys(0x3AD67ED0,0x44703C69,0x6F876809); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20110906
+	packetKeys(0x3AD67ED0,0x44703C69,0x6F876809); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20111005
+	packetKeys(0x291E6762,0x77CD391A,0x60AC2F16); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20111012
+	packetKeys(0x7F3C2D29,0x59B01DE6,0x1DBB44CA); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20111021
+	packetKeys(0x357D55DC,0x5A8D759F,0x245C30F5); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20111025
+	packetKeys(0x50AE1A63,0x3CE579B5,0x29C10406); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20111102
+	packetKeys(0x5324329D,0x5D545D52,0x06137269); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20111109
+	packetKeys(0x0B642BDA,0x6ECB1D1C,0x61C7454B); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20111122
+	packetKeys(0x3B550F07,0x1F666C7C,0x60304EF5); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20111207
+	packetKeys(0x2A610886,0x3E09165E,0x57C11888); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20111214
+	packetKeys(0x5151306B,0x7AE32886,0x53060628); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20111220
+	packetKeys(0x05D53871,0x7D0027B4,0x29975333); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20111228
+	packetKeys(0x0FF87E93,0x6CFF7860,0x3A3D1DEC); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120104
+	packetKeys(0x262034A1,0x674542A5,0x73A50BA5); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120111
+	packetKeys(0x2B412AFC,0x4FF94487,0x6705339D); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120120
+	packetKeys(0x504345D0,0x3D427B1B,0x794C2DCC); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120202
+	packetKeys(0x2CFC0A71,0x2BA91D8D,0x087E39E0); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120207
+	packetKeys(0x1D373F5D,0x5ACD604D,0x1C4D7C4D); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120214
+	packetKeys(0x7A255EFA,0x30977276,0x2D4A0448); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120229
+	packetKeys(0x520B4C64,0x2800407D,0x47651458); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120307
+	packetKeys(0x382A6DEF,0x5CBE7202,0x61F46637); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120314
+	packetKeys(0x689C1729,0x11812639,0x60F82967); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120321
+	packetKeys(0x21F9683F,0x710C5CA5,0x1FD910E9); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120328
+	packetKeys(0x75B8553B,0x37F20B12,0x385C2B40); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120404
+	packetKeys(0x0036310C,0x2DCD0BED,0x1EE62A78); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120410
+	packetKeys(0x01581359,0x452D6FFA,0x6AFB6E2E); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120418
+	packetKeys(0x01540E48,0x13041224,0x31247924); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120424
+	packetKeys(0x411D1DBB,0x4CBA4848,0x1A432FC4); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120509
+	packetKeys(0x16CF3301,0x1F472B9B,0x0B4A3CD2); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120515
+	packetKeys(0x4A715EF9,0x79103E4F,0x405C1238); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120525
+	packetKeys(0x70EB4CCB,0x0487713C,0x398D4B08); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120605
+	packetKeys(0x68CA3080,0x31B74BDD,0x505208F1); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120612
+	packetKeys(0x32E45D64,0x35643564,0x35643564); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120618
+	packetKeys(0x261F261F,0x261F261F,0x261F261F); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120702
+	packetKeys(0x25733B31,0x53486CFD,0x398649BD); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20120716
+	packetKeys(0x76052205,0x22052205,0x22052205); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20130320
+	packetKeys(0x3F094C49,0x55F86C1E,0x58AA359A); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20130514
+	packetKeys(0x75794A38,0x58A96BC1,0x296E6FB8); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20130522
+	packetKeys(0x6948050B,0x06511D9D,0x725D4DF1); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20130529
+	packetKeys(0x023A6C87,0x14BF1F1E,0x5CC70CC9); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20130605
+	packetKeys(0x646E08D9,0x5F153AB5,0x61B509B5); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20130612
+	packetKeys(0x6D166F66,0x3C000FCF,0x295B0FCB); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20130618
+	packetKeys(0x434115DE,0x34A10FE9,0x6791428E); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20130626
+	packetKeys(0x38F453EF,0x6A040FD8,0X65BD6668); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20130703
+	packetKeys(0x4FF90E23,0x0F1432F2,0x4CFA1EDA); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20130807
+	packetKeys(0x7E241DE0,0x5E805580,0x3D807D80); /* Thanks to Shakto */
+#endif
+
+#if PACKETVER >= 20130814
+	packetKeys(0x23A23148,0x0C41420E,0x53785AD7); /* Themon */
+#endif
+
+#if PACKETVER >= 20131218
+	packetKeys(0x6A596301,0x76866D0E,0x32294A45);
+#endif
+
+#if PACKETVER >= 20131223
+	packetKeys(0x631C511C,0x111C111C,0x111C111C);
+#endif
+
+#if PACKETVER >= 20131230
+	packetKeys(0x611B7097,0x01F957A1,0x768A0FCB);
+#endif
+
+// 2014 Packet Keys
+
+#if PACKETVER >= 20140115
+	packetKeys(0x63224335,0x0F3A1F27,0x6D217B24); /* Thanks to Yommy */
+#endif
+
+#if PACKETVER >= 20140205
+	packetKeys(0x63DC7BDC,0x7BDC7BDC,0x7BDC7BDC); /* Themon */
+#endif
+
+#if PACKETVER >= 20140305
+	packetKeys(0x116763F2,0x41117DAC,0x7FD13C45); /* Themon */
+#endif
+
+#if PACKETVER >= 20140402
+	packetKeys(0x15D3271C,0x004D725B,0x111A3A37); /* Themon */
+#endif
+
+#if PACKETVER >= 20140416
+	packetKeys(0x04810281,0x42814281,0x42814281); /* Themon */
+#endif
+
+#if PACKETVER >= 20141016
+	packetKeys(0x2DFF467C,0x444B37EE,0x2C1B634F); /* YomRawr */
+#endif
+
+#if PACKETVER >= 20141022
+	packetKeys(0x290551EA,0x2B952C75,0x2D67669B); /* YomRawr */
+#endif
+
+// 2015 Packet Keys
+
+#if PACKETVER == 20150107
+	packetKeys(0x6C494A14,0x4DDB6427,0x3E6D7B65); /* 4144 */
+#endif
+
+#if PACKETVER == 20150114
+	packetKeys(0x21C96102,0x13142934,0x1ABF4EA3); /* 4144 */
+#endif
+
+#if PACKETVER == 20150128
+	packetKeys(0x77CA2D55,0x28B608F0,0x75B47957); /* 4144 */
+#endif
+
+#if PACKETVER == 20150204
+	packetKeys(0x134529DB,0x5B4F6CEF,0x29EF11EF); /* 4144 */
+#endif
+
+#if PACKETVER == 20150225
+	packetKeys(0x57FD4B7B,0x19CC16FB,0x0D255D72); /* 4144 */
+#endif
+
+#if PACKETVER == 20150226
+	packetKeys(0x57FD4B7B,0x19CC16FB,0x0D255D72); /* 4144 */
+#endif
+
+#if PACKETVER == 20150311
+	packetKeys(0x48C45D97,0x06CE09B0,0x5836642F); /* 4144 */
+#endif
+
+#if PACKETVER == 20150325
+	packetKeys(0x68F62B8C,0x337C3468,0x38FC0AC7); /* 4144 */
+#endif
+
+#if PACKETVER == 20150401
+	packetKeys(0x207F3A08,0x57E6160C,0x02A60382); /* 4144 */
+#endif
+
+#if PACKETVER == 20150422
+	packetKeys(0x10D22CE2,0x69E279E2,0x79E279E2); /* 4144 */
+#endif
+
+#if PACKETVER == 20150429
+	packetKeys(0x2BF61A71,0x565D5DDF,0x0FB90019); /* 4144 */
+#endif
+
+#if PACKETVER == 20150507
+	packetKeys(0x55B54373,0x58967821,0x67F41832); /* 4144 */
+#endif
+
+#if PACKETVER >= 20150513
+	packetKeys(0x62C86D09,0x75944F17,0x112C133D); /* Dastgir */
+#endif
+
+#if PACKETVER == 20150527
+	packetKeys(0x35AE7BAE,0x3BAE3BAE,0x3BAE3BAE); /* 4144 */
+#endif
+
+#if PACKETVER == 20150617
+	packetKeys(0x250F7E09,0x25416076,0x029A780E); /* 4144 */
+#endif
+
+#if PACKETVER == 20150618
+	packetKeys(0x250F7E09,0x25416076,0x029A780E); /* 4144 */
+#endif
+
+#if PACKETVER == 20150819
+	packetKeys(0x1A2400E0,0x736E5686,0x10F315D5); /* 4144 */
+#endif
+
+#if PACKETVER == 20150826
+	packetKeys(0x77883C56,0x1829359F,0x0DE635B6); /* 4144 */
+#endif
+
+#if PACKETVER >= 20151001
+	packetKeys(0x5CFF4561,0x32514AD1,0x06D126D1); /* Dastgir */
+#endif
+
+#if PACKETVER == 20151007
+	packetKeys(0x3C6447A8,0x032170D7,0x6490476C); /* 4144 */
+#endif
+
+#if PACKETVER == 20151014
+	packetKeys(0x402728A8,0x5D0E309F,0x240018FD); /* 4144 */
+#endif
+
+#if PACKETVER == 20151028
+	packetKeys(0x45B945B9,0x45B945B9,0x45B945B9); /* 4144 */
+#endif
+
+#if PACKETVER >= 20151029
+	packetKeys(0x45B945B9,0x45B945B9,0x45B945B9); /* Dastgir */
+#endif
+
+#if PACKETVER >= 20151104
+	packetKeys(0x4C17382A,0x7ED174C9,0x29961E4F);  /* ossi0110 */
+#endif
+
+#if PACKETVER == 20151118
+	packetKeys(0x734C3241,0x6E846F34,0x731C06D6); /* 4144 */
+#endif
+
+#if PACKETVER == 20151202
+	packetKeys(0x4EDE52DE,0x52DE52DE,0x52DE52DE); /* 4144 */
+#endif
+
+#if PACKETVER >= 20151216
+	packetKeys(0x25DD643D,0x61AC39DE,0x77A8206D); /* Dastgir */
+#endif
+
+#if PACKETVER == 20151223
+	packetKeys(0x347D68D0,0x2C705320,0x7B4A199D); /* 4144 */
+#endif
+
+#if PACKETVER == 20160127
+	packetKeys(0x6B1E7146,0x612C47E6,0x274E56EE); /* 4144 */
+#endif
+
+#if PACKETVER == 20160203
+	packetKeys(0x3E1411AF,0x6C744497,0x7CFA1BDE); /* 4144 */
+#endif
+
+#if PACKETVER == 20160217
+	packetKeys(0x25895A8E,0x09421C19,0x763A2D7A); /* 4144 */
+#endif
+
+#if PACKETVER == 20160302
+	packetKeys(0x7B4441B9,0x5BBC63AF,0x45DA0E71); /* 4144 */
+#endif
+
+#if PACKETVER == 20160309
+	packetKeys(0x21587520,0x353A7706,0x1B722B25); /* 4144 */
+#endif
+
+#if PACKETVER == 20160330
+	packetKeys(0x02050940,0x545336FF,0x7E7D4902); /* 4144 */
+#endif
+
+#if PACKETVER == 20160420
+	packetKeys(0x67D2163A,0x3068215B,0x4835474D); /* 4144 */
+#endif
+
+#if PACKETVER == 20160511
+	packetKeys(0x3C666FE2,0x27E84E3E,0x53E11BA5); /* 4144 */
+#endif
+
+#if PACKETVER == 20160525
+	packetKeys(0x485C45B6,0x47DC6192,0x76B34A36); /* 4144 */
+#endif
+
+#if PACKETVER == 20160608
+	packetKeys(0x11D74609,0x77C43E8A,0x44290F53); /* 4144 */
+#endif
+
+#if PACKETVER == 20160615
+	packetKeys(0x062C5C26,0x6CF47E82,0x4DD53480); /* 4144 */
+#endif
+
+#if PACKETVER == 20160630
+	packetKeys(0x0DF31CCC,0x54281606,0x5C4C6855); /* 4144 */
+#endif
+
+#if PACKETVER == 20160706
+	packetKeys(0x33A766D0,0x743F04F8,0x0FA0276C); /* 4144 */
+#endif
+
+#if PACKETVER == 20160713
+	packetKeys(0x714F2495,0x7DDC6F32,0x3FD8533D); /* 4144 */
+#endif
+
+#if PACKETVER == 20160720
+	packetKeys(0x4F8A19C0,0x2D8E085C,0x37BB67D6); /* 4144 */
+#endif
+
+#if PACKETVER == 20160727
+	packetKeys(0x3C6952AB,0x26E4077F,0x37E25DF7); /* 4144 */
+#endif
+
+#if PACKETVER == 20160831
+	packetKeys(0x564E13B0,0x7F680549,0x382D273B); /* 4144 */
+#endif
+
+#if PACKETVER == 20160907
+	packetKeys(0x32E5237D,0x57BD4DBD,0x5DBD5DBD); /* 4144 */
+#endif
+
+#if PACKETVER == 20160921
+	packetKeys(0x11CD15CD,0x15CD15CD,0x15CD15CD); /* 4144 */
+#endif
+
+#if PACKETVER == 20161012
+	packetKeys(0x5E2311F2,0x14FD012C,0x76EB64F6); /* 4144 */
+#endif
+
+#if PACKETVER == 20161026
+	packetKeys(0x2CB86AE6,0x7D12660E,0x1B004DEB); /* 4144 */
+#endif
+
+#if PACKETVER == 20161109
+	packetKeys(0x0A5277C0,0x2DB17506,0x0E8F26DA); /* 4144 */
+#endif
+
+#if PACKETVER == 20161207
+	packetKeys(0x52D267AA,0x4FE42156,0x1292153E); /* 4144 */
+#endif
+
+#if PACKETVER == 20161214
+	packetKeys(0x4DDE217B,0x07863AE0,0x5B591656); /* 4144 */
+#endif
+
+#if PACKETVER == 20161221
+	packetKeys(0x69CB4F56,0x793C165E,0x673A2354); /* 4144 */
+#endif
+
+#if PACKETVER == 20170125
+	packetKeys(0x066E04FE,0x3004224A,0x04FF0458); /* 4144 */
+#endif
+
+#if PACKETVER == 20170208
+	packetKeys(0x6A764E5F,0x0609570D,0x28AE07FA); /* 4144 */
+#endif
+
+#if PACKETVER == 20170228
+	packetKeys(0x771D4F2B,0x20EF1F4C,0x0D5135C8); /* 4144 */
+#endif
+
+#if PACKETVER == 20170308
+	packetKeys(0x653470A9,0x6B316A71,0x5C712C71); /* 4144 */
+#endif
+
+#if PACKETVER == 20170315
+	packetKeys(0x399A0856,0x56642A94,0x7F77157D); /* 4144 */
+#endif
+
+#if PACKETVER == 20170322
+	packetKeys(0x2050167B,0x01731233,0x40337033); /* 4144 */
+#endif
+
+#if PACKETVER == 20170329
+	packetKeys(0x18B31A80,0x1B0B1D56,0x16857D6A); /* 4144 */
+#endif
+
+#if PACKETVER == 20170405
+	packetKeys(0x1FDE7DAC,0x2F9F5B63,0x3F2062AF); /* 4144 */
+#endif
+
+#if PACKETVER == 20170517
+	packetKeys(0x2CC4749A,0x1FA954DC,0x72276857); /* 4144 */
+#endif
+
+#if defined(OBFUSCATIONKEY1) && defined(OBFUSCATIONKEY2) && defined(OBFUSCATIONKEY3)
+	packetKeys(OBFUSCATIONKEY1,OBFUSCATIONKEY2,OBFUSCATIONKEY3);
+#endif
+
+#endif /* MAP_PACKETS_KEYS_H */