Skip to content
Browse files

* Core switched to support client 3.3.5a (build 12340)

* You *MUST* extract new DBCs / maps / vmaps
* You *MUST* use UP32
* Be sure to update your realmlist
* Huge thanks to TOM_RUS

--HG--
branch : trunk
  • Loading branch information...
2 parents 45e2a65 + 70a3142 commit b7014c0dc8315804e98411793c75ed0a507a967d @runningnak3d runningnak3d committed
View
4 sql/base/auth_database.sql
@@ -196,7 +196,7 @@ CREATE TABLE `realmlist` (
`timezone` tinyint(3) unsigned NOT NULL default '0',
`allowedSecurityLevel` tinyint(3) unsigned NOT NULL default '0',
`population` float unsigned NOT NULL default '0',
- `gamebuild` int(11) unsigned NOT NULL default '11723',
+ `gamebuild` int(11) unsigned NOT NULL default '12340',
PRIMARY KEY (`id`),
UNIQUE KEY `idx_name` (`name`)
) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Realm System';
@@ -209,7 +209,7 @@ CREATE TABLE `realmlist` (
LOCK TABLES `realmlist` WRITE;
/*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
INSERT INTO `realmlist` (`id`,`name`,`address`,`port`,`icon`,`color`,`timezone`,`allowedSecurityLevel`,`population`,`gamebuild`) VALUES
-(1,'Trinity','127.0.0.1',8085,1,0,1,0,0,11723);
+(1,'Trinity','127.0.0.1',8085,1,0,1,0,0,12340);
/*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
UNLOCK TABLES;
View
4 sql/create/create_mysql.sql
@@ -4,10 +4,10 @@ CREATE DATABASE `world` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
CREATE DATABASE `characters` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
-CREATE DATABASE `realmd` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
+CREATE DATABASE `auth` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;
GRANT ALL PRIVILEGES ON `world` . * TO 'trinity'@'localhost' WITH GRANT OPTION;
GRANT ALL PRIVILEGES ON `characters` . * TO 'trinity'@'localhost' WITH GRANT OPTION;
-GRANT ALL PRIVILEGES ON `realmd` . * TO 'trinity'@'localhost' WITH GRANT OPTION;
+GRANT ALL PRIVILEGES ON `auth` . * TO 'trinity'@'localhost' WITH GRANT OPTION;
View
6 sql/create/drop_mysql.sql
@@ -8,9 +8,9 @@ REVOKE ALL PRIVILEGES ON `characters` . * FROM 'trinity'@'localhost';
REVOKE GRANT OPTION ON `characters` . * FROM 'trinity'@'localhost';
-REVOKE ALL PRIVILEGES ON `realmd` . * FROM 'trinity'@'localhost';
+REVOKE ALL PRIVILEGES ON `auth` . * FROM 'trinity'@'localhost';
-REVOKE GRANT OPTION ON `realmd` . * FROM 'trinity'@'localhost';
+REVOKE GRANT OPTION ON `auth` . * FROM 'trinity'@'localhost';
DROP USER 'trinity'@'localhost';
@@ -18,4 +18,4 @@ DROP DATABASE IF EXISTS `world`;
DROP DATABASE IF EXISTS `characters`;
-DROP DATABASE IF EXISTS `realmd`;
+DROP DATABASE IF EXISTS `auth`;
View
0 ...pdates/8770_world_areatrigger_scripts.sql → ...3a_old/8770_world_areatrigger_scripts.sql
File renamed without changes.
View
0 sql/updates/8770_world_script_waypoints.sql → ....3.3a_old/8770_world_script_waypoints.sql
File renamed without changes.
View
0 sql/updates/8770_world_scriptname.sql → ...ates/3.3.3a_old/8770_world_scriptname.sql
File renamed without changes.
View
0 ...tes/8790_world_locales_item_set_names.sql → ...old/8790_world_locales_item_set_names.sql
File renamed without changes.
View
0 sql/updates/8816_world_spell_bonus_data.sql → ....3.3a_old/8816_world_spell_bonus_data.sql
File renamed without changes.
View
0 sql/updates/8821_world_spell_dbc.sql → ...dates/3.3.3a_old/8821_world_spell_dbc.sql
File renamed without changes.
View
0 ...updates/8836_world_spell_linked_spell.sql → ....3a_old/8836_world_spell_linked_spell.sql
File renamed without changes.
View
0 sql/updates/8842_world_script_texts.sql → ...es/3.3.3a_old/8842_world_script_texts.sql
File renamed without changes.
View
0 sql/updates/8842_world_scriptname.sql → ...ates/3.3.3a_old/8842_world_scriptname.sql
File renamed without changes.
View
0 sql/updates/8843_world_scriptname.sql → ...ates/3.3.3a_old/8843_world_scriptname.sql
File renamed without changes.
View
3 sql/updates/3.3.5a_old/8861_auth_realmlist.sql
@@ -0,0 +1,3 @@
+UPDATE `realmlist` SET `gamebuild`=12340 WHERE `id`=1;
+ALTER TABLE `realmlist` CHANGE COLUMN `gamebuild` `gamebuild` int(11) unsigned NOT NULL default '12340';
+
View
3 sql/updates/3.3.5a_old/CMakeLists.txt
@@ -0,0 +1,3 @@
+FILE(GLOB _SQL_335 *.sql)
+
+INSTALL(FILES ${_SQL_333} DESTINATION share/trinity/sql/updates/3.3.5a_old)
View
1 sql/updates/CMakeLists.txt
@@ -4,6 +4,7 @@ add_subdirectory(3.1.3_old)
add_subdirectory(3.2.2a_old)
add_subdirectory(3.3.2_old)
add_subdirectory(3.3.3a_old)
+add_subdirectory(3.3.5a_old)
FILE(GLOB _SQL_UPDATES *.sql)
View
2 src/server/authserver/Authentication/AuthCodes.h
@@ -80,7 +80,7 @@ enum LoginResult
//3.3.2 build 11403
//3.3.3a build 11723
-#define POST_BC_ACCEPTED_CLIENT_BUILD {11723, 11403, 11159, 10571, 10505, 10146, 9947, 8606, 0}
+#define POST_BC_ACCEPTED_CLIENT_BUILD {12340, 11723, 11403, 11159, 10571, 10505, 10146, 9947, 8606, 0}
#define PRE_BC_ACCEPTED_CLIENT_BUILD {5875, 6005, 0}
#define POST_BC_EXP_FLAG 0x2
View
14 src/server/game/DataStores/DBCStores.cpp
@@ -592,13 +592,13 @@ void LoadDBCStores(const std::string& dataPath)
}
// Check loaded DBC files proper version
- if (!sAreaStore.LookupEntry(3617) || // last area (areaflag) added in 3.3.3a
- !sCharTitlesStore.LookupEntry(177) || // last char title added in 3.3.3a
- !sGemPropertiesStore.LookupEntry(1629) || // last added spell in 3.3.3a
- !sItemStore.LookupEntry(54860) || // last gem property added in 3.3.3a
- !sItemExtendedCostStore.LookupEntry(2997) || // last item extended cost added in 3.3.3a
- !sMapStore.LookupEntry(724) || // last map added in 3.3.3a
- !sSpellStore.LookupEntry(76567) ) // last client known item added in 3.3.3a
+ if (!sAreaStore.LookupEntry(3617) || // last area (areaflag) added in 3.3.5a
+ !sCharTitlesStore.LookupEntry(177) || // last char title added in 3.3.5a
+ !sGemPropertiesStore.LookupEntry(1629) || // last added spell in 3.3.5a
+ !sItemStore.LookupEntry(56806) || // last gem property added in 3.3.5a
+ !sItemExtendedCostStore.LookupEntry(2997) || // last item extended cost added in 3.3.5a
+ !sMapStore.LookupEntry(724) || // last map added in 3.3.5a
+ !sSpellStore.LookupEntry(80864) ) // last client known item added in 3.3.5a
{
sLog.outError("\nYou have _outdated_ DBC files. Please extract correct versions from current using client.");
exit(1);
View
2 src/server/game/Entities/Object/Updates/UpdateFields.h
@@ -21,7 +21,7 @@
#ifndef _UPDATEFIELDS_AUTO_H
#define _UPDATEFIELDS_AUTO_H
-// Auto generated for version 3, 3, 3, 11723
+// Auto generated for version 3, 3, 5, 12340
enum EObjectFields
{
View
2 src/server/game/Entities/Player/Player.cpp
@@ -6536,7 +6536,7 @@ void Player::RewardReputation(Quest const *pQuest)
continue;
if (pQuest->RewRepValue[i])
{
- int32 rep = CalculateReputationGain(GetQuestLevel(pQuest), pQuest->RewRepValue[i], pQuest->RewRepFaction[i], true);
+ int32 rep = CalculateReputationGain(GetQuestLevel(pQuest), pQuest->RewRepValue[i]/100, pQuest->RewRepFaction[i], true);
if (FactionEntry const* factionEntry = sFactionStore.LookupEntry(pQuest->RewRepFaction[i]))
GetReputationMgr().ModifyReputation(factionEntry, rep);
}
View
5 src/server/game/Entities/Player/SocialMgr.h
@@ -43,7 +43,8 @@ enum SocialFlag
{
SOCIAL_FLAG_FRIEND = 0x01,
SOCIAL_FLAG_IGNORED = 0x02,
- SOCIAL_FLAG_MUTED = 0x04 // guessed
+ SOCIAL_FLAG_MUTED = 0x04, // guessed
+ SOCIAL_FLAG_RAF = 0x08 // Recruit A Friend
};
struct FriendInfo
@@ -112,7 +113,7 @@ enum FriendsResult
};
#define SOCIALMGR_FRIEND_LIMIT 50
-#define SOCIALMGR_IGNORE_LIMIT 25
+#define SOCIALMGR_IGNORE_LIMIT 50
class PlayerSocial
{
View
8 src/server/game/Server/Protocol/Opcodes.h
@@ -1244,7 +1244,7 @@ enum Opcodes
SMSG_ITEM_REFUND_RESULT = 0x4B5, // refund item result
CMSG_CORPSE_MAP_POSITION_QUERY = 0x4B6, // CMSG, uint32
SMSG_CORPSE_MAP_POSITION_QUERY_RESPONSE = 0x4B7, // SMSG, 3*float+float
- CMSG_LFG_SET_ROLES_2 = 0x4B8, // not found
+ UMSG_UNKNOWN_1208 = 0x4B8, // not found
UMSG_UNKNOWN_1209 = 0x4B9, // not found
CMSG_CALENDAR_CONTEXT_EVENT_SIGNUP = 0x4BA, // CMSG, uint64, lua: CalendarContextEventSignUp
SMSG_CALENDAR_ACTION_PENDING = 0x4BB, // SMSG, calendar related EVENT_CALENDAR_ACTION_PENDING
@@ -1343,7 +1343,11 @@ enum Opcodes
SMSG_UNKNOWN_1304 = 0x518, // something with player movement (move event 58?), speed packet
UMSG_UNKNOWN_1305 = 0x519, // not found
UMSG_UNKNOWN_1306 = 0x51A, // not found
- NUM_MSG_TYPES = 0x51B
+ CMSG_COMMENTATOR_SKIRMISH_QUEUE_COMMAND = 0x51B, // lua: CommentatorSetSkirmishMatchmakingMode/CommentatorRequestSkirmishQueueData/CommentatorRequestSkirmishMode/CommentatorStartSkirmishMatch
+ SMSG_UNKNOWN_1308 = 0x51C, // event EVENT_COMMENTATOR_SKIRMISH_QUEUE_REQUEST, CGCommentator::QueueNode
+ SMSG_UNKNOWN_1309 = 0x51D, // event EVENT_COMMENTATOR_SKIRMISH_QUEUE_REQUEST
+ SMSG_UNKNOWN_1310 = 0x51E, // some compressed packet?
+ NUM_MSG_TYPES = 0x51F
};
/// Player state
View
3 src/server/game/Server/WorldSocket.cpp
@@ -768,7 +768,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
// NOTE: ATM the socket is singlethread, have this in mind ...
uint8 digest[20];
uint32 clientSeed;
- uint32 unk2, unk3;
+ uint32 unk2, unk3, unk5, unk6, unk7;
uint64 unk4;
uint32 BuiltNumberClient;
uint32 id, security;
@@ -797,6 +797,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
recvPacket >> account;
recvPacket >> unk3;
recvPacket >> clientSeed;
+ recvPacket >> unk5 >> unk6 >> unk7;
recvPacket >> unk4;
recvPacket.read (digest, 20);

0 comments on commit b7014c0

Please sign in to comment.
Something went wrong with that request. Please try again.