Changeset 2860

Timestamp:

08/31/2009 05:27:10 PM (12 months ago)

Author:

Vlack

Message:

Notice: Trunk is now 3.2.0

FIXED: Mail sending (by providing a missing item for the world database, this item is necessary for the client - for the item, thanks goes to Darkgrööm)
FIXED: Battleground selection crash (now the server will queue you on Isle of Conquest - note: this does not mean you can play on it, but it solves the instant crash when players selected it)
FIXED: Glyphs (till we properly implement dual spec)
FIXED: A9 target GUID sending (on flags & UPDATEFLAG_HAS_TARGET - thanks Alleycat)
FIXED: Re-enabled ground targeted spells (on m_targetMask & TARGET_FLAG_DEST_LOCATION - if a spell where you can select the area of its effect crashes the client in the future, we'll revise this part)
FIXED: A9 (actually just moved the already existing code pieces up/down to better suit the required format, but to know the format right, I had looked into Mangos code too, as I haven't got months to figure out the right structure)
FIXED: TaxiMgr::GetGlobalTaxiNodeMask? (index check, as with the new DBCs we have a "to" with value "-1", and when that's used as an uint, it'll result in an index of 255, while the structure is from 0 to 11).
ADDED: Override support (this extends the core with special features for special gameobjects, like what's required for trams and transports, which include features as: "override update fields", "never despawn on same map", "announce on greater range" and "push to player on map entry").
FIXED: static map object pushing (repaired the buffer handling error which duplicated buffer content in a pretty unique way).
ADDED: SQL fixes for Deeprun and Ulduar Trams (retail data, but it works right only with the override system).
UPDATED: UpdateFields?.h
UPDATED: DBCs (thanks Xuni)
UPDATED: Error codes (thanks Hopla)
FIXED: various packets, especially the following ones: character enumeration, mail list, group details (raid difficulty), movement-related packets
FIXED: The display of quest rewards the player can choose from on the quest page before accepting it.
FIXED: A nasty bug when un-equipping an item to a bag and not to the backpack. The problem was that I have missed 2 for loops where the visible items get nulled out on unequip, it erased 17 fields instead of just 2, so it made the character pretty much naked.

Location:

trunk

Files:

• configs/logon.conf (modified) (1 diff)
• sql/character_updates/2860_groups.sql (added)
• sql/utilities/ArcEmu DB Updater.bat (modified) (4 diffs)
• sql/world_updates/2801_items.sql (modified) (1 diff)
• sql/world_updates/2817_recallorientation.sql (modified) (1 diff)
• sql/world_updates/2860_gameobject_overrides.sql (added)
• sql/world_updates/2860_items.sql (added)
• sql/world_updates/2860_mail_sending.sql (added)
• src/arcemu-shared/AuthCodes.h (modified) (8 diffs)
• src/arcemu-shared/Database/DBCStores.cpp (modified) (5 diffs)
• src/arcemu-shared/Database/DBCStores.h (modified) (2 diffs)
• src/arcemu-world/ArenaTeam.cpp (modified) (3 diffs)
• src/arcemu-world/BattlegroundHandler.cpp (modified) (1 diff)
• src/arcemu-world/BattlegroundMgr.cpp (modified) (3 diffs)
• src/arcemu-world/BattlegroundMgr.h (modified) (2 diffs)
• src/arcemu-world/CharacterHandler.cpp (modified) (3 diffs)
• src/arcemu-world/Creature.h (modified) (1 diff)
• src/arcemu-world/DynamicObject.cpp (modified) (1 diff)
• src/arcemu-world/GameObject.cpp (modified) (7 diffs)
• src/arcemu-world/GameObject.h (modified) (5 diffs)
• src/arcemu-world/Group.cpp (modified) (5 diffs)
• src/arcemu-world/Group.h (modified) (1 diff)
• src/arcemu-world/ItemHandler.cpp (modified) (2 diffs)
• src/arcemu-world/ItemInterface.cpp (modified) (2 diffs)
• src/arcemu-world/ItemPrototype.h (modified) (2 diffs)
• src/arcemu-world/LfgMgr.h (modified) (1 diff)
• src/arcemu-world/MailSystem.cpp (modified) (2 diffs)
• src/arcemu-world/Map.cpp (modified) (3 diffs)
• src/arcemu-world/Map.h (modified) (1 diff)
• src/arcemu-world/MapMgr.cpp (modified) (6 diffs)
• src/arcemu-world/Master.h (modified) (1 diff)
• src/arcemu-world/MiscHandler.cpp (modified) (4 diffs)
• src/arcemu-world/MovementHandler.cpp (modified) (4 diffs)
• src/arcemu-world/Object.cpp (modified) (15 diffs)
• src/arcemu-world/ObjectMgr.cpp (modified) (1 diff)
• src/arcemu-world/ObjectStorage.cpp (modified) (1 diff)
• src/arcemu-world/Opcodes.cpp (modified) (2 diffs)
• src/arcemu-world/Opcodes.h (modified) (1 diff)
• src/arcemu-world/Player.cpp (modified) (6 diffs)
• src/arcemu-world/Player.h (modified) (1 diff)
• src/arcemu-world/QueryHandler.cpp (modified) (2 diffs)
• src/arcemu-world/QuestMgr.cpp (modified) (1 diff)
• src/arcemu-world/Spell.cpp (modified) (1 diff)
• src/arcemu-world/SpellAuras.cpp (modified) (1 diff)
• src/arcemu-world/SpellAuras.h (modified) (1 diff)
• src/arcemu-world/SpellEffects.cpp (modified) (2 diffs)
• src/arcemu-world/TaxiHandler.cpp (modified) (3 diffs)
• src/arcemu-world/TaxiMgr.cpp (modified) (1 diff)
• src/arcemu-world/TransporterHandler.cpp (modified) (1 diff)
• src/arcemu-world/UpdateFields.h (modified) (5 diffs)
• src/arcemu-world/WorldSession.cpp (modified) (2 diffs)
• src/arcemu-world/WorldSession.h (modified) (3 diffs)

trunk/configs/logon.conf

@@ -69 +69 @@
 */
 
-<Client MinBuild = "9947"
-        MaxBuild = "9947">
+<Client MinBuild = "10192"
+        MaxBuild = "10314">
 
 /* WorldServer Setup

trunk/sql/utilities/ArcEmu DB Updater.bat

@@ -255 +255 @@
 mysql -h %server% --user=%user% --password=%pass% --port=%port% %wdb% --force < ..\world_updates\2840_guardtype.sql
 
+ECHO [Importing] 2860_gameobject_overrides.sql
+mysql -h %server% --user=%user% --password=%pass% --port=%port% %wdb% --force < ..\world_updates\2860_gameobject_overrides.sql
+
+ECHO [Importing] 2860_items.sql
+mysql -h %server% --user=%user% --password=%pass% --port=%port% %wdb% --force < ..\world_updates\2860_items.sql
+
+ECHO [Importing] 2860_mail_sending.sql
+mysql -h %server% --user=%user% --password=%pass% --port=%port% %wdb% --force < ..\world_updates\2860_mail_sending.sql
+
 
 ECHO [Importing] ArcScript_full.sql
@@ -350 +359 @@
 mysql -h %server% --user=%user% --password=%pass% --port=%port% %chr% < ..\character_updates\2845_refund.sql
 
+ECHO [Importing] 2860_groups.sql
+mysql -h %server% --user=%user% --password=%pass% --port=%port% %chr% < ..\character_updates\2860_groups.sql
+
 ECHO [Importing] Finished
 ECHO  Update Success.
@@ -540 +552 @@
 ECHO [Importing] 2840_guardtype.sql
 mysql -h %server% --user=%user% --password=%pass% --port=%port% %wdb% --force < ..\world_updates\2840_guardtype.sql
+
+ECHO [Importing] 2860_gameobject_overrides.sql
+mysql -h %server% --user=%user% --password=%pass% --port=%port% %wdb% --force < ..\world_updates\2860_gameobject_overrides.sql
+
+ECHO [Importing] 2860_items.sql
+mysql -h %server% --user=%user% --password=%pass% --port=%port% %wdb% --force < ..\world_updates\2860_items.sql
+
+ECHO [Importing] 2860_mail_sending.sql
+mysql -h %server% --user=%user% --password=%pass% --port=%port% %wdb% --force < ..\world_updates\2860_mail_sending.sql
 
 
@@ -631 +652 @@
 ECHO [Importing] 2845_refund.sql
 mysql -h %server% --user=%user% --password=%pass% --port=%port% %chr% < ..\character_updates\2845_refund.sql
+
+ECHO [Importing] 2860_groups.sql
+mysql -h %server% --user=%user% --password=%pass% --port=%port% %chr% < ..\character_updates\2860_groups.sql
 
 

trunk/sql/world_updates/2801_items.sql

@@ -12 +12 @@
 
 /* there is HolidayId column added in 3.1 */
-ALTER TABLE `items` ADD `HolidayId` INT( 32 ) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `items` ADD `HolidayId` INT( 32 ) UNSIGNED NOT NULL DEFAULT '0' after `ItemLimitCategoryId`;
 
 /* Cosmetic changes */

trunk/sql/world_updates/2817_recallorientation.sql

@@ -1 @@
-ALTER TABLE recall ADD `Orientation` float unsigned NOT NULL DEFAULT '0';
+ALTER TABLE recall ADD `Orientation` float unsigned NOT NULL DEFAULT '0' after `positionZ`;

trunk/src/arcemu-shared/AuthCodes.h

@@ -21 +21 @@
 #define _AUTHCODES_H
 
-// client 3.0.3, 2008/11/13
+// client 3.2.0, 2009/08/16
 enum LoginErrorCode
 {
@@ -31 +31 @@
         E_RESPONSE_CONNECTED                                                                            = 0x05,
         E_RESPONSE_VERSION_MISMATCH                                                                     = 0x06,
-        
+
         E_CSTATUS_CONNECTING                                                                            = 0x07,
         E_CSTATUS_NEGOTIATING_SECURITY                                                          = 0x08,
@@ -37 +37 @@
         E_CSTATUS_NEGOTIATION_FAILED                                                            = 0x0A,
         E_CSTATUS_AUTHENTICATING                                                                        = 0x0B,
-        
+
         E_AUTH_OK                                                                                                       = 0x0C,
         E_AUTH_FAILED                                                                                           = 0x0D,
@@ -61 +61 @@
         E_AUTH_PARENTAL_CONTROL                                                                         = 0x21,
         E_AUTH_LOCKED_ENFORCED                                                                          = 0x22,
-        
+
         E_REALM_LIST_IN_PROGRESS                                                                        = 0x23,
         E_REALM_LIST_SUCCESS                                                                            = 0x24,
@@ -67 +67 @@
         E_REALM_LIST_INVALID                                                                            = 0x26,
         E_REALM_LIST_REALM_NOT_FOUND                                                            = 0x27,
-        
+
         E_ACCOUNT_CREATE_IN_PROGRESS                                                            = 0x28,
         E_ACCOUNT_CREATE_SUCCESS                                                                        = 0x29,
         E_ACCOUNT_CREATE_FAILED                                                                         = 0x2A,
-        
+
         E_CHAR_LIST_RETRIEVING                                                                          = 0x2B,
         E_CHAR_LIST_RETRIEVED                                                                           = 0x2C,
         E_CHAR_LIST_FAILED                                                                                      = 0x2D,
-        
+
         E_CHAR_CREATE_IN_PROGRESS                                                                       = 0x2E,
         E_CHAR_CREATE_SUCCESS                                                                           = 0x2F,
@@ -89 +89 @@
         E_CHAR_CREATE_EXPANSION                                                                         = 0x39,
         E_CHAR_CREATE_EXPANSION_CLASS                                                           = 0x3A,
-        E_CHAR_CREATE_ERROR_NEED_LVL_55_CHAR                                            = 0x3B,
-        E_CHAR_CREATE_ERROR_HERO_CLASS_LIMIT                                            = 0x3C,
-        
-        E_CHAR_DELETE_IN_PROGRESS                                                                       = 0x3D,
-        E_CHAR_DELETE_SUCCESS                                                                           = 0x3E,
-        E_CHAR_DELETE_FAILED                                                                            = 0x3F,
-        E_CHAR_DELETE_FAILED_LOCKED_FOR_TRANSFER                                        = 0x40,
-        E_CHAR_DELETE_FAILED_GUILD_LEADER                                                       = 0x41,
-        E_CHAR_DELETE_FAILED_ARENA_CAPTAIN                                                      = 0x42,
-        
-        E_CHAR_LOGIN_IN_PROGRESS                                                                        = 0x43,
-        E_CHAR_LOGIN_SUCCESS                                                                            = 0x44,
-        E_CHAR_LOGIN_NO_WORLD                                                                           = 0x45,
-        E_CHAR_LOGIN_DUPLICATE_CHARACTER                                                        = 0x46,
-        E_CHAR_LOGIN_NO_INSTANCES                                                                       = 0x47,
-        E_CHAR_LOGIN_FAILED                                                                                     = 0x48,
-        E_CHAR_LOGIN_DISABLED                                                                           = 0x49,
-        E_CHAR_LOGIN_NO_CHARACTER                                                                       = 0x4A,
-        E_CHAR_LOGIN_LOCKED_FOR_TRANSFER                                                        = 0x4B,
-        E_CHAR_LOGIN_LOCKED_BY_BILLING                                                          = 0x4C,
-        
-        E_CHAR_NAME_SUCCESS                                                                                     = 0x4D,
-        E_CHAR_NAME_FAILURE                                                                                     = 0x4E,
-        E_CHAR_NAME_NO_NAME                                                                                     = 0x4F,
-        E_CHAR_NAME_TOO_SHORT                                                                           = 0x50,
-        E_CHAR_NAME_TOO_LONG                                                                            = 0x51,
-        E_CHAR_NAME_INVALID_CHARACTER                                                           = 0x52,
-        E_CHAR_NAME_MIXED_LANGUAGES                                                                     = 0x53,
-        E_CHAR_NAME_PROFANE                                                                                     = 0x54,
-        E_CHAR_NAME_RESERVED                                                                            = 0x55,
-        E_CHAR_NAME_INVALID_APOSTROPHE                                                          = 0x56,
-        E_CHAR_NAME_MULTIPLE_APOSTROPHES                                                        = 0x57,
-        E_CHAR_NAME_THREE_CONSECUTIVE                                                           = 0x58,
-        E_CHAR_NAME_INVALID_SPACE                                                                       = 0x59,
-        E_CHAR_NAME_CONSECUTIVE_SPACES                                                          = 0x5A,
-        E_CHAR_NAME_RUSSIAN_CONSECUTIVE_SILENT_CHARACTERS                       = 0x5B,
-        E_CHAR_NAME_RUSSIAN_SILENT_CHARACTER_AT_BEGINNING_OR_END        = 0x5C,
-        E_CHAR_NAME_DECLENSION_DOESNT_MATCH_BASE_NAME                           = 0x5D,
-
+        E_CHAR_CREATE_LEVEL_REQUIREMENT                                                         = 0x3B,
+        E_CHAR_CREATE_UNIQUE_CLASS_LIMIT                                                        = 0x3C,
+        E_CHAR_CREATE_CHARACTER_IN_GUILD                                                        = 0x3D,
+        E_CHAR_CREATE_RESTRICTED_RACECLASS                                                      = 0x3E,
+        E_CHAR_CREATE_CHARACTER_CHOOSE_RACE                                                     = 0x3F,
+        E_CHAR_CREATE_CHARACTER_ARENA_LEADER                                            = 0x40,
+        E_CHAR_CREATE_CHARACTER_DELETE_MAIL                                                     = 0x41,
+
+        E_CHAR_DELETE_IN_PROGRESS                                                                       = 0x42,
+        E_CHAR_DELETE_SUCCESS                                                                           = 0x43,
+        E_CHAR_DELETE_FAILED                                                                            = 0x44,
+        E_CHAR_DELETE_FAILED_LOCKED_FOR_TRANSFER                                        = 0x45,
+        E_CHAR_DELETE_FAILED_GUILD_LEADER                                                       = 0x46,
+        E_CHAR_DELETE_FAILED_ARENA_CAPTAIN                                                      = 0x47,
+
+        E_CHAR_LOGIN_IN_PROGRESS                                                                        = 0x48,
+        E_CHAR_LOGIN_SUCCESS                                                                            = 0x49,
+        E_CHAR_LOGIN_NO_WORLD                                                                           = 0x4A,
+        E_CHAR_LOGIN_DUPLICATE_CHARACTER                                                        = 0x4B,
+        E_CHAR_LOGIN_NO_INSTANCES                                                                       = 0x4C,
+        E_CHAR_LOGIN_FAILED                                                                                     = 0x4D,
+        E_CHAR_LOGIN_DISABLED                                                                           = 0x4E,
+        E_CHAR_LOGIN_NO_CHARACTER                                                                       = 0x4F,
+        E_CHAR_LOGIN_LOCKED_FOR_TRANSFER                                                        = 0x50,
+        E_CHAR_LOGIN_LOCKED_BY_BILLING                                                          = 0x51,
+
+        E_CHAR_NAME_SUCCESS                                                                                     = 0x52,
+        E_CHAR_NAME_FAILURE                                                                                     = 0x53,
+        E_CHAR_NAME_NO_NAME                                                                                     = 0x54,
+        E_CHAR_NAME_TOO_SHORT                                                                           = 0x55,
+        E_CHAR_NAME_TOO_LONG                                                                            = 0x56,
+        E_CHAR_NAME_INVALID_CHARACTER                                                           = 0x57,
+        E_CHAR_NAME_MIXED_LANGUAGES                                                                     = 0x58,
+        E_CHAR_NAME_PROFANE                                                                                     = 0x59,
+        E_CHAR_NAME_RESERVED                                                                            = 0x5A,
+        E_CHAR_NAME_INVALID_APOSTROPHE                                                          = 0x5B,
+        E_CHAR_NAME_MULTIPLE_APOSTROPHES                                                        = 0x5C,
+        E_CHAR_NAME_THREE_CONSECUTIVE                                                           = 0x5D,
+        E_CHAR_NAME_INVALID_SPACE                                                                       = 0x5E,
+        E_CHAR_NAME_CONSECUTIVE_SPACES                                                          = 0x5F,
+        E_CHAR_NAME_RUSSIAN_CONSECUTIVE_SILENT_CHARACTERS                       = 0x60,
+        E_CHAR_NAME_RUSSIAN_SILENT_CHARACTER_AT_BEGINNING_OR_END        = 0x61,
+        E_CHAR_NAME_DECLENSION_DOESNT_MATCH_BASE_NAME                           = 0x62,
 };
+
 //These defines are for use with OutPacket
 #define    RESPONSE_SUCCESS "\x0"
@@ -168 +173 @@
 #define    AUTH_LOCKED_ENFORCED "\x22"
 
-#define    REALM_LIST_RECIEVING "\x23"
+#define    REALM_LIST_IN_PROGRESS "\x23"
 #define    REALM_LIST_SUCCESS "\x24"
 #define    REALM_LIST_FAILED "\x25"
@@ -195 +200 @@
 #define    CHAR_CREATE_EXPANSION "\x39"
 #define    CHAR_CREATE_EXPANSION_CLASS "\x3A"
-#define    CHAR_CREATE_ERROR_NEED_LVL_55_CHAR "\x3B"
-#define    CHAR_CREATE_ERROR_HERO_CLASS_LIMIT "\x3C"
-
-#define    CHAR_DELETE_IN_PROGRESS "\x3D"
-#define    CHAR_DELETE_SUCCESS "\x3E"
-#define    CHAR_DELETE_FAILED "\x3F"
-#define    CHAR_DELETE_FAILED_LOCKED_FOR_TRANSFER "\x40"
-#define    CHAR_DELETE_FAILED_GUILD_LEADER "\x41"
-#define    CHAR_DELETE_FAILED_ARENA_CAPTAIN "\x42"
-
-#define    CHAR_LOGIN_IN_PROGRESS "\x43"
-#define    CHAR_LOGIN_SUCCESS "\x44"
-#define    CHAR_LOGIN_NO_WORLD "\x45"
-#define    CHAR_LOGIN_DUPLICATE_CHARACTER "\x46"
-#define    CHAR_LOGIN_NO_INSTANCES "\x47"
-#define    CHAR_LOGIN_FAILED "\x48"
-#define    CHAR_LOGIN_DISABLED "\x49"
-#define    CHAR_LOGIN_NO_CHARACTER "\x4A"
-#define    CHAR_LOGIN_LOCKED_FOR_TRANSFER "\x4B"
-#define    CHAR_LOGIN_LOCKED_BY_BILLING "\x4C"
-
-#define    CHAR_NAME_SUCCESS "\x4D"
-#define    CHAR_NAME_FAILURE "\x4E"
-#define    CHAR_NAME_NO_NAME "\x4F"
-#define    CHAR_NAME_TOO_SHORT "\x50"
-#define    CHAR_NAME_TOO_LONG "\x51"
-#define    CHAR_NAME_INVALID_CHARACTER "\x52"
-#define    CHAR_NAME_MIXED_LANGUAGES "\x53"
-#define    CHAR_NAME_PROFANE "\x54"
-#define    CHAR_NAME_RESERVED "\x55"
-#define    CHAR_NAME_INVALID_APOSTROPHE "\x56"
-#define    CHAR_NAME_MULTIPLE_APOSTROPHES "\x57"
-#define    CHAR_NAME_THREE_CONSECUTIVE "\x58"
-#define    CHAR_NAME_INVALID_SPACE "\x59"
-#define    CHAR_NAME_CONSECUTIVE_SPACES "\x5A"
-#define    CHAR_NAME_RUSSIAN_CONSECUTIVE_SILENT_CHARACTERS "\x5B"
-#define    CHAR_NAME_RUSSIAN_SILENT_CHARACTER_AT_BEGINNING_OR_END "\x5C"
-#define    CHAR_NAME_DECLENSION_DOESNT_MATCH_BASE_NAME "\x5D"
+#define    CHAR_CREATE_LEVEL_REQUIREMENT "\x3B"
+#define    CHAR_CREATE_UNIQUE_CLASS_LIMIT "\x3C"
+#define    CHAR_CREATE_CHARACTER_IN_GUILD "\x3D"
+#define    CHAR_CREATE_RESTRICTED_RACECLASS "\x3E"
+#define    CHAR_CREATE_CHARACTER_CHOOSE_RACE "\x3F"
+#define    CHAR_CREATE_CHARACTER_ARENA_LEADER "\x40"
+#define    CHAR_CREATE_CHARACTER_DELETE_MAIL "\x41"
+
+#define    CHAR_DELETE_IN_PROGRESS "\x42"
+#define    CHAR_DELETE_SUCCESS "\x43"
+#define    CHAR_DELETE_FAILED "\x44"
+#define    CHAR_DELETE_FAILED_LOCKED_FOR_TRANSFER "\x45"
+#define    CHAR_DELETE_FAILED_GUILD_LEADER "\x46"
+#define    CHAR_DELETE_FAILED_ARENA_CAPTAIN "\x47"
+
+#define    CHAR_LOGIN_IN_PROGRESS "\x48"
+#define    CHAR_LOGIN_SUCCESS "\x49"
+#define    CHAR_LOGIN_NO_WORLD "\x4A"
+#define    CHAR_LOGIN_DUPLICATE_CHARACTER "\x4B"
+#define    CHAR_LOGIN_NO_INSTANCES "\x4C"
+#define    CHAR_LOGIN_FAILED "\x4D"
+#define    CHAR_LOGIN_DISABLED "\x4E"
+#define    CHAR_LOGIN_NO_CHARACTER "\x4F"
+#define    CHAR_LOGIN_LOCKED_FOR_TRANSFER "\x50"
+#define    CHAR_LOGIN_LOCKED_BY_BILLING "\x51"
+
+#define    CHAR_NAME_SUCCESS "\x52"
+#define    CHAR_NAME_FAILURE "\x53"
+#define    CHAR_NAME_NO_NAME "\x54"
+#define    CHAR_NAME_TOO_SHORT "\x55"
+#define    CHAR_NAME_TOO_LONG "\x56"
+#define    CHAR_NAME_INVALID_CHARACTER "\x57"
+#define    CHAR_NAME_MIXED_LANGUAGES "\x58"
+#define    CHAR_NAME_PROFANE "\x59"
+#define    CHAR_NAME_RESERVED "\x5A"
+#define    CHAR_NAME_INVALID_APOSTROPHE "\x5B"
+#define    CHAR_NAME_MULTIPLE_APOSTROPHES "\x5C"
+#define    CHAR_NAME_THREE_CONSECUTIVE "\x5D"
+#define    CHAR_NAME_INVALID_SPACE "\x5E"
+#define    CHAR_NAME_CONSECUTIVE_SPACES "\x5F"
+#define    CHAR_NAME_RUSSIAN_CONSECUTIVE_SILENT_CHARACTERS "\x60"
+#define    CHAR_NAME_RUSSIAN_SILENT_CHARACTER_AT_BEGINNING_OR_END "\x61"
+#define    CHAR_NAME_DECLENSION_DOESNT_MATCH_BASE_NAME "\x62"
 
 #endif

trunk/src/arcemu-shared/Database/DBCStores.cpp

@@ -172 +172 @@
         "u" // AttributesExE
         "u" // AttributesExF
+        "x" // unk 3.2.0
         "u" // RequiredShapeShift
+        "x" // unk 3.2.0
         "u" // ShapeshiftExclude
+        "x" // unk 3.2.0
         "u" // Targets
         "u" // TargetCreatureType
@@ -265 +268 @@
         "ux"
         "x" //Added in 3.1
+        "xxx" // unk 3.2.0, float!
+        "x" // unk 3.2.0
 ;
 
 
-const char* itemextendedcostFormat = "uuuuuuuuuuuuuux";
+const char* itemextendedcostFormat = "uuuxuuuuuuuuuuux";
 const char* talententryFormat = "uuuuuuuuuxxxxuxxuxxxxxx";
 const char* talenttabentryFormat = "uxxxxxxxxxxxxxxxxxxxuuux";
@@ -286 +291 @@
 const char* dbctaxipathnodeFormat = "uuuufffuuxx";
 const char* creaturespelldataFormat = "uuuuuuuuu";
-const char* charraceFormat = "uxxxxxxxuxxxxulxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+const char* charraceFormat = "uxxxxxxuxxxxulxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
 const char* charclassFormat = "uxuxlxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
 const char* creaturefamilyFormat = "ufufuuuuuxlxxxxxxxxxxxxxxxxx";
@@ -300 +305 @@
         "u"                                     // 56 multimap_id
         "x"                                     // 57 unk_float (all 1 but arathi 1.25)
-        "xxxxxxxxxxxxxxxxx"     // 58-74 normalReqText
-        "xxxxxxxxxxxxxxxxx"     // 75-91 heroicReqText
-        "xxxxxxxxxxxxxxxxx"     // 92-108 emptyText
-        "u"                                     // 109 parent_map
-        "u"                                     // 110 start_x
-        "u"                                     // 111 start_y
-        "u"                                     // 112 resetTimeRaid
-        "u"                                     // 113 resetTimeHeroic
-        "x"                                     // 114 unk
-        "x"                                     // 115 unk
-        "u"                                     // 116 addon
-        "x";                            // 117 unk
+        "u"                                     // 58 parent_map
+        "u"                                     // 59 start_x
+        "u"                                     // 60 start_y
+        "x"                                     // 61 unk
+        "u"                                     // 62 addon
+        "x"                                     // 63 unk
+        "x";                                    // 64 unk, but as it is always one of the following ones, it could be a max. player count: 0, 5, 10, 20, 25, 40
 
 const char* itemrandomsuffixformat = "uxxxxxxxxxxxxxxxxxxuuuxxuuuxx";//19, 20, 21, 24, 25, 26
@@ -322 +322 @@
 const char* areatriggerformat = "uuffffffff";
 const char* scalingstatdistributionformat = "uiiiiiiiiiiuuuuuuuuuuu";
-const char* scalingstatvaluesformat = "uuuuuuuuuuuuuuuuuuu";
+const char* scalingstatvaluesformat = "uuuuuuuuuuuuuuuuuuxxxxxx";
 const char* itemlimitcategoryformat = "usxxxxxxxxxxxxxxxxuu";
 

trunk/src/arcemu-shared/Database/DBCStores.h

@@ -1301 +1301 @@
         float  start_x;      // enter x coordinate (if exist single entry)
         float  start_y;      // enter y coordinate (if exist single entry)
-        uint32 resetTimeRaid;
-        uint32 resetTimeHeroic;
+        //uint32 resetTimeRaid;   // REMOVED IN 3.2.0
+        //uint32 resetTimeHeroic; // REMOVED IN 3.2.0
         uint32 addon;        // 0-original maps, 1-tbc addon, 2-wotlk addon
 };
@@ -1435 +1435 @@
         uint32 id;
         uint32 level;
-        uint32 multiplier[17];
+        uint32 multiplier[16];
 };
 

trunk/src/arcemu-world/ArenaTeam.cpp

@@ -156 +156 @@
         if(plr)
         {
-                base_field = (m_type*6) + PLAYER_FIELD_ARENA_TEAM_INFO_1_1;
+                base_field = (m_type*7) + PLAYER_FIELD_ARENA_TEAM_INFO_1_1;
                 plr->SetUInt32Value(base_field, m_id);
                 plr->SetUInt32Value(base_field+1,m_leader);
@@ -181 +181 @@
                         if(info->m_loggedInPlayer)
                         {
-                                info->m_loggedInPlayer->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (m_type*6), 0);
+                                info->m_loggedInPlayer->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (m_type*7), 0);
                                 info->m_loggedInPlayer->m_arenaTeams[m_type]=0;
                         }
