diff options
| -rw-r--r-- | sql/mangos.sql | 6 | ||||
| -rw-r--r-- | sql/updates/1688_mangos_7382_01_creature_template.sql | 5 | ||||
| -rw-r--r-- | src/game/Creature.h | 2 | ||||
| -rw-r--r-- | src/game/QueryHandler.cpp | 4 | ||||
| -rw-r--r-- | src/shared/Database/SQLStorage.cpp | 4 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
6 files changed, 16 insertions, 7 deletions
diff --git a/sql/mangos.sql b/sql/mangos.sql index 0446fda2bb6..ae9773f02ae 100644 --- a/sql/mangos.sql +++ b/sql/mangos.sql @@ -22,7 +22,7 @@ DROP TABLE IF EXISTS `db_version`; CREATE TABLE `db_version` ( `version` varchar(120) default NULL, - `required_7376_01_mangos_spell_area` bit(1) default NULL + `required_7382_01_mangos_creature_template` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes'; -- @@ -811,6 +811,8 @@ CREATE TABLE `creature_template` ( `AIName` char(64) NOT NULL default '', `MovementType` tinyint(3) unsigned NOT NULL default '0', `InhabitType` tinyint(3) unsigned NOT NULL default '3', + `unk16` float NOT NULL default '1', + `unk17` float NOT NULL default '1', `RacialLeader` tinyint(3) unsigned NOT NULL default '0', `RegenHealth` tinyint(3) unsigned NOT NULL default '1', `equipment_id` mediumint(8) unsigned NOT NULL default '0', @@ -827,7 +829,7 @@ CREATE TABLE `creature_template` ( LOCK TABLES `creature_template` WRITE; /*!40000 ALTER TABLE `creature_template` DISABLE KEYS */; INSERT INTO `creature_template` VALUES -(1,1,10045,0,10045,0,'Waypoint(Only GM can see it)','Visual',NULL,1,1,64,64,0,0,0,35,35,0,0.91,1,0,14,15,0,100,2000,2200,4096,0,0,0,0,0,0,1.76,2.42,100,8,5242886,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,0,1,0,0,0x82,''); +(1,1,10045,0,10045,0,'Waypoint(Only GM can see it)','Visual',NULL,1,1,64,64,0,0,0,35,35,0,0.91,1,0,14,15,0,100,2000,2200,4096,0,0,0,0,0,0,1.76,2.42,100,8,5242886,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'',0,3,1.0,1.0,0,1,0,0,0x82,''); /*!40000 ALTER TABLE `creature_template` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/updates/1688_mangos_7382_01_creature_template.sql b/sql/updates/1688_mangos_7382_01_creature_template.sql new file mode 100644 index 00000000000..9616f20a7d3 --- /dev/null +++ b/sql/updates/1688_mangos_7382_01_creature_template.sql @@ -0,0 +1,5 @@ +ALTER TABLE db_version CHANGE COLUMN required_7376_01_mangos_spell_area required_7382_01_mangos_creature_template bit; + +ALTER TABLE creature_template + ADD COLUMN unk16 float NOT NULL default '1' AFTER InhabitType, + ADD COLUMN unk17 float NOT NULL default '1' AFTER unk16; diff --git a/src/game/Creature.h b/src/game/Creature.h index df37caa1ef2..def2eebb2ae 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -202,6 +202,8 @@ struct CreatureInfo char const* AIName; uint32 MovementType; uint32 InhabitType; + float unk16; + float unk17; bool RacialLeader; bool RegenHealth; uint32 equipmentId; diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp index eefecbce078..ac126a4514e 100644 --- a/src/game/QueryHandler.cpp +++ b/src/game/QueryHandler.cpp @@ -191,8 +191,8 @@ void WorldSession::HandleCreatureQueryOpcode( WorldPacket & recv_data ) data << (uint32)ci->Modelid2; // Modelid2 data << (uint32)ci->Modelid3; // Modelid3 data << (uint32)ci->Modelid4; // Modelid4 - data << (float)1.0f; // unk - data << (float)1.0f; // unk + data << (float)ci->unk16; // unk + data << (float)ci->unk17; // unk data << (uint8)ci->RacialLeader; SendPacket( &data ); sLog.outDebug( "WORLD: Sent SMSG_CREATURE_QUERY_RESPONSE " ); diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp index 2401f715074..8ffc42dccd3 100644 --- a/src/shared/Database/SQLStorage.cpp +++ b/src/shared/Database/SQLStorage.cpp @@ -27,8 +27,8 @@ extern DatabasePostgre WorldDatabase; extern DatabaseMysql WorldDatabase; #endif -const char CreatureInfosrcfmt[]="iiiiiisssiiiiiiiiiiffiffiiiiiiiiiiiffiiiiiiiiiiiiiiiiiiiiiiisiilliiis"; -const char CreatureInfodstfmt[]="iiiiiisssiiiiiiiiiiffiffiiiiiiiiiiiffiiiiiiiiiiiiiiiiiiiiiiisiilliiii"; +const char CreatureInfosrcfmt[]="iiiiiisssiiiiiiiiiiffiffiiiiiiiiiiiffiiiiiiiiiiiiiiiiiiiiiiisiifflliiis"; +const char CreatureInfodstfmt[]="iiiiiisssiiiiiiiiiiffiffiiiiiiiiiiiffiiiiiiiiiiiiiiiiiiiiiiisiifflliiii"; const char CreatureDataAddonInfofmt[]="iiiiiiiis"; const char CreatureModelfmt[]="iffbi"; const char CreatureInfoAddonInfofmt[]="iiiiiiiis"; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 4cfe42ae416..b3a576dcd56 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7381" + #define REVISION_NR "7382" #endif // __REVISION_NR_H__ |