@@ -315 +315 @@
                 {
                         if(m_members[i].Info->m_loggedInPlayer)
-                                m_members[i].Info->m_loggedInPlayer->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (m_type*6) + 1, 0);
+                                m_members[i].Info->m_loggedInPlayer->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (m_type*7) + 1, 0);
                 }
                 else if(m_members[i].Info->guid == old_leader)
                 {
                         if(m_members[i].Info->m_loggedInPlayer)
-                                m_members[i].Info->m_loggedInPlayer->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (m_type*6) + 1, 1);
+                                m_members[i].Info->m_loggedInPlayer->SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (m_type*7) + 1, 1);
                 }
         }

trunk/src/arcemu-world/BattlegroundHandler.cpp

@@ -347 +347 @@
     for( uint8 i = 0; i < 3; i++ )
     {
-                id = player->GetUInt32Value( PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + ( i * 6 ) );
+                id = player->GetUInt32Value( PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + ( i * 7 ) );
         if( id > 0 )
         {

trunk/src/arcemu-world/BattlegroundMgr.cpp

@@ -26 +26 @@
 const static uint32 BGMapIds[ BATTLEGROUND_NUM_TYPES ] =
 {
-        0,              // 0
-        30,             // AV
+        0,      // 0
+        30,     // AV
         489,    // WSG
         529,    // AB
-        0,              // 2v2
-        0,              // 3v3
-        0,              // 5v5
+        0,      // 2v2
+        0,      // 3v3
+        0,      // 5v5
         566,    // EOTS
         0,
@@ -41 +41 @@
 
 const static CreateBattlegroundFunc BGCFuncs[BATTLEGROUND_NUM_TYPES] = {
-        NULL,                                                           // 0
-        &AlteracValley::Create,                         // AV
-        &WarsongGulch::Create,                          // WSG
-        &ArathiBasin::Create,                           // AB
-        NULL,                                                           // 2v2
-        NULL,                                                           // 3v3
-        NULL,                                                           // 5v5
-        &EyeOfTheStorm::Create,                         // EotS
+        NULL,                           // 0
+        &AlteracValley::Create,         // AV
+        &WarsongGulch::Create,          // WSG
+        &ArathiBasin::Create,           // AB
+        NULL,                           // 2v2
+        NULL,                           // 3v3
+        NULL,                           // 5v5
+        &EyeOfTheStorm::Create,         // EotS
         NULL,
-        &StrandOfTheAncient::Create,            // SOTA
+        &StrandOfTheAncient::Create,    // SOTA
         NULL,
         NULL,
@@ -84 +84 @@
                 return;
         }
+
+        if( BattlegroundType >= BATTLEGROUND_NUM_TYPES ) return; //VLack: Nasty hackers might try to abuse this packet to crash us...
 
         uint32 Count = 0;

trunk/src/arcemu-world/BattlegroundMgr.h

@@ -35 +35 @@
 enum BattlegroundDbcIndex
 {
-        BGDBC_ALTERAC_VALLEY            = 1,
+        BGDBC_ALTERAC_VALLEY                    = 1,
         BGDBC_WARSONG_GULCH                     = 2,
         BGDBC_ARATHI_BASIN                      = 3,
         BGDBC_ARENA_NAGRAND                     = 4,
-        BGDBC_ARENA_BLADES_EDGE         = 5,
+        BGDBC_ARENA_BLADES_EDGE                 = 5,
         BGDBC_ARENA_ALLMAPS                     = 6,
-        BGDBC_EYE_OF_THE_STORM          = 7,
-        BGDBC_RUINS_OF_LORDAERON        = 8,
-        BGDBC_STRAND_OF_THE_ANCIENT     = 9,
-        BGDBC_DALARAN_SEWERS            = 10,
+        BGDBC_EYE_OF_THE_STORM                  = 7,
+        BGDBC_RUINS_OF_LORDAERON                = 8,
+        BGDBC_STRAND_OF_THE_ANCIENT             = 9,
+        BGDBC_DALARAN_SEWERS                    = 10,
         BGDBC_RING_OF_VALOR                     = 11,
-        BGDBC_ROWS                                      = 11,
+        BGDBC_ROWS                              = 11,
 };
 
 enum BattleGroundTypes
 {
-        BATTLEGROUND_ALTERAC_VALLEY                     = 1,
-        BATTLEGROUND_WARSONG_GULCH                      = 2,
-        BATTLEGROUND_ARATHI_BASIN                       = 3,
-        BATTLEGROUND_ARENA_2V2                          = 4,
-        BATTLEGROUND_ARENA_3V3                          = 5,
-        BATTLEGROUND_ARENA_5V5                          = 6,
+        BATTLEGROUND_ALTERAC_VALLEY             = 1,
+        BATTLEGROUND_WARSONG_GULCH              = 2,
+        BATTLEGROUND_ARATHI_BASIN               = 3,
+        BATTLEGROUND_ARENA_2V2                  = 4,
+        BATTLEGROUND_ARENA_3V3                  = 5,
+        BATTLEGROUND_ARENA_5V5                  = 6,
         BATTLEGROUND_EYE_OF_THE_STORM           = 7,
         BATTLEGROUND_STRAND_OF_THE_ANCIENT      = 9,
-        BATTLEGROUND_NUM_TYPES                          = 12,
+        BATTLEGROUND_NUM_TYPES                  = 33, //Based on BattlemasterList.dbc, make the storage arrays big enough! On 3.1.3 the last one was 11 The Ring of Valor, so 12 was enough here, but on 3.2.0 there is 32 All Battlegrounds!
 };
 
@@ -87 +87 @@
 
 #define SOUND_BATTLEGROUND_BEGIN                        0xD6F
-#define SOUND_HORDE_SCORES                                      8213
+#define SOUND_HORDE_SCORES                              8213
 #define SOUND_ALLIANCE_SCORES                           8173
 #define SOUND_ALLIANCE_CAPTURE                          8174
-#define SOUND_HORDE_CAPTURE                                     8212
+#define SOUND_HORDE_CAPTURE                             8212
 #define SOUND_ALLIANCE_RETURNED                         8192
 #define SOUND_HORDE_RETURNED                            8192    // huh?
-#define SOUND_HORDEWINS                                         8454
-#define SOUND_ALLIANCEWINS                                      8455
-#define SOUND_HORDE_BGALMOSTEND                  0x2108
-#define SOUND_ALLIANCE_BGALMOSTEND                0x2109
-
-#define AB_ALLIANCE_RESOURCES                      0x6F0
-#define AB_HORDE_RESOURCES                                0x6F1
+#define SOUND_HORDEWINS                                 8454
+#define SOUND_ALLIANCEWINS                              8455
+#define SOUND_HORDE_BGALMOSTEND                         0x2108
+#define SOUND_ALLIANCE_BGALMOSTEND                      0x2109
+
+#define AB_ALLIANCE_RESOURCES                           0x6F0
+#define AB_HORDE_RESOURCES                              0x6F1
 #define AB_HORDE_CAPTUREBASE                            0x6F2
-#define AB_ALLIANCE_CAPTUREBASE                  0x6F3
-#define AB_MAX_SCORE                                            0x6F4
-
-#define BG_PREPARATION 44521
-#define BG_REVIVE_PREPARATION   44535
-#define RESURRECT_SPELL                 21074   // Spirit Healer Res
-#define BG_DESERTER 26013
+#define AB_ALLIANCE_CAPTUREBASE                         0x6F3
+#define AB_MAX_SCORE                                    0x6F4
+
+#define BG_PREPARATION                                  44521
+#define BG_REVIVE_PREPARATION                           44535
+#define RESURRECT_SPELL                                 21074   // Spirit Healer Res
+#define BG_DESERTER                                     26013
 
 // WSG define's
-#define WSG_ALLIANCE_FLAG_CAPTURED                0x922
-#define WSG_HORDE_FLAG_CAPTURED                  0x923
-#define WSG_CURRENT_HORDE_SCORE                  0x62E
-#define WSG_CURRENT_ALLIANCE_SCORE                0x62D
-#define WSG_MAX_SCORE                                      0x641
+#define WSG_ALLIANCE_FLAG_CAPTURED                      0x922
+#define WSG_HORDE_FLAG_CAPTURED                         0x923
+#define WSG_CURRENT_HORDE_SCORE                         0x62E
+#define WSG_CURRENT_ALLIANCE_SCORE                      0x62D
+#define WSG_MAX_SCORE                                   0x641
 
 // AV define's
-#define AV_UNCONTROLED_SNOWFALL_GRAVE      0x7AE //1 -> show uncontrolled
-
-#define AV_CONTROLED_ICEBLOOD_TOWER_HORDE   0x569 //1 -> horde controlled
-#define AV_CONTROLED_TOWER_POINT_HORDE    0x568 //1 -> horde controlled
-#define AV_CONTROLED_FROSTWOLF_RELIFHUNT_HORDE 0x532 //1 -> horde controlled
-#define AV_CONTROLED_EAST_FROSTWOLF_TOWER_HORDE 0x567 //1 -> horde controlled
-#define AV_CONTROLED_WEST_FROSTWOLF_TOWER_HORDE 0x566 //1 -> horde controlled
-#define AV_CONTROLED_ICEBLOOD_GRAVE_HORDE   0x543 //1 -> horde controlled
-#define AV_CONTROLED_FROSTWOLF_GRAVE_HORDE   0x53A //1 -> horde controlled
-
-#define AV_CONTROLED_IRONDEEP_MINE_TROGG        0x550 //1 -> trogg controlled
-#define AV_CONTROLED_COLDTHOOT_MINE_KOBOLT  0x54D //1 -> kobolt controlled
-
-#define AV_CONTROLED_STORMPIKE_GRAVE_ALLIANCE  0x535 //1 -> alliance controlled
-#define AV_CONTROLED_STONEHEART_BUNKER_ALLIANCE  0x554 //1 -> alliance controlled
-#define AV_CONTROLED_ICEWING_BUNKER_ALLIANCE  0x553 //1 -> alliance controlled
-#define AV_CONTROLED_DUBALDER_NORTH_BUNKER_ALLIANCE  0x552 //1 -> alliance controlled
-#define AV_CONTROLED_DUBALDER_SOUTH_BUNKER_ALLIANCE  0x551 //1 -> alliance controlled
-#define AV_CONTROLED_STORMPIKE_AID_STATION_ALLIANCE  0x52D //1 -> alliance controlled
-#define AV_CONTROLED_STONEHEART_GRAVE_ALLIANCE  0x516 //1 -> alliance controlled
+#define AV_UNCONTROLED_SNOWFALL_GRAVE                   0x7AE //1 -> show uncontrolled
+
+#define AV_CONTROLED_ICEBLOOD_TOWER_HORDE               0x569 //1 -> horde controlled
+#define AV_CONTROLED_TOWER_POINT_HORDE                  0x568 //1 -> horde controlled
+#define AV_CONTROLED_FROSTWOLF_RELIFHUNT_HORDE          0x532 //1 -> horde controlled
+#define AV_CONTROLED_EAST_FROSTWOLF_TOWER_HORDE         0x567 //1 -> horde controlled
+#define AV_CONTROLED_WEST_FROSTWOLF_TOWER_HORDE         0x566 //1 -> horde controlled
+#define AV_CONTROLED_ICEBLOOD_GRAVE_HORDE               0x543 //1 -> horde controlled
+#define AV_CONTROLED_FROSTWOLF_GRAVE_HORDE              0x53A //1 -> horde controlled
+
+#define AV_CONTROLED_IRONDEEP_MINE_TROGG                0x550 //1 -> trogg controlled
+#define AV_CONTROLED_COLDTHOOT_MINE_KOBOLT              0x54D //1 -> kobolt controlled
+
+#define AV_CONTROLED_STORMPIKE_GRAVE_ALLIANCE           0x535 //1 -> alliance controlled
+#define AV_CONTROLED_STONEHEART_BUNKER_ALLIANCE         0x554 //1 -> alliance controlled
+#define AV_CONTROLED_ICEWING_BUNKER_ALLIANCE            0x553 //1 -> alliance controlled
+#define AV_CONTROLED_DUBALDER_NORTH_BUNKER_ALLIANCE     0x552 //1 -> alliance controlled
+#define AV_CONTROLED_DUBALDER_SOUTH_BUNKER_ALLIANCE     0x551 //1 -> alliance controlled
+#define AV_CONTROLED_STORMPIKE_AID_STATION_ALLIANCE     0x52D //1 -> alliance controlled
+#define AV_CONTROLED_STONEHEART_GRAVE_ALLIANCE          0x516 //1 -> alliance controlled
 
 /* get level grouping for player */

trunk/src/arcemu-world/CharacterHandler.cpp

@@ -197 +197 @@
                                 data << uint32(1);              // alive
                         }
-                                data << uint32(0); //Added in 3.0.2
-                        
+
+                        data << uint32(0); //Added in 3.0.2 - if 1, faction change at logon...
+
                         data << fields[14].GetUInt8();          // Rest State
+
+                        data << uint8(0); //3.2.0
 
                         if( Class == WARLOCK || Class == HUNTER )
@@ -368 +371 @@
                 && ( class_ == DEATHKNIGHT ) )
         {
-                OutPacket(SMSG_CHAR_CREATE, 1, CHAR_CREATE_ERROR_HERO_CLASS_LIMIT);
+                OutPacket(SMSG_CHAR_CREATE, 1, CHAR_CREATE_UNIQUE_CLASS_LIMIT);
                 return;
         }
@@ -427 +430 @@
                 SendPacket( &data );
                 */
-                OutPacket( SMSG_CHAR_CREATE, 1, CHAR_CREATE_ERROR_NEED_LVL_55_CHAR);
+                OutPacket( SMSG_CHAR_CREATE, 1, CHAR_CREATE_LEVEL_REQUIREMENT);
                 return;
         }

trunk/src/arcemu-world/Creature.h

@@ -65 +65 @@
         char * SubName;
         char * info_str;
+        uint32 QuestItems[6];
         uint32 Flags1;
         uint32 Type;

trunk/src/arcemu-world/DynamicObject.cpp

@@ -72 +72 @@
 
         m_floatValues[DYNAMICOBJECT_RADIUS] = radius;
-        m_floatValues[DYNAMICOBJECT_POS_X]  = x;
-        m_floatValues[DYNAMICOBJECT_POS_Y]  = y;
-        m_floatValues[DYNAMICOBJECT_POS_Z]  = z;
+        m_position.x = x; //m_floatValues[DYNAMICOBJECT_POS_X]  = x;
+        m_position.y = y; //m_floatValues[DYNAMICOBJECT_POS_Y]  = y;
+        m_position.z = z; //m_floatValues[DYNAMICOBJECT_POS_Z]  = z;
+        
 
         m_aliveDuration = duration;

trunk/src/arcemu-world/GameObject.cpp

@@ -60 +60 @@
         m_battleground = NULL;
         m_rotation = 0;
+
+        m_overrides = 0;
 }
 
@@ -99 +101 @@
 }
 
-bool GameObject::CreateFromProto(uint32 entry,uint32 mapid, float x, float y, float z, float ang, float r0, float r1, float r2, float r3)
+bool GameObject::CreateFromProto(uint32 entry,uint32 mapid, float x, float y, float z, float ang, float r0, float r1, float r2, float r3, uint32 overrides)
 {
         pInfo= GameObjectNameStorage.LookupEntry(entry);
@@ -107 +109 @@
         SetUInt32Value( OBJECT_FIELD_ENTRY, entry );
         
+        m_overrides=overrides;
 //      SetFloatValue( GAMEOBJECT_POS_X, x );
 //      SetFloatValue( GAMEOBJECT_POS_Y, y );
@@ -322 +325 @@
                 << GetFloatValue(OBJECT_FIELD_SCALE_X) << ","
                 << "0,"
-                << m_phase << ")";
+                << m_phase << ","
+                << m_overrides << ")";
         WorldDatabase.Execute(ss.str().c_str());
 
@@ -374 +378 @@
                 << GetFloatValue(OBJECT_FIELD_SCALE_X) << ","
                 << "0,"
-                << m_phase << ")";
+                << m_phase << ","
+                << m_overrides << ")";
 
         FILE * OutFile;
@@ -497 +502 @@
 bool GameObject::Load(GOSpawn *spawn)
 {
-        if(!CreateFromProto(spawn->entry,0,spawn->x,spawn->y,spawn->z,spawn->facing))
+        if(!CreateFromProto(spawn->entry,0,spawn->x,spawn->y,spawn->z,spawn->facing,spawn->o,spawn->o1,spawn->o2,spawn->o3,spawn->overrides))
                 return false;
 
@@ -840 +845 @@
         float r2=GetFloatValue(GAMEOBJECT_PARENTROTATION_02);
         float r3=GetFloatValue(GAMEOBJECT_PARENTROTATION_03);
-        if(r2==0.0f && r3==0.0f)
+        if(r2==0.0f && r3==0.0f && !(m_overrides & GAMEOBJECT_OVERRIDE_PARENTROT) )
         {
                 r2 = (float)f_rot1;

trunk/src/arcemu-world/GameObject.h

@@ -44 +44 @@
 };
 
+enum GAMEOBJECT_OVERRIDES //by VLack
+{
+        GAMEOBJECT_INFVIS = 0x01,               //Makes the gameobject forever visible on the map after you saw it at least once - for various transports; actually it just doesn't erase it while you're on the same map.
+        GAMEOBJECT_MAPWIDE = 0x02,              //When you enter its map, the gameobject gets pushed to you no matter how far it is (but only for players), especially for Deeprun and Ulduar Trams.
+        GAMEOBJECT_AREAWIDE = 0x04,             //UNIMPLEMENTED, but will work like this: the Map will get marked that it contains an object like this, and on player movement these objects will get distance-checked to spawn them from a greater distance than normal if needed - for few objects on smaller maps, like on battlegrounds; maybe they'll get area-triggered, haven't decided yet.
+        GAMEOBJECT_ONMOVEWIDE = 0x08,           //When this gameobject moves and sends updates about it's position, do so in the second range - MapMgr::ChangeObjectLocation, +/- 6 units wide instead of +/- 1.
+        GAMEOBJECT_OVERRIDE_FLAGS = 0x10,       //UNIMPLEMENTED, Let the core decide about the flags sent in the A9 - example: 252 instead of 352 for Deeprun Tram.
+        GAMEOBJECT_OVERRIDE_BYTES1 = 0x20,      //UNIMPLEMENTED, Let the core use the full field instead an uint8 in GAMEOBJECT_BYTES_1, if the database creator knows what to do with it.
+        GAMEOBJECT_OVERRIDE_PARENTROT = 0x40,   //Makes it possible for the core to skip calculating these fields and use whatever was specified in the spawn.
+        //Later other types might folow, or the upper bytes might get used for the AREAWIDE option in the overrides variable...
+};
+
 #if ENABLE_SHITTY_STL_HACKS == 1
 typedef HM_NAMESPACE::hash_map<Quest*, uint32 > GameObjectGOMap;
@@ -86 +98 @@
         char * Unkstr;
         float Size;
-        uint32 QuestItems[4];
+        uint32 QuestItems[6];
         uint32 SpellFocus;
         uint32 sound1;
@@ -188 +200 @@
         //void Create ( uint32 display_id, uint8 state, uint32 obj_field_entry, float scale, uint16 type, uint16 faction, uint32 mapid, float x, float y, float z, float ang );
    // void Create ( uint32 mapid, float x, float y, float z, float ang);
-        bool CreateFromProto(uint32 entry,uint32 mapid, float x, float y, float z, float ang, float r0=0.0f, float r1=0.0f, float r2=0.0f, float r3=0.0f);
+        bool CreateFromProto(uint32 entry,uint32 mapid, float x, float y, float z, float ang, float r0=0.0f, float r1=0.0f, float r2=0.0f, float r3=0.0f, uint32 overrides=0);
    
         bool Load(GOSpawn *spawn);
@@ -303 +315 @@
         uint8 GetState();
 
+        ARCEMU_INLINE uint32 GetOverrides() { return m_overrides; }
+
 protected:
 
@@ -312 +326 @@
         uint32 usage_remaining; //used for mining to mark times it can be mined
 
+        uint32 m_overrides; //See enum GAMEOBJECT_OVERRIDES!
 };
 

trunk/src/arcemu-world/Group.cpp

@@ -82 +82 @@
         m_isqueued=false;
         m_difficulty=0;
+        m_raiddifficulty=0;
         m_assistantLeader=m_mainAssist=m_mainTank=NULL;
 #ifdef VOICE_CHAT
@@ -285 +286 @@
                                 data.Initialize(SMSG_GROUP_LIST);
                                 data << uint8(m_GroupType);     //0=party,1=raid
-                                data << uint8(0);   // unk
+                                data << uint8(0);   // 1 if battleground group
                                 data << uint8(sg1->GetID());
                                 data << uint8(0);       // unk2
@@ -344 +345 @@
                                 data << uint8( m_LootThreshold );
                                 data << uint8( m_difficulty );
+                                data << uint8( m_raiddifficulty );
 
                                 if( !(*itr1)->m_loggedInPlayer->IsInWorld() )
@@ -776 +778 @@
         m_LootThreshold = fields[4].GetUInt8();
         m_difficulty = fields[5].GetUInt8();
+        m_raiddifficulty = fields[6].GetUInt8();
 
         LOAD_ASSISTANT(6, m_assistantLeader);
@@ -849 +852 @@
                 << uint32(m_LootMethod) << ","
                 << uint32(m_LootThreshold) << ","
-                << uint32(m_difficulty) << ",";
+                << uint32(m_difficulty) << ","
+                << uint32(m_raiddifficulty) << ",";
 
         if(m_assistantLeader)

trunk/src/arcemu-world/Group.h

@@ -237 +237 @@
 public:
         uint8 m_difficulty;
+        uint8 m_raiddifficulty;
 };
 

trunk/src/arcemu-world/ItemHandler.cpp

@@ -429 +429 @@
         int8 error=0;
 
-        recv_data >> srcslot >> dstslot;
+        recv_data >> dstslot >> srcslot;
 
         sLog.outDetail("ITEM: swap, src slot: %u dst slot: %u", (uint32)srcslot, (uint32)dstslot);
@@ -943 +943 @@
         data << itemProto->Flags;
         data << itemProto->BuyPrice;
+        data << itemProto->Faction;
         data << itemProto->SellPrice;
         data << itemProto->InventoryType;

trunk/src/arcemu-world/ItemInterface.cpp

@@ -414 +414 @@
                                 m_pOwner->ApplyItemMods( pItem, slot, false );
                                 int VisibleBase = PLAYER_VISIBLE_ITEM_1_ENTRYID + (slot * PLAYER_VISIBLE_ITEM_LENGTH);
-                                for (int i = VisibleBase; i < VisibleBase + 17; ++i)
+                                for (int i = VisibleBase; i < VisibleBase + PLAYER_VISIBLE_ITEM_LENGTH; ++i)
                                 {
                                         m_pOwner->SetUInt32Value(i, 0);
@@ -585 +585 @@
                                 m_pOwner->ApplyItemMods(pItem, slot, false );
                                 int VisibleBase = PLAYER_VISIBLE_ITEM_1_ENTRYID + (slot * PLAYER_VISIBLE_ITEM_LENGTH);
-                                for (int i = VisibleBase; i < VisibleBase + 17; ++i)
+                                for (int i = VisibleBase; i < VisibleBase + PLAYER_VISIBLE_ITEM_LENGTH; ++i)
                                 {
                                         m_pOwner->SetUInt32Value(i, 0);

trunk/src/arcemu-world/ItemPrototype.h

@@ -319 +319 @@
         ARMOR_PENETRATION_RATING                        = 44,
         SPELL_POWER                                                     = 45, 
+        HEALTH_REGEN                                    = 46,
+        SPELL_PENETRATION                               = 47,
+        BLOCK_VALUE                                     = 48,
 };
 
@@ -586 +589 @@
         uint32 Quality;
         uint32 Flags;
+        uint32 Faction;
         uint32 BuyPrice;
         uint32 SellPrice;

trunk/src/arcemu-world/LfgMgr.h

@@ -27 +27 @@
         LFG_ZONE = 4,
         LFG_HEROIC_DUNGEON = 5, // from client
+        LFG_ANY_DUNGEON = 6,
+        LFG_ANY_HEROIC_DUNGEON = 7,
+        LFG_DAILY_DUNGEON = 8,
+        LFG_DAILY_HEROIC_DUNGEON = 9,
 };
 
-#define MAX_DUNGEONS 244+1 // check max entry's +1 on lfgdungeons.dbc
+#define MAX_DUNGEONS 250+1 // check max entry's +1 on lfgdungeons.dbc
 #define MAX_LFG_QUEUE_ID 3
 #define LFG_MATCH_TIMEOUT 30            // in seconds

trunk/src/arcemu-world/MailSystem.cpp

@@ -63 +63 @@
         WorldPacket * data = new WorldPacket(SMSG_MAIL_LIST_RESULT, 500);
         MessageMap::iterator itr;
+        uint32 realcount = 0;
         uint32 count = 0;
         uint32 t = (uint32)UNIXTIME;
+        *data << uint32(0);      // realcount - this can be used to tell the client we have more mail than that fits into this packet
         *data << uint8(0);       // size placeholder
 
@@ -74 +76 @@
                 if((uint32)UNIXTIME < itr->second.delivery_time)
                         continue;               // undelivered
-                
+
+                if(count >= 50) //VLack: We could calculate message sizes instead of this, but the original code did a break at 50, so I won't fix this up if no one felt the need to do so before ;-)
+                {
+                        ++realcount;
+                        continue;
+                }
+
                 if(itr->second.AddMessageDataToPacket(*data))
+                {
                         ++count;
-                
-                if(count == 50)
-                        break;
-        }
-
-        const_cast<uint8*>(data->contents())[0] = static_cast<uint8>( count );
+                        ++realcount;
+                }
+        }
+
+        data->put<uint32>(0, realcount); 
+        data->put<uint8>(4, count); 
 
         // do cleanup on request mail

trunk/src/arcemu-world/Map.cpp

@@ -26 +26 @@
 
 #define CREATURESPAWNSFIELDCOUNT 26
-#define GOSPAWNSFIELDCOUNT               17
+#define GOSPAWNSFIELDCOUNT               18
 
 Map::Map(uint32 mapid, MapInfo * inf)
@@ -274 +274 @@
                                 gspawn->phase = fields[16].GetUInt32();
                                 if( gspawn->phase == 0 ) gspawn->phase=0xFFFFFFFF;
+                                gspawn->overrides = fields[17].GetUInt32();
                                 staticSpawns.GOSpawns.push_back(gspawn);
                                 ++GameObjectSpawnCount;
@@ -309 +310 @@
                                         gspawn->phase = fields[16].GetUInt32();
                                         if( gspawn->phase == 0 ) gspawn->phase=0xFFFFFFFF;
-
-                                        //uint32 cellx=float2int32(((_maxX-gspawn->x)/_cellSize));
-                                        //uint32 celly=float2int32(((_maxY-gspawn->y)/_cellSize));
-                                        uint32 cellx=CellHandler<MapMgr>::GetPosX(gspawn->x);
-                                        uint32 celly=CellHandler<MapMgr>::GetPosY(gspawn->y);
-                                        if(spawns[cellx]==NULL)
+                                        gspawn->overrides = fields[17].GetUInt32();
+
+                                        if( gspawn->overrides & GAMEOBJECT_MAPWIDE )
                                         {
-                                                spawns[cellx]=new CellSpawns*[_sizeY];
-                                                memset(spawns[cellx],0,sizeof(CellSpawns*)*_sizeY);
+                                                staticSpawns.GOSpawns.push_back(gspawn); //We already have a staticSpawns in the Map class, and it does just the right thing
+                                                ++GameObjectSpawnCount;
                                         }
-
-                                        if(!spawns[cellx][celly])
-                                                spawns[cellx][celly]=new CellSpawns;
-
-                                        spawns[cellx][celly]->GOSpawns.push_back(gspawn);
-                                        ++GameObjectSpawnCount;
+                                        else
+                                        {
+                                                //uint32 cellx=float2int32(((_maxX-gspawn->x)/_cellSize));
+                                                //uint32 celly=float2int32(((_maxY-gspawn->y)/_cellSize));
+                                                uint32 cellx=CellHandler<MapMgr>::GetPosX(gspawn->x);
+                                                uint32 celly=CellHandler<MapMgr>::GetPosY(gspawn->y);
+                                                if(spawns[cellx]==NULL)
+                                                {
+                                                        spawns[cellx]=new CellSpawns*[_sizeY];
+                                                        memset(spawns[cellx],0,sizeof(CellSpawns*)*_sizeY);
+                                                }
+
+                                                if(!spawns[cellx][celly])
+                                                        spawns[cellx][celly]=new CellSpawns;
+
+                                                spawns[cellx][celly]->GOSpawns.push_back(gspawn);
+                                                ++GameObjectSpawnCount;
+                                        }
                                 }while(result->NextRow());
                         }

trunk/src/arcemu-world/Map.h

@@ -97 +97 @@
         //uint32 stateNpcLink;
         uint32 phase;
+        uint32 overrides;
 } GOSpawn;
 

trunk/src/arcemu-world/MapMgr.cpp

@@ -434 +434 @@
                 if(_mapWideStaticObjects.size())
                 {
+                        uint32 globalcount=0;
                         if(!buf)
                                 buf = new ByteBuffer(300);
@@ -440 +441 @@
                         {
                                 count = (*itr)->BuildCreateUpdateBlockForPlayer(buf, plObj);
-                                plObj->PushCreationData(buf, count);
-                        }
+                                globalcount += count;
+                        }
+                        //VLack: It seems if we use the same buffer then it is a BAD idea to try and push created data one by one, add them at once!
+                        //       If you try to add them one by one, then as the buffer already contains data, they'll end up repeating some object.
+                        //       Like 6 object updates for Deeprun Tram, but the built package will contain these entries: 2AFD0, 2AFD0, 2AFD1, 2AFD0, 2AFD1, 2AFD2
+                        if( globalcount>0 ) plObj->PushCreationData(buf, globalcount);
                 }
         }
@@ -764 +769 @@
                         else if( curObj->GetTypeFromGUID() == HIGHGUID_TYPE_TRANSPORTER )
                                 fRange = 0.0f; // unlimited distance for transporters (only up to 2 cells +/- anyway.)
-                        //If the object announcing it's position is a transport, then it should announce it to everyone and everything; thus deleting it from visible objects should be avoided. - By: VLack aka. VLsoft
-                        else if( obj->GetTypeId() == TYPEID_GAMEOBJECT && static_cast<GameObject*>(obj)->GetInfo()->Type == GAMEOBJECT_TYPE_TRANSPORT )
+                        //If the object announcing its position is a transport, or other special object, then deleting it from visible objects should be avoided. - By: VLack
+                        else if( obj->GetTypeId() == TYPEID_GAMEOBJECT && (static_cast<GameObject*>(obj)->GetOverrides() & GAMEOBJECT_INFVIS) && obj->GetMapId() == curObj->GetMapId() )
+                                fRange = 0.0f;
+                        //If the object we're checking for possible removal is a transport or other special object, and we are players on the same map, don't remove it...
+                        else if( plObj && curObj->GetTypeId() == TYPEID_GAMEOBJECT && (static_cast<GameObject*>(curObj)->GetOverrides() & GAMEOBJECT_INFVIS) && obj->GetMapId() == curObj->GetMapId() )
                                 fRange = 0.0f;
                         else if( curObj->IsPlayer() && static_cast< Player* >( curObj )->GetUInt64Value(PLAYER_FARSIGHT) == obj->GetGUID())
@@ -893 +901 @@
         MapCell *cell;
 
-        //If the object announcing it's position is a transport, then it should do so in a much wider area - like the distance between the two transport towers in Orgrimmar, or more. - By: VLack aka. VLsoft
-        if( obj->GetTypeId() == TYPEID_GAMEOBJECT && static_cast<GameObject*>(obj)->GetInfo()->Type == GAMEOBJECT_TYPE_TRANSPORT ) {
+        //If the object announcing it's position is a special one, then it should do so in a much wider area - like the distance between the two transport towers in Orgrimmar, or more. - By: VLack
+        if( obj->GetTypeId() == TYPEID_GAMEOBJECT && (static_cast<GameObject*>(obj)->GetOverrides() & GAMEOBJECT_ONMOVEWIDE) ) {
                 endX = cellX + 5 <= _sizeX ? cellX + 6 : ( _sizeX - 1 );
                 endY = cellY + 5 <= _sizeY ? cellY + 6 : ( _sizeY - 1 );
@@ -943 +951 @@
                 else if( curObj->GetTypeFromGUID() == HIGHGUID_TYPE_TRANSPORTER )
                         fRange = 0.0f; // unlimited distance for transporters (only up to 2 cells +/- anyway.)
-                //If the object announcing it's position is a transport, then it should announce it to everyone and everything as far as possible. - By: VLack aka. VLsoft
-                else if( obj->GetTypeId() == TYPEID_GAMEOBJECT && static_cast<GameObject*>(obj)->GetInfo()->Type == GAMEOBJECT_TYPE_TRANSPORT )
+
+                //If the object announcing its position is a transport, or other special object, then deleting it from visible objects should be avoided. - By: VLack
+                else if( obj->GetTypeId() == TYPEID_GAMEOBJECT && (static_cast<GameObject*>(obj)->GetOverrides() & GAMEOBJECT_INFVIS) && obj->GetMapId() == curObj->GetMapId() )
+                        fRange = 0.0f;
+                //If the object we're checking for possible removal is a transport or other special object, and we are players on the same map, don't remove it, and add it whenever possible...
+                else if( plObj && curObj->GetTypeId() == TYPEID_GAMEOBJECT && (static_cast<GameObject*>(curObj)->GetOverrides() & GAMEOBJECT_INFVIS) && obj->GetMapId() == curObj->GetMapId() )
                         fRange = 0.0f;
                 else
@@ -2241 +2253 @@
 }
 
-void MapMgr::LoadInstanceScript() 
-{ 
-        mInstanceScript = sScriptMgr.CreateScriptClassForInstance( _mapId, this ); 
-};       
- void MapMgr::CallScriptUpdate() 
-{ 
-        ASSERT( mInstanceScript ); 
-                mInstanceScript->UpdateEvent(); 
- };
+void MapMgr::LoadInstanceScript()
+{
+        mInstanceScript = sScriptMgr.CreateScriptClassForInstance( _mapId, this );
+};
+
+void MapMgr::CallScriptUpdate()
+{
+        ASSERT( mInstanceScript );
+        mInstanceScript->UpdateEvent();
+};

trunk/src/arcemu-world/Master.h

@@ -29 +29 @@
 
 #ifndef _VERSION
-# define _VERSION "3.1.3"
+# define _VERSION "3.2.0"
 #endif
 

trunk/src/arcemu-world/MiscHandler.cpp

@@ -1924 +1924 @@
         }
 
+//NOTE: VLack: since 3.2.0, the first field of this packet is a _packed_ GUID, so keep this in mind if you plan to read data (just use WoWGuid, it'll read it correctly).
+
    /* uint16 opcode = recv_data.GetOpcode();
         std::stringstream ss;
@@ -2462 +2464 @@
 }
 
+void WorldSession::HandleRaidDifficultyOpcode(WorldPacket& recv_data)
+{
+        uint32 data;
+        recv_data >> data;
+
+        Group * m_Group = _player->GetGroup();
+
+        if(m_Group && _player->IsGroupLeader())
+        {
+                m_Group->m_raiddifficulty = data;
+                _player->iInstanceType = data;
+                sInstanceMgr.ResetSavedInstances(_player);
+
+                m_Group->Lock();
+                for(uint32 i = 0; i < m_Group->GetSubGroupCount(); ++i)
+                {
+                        for(GroupMembersSet::iterator itr = m_Group->GetSubGroup(i)->GetGroupMembersBegin(); itr != m_Group->GetSubGroup(i)->GetGroupMembersEnd(); ++itr)
+                        {
+                                if((*itr)->m_loggedInPlayer)
+                                {
+                                        (*itr)->m_loggedInPlayer->iInstanceType = data;
+                                        (*itr)->m_loggedInPlayer->SendRaidDifficulty();
+                                }
+                        }
+                }
+                m_Group->Unlock();
+        }
+        else if(!_player->GetGroup())
+        {
+                _player->iInstanceType = data;
+                sInstanceMgr.ResetSavedInstances(_player);
+        }
+
+#ifdef OPTIMIZED_PLAYER_SAVING
+        _player->save_InstanceType();
+#endif
+}
+
 void WorldSession::HandleSummonResponseOpcode(WorldPacket & recv_data)
 {
@@ -2523 +2563 @@
         _player->SetUInt32Value(PLAYER_FIELD_GLYPHS_1 + glyphNum, 0);
         _player->RemoveAllAuras(glyph->SpellID, 0);
+        _player->m_specs[0].glyphs[glyphNum] = 0; //VLack: TempFIX till dual spec...
+        _player->smsg_TalentsInfo(false, 0, 0);
 }
 
@@ -2542 +2584 @@
         return;
 }
+
+void WorldSession::HandleWorldStateUITimerUpdate(WorldPacket& recv_data)
+{
+        WorldPacket data(SMSG_WORLD_STATE_UI_TIMER_UPDATE, 4);
+        data << (uint32)UNIXTIME;;
+        SendPacket(&data);
+}

trunk/src/arcemu-world/MovementHandler.cpp

@@ -99 +99 @@
 void WorldSession::HandleMoveTeleportAckOpcode( WorldPacket & recv_data )
 {
-        uint64 guid;
+        WoWGuid guid;
         recv_data >> guid;
         if(guid == _player->GetGUID())
@@ -272 +272 @@
         /* Read Movement Data Packet                                            */
         /************************************************************************/
+        WoWGuid guid;
+        recv_data >> guid;
         movement_info.init(recv_data);
+        m_MoverWoWGuid = guid;
 
         /************************************************************************/
@@ -427 +430 @@
         {
                 move_time = (movement_info.time - (mstime - m_clientTimeDelay)) + MOVEMENT_PACKET_TIME_DELAY + mstime;
-                memcpy(&movement_packet[pos], recv_data.contents(), recv_data.size());
+//              memcpy(&movement_packet[pos], recv_data.contents(), recv_data.size());
+                memcpy(&movement_packet[0], recv_data.contents(), recv_data.size());
                 movement_packet[pos+6]=0;
 
@@ -673 +677 @@
 void WorldSession::HandleMoveNotActiveMoverOpcode( WorldPacket & recv_data )
 {
-
+        WoWGuid guid;
+        recv_data >> guid;
+
+        if(guid == m_MoverWoWGuid)
+                return;
+
+        movement_info.init(recv_data);
+
+        if(guid != uint64(0))
+                m_MoverWoWGuid = guid;
+        else
+                m_MoverWoWGuid.Init(_player->GetGUID());
+
+        // set up to the movement packet
+        movement_packet[0] = m_MoverWoWGuid.GetNewGuidMask();
+        memcpy(&movement_packet[1], m_MoverWoWGuid.GetNewGuid(), m_MoverWoWGuid.GetNewGuidLen());
 }
 

trunk/src/arcemu-world/Object.cpp

@@ -240 +240 @@
         case TYPEID_GAMEOBJECT:
                 flags = 0x0350;
+                if( m_uint32Values[GAMEOBJECT_DISPLAYID]==3831 ) flags=0x0252; //Deeprun Tram proper flags as of 3.2.0.
                 break;
 
         case TYPEID_DYNAMICOBJECT:
-                flags = 0x0050;
+                flags = 0x0150;
                 break;
 
@@ -276 +277 @@
                                 {
                                         /* deeprun tram, etc */
-                                        flags = 0x352;
+                                        flags = 0x252;
                                 }break;
 
@@ -287 +288 @@
                 }
                 //The above 3 checks FAIL to identify transports, thus their flags remain 0x58, and this is BAAAAAAD! Later they don't get position x,y,z,o updates, so they appear randomly by a client-calculated path, they always face north, etc... By: VLack
-                if( flags != 0x0352 && GetTypeId() == TYPEID_GAMEOBJECT && static_cast<GameObject*>(this)->GetInfo()->Type == GAMEOBJECT_TYPE_TRANSPORT )
+                if( flags != 0x0352 && GetTypeId() == TYPEID_GAMEOBJECT && static_cast<GameObject*>(this)->GetInfo()->Type == GAMEOBJECT_TYPE_TRANSPORT && !(static_cast<GameObject*>(this)->GetOverrides() & GAMEOBJECT_OVERRIDE_PARENTROT) )
                         flags = 0x0352;
         }
@@ -307 +308 @@
         _SetCreateBits( &updateMask, target );
 
+        if(GetTypeId() == TYPEID_GAMEOBJECT && (static_cast<GameObject*>(this)->GetOverrides() & GAMEOBJECT_OVERRIDE_PARENTROT) )
+        {
+                updateMask.SetBit(GAMEOBJECT_PARENTROTATION_02);
+                updateMask.SetBit(GAMEOBJECT_PARENTROTATION_03);
+        }
+
         // this will cache automatically if needed
         _BuildValuesUpdate( data, &updateMask, target );
@@ -439 +446 @@
         /* ByteBuffer *splinebuf = (m_objectTypeId == TYPEID_UNIT) ? target->GetAndRemoveSplinePacket(GetGUID()) : 0; */
         uint16 flag16 = 0;      // some other flag
+        /* VLack: idea from Mangos, for future vehicle implementation
+        if(GetTypeId() == TYPEID_UNIT)
+                if(((Creature*)this)->isVehicle())
+                        flag16 |= 0x20;*/
+
         *data << (uint16)flags;
 
@@ -458 +470 @@
                 uThis = static_cast<Creature*>(this);
 
-        if( flags & UPDATEFLAG_UNK1 ) //0x0100
-                *data << uint8( 0 ); //some say it is like parent guid ?
-
         if (flags & UPDATEFLAG_LIVING) //0x20
         {
@@ -483 +492 @@
                         //               Don't know what this is, but I've only seen it applied to spirit healers.
                         //               maybe some sort of invisibility flag? :/
-
                         switch(GetEntry())
                         {
@@ -495 +503 @@
 
                         if(uThis->GetAIInterface()->IsFlying())
-//                              flags2 |= 0x800; //in 2.3 this is some state that i was not able to decode yet
+                                //flags2 |= 0x800; //in 2.3 this is some state that i was not able to decode yet
                                 flags2 |= MOVEFLAG_NO_COLLISION; //0x400 Zack : Teribus the Cursed had flag 400 instead of 800 and he is flying all the time 
                         if(uThis->GetProto() && uThis->GetProto()->extra_a9_flags)
                         {
 //do not send shit we can't honor
-#define UNKNOWN_FLAGS2 ( 0x0200 | 0x00002000 | 0x00001000 | 0x00200000 | 0x04000000 | 0x08000000 )
+#define UNKNOWN_FLAGS2 ( 0x00002000 | 0x04000000 | 0x08000000 )
                                 uint32 inherit = uThis->GetProto()->extra_a9_flags & UNKNOWN_FLAGS2;
                                 flags2 |= inherit;
                         }
-/*                      if(GetGUIDHigh() == HIGHGUID_WAYPOINT)
+                        /*if(GetGUIDHigh() == HIGHGUID_WAYPOINT)
                         {
                                 if(GetUInt32Value(UNIT_FIELD_STAT0) == 768)             // flying waypoint
@@ -522 +530 @@
                 //   0x10 -> disables movement compensation and causes players to jump around all the place
                 //   0x40 -> disables movement compensation and causes players to jump around all the place
-        }
-
-        if( ( flags & 0x0300 ) ) //0x0300=UPDATEFLAG_UNK1 | UPDATEFLAG_UNK2
-        {
-                if( flags & UPDATEFLAG_UNK1 ) //0x0100
-                {
-                        *data << (float)m_position.x;
-                        *data << (float)m_position.y;
-                        *data << (float)m_position.z;
-                }
-                *data << (float)m_position.x;
-                *data << (float)m_position.y;
-                *data << (float)m_position.z;
-//              if( flags & UPDATEFLAG_UNK2 ) //0x0200
-//              {
-                        *data << (float)m_position.o;
-//                      *data << (float)0; //well no idea atm
-                        if (m_objectTypeId == TYPEID_CORPSE)
-                                *data << (float)m_position.o; //VLack: repeat the orientation!
-                        else
-                                *data << (float)0;
-//              }
-        }
-        else if (flags & UPDATEFLAG_HAS_POSITION) //0x40
-        {
+
+                //Send position data, every living thing has these
                 *data << (float)m_position.x;
                 *data << (float)m_position.y;
@@ -559 +544 @@
                                 *data << wowguid;
                                 *data << pThis->m_TransporterX << pThis->m_TransporterY << pThis->m_TransporterZ << pThis->m_TransporterO;
-//                              *data << pThis->m_TransporterTime;
+                                //*data << pThis->m_TransporterTime;
                                 *data << pThis->m_TransporterUnk;
                                 *data << (uint8)0;
@@ -574 +559 @@
                         }
                 }
-        }
-
-        if (flags & UPDATEFLAG_LIVING) //0x20
-        {
-                if( flags2 & MOVEFLAG_SWIMMING ) //0x0200000 flying/swimming, && unk sth to do with vehicles?
+
+                if( (flags2 & (MOVEFLAG_SWIMMING | MOVEFLAG_AIR_SWIMMING)) || (flag16 & 0x20) ) // 0x2000000+0x0200000 flying/swimming, && unk sth to do with vehicles?
                 {
                         if(pThis && moveinfo)
@@ -591 +573 @@
                         *data << (uint32)0; //last fall time
 
-                if( flags2 & MOVEFLAG_FALLING || flags2 & MOVEFLAG_JUMPING ) // 0x00002000 || 0x00001000
-                {
-/*                      if(pThis && moveinfo)
+                if( flags2 & MOVEFLAG_JUMPING ) // 0x00001000
+                {
+                        /*if(pThis && moveinfo)
                         {
                                 *data << moveinfo->FallTime;
@@ -601 +583 @@
                         }
                         else
-                        {
-*/
+                        {*/
                                 *data << (float)0;
                                 *data << (float)1.0;
                                 *data << (float)0;
                                 *data << (float)0;
-//                      }
-                }
-                if( flags2 & MOVEFLAG_AIR_SWIMMING ) //0x02000000
-                        *data << (uint32)0; //?
-                if( flags2 & MOVEFLAG_SWIMMING ) //0x00200000
-                        *data << (uint32)0; //?
-                if( flags2 & MOVEFLAG_SPLINE_MOVER ) //0x04000000
-                        *data << (uint32)0; //?
+                        //}
+                }
+
+                if( flags2 & MOVEFLAG_SPLINE_MOVER ) // 0x4000000
+                {
+                        int err1, err2; err2=0; err1=10/err2; //FAIL please with divide by zero :)
+                }
 
                 if( m_walkSpeed == 0 )
                         *data << 8.0f;
                 else
-                        *data << m_walkSpeed;    // walk speed
+                        *data << m_walkSpeed;   // walk speed
                 if( m_runSpeed == 0 )
                         *data << 8.0f;
                 else
-                        *data << m_runSpeed;      // run speed
-                *data << m_backWalkSpeed; // backwards walk speed
-                *data << m_swimSpeed;    // swim speed
-                *data << m_backSwimSpeed; // backwards swim speed
+                        *data << m_runSpeed;    // run speed
+                *data << m_backWalkSpeed;       // backwards walk speed
+                *data << m_swimSpeed;           // swim speed
+                *data << m_backSwimSpeed;       // backwards swim speed
                 if( m_flySpeed == 0 )
                         *data << 8.0f;
                 else
-                        *data << m_flySpeed;            // fly speed
+                        *data << m_flySpeed;    // fly speed
                 *data << m_backFlySpeed;        // back fly speed
-                *data << m_turnRate;      // turn rate
-                *data << float(7);
-                /*if( flags2 & MOVEFLAG_IMMOBILIZED ) //0x08000000
-                        if(splinebuf)
-                        {
-                                data->append(*splinebuf);
-                                delete splinebuf;
-                        }*/
-        }
+                *data << m_turnRate;            // turn rate
+                *data << float(7);              // pitch rate, now a constant...
+
+                if( flags2 & 0x08000000 ) //VLack: On Mangos this is a nice spline movement code, but we never had such... Also, at this point we haven't got this flag, that's for sure, but fail just in case...
+                {
+                        int err1, err2; err2=0; err1=10/err2; //FAIL please with divide by zero :)
+                }
+        }
+        else //----------------------------------- No UPDATEFLAG_LIVING -----------------------------------
+        {
+                if( flags & UPDATEFLAG_POSITION ) //0x0100
+                {
+                        *data << uint8( 0 ); //some say it is like parent guid ?
+                        *data << (float)m_position.x;
+                        *data << (float)m_position.y;
+                        *data << (float)m_position.z;
+                        *data << (float)m_position.x;
+                        *data << (float)m_position.y;
+                        *data << (float)m_position.z;
+                        *data << (float)m_position.o;
+
+                        if (m_objectTypeId == TYPEID_CORPSE)
+                                *data << (float)m_position.o; //VLack: repeat the orientation!
+                        else
+                                *data << (float)0;
+                }
+                else if (flags & UPDATEFLAG_HAS_POSITION) //0x40
+                {
+                        if(flags & UPDATEFLAG_TRANSPORT && m_uint32Values[GAMEOBJECT_BYTES_1]==GAMEOBJECT_TYPE_MO_TRANSPORT)
+                        {
+                                *data << (float)0;
+                                *data << (float)0;
+                                *data << (float)0;
+                        }
+                        else
+                        {
+                                *data << (float)m_position.x;
+                                *data << (float)m_position.y;
+                                *data << (float)m_position.z;
+                        }
+                        *data << (float)m_position.o;
+                }
+        }
+
 
         if( flags & UPDATEFLAG_LOWGUID ) //0x08
@@ -649 +664 @@
 
         if( flags & UPDATEFLAG_HAS_TARGET ) //0x04
-                *data << (uint8)0;      //some compressed GUID
-
-        if( flags & UPDATEFLAG_VEHICLE ) //0x80
-        {
-                *data << (uint32)0; //?
-                *data << (uint32)0; //?
-        }
-
-        if(flags & UPDATEFLAG_TRANSPORT) //0x2
+                FastGUIDPack(*data, GetUInt64Value(UNIT_FIELD_TARGET)); //some compressed GUID
+
+
+        if( flags & UPDATEFLAG_TRANSPORT ) //0x2
         {
                 if(target)
@@ -668 +678 @@
                         *data << getMSTime();
         }
-        if( flags & UPDATEFLAG_UNK2 ) //0x0200
+        if( flags & UPDATEFLAG_VEHICLE ) //0x80
+        {
+                *data << (uint32)0; //Vehicle ID
+                *data << (uint32)0; //Facing
+        }
+
+        if( flags & UPDATEFLAG_ROTATION ) //0x0200
         {
                 if( IsGameObject() )

trunk/src/arcemu-world/ObjectMgr.cpp

@@ -3133 +3133 @@
         if(result)
         {
-                if(result->GetFieldCount() != 51)
+                if(result->GetFieldCount() != 52)
                 {
                         Log.LargeErrorMessage(LARGERRORMESSAGE_WARNING, "groups table format is invalid. Please update your database.");

trunk/src/arcemu-world/ObjectStorage.cpp

@@ -23 +23 @@
 /** Table formats converted to strings
  */
-const char * gItemPrototypeFormat                                               = "uuuusuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuffuffuuuuuuuuuufuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuusuuuuuuuuuuuuuuuuuuuuuuuuuuuuu";
+const char * gItemPrototypeFormat                                               = "uuuusuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuffuffuuuuuuuuuufuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuusuuuuuuuuuuuuuuuuuuuuuuuuuuuuu";
 const char * gItemNameFormat                                                    = "usu";
-const char * gCreatureNameFormat                                                = "usssuuuuuuuuuuffcc";
-const char * gGameObjectNameFormat                                              = "uuusssssssfuuuuuuuuuuuuuuuuuuuuuuuuuuuu";
+const char * gCreatureNameFormat                                                = "usssuuuuuuuuuuuuuuuuffcc";
+const char * gGameObjectNameFormat                                              = "uuusssssssfuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu";
 const char * gCreatureProtoFormat                                               = "uuuuuuufuuuffuuffuuuuuuuuffsuuuufffuuuuuuuuu";
 const char * gVendorRestrictionEntryFormat                              = "uuuuuu";

trunk/src/arcemu-world/Opcodes.cpp

@@ -21 +21 @@
 #include "StdAfx.h"
 
-// Updated for 3.0.2.9038
+// Updated for 3.2.0
 NameTableEntry g_worldOpcodeNames[] = {
  {MSG_NULL_ACTION,     "MSG_NULL_ACTION"},
@@ -1215 +1215 @@
  {SMSG_EQUIPMENT_SET_LIST,    "SMSG_EQUIPMENT_SET_LIST"},
  {SMSG_TALENTS_INFO,    "SMSG_TALENTS_INFO"},
+ {MSG_SET_RAID_DIFFICULTY,    "MSG_SET_RAID_DIFFICULTY"},
+ {CMSG_WORLD_STATE_UI_TIMER_UPDATE,    "CMSG_WORLD_STATE_UI_TIMER_UPDATE"},
+ {SMSG_WORLD_STATE_UI_TIMER_UPDATE,    "SMSG_WORLD_STATE_UI_TIMER_UPDATE"},
         {0,                     0}
 };
-
-
-

trunk/src/arcemu-world/Opcodes.h

@@ -1223 +1223 @@
     SMSG_EQUIPMENT_SET_LIST                         = 0x4BC, // SMSG, equipment manager list?
     SMSG_TALENTS_INFO                               = 0x4C0, // SMSG, talents related
-    NUM_MSG_TYPES                                   = 0x4CB, // max msg number
+    MSG_SET_RAID_DIFFICULTY                         = 0x4EB,
+    CMSG_WORLD_STATE_UI_TIMER_UPDATE                = 0x4F6,
+    SMSG_WORLD_STATE_UI_TIMER_UPDATE                = 0x4F7,
+    NUM_MSG_TYPES                                   = 0x4F8, // max msg number
 };
 

trunk/src/arcemu-world/Player.cpp

@@ -1602 +1602 @@
         *p_data << GetUInt32Value(PLAYER_GUILDID);// guild
 
-        if(rename_pending)  *p_data << uint32(0x00A04342);  // wtf blizz? :P
+        if(rename_pending)  *p_data << uint32(0x00A04342); // wtf blizz? :P
         else if(m_banned)   *p_data << (uint32)7;       // Banned (cannot login)
-        else if(IsDead())   *p_data << (uint32)8704; // Dead (displaying as Ghost)
-        else                            *p_data << (uint32)1;   // Alive
-
+        else if(IsDead())   *p_data << (uint32)8704;    // Dead (displaying as Ghost)
+        else                *p_data << (uint32)1;       // Alive
+
+        *p_data << (uint32)0; //VLack: send 1 for faction change at logon
         *p_data << (uint8)m_restState;    // rest state
+        *p_data << (uint8)0; //3.2.0
 
         // pet stuff
@@ -2718 +2720 @@
         ss << "'";
 
-        for(uint32 i = 0; i < 8; ++i)
+        for(uint32 i = 0; i < GLYPHS_COUNT; ++i)
                 ss << m_uint32Values[PLAYER_FIELD_GLYPHS_1 + i] << ",";
 
@@ -3255 +3257 @@
                 if(m_arenaTeams[z] != NULL)
                 {
-                        SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (z*6), m_arenaTeams[z]->m_id);
+                        SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (z*7), m_arenaTeams[z]->m_id);
                         if(m_arenaTeams[z]->m_leader == GetLowGUID())
-                                SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (z*6) + 1, 0);
+                                SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (z*7) + 1, 0);
                         else
-                                SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (z*6) + 1, 1);
+                                SetUInt32Value(PLAYER_FIELD_ARENA_TEAM_INFO_1_1 + (z*7) + 1, 1);
                 }
         }
@@ -3491 +3493 @@
 
         // Load Glyphs and apply their auras
-//      LoadFieldsFromString(get_next_field.GetString(), PLAYER_FIELD_GLYPHS_1, 8);
-        LoadFieldsFromString(get_next_field.GetString(), PLAYER_FIELD_GLYPHS_1, 6);
+        LoadFieldsFromString(get_next_field.GetString(), PLAYER_FIELD_GLYPHS_1, GLYPHS_COUNT);
         GlyphPropertyEntry *glyph;
-//      for(uint32 i=0; i < 8; i++)
-        for(uint32 i=0; i < 6; i++)
+        for(uint32 i=0; i < GLYPHS_COUNT; i++)
         {
                 uint32 glyphId = GetUInt32Value(PLAYER_FIELD_GLYPHS_1 + i);
@@ -3510 +3510 @@
                 la.positive = 0; //VLack: check this, as this was uninitialized, 0 is a safe bet, but glyphs should be positive, aren't they?
                 loginauras.push_back(la);
+                m_specs[0].glyphs[i] = glyphId; //VLack: TempFIX till we properly implement dual specs, make them appear in the first set!
         }
 
@@ -4674 +4675 @@
     WorldPacket data(MSG_SET_DUNGEON_DIFFICULTY, 12);
         data << (uint32)iInstanceType;
+    data << (uint32)0x1;
+    data << (uint32)InGroup();
+    GetSession()->SendPacket(&data);
+}
+
+void Player::SendRaidDifficulty()
+{
+    WorldPacket data(MSG_SET_RAID_DIFFICULTY, 12);
+    data << (uint32)iInstanceType;
     data << (uint32)0x1;
     data << (uint32)InGroup();

trunk/src/arcemu-world/Player.h

@@ -992 +992 @@
         void SendMeetingStoneQueue(uint32 DungeonId, uint8 Status);
         void SendDungeonDifficulty();
+        void SendRaidDifficulty();
 
         void AddToWorld();

trunk/src/arcemu-world/QueryHandler.cpp

@@ -136 +136 @@
                 data << ci->unkfloat2;
                 data << ci->Leader;
-                data << uint32(0); // VLack: 4 quest items and one movement information
-                data << uint32(0);
-                data << uint32(0);
-                data << uint32(0);
+                for(uint32 i = 0; i < 6; ++i)
+                {
+                        data << uint32(ci->QuestItems[i]);
+                }
                 data << uint32(0);
         }
@@ -216 +216 @@
 
         data << float(goinfo->Size);
-        for(uint32 i = 0; i < 4; ++i)
+        for(uint32 i = 0; i < 6; ++i)
         {
                 data << uint32(goinfo->QuestItems[i]);

trunk/src/arcemu-world/QuestMgr.cpp

@@ -410 +410 @@
                 *data << qst->reward_choiceitem[i];
                 *data << qst->reward_choiceitemcount[i];
-                ip = ItemPrototypeStorage.LookupEntry(qst->reward_item[i]);
+                ip = ItemPrototypeStorage.LookupEntry(qst->reward_choiceitem[i]);
                 *data << ( ip ? ip->DisplayInfoID : uint32(0) );
 

trunk/src/arcemu-world/Spell.cpp

@@ -120 +120 @@
 void SpellCastTargets::write( WorldPacket& data )
 {
-        if( m_targetMask & TARGET_FLAG_DEST_LOCATION ){ //VLack: nice Aspire code, might be useful for us too
-                m_targetMask = TARGET_FLAG_SELF;        // hackfix for client crash. TODO fix
-        }
-
         data << m_targetMask;
         data << m_targetMaskExtended;

trunk/src/arcemu-world/SpellAuras.cpp

@@ -316 +316 @@
                 &Aura::SpellAuraNULL,//292 call stabled pet
                 &Aura::SpellAuraNULL,//293 2 test spells
-                &Aura::SpellAuraNULL //294 2 spells, possible prevent mana regen
+                &Aura::SpellAuraNULL,//294 2 spells, possible prevent mana regen
+                &Aura::SpellAuraNULL,//295
+                &Aura::SpellAuraNULL,//296
+                &Aura::SpellAuraNULL,//297
+                &Aura::SpellAuraNULL,//298
+                &Aura::SpellAuraNULL,//299
+                &Aura::SpellAuraNULL,//300
+                &Aura::SpellAuraNULL,//301
+                &Aura::SpellAuraNULL,//302
+                &Aura::SpellAuraNULL,//303
+                &Aura::SpellAuraNULL,//304
+                &Aura::SpellAuraNULL,//305
+                &Aura::SpellAuraNULL,//306
 };
 

trunk/src/arcemu-world/SpellAuras.h

@@ -319 +319 @@
         SPELL_AURA_293 = 293,
         SPELL_AURA_294 = 294,
-    TOTAL_SPELL_AURAS = 295,
-};
+        SPELL_AURA_295 = 295,
+        SPELL_AURA_296 = 296,
+        SPELL_AURA_297 = 297,
+        SPELL_AURA_298 = 298,
+        SPELL_AURA_299 = 299,
+        SPELL_AURA_300 = 300,
+        SPELL_AURA_301 = 301,
+        SPELL_AURA_302 = 302,
+        SPELL_AURA_303 = 303,
+        SPELL_AURA_304 = 304,
+        SPELL_AURA_305 = 305,
+        SPELL_AURA_306 = 306,
+    TOTAL_SPELL_AURAS = 307,
+};
+
 enum AuraTickFlags
 {

trunk/src/arcemu-world/SpellEffects.cpp

@@ -5086 +5086 @@
                                 p_caster->RemoveAura( gp_old->SpellID );
                         p_caster->SetUInt32Value( PLAYER_FIELD_GLYPHS_1 + m_glyphslot, 0 );
+                        p_caster->m_specs[0].glyphs[m_glyphslot] = 0; //VLack: TempFIX till dual spec...
+                        p_caster->smsg_TalentsInfo(false, 0, 0);
                 }
         }
@@ -5099 +5101 @@
                 p_caster->SetUInt32Value( PLAYER_FIELD_GLYPHS_1 + m_glyphslot, g_new );
                 p_caster->CastSpell( p_caster, gp_new->SpellID, true );
+                p_caster->m_specs[0].glyphs[m_glyphslot] = g_new; //VLack: TempFIX till dual spec...
+                p_caster->smsg_TalentsInfo(false, 0, 0);
         }
 

trunk/src/arcemu-world/TaxiHandler.cpp

@@ -108 +108 @@
         }
 
-        WorldPacket data(48);
+        WorldPacket data(64);
         data.Initialize( SMSG_SHOWTAXINODES );
         data << uint32( 1 ) << guid;
@@ -251 +251 @@
 
         uint64 guid;
-        uint32 moocost;
         uint32 nodecount;
         vector<uint32> pathes;
@@ -260 +259 @@
         WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4);
 
-        recvPacket >> guid >> moocost >> nodecount;
+        recvPacket >> guid >> nodecount;
         if(nodecount < 2)
                 return;

trunk/src/arcemu-world/TaxiMgr.cpp

@@ -457 +457 @@
                 {*/
                         field = (uint8)((itr->second->to - 1) / 32);
+                        if ( field>=12 ) continue; //The DBC can contain negative TO values??? That'll be 255 here (because we store everything unsigned), skip them!
                         Mask[field] |= 1 << ( (itr->second->to - 1 ) % 32 );
                 //}

trunk/src/arcemu-world/TransporterHandler.cpp

@@ -41 +41 @@
                 sLog.outString("Transporter id[%i] name[%s] - can't set GAMEOBJECT_TYPE - it will behave badly!",EntryID,Name);
 
+        m_overrides = GAMEOBJECT_INFVIS | GAMEOBJECT_ONMOVEWIDE; //Make it forever visible on the same map
+
         // Set period
         m_period = Time;

trunk/src/arcemu-world/UpdateFields.h

@@ -19 +19 @@
  */
 
-/** 3.1.1 UpdateFields as of whenever i extracted them.
+/** 3.2.0 UpdateFields as of whenever i extracted them.
  */
 
@@ -71 +71 @@
 #define ITEM_FIELD_DURABILITY                     OBJECT_END + 0x0037 // Size: 1, Type: INT, Flags: OWNER, ITEM_OWNER
 #define ITEM_FIELD_MAXDURABILITY                  OBJECT_END + 0x0038 // Size: 1, Type: INT, Flags: OWNER, ITEM_OWNER
-#define ITEM_FIELD_PAD                            OBJECT_END + 0x0039 // Size: 1, Type: INT, Flags: NONE
+#define ITEM_FIELD_CREATE_PLAYED_TIME             OBJECT_END + 0x0039 // Size: 1, Type: INT, Flags: PUBLIC
 #define ITEM_END                                  OBJECT_END + 0x003A
 
@@ -319 +319 @@
 #define PLAYER_VISIBLE_ITEM_19_ENCHANTMENT        UNIT_END + 0x0093 // Size: 1, Type: TWO_SHORT, Flags: PUBLIC
 #define PLAYER_CHOSEN_TITLE                       UNIT_END + 0x0094 // Size: 1, Type: INT, Flags: PUBLIC
-#define PLAYER_FIELD_PAD_0                        UNIT_END + 0x0095 // Size: 1, Type: INT, Flags: NONE
+#define PLAYER_FAKE_INEBRIATION                   UNIT_END + 0x0095 // Size: 1, Type: INT, Flags: PUBLIC
 #define PLAYER_FIELD_INV_SLOT_HEAD                UNIT_END + 0x0096 // Size: 46, Type: LONG, Flags: PRIVATE
 #define PLAYER_FIELD_PACK_SLOT_1                  UNIT_END + 0x00C4 // Size: 32, Type: LONG, Flags: PRIVATE
@@ -357 +357 @@
 #define PLAYER_FIELD_MOD_DAMAGE_DONE_PCT          UNIT_END + 0x03F3 // Size: 7, Type: INT, Flags: PRIVATE
 #define PLAYER_FIELD_MOD_HEALING_DONE_POS         UNIT_END + 0x03FA // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_MOD_TARGET_RESISTANCE        UNIT_END + 0x03FB // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE UNIT_END + 0x03FC // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_BYTES                        UNIT_END + 0x03FD // Size: 1, Type: BYTES, Flags: PRIVATE
-#define PLAYER_AMMO_ID                            UNIT_END + 0x03FE // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_SELF_RES_SPELL                     UNIT_END + 0x03FF // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_PVP_MEDALS                   UNIT_END + 0x0400 // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_BUYBACK_PRICE_1              UNIT_END + 0x0401 // Size: 12, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_BUYBACK_TIMESTAMP_1          UNIT_END + 0x040D // Size: 12, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_KILLS                        UNIT_END + 0x0419 // Size: 1, Type: TWO_SHORT, Flags: PRIVATE
-#define PLAYER_FIELD_TODAY_CONTRIBUTION           UNIT_END + 0x041A // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_YESTERDAY_CONTRIBUTION       UNIT_END + 0x041B // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_LIFETIME_HONORBALE_KILLS     UNIT_END + 0x041C // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_BYTES2                       UNIT_END + 0x041D // Size: 1, Type: BYTES, Flags: PRIVATE
-#define PLAYER_FIELD_WATCHED_FACTION_INDEX        UNIT_END + 0x041E // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_COMBAT_RATING_1              UNIT_END + 0x041F // Size: 25, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_ARENA_TEAM_INFO_1_1          UNIT_END + 0x0438 // Size: 18, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_HONOR_CURRENCY               UNIT_END + 0x044A // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_ARENA_CURRENCY               UNIT_END + 0x044B // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_MAX_LEVEL                    UNIT_END + 0x044C // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_DAILY_QUESTS_1               UNIT_END + 0x044D // Size: 25, Type: INT, Flags: PRIVATE
-#define PLAYER_RUNE_REGEN_1                       UNIT_END + 0x0466 // Size: 4, Type: FLOAT, Flags: PRIVATE
-#define PLAYER_NO_REAGENT_COST_1                  UNIT_END + 0x046A // Size: 3, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_GLYPH_SLOTS_1                UNIT_END + 0x046D // Size: 6, Type: INT, Flags: PRIVATE
-#define PLAYER_FIELD_GLYPHS_1                     UNIT_END + 0x0473 // Size: 6, Type: INT, Flags: PRIVATE
-#define PLAYER_GLYPHS_ENABLED                     UNIT_END + 0x0479 // Size: 1, Type: INT, Flags: PRIVATE
-#define PLAYER_END                                UNIT_END + 0x047A
+#define PLAYER_FIELD_MOD_HEALING_PCT              UNIT_END + 0x03FB // Size: 1, Type: FLOAT, Flags: PRIVATE
+#define PLAYER_FIELD_MOD_HEALING_DONE_PCT         UNIT_END + 0x03FC // Size: 1, Type: FLOAT, Flags: PRIVATE
+#define PLAYER_FIELD_MOD_TARGET_RESISTANCE        UNIT_END + 0x03FD // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_MOD_TARGET_PHYSICAL_RESISTANCE UNIT_END + 0x03FE // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_BYTES                        UNIT_END + 0x03FF // Size: 1, Type: BYTES, Flags: PRIVATE
+#define PLAYER_AMMO_ID                            UNIT_END + 0x0400 // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_SELF_RES_SPELL                     UNIT_END + 0x0401 // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_PVP_MEDALS                   UNIT_END + 0x0402 // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_BUYBACK_PRICE_1              UNIT_END + 0x0403 // Size: 12, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_BUYBACK_TIMESTAMP_1          UNIT_END + 0x040F // Size: 12, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_KILLS                        UNIT_END + 0x041B // Size: 1, Type: TWO_SHORT, Flags: PRIVATE
+#define PLAYER_FIELD_TODAY_CONTRIBUTION           UNIT_END + 0x041C // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_YESTERDAY_CONTRIBUTION       UNIT_END + 0x041D // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_LIFETIME_HONORBALE_KILLS     UNIT_END + 0x041E // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_BYTES2                       UNIT_END + 0x041F // Size: 1, Type: 6, Flags: PRIVATE
+#define PLAYER_FIELD_WATCHED_FACTION_INDEX        UNIT_END + 0x0420 // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_COMBAT_RATING_1              UNIT_END + 0x0421 // Size: 25, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_ARENA_TEAM_INFO_1_1          UNIT_END + 0x043A // Size: 21, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_HONOR_CURRENCY               UNIT_END + 0x044F // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_ARENA_CURRENCY               UNIT_END + 0x0450 // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_MAX_LEVEL                    UNIT_END + 0x0451 // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_DAILY_QUESTS_1               UNIT_END + 0x0452 // Size: 25, Type: INT, Flags: PRIVATE
+#define PLAYER_RUNE_REGEN_1                       UNIT_END + 0x046B // Size: 4, Type: FLOAT, Flags: PRIVATE
+#define PLAYER_NO_REAGENT_COST_1                  UNIT_END + 0x046F // Size: 3, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_GLYPH_SLOTS_1                UNIT_END + 0x0472 // Size: 6, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_GLYPHS_1                     UNIT_END + 0x0478 // Size: 6, Type: INT, Flags: PRIVATE
+#define PLAYER_GLYPHS_ENABLED                     UNIT_END + 0x047E // Size: 1, Type: INT, Flags: PRIVATE
+#define PLAYER_FIELD_PADDING                      UNIT_END + 0x047F // Size: 1, Type: INT, Flags: NONE
+#define PLAYER_END                                UNIT_END + 0x0480
 
 //GameObjectFields
@@ -400 +403 @@
 #define DYNAMICOBJECT_SPELLID                     OBJECT_END + 0x0003 // Size: 1, Type: INT, Flags: PUBLIC
 #define DYNAMICOBJECT_RADIUS                      OBJECT_END + 0x0004 // Size: 1, Type: FLOAT, Flags: PUBLIC
-#define DYNAMICOBJECT_POS_X                       OBJECT_END + 0x0005 // Size: 1, Type: FLOAT, Flags: PUBLIC
-#define DYNAMICOBJECT_POS_Y                       OBJECT_END + 0x0006 // Size: 1, Type: FLOAT, Flags: PUBLIC
-#define DYNAMICOBJECT_POS_Z                       OBJECT_END + 0x0007 // Size: 1, Type: FLOAT, Flags: PUBLIC
-#define DYNAMICOBJECT_FACING                      OBJECT_END + 0x0008 // Size: 1, Type: FLOAT, Flags: PUBLIC
-#define DYNAMICOBJECT_CASTTIME                    OBJECT_END + 0x0009 // Size: 1, Type: INT, Flags: PUBLIC
-#define DYNAMICOBJECT_END                         OBJECT_END + 0x000A
+#define DYNAMICOBJECT_CASTTIME                    OBJECT_END + 0x0005 // Size: 1, Type: INT, Flags: PUBLIC
+#define DYNAMICOBJECT_END                         OBJECT_END + 0x0006
 
 //CorpseFields

trunk/src/arcemu-world/WorldSession.cpp

@@ -896 +896 @@
         WorldPacketHandlers[MSG_RANDOM_ROLL].handler                                                            = &WorldSession::HandleRandomRollOpcode;
         WorldPacketHandlers[MSG_SET_DUNGEON_DIFFICULTY].handler                        = &WorldSession::HandleDungeonDifficultyOpcode;
+        WorldPacketHandlers[MSG_SET_RAID_DIFFICULTY].handler                                                    = &WorldSession::HandleRaidDifficultyOpcode;
 
         // Misc
@@ -908 +909 @@
 
         WorldPacketHandlers[CMSG_PET_CAST_SPELL].handler                                = &WorldSession::HandlePetCastSpell;
+
+        WorldPacketHandlers[CMSG_WORLD_STATE_UI_TIMER_UPDATE].handler                           = &WorldSession::HandleWorldStateUITimerUpdate;
 
 

trunk/src/arcemu-world/WorldSession.h

@@ -111 +111 @@
     UPDATEFLAG_HAS_POSITION = 0x40,
     UPDATEFLAG_VEHICLE      = 0x80,
-    UPDATEFLAG_UNK1       = 0x0100,
-    UPDATEFLAG_UNK2       = 0x0200
+    UPDATEFLAG_POSITION   = 0x0100,
+    UPDATEFLAG_ROTATION   = 0x0200
 };
 
@@ -680 +680 @@
         //instances
         void HandleResetInstanceOpcode(WorldPacket& recv_data);
-    void HandleDungeonDifficultyOpcode(WorldPacket& recv_data);
+        void HandleDungeonDifficultyOpcode(WorldPacket& recv_data);
+        void HandleRaidDifficultyOpcode(WorldPacket& recv_data);
 
         uint8 TrainerGetSpellStatus(TrainerSpell* pSpell);
@@ -718 +719 @@
 
         void HandleSetFactionInactiveOpcode( WorldPacket & recv_data );
+
+        //MISC
+        void HandleWorldStateUITimerUpdate( WorldPacket & recv_data );
 
 public: