Skip to content
Browse files

Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Chat/ChatLink.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ArenaTeamHandler.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSpline.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Reputation/ReputationMgr.cpp
	src/server/game/Spells/Auras/SpellAuraDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Commands/cs_disable.cpp
	src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
	src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/Kalimdor/ungoro_crater.cpp
	src/server/shared/Packets/ByteBuffer.h
	src/tools/map_extractor/dbcfile.h
  • Loading branch information...
2 parents 99e050f + e954498 commit 404129963c8536ced7c1398827e0f7ef9391bcba @Spp- Spp- committed Nov 27, 2012
Showing with 790 additions and 301 deletions.
  1. +1 −1 CMakeLists.txt
  2. +2 −2 cmake/compiler/clang/settings.cmake
  3. +2 −2 cmake/compiler/gcc/settings.cmake
  4. +1 −4 cmake/compiler/icc/settings.cmake
  5. +0 −2 cmake/macros/CheckPlatform.cmake
  6. +0 −33 cmake/platform/osx/settings.cmake
  7. +2 −0 cmake/platform/unix/settings.cmake
  8. +3 −1 dep/SFMT/SFMT.h
  9. +346 −0 sql/updates/world/2012_11_24_02_world_creature_text.sql
  10. +115 −0 sql/updates/world/2012_11_26_03_world_misc.sql
  11. 0 src/server/authserver/Authentication/AuthCodes.h
  12. 0 src/server/authserver/Main.cpp
  13. +8 −8 src/server/authserver/Realms/RealmList.cpp
  14. +3 −2 src/server/authserver/Realms/RealmList.h
  15. 0 src/server/authserver/Server/AuthSocket.h
  16. 0 src/server/authserver/Server/RealmAcceptor.h
  17. 0 src/server/authserver/Server/RealmSocket.cpp
  18. 0 src/server/authserver/Server/RealmSocket.h
  19. 0 src/server/authserver/authserver.rc
  20. 0 src/server/collision/BoundingIntervalHierarchy.cpp
  21. 0 src/server/collision/BoundingIntervalHierarchy.h
  22. 0 src/server/collision/Management/IVMapManager.h
  23. 0 src/server/collision/Management/VMapFactory.cpp
  24. 0 src/server/collision/Management/VMapFactory.h
  25. 0 src/server/collision/Management/VMapManager2.h
  26. 0 src/server/collision/Maps/MapTree.h
  27. 0 src/server/collision/Maps/TileAssembler.h
  28. 0 src/server/collision/Models/ModelInstance.h
  29. 0 src/server/collision/Models/WorldModel.h
  30. 0 src/server/collision/VMapTools.h
  31. 0 src/server/game/AI/CoreAI/CombatAI.cpp
  32. 0 src/server/game/AI/CoreAI/CombatAI.h
  33. 0 src/server/game/AI/CoreAI/GuardAI.cpp
  34. 0 src/server/game/AI/CoreAI/GuardAI.h
  35. 0 src/server/game/AI/CoreAI/PassiveAI.cpp
  36. 0 src/server/game/AI/CoreAI/PassiveAI.h
  37. 0 src/server/game/AI/CoreAI/PetAI.cpp
  38. 0 src/server/game/AI/CoreAI/PetAI.h
  39. 0 src/server/game/AI/CoreAI/ReactorAI.cpp
  40. 0 src/server/game/AI/CoreAI/ReactorAI.h
  41. 0 src/server/game/AI/CoreAI/TotemAI.cpp
  42. 0 src/server/game/AI/CoreAI/TotemAI.h
  43. 0 src/server/game/AI/CoreAI/UnitAI.cpp
  44. 0 src/server/game/AI/CoreAI/UnitAI.h
  45. 0 src/server/game/AI/CreatureAI.cpp
  46. 0 src/server/game/AI/CreatureAI.h
  47. 0 src/server/game/AI/CreatureAIFactory.h
  48. 0 src/server/game/AI/CreatureAIImpl.h
  49. 0 src/server/game/AI/CreatureAIRegistry.cpp
  50. 0 src/server/game/AI/CreatureAIRegistry.h
  51. 0 src/server/game/AI/CreatureAISelector.cpp
  52. 0 src/server/game/AI/CreatureAISelector.h
  53. 0 src/server/game/Accounts/AccountMgr.cpp
  54. 0 src/server/game/Accounts/AccountMgr.h
  55. +2 −3 src/server/game/Achievements/AchievementMgr.h
  56. 0 src/server/game/Addons/AddonMgr.cpp
  57. 0 src/server/game/Addons/AddonMgr.h
  58. +0 −1 src/server/game/AuctionHouse/AuctionHouseMgr.cpp
  59. 0 src/server/game/Battlegrounds/ArenaTeam.cpp
  60. 0 src/server/game/Battlegrounds/ArenaTeam.h
  61. 0 src/server/game/Battlegrounds/Battleground.cpp
  62. 0 src/server/game/Battlegrounds/Battleground.h
  63. 0 src/server/game/Battlegrounds/BattlegroundMgr.cpp
  64. 0 src/server/game/Battlegrounds/BattlegroundMgr.h
  65. 0 src/server/game/Battlegrounds/BattlegroundQueue.cpp
  66. 0 src/server/game/Battlegrounds/BattlegroundQueue.h
  67. 0 src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
  68. 0 src/server/game/Battlegrounds/Zones/BattlegroundAB.h
  69. 0 src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
  70. 0 src/server/game/Battlegrounds/Zones/BattlegroundAV.h
  71. 0 src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp
  72. 0 src/server/game/Battlegrounds/Zones/BattlegroundBE.h
  73. 0 src/server/game/Battlegrounds/Zones/BattlegroundDS.h
  74. 0 src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
  75. 0 src/server/game/Battlegrounds/Zones/BattlegroundEY.h
  76. 0 src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
  77. 0 src/server/game/Battlegrounds/Zones/BattlegroundIC.h
  78. 0 src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp
  79. 0 src/server/game/Battlegrounds/Zones/BattlegroundNA.h
  80. 0 src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp
  81. 0 src/server/game/Battlegrounds/Zones/BattlegroundRL.h
  82. 0 src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp
  83. 0 src/server/game/Battlegrounds/Zones/BattlegroundRV.h
  84. 0 src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
  85. 0 src/server/game/Battlegrounds/Zones/BattlegroundSA.h
  86. 0 src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
  87. 0 src/server/game/Battlegrounds/Zones/BattlegroundWS.h
  88. 0 src/server/game/Chat/Channels/Channel.cpp
  89. 0 src/server/game/Chat/Channels/Channel.h
  90. 0 src/server/game/Chat/Channels/ChannelMgr.cpp
  91. 0 src/server/game/Chat/Channels/ChannelMgr.h
  92. 0 src/server/game/Chat/Chat.cpp
  93. 0 src/server/game/Combat/HostileRefManager.cpp
  94. 0 src/server/game/Combat/HostileRefManager.h
  95. 0 src/server/game/Combat/ThreatManager.cpp
  96. 0 src/server/game/Combat/ThreatManager.h
  97. 0 src/server/game/Combat/UnitEvents.h
  98. +23 −3 src/server/game/Conditions/ConditionMgr.cpp
  99. +1 −1 src/server/game/Conditions/ConditionMgr.h
  100. 0 src/server/game/Conditions/DisableMgr.cpp
  101. 0 src/server/game/Conditions/DisableMgr.h
  102. 0 src/server/game/DataStores/DBCEnums.h
  103. 0 src/server/game/DataStores/DBCStores.h
  104. +3 −3 src/server/game/DataStores/DBCStructure.h
  105. +1 −1 src/server/game/DataStores/DBCfmt.h
  106. 0 src/server/game/DungeonFinding/LFG.h
  107. +4 −2 src/server/game/DungeonFinding/LFGGroupData.cpp
  108. +105 −68 src/server/game/DungeonFinding/LFGMgr.cpp
  109. +2 −2 src/server/game/DungeonFinding/LFGMgr.h
  110. +11 −7 src/server/game/DungeonFinding/LFGPlayerData.cpp
  111. +2 −2 src/server/game/DungeonFinding/LFGPlayerData.h
  112. +1 −6 src/server/game/DungeonFinding/LFGQueue.cpp
  113. +0 −1 src/server/game/DungeonFinding/LFGScripts.cpp
  114. 0 src/server/game/Entities/Corpse/Corpse.cpp
  115. 0 src/server/game/Entities/Corpse/Corpse.h
  116. 0 src/server/game/Entities/Creature/Creature.cpp
  117. 0 src/server/game/Entities/Creature/Creature.h
  118. 0 src/server/game/Entities/Creature/CreatureGroups.cpp
  119. 0 src/server/game/Entities/Creature/CreatureGroups.h
  120. 0 src/server/game/Entities/Creature/GossipDef.cpp
  121. 0 src/server/game/Entities/Creature/GossipDef.h
  122. 0 src/server/game/Entities/Creature/TemporarySummon.cpp
  123. 0 src/server/game/Entities/Creature/TemporarySummon.h
  124. 0 src/server/game/Entities/DynamicObject/DynamicObject.cpp
  125. 0 src/server/game/Entities/DynamicObject/DynamicObject.h
  126. +2 −2 src/server/game/Entities/GameObject/GameObject.cpp
  127. 0 src/server/game/Entities/GameObject/GameObject.h
  128. 0 src/server/game/Entities/Item/Container/Bag.cpp
  129. 0 src/server/game/Entities/Item/Container/Bag.h
  130. 0 src/server/game/Entities/Item/Item.cpp
  131. 0 src/server/game/Entities/Item/Item.h
  132. 0 src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
  133. 0 src/server/game/Entities/Item/ItemEnchantmentMgr.h
  134. 0 src/server/game/Entities/Item/ItemPrototype.h
  135. 0 src/server/game/Entities/Object/Object.h
  136. 0 src/server/game/Entities/Object/ObjectDefines.h
  137. 0 src/server/game/Entities/Object/ObjectPosSelector.cpp
  138. 0 src/server/game/Entities/Object/ObjectPosSelector.h
  139. 0 src/server/game/Entities/Object/Updates/UpdateData.h
  140. 0 src/server/game/Entities/Object/Updates/UpdateFields.h
  141. 0 src/server/game/Entities/Object/Updates/UpdateMask.h
  142. 0 src/server/game/Entities/Pet/Pet.cpp
  143. 0 src/server/game/Entities/Pet/Pet.h
  144. +3 −9 src/server/game/Entities/Player/Player.cpp
  145. +0 −2 src/server/game/Entities/Player/Player.h
  146. 0 src/server/game/Entities/Player/SocialMgr.cpp
  147. 0 src/server/game/Entities/Player/SocialMgr.h
  148. 0 src/server/game/Entities/Totem/Totem.cpp
  149. 0 src/server/game/Entities/Totem/Totem.h
  150. 0 src/server/game/Entities/Transport/Transport.cpp
  151. 0 src/server/game/Entities/Transport/Transport.h
  152. 0 src/server/game/Entities/Unit/StatSystem.cpp
  153. +11 −1 src/server/game/Entities/Unit/Unit.cpp
  154. +1 −1 src/server/game/Entities/Unit/Unit.h
  155. +3 −3 src/server/game/Entities/Vehicle/Vehicle.cpp
  156. 0 src/server/game/Entities/Vehicle/Vehicle.h
  157. 0 src/server/game/Events/GameEventMgr.cpp
  158. 0 src/server/game/Events/GameEventMgr.h
  159. 0 src/server/game/Globals/ObjectAccessor.cpp
  160. 0 src/server/game/Globals/ObjectAccessor.h
  161. 0 src/server/game/Globals/ObjectMgr.h
  162. 0 src/server/game/Grids/Cells/Cell.h
  163. 0 src/server/game/Grids/Grid.h
  164. 0 src/server/game/Grids/GridLoader.h
  165. 0 src/server/game/Grids/GridRefManager.h
  166. 0 src/server/game/Grids/GridReference.h
  167. 0 src/server/game/Grids/GridStates.cpp
  168. 0 src/server/game/Grids/GridStates.h
  169. 0 src/server/game/Grids/NGrid.h
  170. 0 src/server/game/Grids/Notifiers/GridNotifiers.cpp
  171. 0 src/server/game/Grids/Notifiers/GridNotifiers.h
  172. 0 src/server/game/Grids/Notifiers/GridNotifiersImpl.h
  173. 0 src/server/game/Grids/ObjectGridLoader.cpp
  174. 0 src/server/game/Grids/ObjectGridLoader.h
  175. +9 −6 src/server/game/Groups/Group.cpp
  176. 0 src/server/game/Groups/Group.h
  177. 0 src/server/game/Groups/GroupRefManager.h
  178. 0 src/server/game/Groups/GroupReference.cpp
  179. 0 src/server/game/Groups/GroupReference.h
  180. 0 src/server/game/Guilds/Guild.h
  181. 0 src/server/game/Handlers/AddonHandler.cpp
  182. 0 src/server/game/Handlers/AddonHandler.h
  183. +8 −8 src/server/game/Handlers/ArenaTeamHandler.cpp
  184. +6 −6 src/server/game/Handlers/AuctionHouseHandler.cpp
  185. 0 src/server/game/Handlers/AuthHandler.cpp
  186. +5 −5 src/server/game/Handlers/BattleGroundHandler.cpp
  187. 0 src/server/game/{Battlefield → Handlers}/BattlefieldHandler.cpp
  188. 0 src/server/game/Handlers/CalendarHandler.cpp
  189. 0 src/server/game/Handlers/ChannelHandler.cpp
  190. +7 −7 src/server/game/Handlers/CharacterHandler.cpp
  191. 0 src/server/game/Handlers/CombatHandler.cpp
  192. 0 src/server/game/Handlers/DuelHandler.cpp
  193. +4 −4 src/server/game/Handlers/GroupHandler.cpp
  194. 0 src/server/game/Handlers/GuildHandler.cpp
  195. +7 −7 src/server/game/Handlers/ItemHandler.cpp
  196. +1 −1 src/server/game/Handlers/LFGHandler.cpp
  197. +2 −2 src/server/game/Handlers/LootHandler.cpp
  198. +3 −3 src/server/game/Handlers/MailHandler.cpp
  199. +1 −1 src/server/game/Handlers/MovementHandler.cpp
  200. +10 −10 src/server/game/Handlers/NPCHandler.cpp
  201. 0 src/server/game/Handlers/NPCHandler.h
  202. +6 −6 src/server/game/Handlers/PetHandler.cpp
  203. +8 −8 src/server/game/Handlers/PetitionsHandler.cpp
  204. +3 −3 src/server/game/Handlers/QueryHandler.cpp
  205. +3 −3 src/server/game/Handlers/QuestHandler.cpp
  206. +1 −1 src/server/game/Handlers/SkillHandler.cpp
  207. +1 −1 src/server/game/Handlers/SpellHandler.cpp
  208. +2 −2 src/server/game/Handlers/TaxiHandler.cpp
  209. +1 −1 src/server/game/Handlers/TicketHandler.cpp
  210. 0 src/server/game/Handlers/TradeHandler.cpp
  211. 0 src/server/game/Handlers/VoiceChatHandler.cpp
  212. 0 src/server/game/Instances/InstanceSaveMgr.cpp
  213. 0 src/server/game/Instances/InstanceSaveMgr.h
  214. 0 src/server/game/Instances/InstanceScript.cpp
  215. 0 src/server/game/Instances/InstanceScript.h
  216. 0 src/server/game/Loot/LootMgr.cpp
  217. 0 src/server/game/Loot/LootMgr.h
  218. 0 src/server/game/Mails/Mail.cpp
  219. 0 src/server/game/Mails/Mail.h
  220. 0 src/server/game/Maps/Map.cpp
  221. 0 src/server/game/Maps/Map.h
  222. 0 src/server/game/Maps/MapInstanced.cpp
  223. 0 src/server/game/Maps/MapInstanced.h
  224. 0 src/server/game/Maps/MapManager.cpp
  225. 0 src/server/game/Maps/MapManager.h
  226. 0 src/server/game/Maps/MapRefManager.h
  227. 0 src/server/game/Maps/MapReference.h
  228. 0 src/server/game/Maps/ZoneScript.h
  229. 0 src/server/game/Miscellaneous/Formulas.h
  230. 0 src/server/game/Miscellaneous/Language.h
  231. +20 −20 src/server/game/Miscellaneous/SharedDefines.h
  232. 0 src/server/game/Movement/FollowerRefManager.h
  233. 0 src/server/game/Movement/FollowerReference.cpp
  234. 0 src/server/game/Movement/FollowerReference.h
  235. 0 src/server/game/Movement/MotionMaster.cpp
  236. 0 src/server/game/Movement/MotionMaster.h
  237. 0 src/server/game/Movement/MovementGenerator.cpp
  238. 0 src/server/game/Movement/MovementGenerator.h
  239. 0 src/server/game/Movement/MovementGeneratorImpl.h
  240. 0 src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
  241. 0 src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
  242. 0 src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
  243. 0 src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
  244. 0 src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
  245. 0 src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
  246. 0 src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
  247. +0 −1 src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
  248. 0 src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
  249. 0 src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
  250. +1 −1 src/server/game/Movement/Spline/MovementUtil.cpp
  251. 0 src/server/game/Movement/Waypoints/Path.h
  252. 0 src/server/game/Movement/Waypoints/WaypointManager.cpp
  253. 0 src/server/game/Movement/Waypoints/WaypointManager.h
  254. 0 src/server/game/OutdoorPvP/OutdoorPvP.cpp
  255. 0 src/server/game/OutdoorPvP/OutdoorPvP.h
  256. 0 src/server/game/OutdoorPvP/OutdoorPvPMgr.cpp
  257. 0 src/server/game/OutdoorPvP/OutdoorPvPMgr.h
  258. 0 src/server/game/Pools/PoolMgr.cpp
  259. 0 src/server/game/Pools/PoolMgr.h
  260. 0 src/server/game/Quests/QuestDef.cpp
  261. 0 src/server/game/Quests/QuestDef.h
  262. +6 −5 src/server/game/Reputation/ReputationMgr.cpp
  263. 0 src/server/game/Reputation/ReputationMgr.h
  264. 0 src/server/game/Scripting/MapScripts.cpp
  265. 0 src/server/game/Scripting/ScriptLoader.cpp
  266. 0 src/server/game/Scripting/ScriptMgr.cpp
  267. 0 src/server/game/Scripting/ScriptMgr.h
  268. 0 src/server/game/Scripting/ScriptSystem.cpp
  269. 0 src/server/game/Server/Protocol/Opcodes.h
  270. 0 src/server/game/Server/WorldSession.h
  271. 0 src/server/game/Server/WorldSocket.h
  272. 0 src/server/game/Server/WorldSocketMgr.cpp
  273. 0 src/server/game/Server/WorldSocketMgr.h
  274. 0 src/server/game/Skills/SkillDiscovery.cpp
  275. 0 src/server/game/Skills/SkillDiscovery.h
  276. 0 src/server/game/Skills/SkillExtraItems.cpp
  277. 0 src/server/game/Skills/SkillExtraItems.h
  278. 0 src/server/game/Spells/Auras/SpellAuraDefines.h
  279. +0 −7 src/server/game/Spells/Auras/SpellAuraEffects.cpp
  280. 0 src/server/game/Spells/Auras/SpellAuras.cpp
  281. 0 src/server/game/Spells/Auras/SpellAuras.h
  282. 0 src/server/game/Spells/Spell.cpp
  283. 0 src/server/game/Spells/Spell.h
  284. +9 −4 src/server/game/Spells/SpellInfo.cpp
  285. 0 src/server/game/Spells/SpellMgr.h
  286. 0 src/server/game/Spells/SpellScript.cpp
  287. 0 src/server/game/Spells/SpellScript.h
  288. 0 src/server/game/Texts/CreatureTextMgr.cpp
  289. 0 src/server/game/Texts/CreatureTextMgr.h
  290. 0 src/server/game/Tickets/TicketMgr.h
  291. +1 −0 src/server/game/Tools/CharacterDatabaseCleaner.cpp
  292. 0 src/server/game/Tools/PlayerDump.h
  293. 0 src/server/game/Weather/Weather.cpp
  294. 0 src/server/game/Weather/Weather.h
  295. 0 src/server/game/Weather/WeatherMgr.cpp
  296. 0 src/server/game/Weather/WeatherMgr.h
  297. +1 −1 src/server/scripts/Commands/cs_disable.cpp
  298. +0 −1 src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
  299. +1 −1 src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
  300. +5 −2 src/server/scripts/EasternKingdoms/MoltenCore/boss_baron_geddon.cpp
Sorry, we could not display the entire diff because too many files (437) changed.
View
2 CMakeLists.txt
@@ -12,7 +12,7 @@
project(TrinityCore)
# CMake policies (can not be handled elsewhere)
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8)
cmake_policy(SET CMP0005 OLD)
# Set RPATH-handing (CMake parameters)
View
4 cmake/compiler/clang/settings.cmake
@@ -2,9 +2,9 @@
add_definitions(-D_BUILD_DIRECTIVE='"$(CONFIGURATION)"')
if(WITH_WARNINGS)
- set(WARNING_FLAGS "-W -Wall -Wextra -Wwrite-strings -Winit-self -Woverloaded-virtual -Wfatal-errors")
+ set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Wfatal-errors")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual")
message(STATUS "Clang: All warnings enabled")
endif()
View
4 cmake/compiler/gcc/settings.cmake
@@ -11,9 +11,9 @@ add_definitions(-DHAVE_SSE2 -D__SSE2__)
message(STATUS "GCC: SFMT enabled, SSE2 flags forced")
if( WITH_WARNINGS )
- set(WARNING_FLAGS "-W -Wall -Wextra -Wwrite-strings -Winit-self -Woverloaded-virtual -Winvalid-pch -Wfatal-errors")
+ set(WARNING_FLAGS "-W -Wall -Wextra -Winit-self -Winvalid-pch -Wfatal-errors")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WARNING_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS} -Woverloaded-virtual")
message(STATUS "GCC: All warnings enabled")
endif()
View
5 cmake/compiler/icc/settings.cmake
@@ -9,10 +9,7 @@ endif()
if( WITH_WARNINGS )
add_definitions(-w1)
- message(STATUS "ICC All warnings enabled")
-else()
- add_definitions(-w)
- message(STATUS "ICC: All warnings disabled")
+ message(STATUS "ICC: All warnings enabled")
endif()
if( WITH_COREDEBUG )
View
2 cmake/macros/CheckPlatform.cmake
@@ -11,8 +11,6 @@ include("${CMAKE_SOURCE_DIR}/cmake/platform/settings.cmake")
if(WIN32)
include("${CMAKE_SOURCE_DIR}/cmake/platform/win/settings.cmake")
-elseif(APPLE)
- include("${CMAKE_SOURCE_DIR}/cmake/platform/osx/settings.cmake")
elseif(UNIX)
include("${CMAKE_SOURCE_DIR}/cmake/platform/unix/settings.cmake")
endif()
View
33 cmake/platform/osx/settings.cmake
@@ -1,33 +0,0 @@
-set(MACOSX 1)
-
-# set default configuration directory
-if( NOT CONF_DIR )
- set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc)
- message(STATUS "OSX: Using default configuration directory")
-endif()
-
-# set default library directory
-if( NOT LIBSDIR )
- set(LIBSDIR ${CMAKE_INSTALL_PREFIX}/lib)
- message(STATUS "OSX: Using default library directory")
-endif()
-
-# configure uninstaller
-configure_file(
- "${CMAKE_SOURCE_DIR}/cmake/platform/cmake_uninstall.in.cmake"
- "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
- IMMEDIATE @ONLY
-)
-message(STATUS "OSX: Configuring uninstall target")
-
-# create uninstaller target (allows for using "make uninstall")
-add_custom_target(uninstall
- "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake"
-)
-message(STATUS "OSX: Created uninstall target")
-
-if (CMAKE_COMPILER_IS_GNUCC)
- include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
-elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
- include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
-endif()
View
2 cmake/platform/unix/settings.cmake
@@ -36,4 +36,6 @@ if(CMAKE_C_COMPILER MATCHES "gcc")
include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
elseif(CMAKE_C_COMPILER MATCHES "icc")
include(${CMAKE_SOURCE_DIR}/cmake/compiler/icc/settings.cmake)
+elseif(CMAKE_C_COMPILER MATCHES "clang")
+ include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
endif()
View
4 dep/SFMT/SFMT.h
@@ -123,14 +123,16 @@
#define SFMT_PARITY 0x00000001, 0x00000000, 0x00000000, 0x5986f054 // Period certification vector
#endif
-// Functions used by SFMTRand::RandomInitByArray
+// Functions used by SFMTRand::RandomInitByArray (UNUSED AND COMMENTED OUT)
+/*
static uint32_t func1(uint32_t x) {
return (x ^ (x >> 27)) * 1664525U;
}
static uint32_t func2(uint32_t x) {
return (x ^ (x >> 27)) * 1566083941U;
}
+*/
// Subfunction for the sfmt algorithm
static inline __m128i sfmt_recursion(__m128i const &a, __m128i const &b,
View
346 sql/updates/world/2012_11_24_02_world_creature_text.sql
@@ -0,0 +1,346 @@
+-- ------------------------------- --
+-- Creature text conversion part 3 --
+-- ------------------------------- --
+-- crusader
+DELETE FROM `creature_text` WHERE `entry` IN (28939,28610,28940) AND `groupid` IN (6,7,8);
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+-- Scarlet Preacher
+(28939,6,0,12,0,100,"break crusader SAY_PERSUADED5","LIES! The pain you are about to endure will be talked about for years to come!"),
+(28939,7,0,12,0,100,"break crusader SAY_PERSUADED6","NO! PLEASE! There is one more thing that I forgot to mention... A courier comes soon... From Hearthglen. It..."),
+(28939,8,0,12,0,100,"player SAY_PERSUADE1","I'll tear the secrets from your soul! Tell me about the \"Crimson Dawn\" and your life may be spared!"),
+(28939,8,1,12,0,100,"player SAY_PERSUADE2","Tell me what you know about \"Crimson Dawn\" or the beatings will continue!"),
+(28939,8,2,12,0,100,"player SAY_PERSUADE3","I'm through being courteous with your kind, human! What is the \"Crimson Dawn\"?"),
+(28939,8,3,12,0,100,"player SAY_PERSUADE4","Is your life worth so little? Just tell me what I need to know about \"Crimson Dawn\" and I'll end your suffering quickly."),
+(28939,8,4,12,0,100,"player SAY_PERSUADE5","I can keep this up for a very long time, Scarlet dog! Tell me about the \"Crimson Dawn\"!"),
+(28939,8,5,12,0,100,"player SAY_PERSUADE6","What is the \"Crimson Dawn\"?"),
+(28939,8,6,12,0,100,"player SAY_PERSUADE7","\"Crimson Dawn\"! What is it! Speak!"),
+-- Scarlet Crusader
+(28940,6,0,12,0,100,"break crusader SAY_PERSUADED5","LIES! The pain you are about to endure will be talked about for years to come!"),
+(28940,7,0,12,0,100,"break crusader SAY_PERSUADED6","NO! PLEASE! There is one more thing that I forgot to mention... A courier comes soon... From Hearthglen. It..."),
+(28940,8,0,12,0,100,"player SAY_PERSUADE1","I'll tear the secrets from your soul! Tell me about the \"Crimson Dawn\" and your life may be spared!"),
+(28940,8,1,12,0,100,"player SAY_PERSUADE2","Tell me what you know about \"Crimson Dawn\" or the beatings will continue!"),
+(28940,8,2,12,0,100,"player SAY_PERSUADE3","I'm through being courteous with your kind, human! What is the \"Crimson Dawn\"?"),
+(28940,8,3,12,0,100,"player SAY_PERSUADE4","Is your life worth so little? Just tell me what I need to know about \"Crimson Dawn\" and I'll end your suffering quickly."),
+(28940,8,4,12,0,100,"player SAY_PERSUADE5","I can keep this up for a very long time, Scarlet dog! Tell me about the \"Crimson Dawn\"!"),
+(28940,8,5,12,0,100,"player SAY_PERSUADE6","What is the \"Crimson Dawn\"?"),
+(28940,8,6,12,0,100,"player SAY_PERSUADE7","\"Crimson Dawn\"! What is it! Speak!"),
+-- Scarlet Marksman
+(28610,6,0,12,0,100,"break crusader SAY_PERSUADED5","LIES! The pain you are about to endure will be talked about for years to come!"),
+(28610,7,0,12,0,100,"break crusader SAY_PERSUADED6","NO! PLEASE! There is one more thing that I forgot to mention... A courier comes soon... From Hearthglen. It..."),
+(28610,8,0,12,0,100,"player SAY_PERSUADE1","I'll tear the secrets from your soul! Tell me about the \"Crimson Dawn\" and your life may be spared!"),
+(28610,8,1,12,0,100,"player SAY_PERSUADE2","Tell me what you know about \"Crimson Dawn\" or the beatings will continue!"),
+(28610,8,2,12,0,100,"player SAY_PERSUADE3","I'm through being courteous with your kind, human! What is the \"Crimson Dawn\"?"),
+(28610,8,3,12,0,100,"player SAY_PERSUADE4","Is your life worth so little? Just tell me what I need to know about \"Crimson Dawn\" and I'll end your suffering quickly."),
+(28610,8,4,12,0,100,"player SAY_PERSUADE5","I can keep this up for a very long time, Scarlet dog! Tell me about the \"Crimson Dawn\"!"),
+(28610,8,5,12,0,100,"player SAY_PERSUADE6","What is the \"Crimson Dawn\"?"),
+(28610,8,6,12,0,100,"player SAY_PERSUADE7","\"Crimson Dawn\"! What is it! Speak!");
+
+-- unworthy initiate
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1609016 AND -1609000;
+DELETE FROM `creature_text` WHERE `entry` IN (29519,29520,29565,29566,29567);
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(29519,0,0,12,0,100,"unworthy initiate SAY_EVENT_START_1","You have made a grave error, fiend!"),
+(29519,0,1,12,0,100,"unworthy initiate SAY_EVENT_START_2","I was a soldier of the Light once... Look at what I have become... "),
+(29519,0,2,12,0,100,"unworthy initiate SAY_EVENT_START_3","You are hopelessly outmatched, $R."),
+(29519,0,3,12,0,100,"unworthy initiate SAY_EVENT_START_4","They brand me unworthy? I will show them unmorthy!"),
+(29519,0,4,12,0,100,"unworthy initiate SAY_EVENT_START_5","You will allow me a weapon and armor, yes?"),
+(29519,0,5,12,0,100,"unworthy initiate SAY_EVENT_START_6","I will win my freedom and leave this cursed place!"),
+(29519,0,6,12,0,100,"unworthy initiate SAY_EVENT_START_7","I will dismantle this festering hellhole!"),
+(29519,0,7,12,0,100,"unworthy initiate SAY_EVENT_START_8","There can be only one survivor!"),
+(29519,1,0,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_1","To battle!"),
+(29519,1,1,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_2","Let your fears consume you!"),
+(29519,1,2,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_3","HAH! You can barely hold a blade! Yours will be a quick death."),
+(29519,1,3,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_4","And now you die"),
+(29519,1,4,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_5","To battle!"),
+(29519,1,5,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_6","There is no hope for our future..."),
+(29519,1,6,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_7","Sate your hunger on cold steel, $R"),
+(29519,1,7,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_8","It ends here!"),
+(29519,1,8,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_9","Death is the only cure!"),
+(29520,0,0,12,0,100,"unworthy initiate SAY_EVENT_START_1","You have made a grave error, fiend!"),
+(29520,0,1,12,0,100,"unworthy initiate SAY_EVENT_START_2","I was a soldier of the Light once... Look at what I have become... "),
+(29520,0,2,12,0,100,"unworthy initiate SAY_EVENT_START_3","You are hopelessly outmatched, $R."),
+(29520,0,3,12,0,100,"unworthy initiate SAY_EVENT_START_4","They brand me unworthy? I will show them unmorthy!"),
+(29520,0,4,12,0,100,"unworthy initiate SAY_EVENT_START_5","You will allow me a weapon and armor, yes?"),
+(29520,0,5,12,0,100,"unworthy initiate SAY_EVENT_START_6","I will win my freedom and leave this cursed place!"),
+(29520,0,6,12,0,100,"unworthy initiate SAY_EVENT_START_7","I will dismantle this festering hellhole!"),
+(29520,0,7,12,0,100,"unworthy initiate SAY_EVENT_START_8","There can be only one survivor!"),
+(29520,1,0,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_1","To battle!"),
+(29520,1,1,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_2","Let your fears consume you!"),
+(29520,1,2,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_3","HAH! You can barely hold a blade! Yours will be a quick death."),
+(29520,1,3,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_4","And now you die"),
+(29520,1,4,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_5","To battle!"),
+(29520,1,5,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_6","There is no hope for our future..."),
+(29520,1,6,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_7","Sate your hunger on cold steel, $R"),
+(29520,1,7,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_8","It ends here!"),
+(29520,1,8,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_9","Death is the only cure!"),
+(29565,0,0,12,0,100,"unworthy initiate SAY_EVENT_START_1","You have made a grave error, fiend!"),
+(29565,0,1,12,0,100,"unworthy initiate SAY_EVENT_START_2","I was a soldier of the Light once... Look at what I have become... "),
+(29565,0,2,12,0,100,"unworthy initiate SAY_EVENT_START_3","You are hopelessly outmatched, $R."),
+(29565,0,3,12,0,100,"unworthy initiate SAY_EVENT_START_4","They brand me unworthy? I will show them unmorthy!"),
+(29565,0,4,12,0,100,"unworthy initiate SAY_EVENT_START_5","You will allow me a weapon and armor, yes?"),
+(29565,0,5,12,0,100,"unworthy initiate SAY_EVENT_START_6","I will win my freedom and leave this cursed place!"),
+(29565,0,6,12,0,100,"unworthy initiate SAY_EVENT_START_7","I will dismantle this festering hellhole!"),
+(29565,0,7,12,0,100,"unworthy initiate SAY_EVENT_START_8","There can be only one survivor!"),
+(29565,1,0,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_1","To battle!"),
+(29565,1,1,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_2","Let your fears consume you!"),
+(29565,1,2,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_3","HAH! You can barely hold a blade! Yours will be a quick death."),
+(29565,1,3,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_4","And now you die"),
+(29565,1,4,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_5","To battle!"),
+(29565,1,5,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_6","There is no hope for our future..."),
+(29565,1,6,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_7","Sate your hunger on cold steel, $R"),
+(29565,1,7,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_8","It ends here!"),
+(29565,1,8,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_9","Death is the only cure!"),
+(29566,0,0,12,0,100,"unworthy initiate SAY_EVENT_START_1","You have made a grave error, fiend!"),
+(29566,0,1,12,0,100,"unworthy initiate SAY_EVENT_START_2","I was a soldier of the Light once... Look at what I have become... "),
+(29566,0,2,12,0,100,"unworthy initiate SAY_EVENT_START_3","You are hopelessly outmatched, $R."),
+(29566,0,3,12,0,100,"unworthy initiate SAY_EVENT_START_4","They brand me unworthy? I will show them unmorthy!"),
+(29566,0,4,12,0,100,"unworthy initiate SAY_EVENT_START_5","You will allow me a weapon and armor, yes?"),
+(29566,0,5,12,0,100,"unworthy initiate SAY_EVENT_START_6","I will win my freedom and leave this cursed place!"),
+(29566,0,6,12,0,100,"unworthy initiate SAY_EVENT_START_7","I will dismantle this festering hellhole!"),
+(29566,0,7,12,0,100,"unworthy initiate SAY_EVENT_START_8","There can be only one survivor!"),
+(29566,1,0,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_1","To battle!"),
+(29566,1,1,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_2","Let your fears consume you!"),
+(29566,1,2,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_3","HAH! You can barely hold a blade! Yours will be a quick death."),
+(29566,1,3,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_4","And now you die"),
+(29566,1,4,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_5","To battle!"),
+(29566,1,5,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_6","There is no hope for our future..."),
+(29566,1,6,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_7","Sate your hunger on cold steel, $R"),
+(29566,1,7,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_8","It ends here!"),
+(29566,1,8,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_9","Death is the only cure!"),
+(29567,0,0,12,0,100,"unworthy initiate SAY_EVENT_START_1","You have made a grave error, fiend!"),
+(29567,0,1,12,0,100,"unworthy initiate SAY_EVENT_START_2","I was a soldier of the Light once... Look at what I have become... "),
+(29567,0,2,12,0,100,"unworthy initiate SAY_EVENT_START_3","You are hopelessly outmatched, $R."),
+(29567,0,3,12,0,100,"unworthy initiate SAY_EVENT_START_4","They brand me unworthy? I will show them unmorthy!"),
+(29567,0,4,12,0,100,"unworthy initiate SAY_EVENT_START_5","You will allow me a weapon and armor, yes?"),
+(29567,0,5,12,0,100,"unworthy initiate SAY_EVENT_START_6","I will win my freedom and leave this cursed place!"),
+(29567,0,6,12,0,100,"unworthy initiate SAY_EVENT_START_7","I will dismantle this festering hellhole!"),
+(29567,0,7,12,0,100,"unworthy initiate SAY_EVENT_START_8","There can be only one survivor!"),
+(29567,1,0,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_1","To battle!"),
+(29567,1,1,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_2","Let your fears consume you!"),
+(29567,1,2,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_3","HAH! You can barely hold a blade! Yours will be a quick death."),
+(29567,1,3,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_4","And now you die"),
+(29567,1,4,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_5","To battle!"),
+(29567,1,5,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_6","There is no hope for our future..."),
+(29567,1,6,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_7","Sate your hunger on cold steel, $R"),
+(29567,1,7,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_8","It ends here!"),
+(29567,1,8,12,0,100,"unworthy initiate SAY_EVENT_ATTACK_9","Death is the only cure!");
+
+-- dk initiate
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1609088 AND -1609080;
+DELETE FROM `creature_text` WHERE `entry`=28406;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(28406,0,0,12,0,100,"dk initiate SAY_DUEL_A","No potions!"),
+(28406,0,1,12,0,100,"dk initiate SAY_DUEL_B","Remember this day, $n, for it is the day that you will be thoroughly owned."),
+(28406,0,2,12,0,100,"dk initiate SAY_DUEL_C","I'm going to tear your heart out, cupcake!"),
+(28406,0,3,12,0,100,"dk initiate SAY_DUEL_D","Don't make me laugh."),
+(28406,0,4,12,0,100,"dk initiate SAY_DUEL_E","Here come the tears..."),
+(28406,0,5,12,0,100,"dk initiate SAY_DUEL_F","You have challenged death itself!"),
+(28406,0,6,12,0,100,"dk initiate SAY_DUEL_G","The Lich King will see his true champion on this day!"),
+(28406,0,7,12,0,100,"dk initiate SAY_DUEL_H","You're going down!"),
+(28406,0,8,12,0,100,"dk initiate SAY_DUEL_I","You don't stand a chance, $n");
+
+-- geddon
+DELETE FROM `script_texts` WHERE `entry`=-1409000;
+DELETE FROM `creature_text` WHERE `entry`=12056;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(12056,0,0,16,0,100,"geddon EMOTE_SERVICE","%s performs one last service for Ragnaros.");
+
+-- majordomo
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1409012 AND -1409003;
+DELETE FROM `creature_text` WHERE `entry`=12018;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(12018,0,0,14,8035,100,"majordomo SAY_AGGRO","Reckless mortals, none may challenge the sons of the living flame!"),
+(12018,1,0,14,8039,100,"majordomo SAY_SPAWN","The runes of warding have been destroyed! Hunt down the infedels my bretheren."),
+(12018,2,0,14,8037,100,"majordomo SAY_SLAY","Ashes to Ashes!"),
+(12018,3,0,14,8036,100,"majordomo SAY_SPECIAL","Burn mortals! Burn for this transgression!"),
+(12018,4,0,14,8038,100,"majordomo SAY_DEFEAT","Impossible! Stay your attack mortals! I submitt! I submitt! Brashly you have come to rest the secrets of the living flame. You will soon regret the recklessness of your quest. I go now to summon the lord whos house this is. Should you seek an audiance with him your paltry lives will surly be forfit. Nevertheless seek out his lair if you dare!"),
+(12018,5,0,14,8040,100,"majordomo SAY_SUMMON_MAJ","Behold Ragnaros, the Firelord! He who was ancient when this world was young! Bow before him, mortals! Bow before your ending!"),
+(12018,6,0,14,8041,100,"majordomo SAY_ARRIVAL2_MAJ","These mortal infidels, my lord! They have invaded your sanctum, and seek to steal your secrets!");
+
+-- magmadar
+DELETE FROM `script_texts` WHERE `entry`=-1409001;
+DELETE FROM `creature_text` WHERE `entry`=11982;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(11982,0,0,16,0,100,"magmadar EMOTE_FRENZY","%s goes into a killing frenzy!");
+
+-- calvin montague
+DELETE FROM `script_texts` WHERE `entry`=-1000431;
+DELETE FROM `creature_text` WHERE `entry`=6784;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(6784,0,0,12,0,100,"calvin montague SAY_RIN_END_6","Ugh.");
+
+-- corporal keeshan
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000468 AND -1000464;
+DELETE FROM `creature_text` WHERE `entry`=349;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(349,0,0,12,0,100,"corporal keeshan SAY_CORPORAL_1","My wounds are grave. Forgive my slow pace but my injuries won't allow me to walk any faster."),
+(349,1,0,12,0,100,"corporal keeshan SAY_CORPORAL_2","Ah,fresh air,at last! I need a moment to reset."),
+(349,2,0,12,0,100,"corporal keeshan SAY_CORPORAL_3","The Blackrock infestation is thick in these parts. I will do my best to keep the pace. Let's go!"),
+(349,3,0,12,0,100,"corporal keeshan SAY_CORPORAL_4","Marshal Marris,sir. Corporal Keeshan of the 12th Sabre Regiment returned from battle and reporting for duty!"),
+(349,4,0,12,0,100,"corporal keeshan SAY_CORPORAL_5","Brave adventurer,thank you for rescuing me! I am sure Marshal Marris will reward your kind deed.");
+
+-- anchorite truuen
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1800070 AND -1800064;
+DELETE FROM `creature_text` WHERE `entry` IN (17238,1854,17233);
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(17238,0,0,12,0,100,"anchorite truuen SAY_WP_0","Beware! We are attacked!"),
+(17238,1,0,12,0,100,"anchorite truuen SAY_WP_1","It must be the purity of the Mark of the Lightbringer that is drawing forth the Scourge to attack us. We must proceed with caution lest we be overwhelmed!"),
+(17238,2,0,12,0,100,"anchorite truuen SAY_WP_2","This land truly needs to be cleansed by the Light! Let us continue on to the tomb. It isn't far now..."),
+(1854,0,0,12,0,100,"anchorite truuen SAY_WP_3","Be welcome, friends!"),
+(17233,0,0,12,0,100,"anchorite truuen SAY_WP_4","Thank you for coming here in remembrance of me. Your efforts in recovering that symbol, while unnecessary, are certainly touching to an old man's heart. "),
+(17233,1,0,12,0,100,"anchorite truuen SAY_WP_5","Please, rise my friend. Keep the Blessing as a symbol of the strength of the Light and how heroes long gone might once again rise in each of us to inspire. "),
+(17233,2,0,12,0,100,"anchorite truuen SAY_WP_6","Thank you my friend for making this possible. This is a day that I shall never forget! I think I will stay a while. Please return to High Priestess MacDonnell at the camp. I know that she'll be keenly interested to know of what has transpired here.");
+
+-- hakkar
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309023 AND -1309020;
+DELETE FROM `creature_text` WHERE `entry`=14834;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(14834,0,0,14,8414,100,"hakkar SAY_AGGRO","PRIDE HERALDS THE END OF YOUR WORLD. COME, MORTALS! FACE THE WRATH OF THE SOULFLAYER!"),
+(14834,1,0,14,0,100,"hakkar SAY_FLEEING","Fleeing will do you no good, mortals!"),
+(14834,2,0,14,0,100,"hakkar SAY_MINION_DESTROY","You dare set foot upon Hakkari holy ground? Minions of Hakkar, destroy the infidels!"),
+(14834,3,0,14,0,100,"hakkar SAY_PROTECT_ALTAR","Minions of Hakkar, hear your God. The sanctity of this temple has been compromised. Invaders encroach upon holy ground! The Altar of Blood must be protected. Kill them all!");
+
+-- thekal
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309010 AND -1309009;
+DELETE FROM `creature_text` WHERE `entry`=14509;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(14509,0,0,14,8419,100,"thekal SAY_AGGRO","Shirvallah, fill me with your RAGE!"),
+(14509,1,0,14,8424,100,"thekal SAY_DEATH","Hakkar binds me no more! Peace at last!");
+
+-- jeklik
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309004 AND -1309002;
+DELETE FROM `creature_text` WHERE `entry`=14517;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(14517,0,0,14,8417,100,"jeklik SAY_AGGRO","Lord Hir'eek, grant me wings of vengance!"),
+(14517,1,0,14,0,100,"jeklik SAY_RAIN_FIRE","I command you to rain fire down upon these invaders!"),
+(14517,2,0,14,8422,100,"jeklik SAY_DEATH","Finally ...death. Curse you Hakkar! Curse you!");
+
+-- arlokk
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309013 AND -1309011;
+DELETE FROM `creature_text` WHERE `entry`=14515;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(14515,0,0,14,8416,100,"arlokk SAY_AGGRO","Bethekk, your priestess calls upon your might!"),
+(14515,1,0,14,0,100,"arlokk SAY_FEAST_PANTHER","Feast on $n, my pretties!"),
+(14515,2,0,14,8412,100,"arlokk SAY_DEATH","At last, I am free of the Soulflayer!");
+
+-- mandokir / jindo
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309019 AND -1309014;
+DELETE FROM `creature_text` WHERE `entry` IN (11382,11380);
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(11382,0,0,14,8413,100,"mandokir SAY_AGGRO","I'll feed your souls to Hakkar himself!"),
+(11382,1,0,14,0,100,"mandokir SAY_DING_KILL","DING!"),
+(11382,2,0,14,0,100,"mandokir SAY_WATCH","I'm keeping my eye on you, $N!"),
+(11382,3,0,14,0,100,"mandokir SAY_WATCH_WHISPER","Don't make me angry. You won't like it when I'm angry."),
+(11380,0,0,14,0,100,"mandokir SAY_GRATS_JINDO","GRATS!"),
+(11380,1,0,14,8425,100,"jindo SAY_AGGRO","Welcome to da great show friends! Step right up to die!");
+
+-- marli
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1309008 AND -1309005;
+DELETE FROM `creature_text` WHERE `entry`=14510;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(14510,0,0,14,8418,100,"marli SAY_AGGRO","Draw me to your web mistress Shadra. Unleash your venom!"),
+(14510,1,0,14,0,100,"marli SAY_TRANSFORM","Shadra, make of me your avatar!"),
+(14510,2,0,14,0,100,"marli SAY_SPIDER_SPAWN","Aid me my brood!"),
+(14510,3,0,14,8423,100,"marli SAY_DEATH","Bless you mortal for this release. Hakkar controls me no longer...");
+
+-- clintar
+DELETE FROM `script_texts` WHERE `entry`=-1000283;
+DELETE FROM `creature_text` WHERE `entry`=16364;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(16364,0,0,12,0,100,"clintar SAY_RELIC1","That's the first relic, but there are still two more. Follow me, $N.");
+
+-- freed soul
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1329003 AND -1329000;
+DELETE FROM `creature_text` WHERE `entry`=11136;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(11136,0,0,12,0,100,"freed soul SAY_ZAPPED0","Thanks to Egan"),
+(11136,0,1,12,0,100,"freed soul SAY_ZAPPED1","Rivendare must die"),
+(11136,0,2,12,0,100,"freed soul SAY_ZAPPED2","Who you gonna call?"),
+(11136,0,3,12,0,100,"freed soul SAY_ZAPPED3","Don't cross those beams!");
+
+-- erland
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000317 AND -1000306;
+DELETE FROM `creature_text` WHERE `entry` IN (1978,1950,1951);
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(1978,0,0,12,0,100,"erland SAY_QUESTACCEPT","Let's get to the others, and keep an eye open for those wolves cutside..."),
+(1978,1,0,12,0,100,"erland SAY_START","Be careful, $N. Those wolves like to hide among the trees."),
+(1978,2,0,12,0,100,"erland SAY_AGGRO_1","A $C attacks!"),
+(1978,2,1,12,0,100,"erland SAY_AGGRO_2","Beware! I am under attack!"),
+(1978,2,2,12,0,100,"erland SAY_AGGRO_3","Oh no! A $C is upon us!"),
+(1978,3,0,12,0,100,"erland SAY_PROGRESS","We're almost there!"),
+(1978,4,0,12,0,100,"erland SAY_LAST","We made it! Thanks, $N. I couldn't have gotten without you."),
+(1950,0,0,12,0,100,"erland SAY_RANE","It's good to see you again, Erland. What is your report?"),
+(1978,5,0,12,0,100,"erland SAY_RANE_ANSWER","Masses of wolves are to the east, and whoever lived at Malden's Orchard is gone."),
+(1978,6,0,12,0,100,"erland SAY_MOVE_QUINN","If I am excused, then I'd like to check on Quinn..."),
+(1978,7,0,12,0,100,"erland SAY_QUINN","Hello, Quinn. How are you faring?"),
+(1951,0,0,12,0,100,"erland SAY_QUINN_ANSWER","I've been better. Ivar the Foul got the better of me..."),
+(1978,8,0,12,0,100,"erland SAY_BYE","Try to take better care of yourself, Quinn. You were lucky this time.");
+
+-- converted sentry
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000189 AND -1000188;
+DELETE FROM `creature_text` WHERE `entry`=24981;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(24981,0,0,12,0,100,"converted sentry SAY_CONVERTED_1","Deployment sucessful. Trespassers will be neutralized."),
+(24981,0,1,12,0,100,"converted sentry SAY_CONVERTED_2","Objective acquired. Initiating security routines.");
+
+-- example creature
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1999910 AND -1999900;
+
+-- example escort
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1999921 AND -1999910;
+
+-- example gossip codebox
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1999924 AND -1999922;
+
+-- azuregos
+DELETE FROM `script_texts` WHERE `entry`=-1000100;
+DELETE FROM `creature_text` WHERE `entry`=6109;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(6109,0,0,14,0,100,"azuregos SAY_TELEPORT","Come, little ones. Face me!");
+
+-- ame
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000522 AND -1000517;
+DELETE FROM `creature_text` WHERE `entry`=9623;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(9623,0,0,12,0,100,"ame SAY_READY","A-Me good. Good, A-Me. Follow... follow A-Me. Home. A-Me go home."),
+(9623,1,0,12,0,100,"ame SAY_AGGRO1","$c, no hurt A-Me. A-Me good."),
+(9623,2,0,12,0,100,"ame SAY_SEARCH","Good... good, A-Me. A-Me good. Home. Find home."),
+(9623,3,0,12,0,100,"ame SAY_AGGRO2","Danger. Danger! $c try hurt A-Me."),
+(9623,4,0,12,0,100,"ame SAY_AGGRO3","Bad, $c. $c, bad!"),
+(9623,5,0,12,0,100,"ame SAY_FINISH","A-Me home! A-Me good! Good A-Me. Home. Home. Home.");
+
+-- ringo
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000433 AND -1000416;
+DELETE FROM `creature_text` WHERE `entry` IN (9999,9997);
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(9999,0,0,12,0,100,"ringo SAY_RIN_START_1","Well, I'm not sure how far I'll make it in this state... I'm feeling kind of faint..."),
+(9999,0,1,12,0,100,"ringo SAY_RIN_START_2","Remember, if I faint again, the water that Spraggle gave you will revive me."),
+(9999,1,0,12,0,100,"ringo SAY_FAINT_1","The heat... I can't take it..."),
+(9999,1,1,12,0,100,"ringo SAY_FAINT_2","Maybe... you could carry me?"),
+(9999,1,2,12,0,100,"ringo SAY_FAINT_3","Uuuuuuggggghhhhh...."),
+(9999,1,3,12,0,100,"ringo SAY_FAINT_4","I'm not feeling so well..."),
+(9999,2,0,12,0,100,"ringo SAY_WAKE_1","Where... Where am I?"),
+(9999,2,1,12,0,100,"ringo SAY_WAKE_2","I am feeling a little better now, thank you."),
+(9999,2,2,12,0,100,"ringo SAY_WAKE_3","Yes, I must go on."),
+(9999,2,3,12,0,100,"ringo SAY_WAKE_4","How am I feeling? Quite soaked, thank you."),
+(9999,3,0,12,0,100,"ringo SAY_RIN_END_1","Spraggle! I didn't think I'd make it back!"),
+(9997,0,0,12,0,100,"ringo SAY_SPR_END_2","Ringo! You're okay!"),
+(9999,4,0,12,0,100,"ringo SAY_RIN_END_3","Oh... I'm feeling faint..."),
+(9999,5,0,16,0,100,"ringo EMOTE_RIN_END_4","%s collapses onto the ground."),
+(9999,6,0,16,0,100,"ringo EMOTE_RIN_END_5","%s stands up after a short pause."),
+(9999,7,0,12,0,100,"ringo SAY_RIN_END_6","Ugh."),
+(9997,1,0,12,0,100,"ringo SAY_SPR_END_7","Ringo? Wake up! Don't worry, I'll take care of you."),
+(9999,8,0,16,0,100,"ringo EMOTE_RIN_END_8","%s fades away after a long pause.");
+
+-- Corrections
+DELETE FROM `creature_text` WHERE `entry`=3850;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`language`,`emote`,`comment`,`text`) VALUES
+(3850,0,0,14,0,100,7,1,"prisoner ashcrombe SAY_FREE_AS","Follow me and I'll open the courtyard door for you."),
+(3850,1,0,14,0,100,7,1,"prisoner ashcrombe SAY_OPEN_DOOR_AS","I have just the spell to get this door open. Too bad the cell doors weren't locked so haphazardly."),
+(3850,2,0,14,0,100,7,1,"prisoner ashcrombe SAY_POST_DOOR_AS","There it is! Wide open. Good luck to you conquering what lies beyond. I must report back to the Kirin Tor at once!"),
+(3850,3,0,12,0,100,7,1,"prisoner ashcrombe SAY_BOSS_DIE_AS","For once I agree with you... scum.");
+
+DELETE FROM `creature_text` WHERE `entry`=7766;
+INSERT INTO `creature_text`(`entry`,`groupid`,`id`,`type`,`sound`,`probability`,`comment`,`text`) VALUES
+(7766,0,0,12,0,100,"tyrion spybot SAY_TYRION_1","Wait here. Spybot will make Lescovar come out as soon as possible. Be ready! Attack only after you've overheard their conversation."),
+(7766,1,0,14,0,100,"lord gregor lescovar SAY_TYRION_2","That's it! That's what you were waiting for! KILL THEM!");
View
115 sql/updates/world/2012_11_26_03_world_misc.sql
@@ -0,0 +1,115 @@
+-- The Battle For Crusaders' Pinnacle (13141)
+
+SET @SPELL_ITEM_BANNER := 58013; -- Plant Blessed Banner
+SET @SPELL_TORCH := 58121;
+SET @SPELL_TORCH_EFFECT := 58125;
+
+SET @NPC_BLESSED_BANNER := 30891; -- Blessed Banner of the Crusade
+SET @NPC_CRUSADER_DALFORS := 31003; -- Crusader Lord Dalfors
+SET @NPC_BATTLE_PRIEST := 30919; -- Argent Battle-priest
+SET @NPC_MASON := 30900; -- Argent Mason
+SET @NPC_TORCH_DUMMY := 31004; -- (Wave 0) Torch Dummy
+SET @NPC_LK := 31013; -- The Lich King
+SET @NPC_CAPTAIN := 30986;
+SET @NPC_DRUDGE := 30984;
+SET @NPC_PLAGEBRINGER := 30987;
+SET @NPC_HALOF := 30989;
+
+SET @EVENT_SCRIPT := 20082;
+
+DELETE FROM `spell_target_position` WHERE `id`=@SPELL_ITEM_BANNER;
+INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES
+(@SPELL_ITEM_BANNER,571,6418.42,422.97,511.11,0);
+
+UPDATE `creature_template` SET `faction_A`=2140,`faction_H`=2140,`ScriptName`='npc_blessed_banner' WHERE `entry`=@NPC_BLESSED_BANNER;
+UPDATE `creature_template` SET `faction_A`=2131,`faction_H`=2131,`AIName`='SmartAI',`unit_flags`=32768,`equipment_id`=@NPC_CRUSADER_DALFORS WHERE `entry`=@NPC_CRUSADER_DALFORS;
+UPDATE `creature_template` SET `faction_A`=2131,`faction_H`=2131,`AIName`='SmartAI',`unit_flags`=32768,`equipment_id`=@NPC_BATTLE_PRIEST WHERE `entry`=@NPC_BATTLE_PRIEST;
+UPDATE `creature_template` SET `faction_A`=2070,`faction_H`=2070,`unit_flags`=32768,`AIName`='SmartAI',`equipment_id`=@NPC_MASON WHERE `entry`=@NPC_MASON;
+UPDATE `creature_template` SET `unit_flags`=33554432,`InhabitType`=4,`AIName`='SmartAI',`flags_extra`=128 WHERE `entry`=@NPC_TORCH_DUMMY;
+UPDATE `creature_template` SET `unit_flags`=33554432,`flags_extra`=128 WHERE `entry`=@NPC_LK;
+UPDATE `creature_template` SET `faction_A`=2068,`faction_H`=2068,`unit_flags`=32768,`AIName`='SmartAI' WHERE `entry`=@NPC_CAPTAIN;
+UPDATE `creature_template` SET `faction_A`=2068,`faction_H`=2068,`unit_flags`=32768,`AIName`='SmartAI' WHERE `entry`=@NPC_DRUDGE;
+UPDATE `creature_template` SET `faction_A`=2068,`faction_H`=2068,`unit_flags`=32768,`AIName`='SmartAI' WHERE `entry`=@NPC_PLAGEBRINGER;
+UPDATE `creature_template` SET `faction_A`=2068,`faction_H`=2068,`unit_flags`=32768 WHERE `entry`=@NPC_HALOF;
+
+DELETE FROM `creature_template_addon` WHERE `entry` IN (@NPC_BLESSED_BANNER,@NPC_CRUSADER_DALFORS,@NPC_BATTLE_PRIEST,@NPC_MASON);
+INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(@NPC_BLESSED_BANNER, 0, 0x0, 0x1, '58026'), -- Blessing of the Crusade
+(@NPC_CRUSADER_DALFORS,2786,0x0,0x1,'58110'), -- Threat Pulse
+(@NPC_BATTLE_PRIEST,0,0x0,0x1,'58110'), -- Threat Pulse
+(@NPC_MASON,0,0x0,0x1,'');
+
+DELETE FROM `creature_equip_template` WHERE `entry` IN (@NPC_CRUSADER_DALFORS,@NPC_BATTLE_PRIEST,@NPC_MASON);
+INSERT INTO `creature_equip_template` (`entry`,`itemEntry1`,`itemEntry2`,`itemEntry3`) VALUES
+(@NPC_CRUSADER_DALFORS,39290,40596,0),
+(@NPC_BATTLE_PRIEST,42544,42543,0),
+(@NPC_MASON,1906,2081,0);
+
+DELETE FROM `creature_text` WHERE `entry` IN (@NPC_BLESSED_BANNER,@NPC_CRUSADER_DALFORS,@NPC_LK);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@NPC_BLESSED_BANNER,0,0,'The Blessed Banner of the Crusade has been planted.\n Defend the banner from all attackers!',41,0,100,0,0,0,'Blessed Banner of the Crusade'),
+(@NPC_CRUSADER_DALFORS,0,0,'BY THE LIGHT! Those damned monsters! Look at what they''ve done to our people!',12,0,100,5,0,0,'Crusader Lord Dalfors'),
+(@NPC_CRUSADER_DALFORS,1,0,'Burn it down, boys. Burn it all down.',12,0,100,1,0,0,'Crusader Lord Dalfors'),
+(@NPC_CRUSADER_DALFORS,2,0,'Let ''em come. They''ll pay for what they''ve done!',12,0,100,1,0,0,'Crusader Lord Dalfors'),
+(@NPC_CRUSADER_DALFORS,3,0,'We''ve done it, lads! We''ve taken the pinnacle from the Scourge! Report to Father Gustav at once and tell him the good news! We''re gonna get to buildin'' and settin'' up! Go!',14,0,100,71,0,0,'Crusader Lord Dalfors'),
+(@NPC_LK,0,0,'Leave no survivors!',14,0,100,0,0,14793,'The Lich King'),
+(@NPC_LK,1,0,'Cower before my terrible creations!',14,0,100,0,0,14800,'The Lich King'),
+(@NPC_LK,2,0,'Feast my children! Feast upon the flesh of the living!',14,0,100,0,0,14801,'The Lich King'),
+(@NPC_LK,3,0,'Lay down your arms and surrender your souls!',14,0,100,0,0,14802,'The Lich King');
+
+DELETE FROM `event_scripts` WHERE `id`=@EVENT_SCRIPT;
+INSERT INTO `event_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `x`, `y`, `z`, `o`) VALUES
+(@EVENT_SCRIPT,0,10,@NPC_BLESSED_BANNER,600000,6418.422,422.9706,511.1964,5.8119);
+
+SET @CGUID := 85714; -- need 18 (85714<->85731)
+DELETE FROM `creature` WHERE `id` IN (@NPC_TORCH_DUMMY,@NPC_LK);
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`MovementType`) VALUES
+(@CGUID+0,@NPC_TORCH_DUMMY,571,1,128,6405.316,431.9516,518.2324,0.296706,120,0,0),
+(@CGUID+1,@NPC_TORCH_DUMMY,571,1,128,6408.057,424.2077,511.3653,1.256637,120,0,0),
+(@CGUID+2,@NPC_TORCH_DUMMY,571,1,128,6371.181,452.4539,513.5053,1.204277,120,0,0),
+(@CGUID+3,@NPC_TORCH_DUMMY,571,1,128,6391.331,460.3002,511.3657,1.745329,120,0,0),
+(@CGUID+4,@NPC_TORCH_DUMMY,571,1,128,6393.723,427.9692,538.7354,1.692969,120,0,0),
+(@CGUID+5,@NPC_TORCH_DUMMY,571,1,128,6374.808,445.4873,517.7629,4.031711,120,0,0),
+(@CGUID+6,@NPC_TORCH_DUMMY,571,1,128,6382.271,451.9008,537.9304,1.32645,120,0,0),
+(@CGUID+7,@NPC_TORCH_DUMMY,571,1,128,6366.836,459.1225,530.3361,0.7330383,120,0,0),
+(@CGUID+8,@NPC_TORCH_DUMMY,571,1,128,6372.479,447.4598,511.3725,0.2443461,120,0,0),
+(@CGUID+9,@NPC_TORCH_DUMMY,571,1,128,6394.698,427.4731,523.7177,1.850049,120,0,0),
+(@CGUID+10,@NPC_TORCH_DUMMY,571,1,128,6367.246,459.7583,518.8009,3.857178,120,0,0),
+(@CGUID+11,@NPC_TORCH_DUMMY,571,1,128,6396.961,432.8676,533.744,3.176499,120,0,0),
+(@CGUID+12,@NPC_TORCH_DUMMY,571,1,128,6403.202,464.2955,535.6572,3.857178,120,0,0),
+(@CGUID+13,@NPC_TORCH_DUMMY,571,1,128,6401.721,464.4387,543.1727,2.199115,120,0,0),
+(@CGUID+14,@NPC_TORCH_DUMMY,571,1,128,6392.169,475.7449,512.7209,0.6283185,120,0,0),
+(@CGUID+15,@NPC_TORCH_DUMMY,571,1,128,6397.238,475.2313,529.652,4.328416,120,0,0),
+(@CGUID+16,@NPC_TORCH_DUMMY,571,1,128,6389.221,474.0008,511.365,1.553343,120,0,0),
+(@CGUID+17,@NPC_LK,571,1,128,6389.73,451.2743,513.3198,1.32645,120,0,0);
+
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (@NPC_TORCH_DUMMY,@NPC_MASON);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@NPC_TORCH_DUMMY,0,0,0,8,0,100,0,@SPELL_TORCH,0,0,0,11,@SPELL_TORCH_EFFECT,0,0,0,0,0,1,0,0,0,0,0,0,0,'On spellhit - Cast Torch Visual'),
+(@NPC_MASON,0,0,0,38,0,100,0,1,1,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'On data - Set phase 1'),
+(@NPC_MASON,0,1,0,60,1,100,0,0,10000,10000,20000,11,@SPELL_TORCH,0,0,0,0,0,1,0,0,0,0,0,0,0,'On update - Cast spell Torch');
+
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId`=13 AND `SourceEntry`=@SPELL_TORCH) OR (`SourceTypeOrReferenceId`=17 AND `SourceEntry`=@SPELL_ITEM_BANNER);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,@SPELL_TORCH,0,0,31,0,3,@NPC_TORCH_DUMMY,0,0,0,'','Spell Torch targets Torch Dummy'),
+(17,0,@SPELL_ITEM_BANNER,0,0,29,0,@NPC_BLESSED_BANNER,10,0,1,0,'','Cast Plant Blessed Banner if no banner is already spawned.');
+
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` IN (@NPC_CRUSADER_DALFORS,@NPC_BATTLE_PRIEST,@NPC_CAPTAIN,@NPC_DRUDGE,@NPC_PLAGEBRINGER);
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+-- Crusader Lord Dalfors
+(@NPC_CRUSADER_DALFORS,0,0,0,2,0,100,1,0,50,0,0,11,58053,0,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Holy Light at 50% HP'),
+(@NPC_CRUSADER_DALFORS,0,1,0,0,0,100,0,5000,8000,23000,29000,11,37554,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Shield'),
+-- Argent Battle-priest
+(@NPC_BATTLE_PRIEST,0,0,0,1,0,100,0,500,1000,600000,600000,11,58054,0,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Blessing of Kings on Spawn'),
+(@NPC_BATTLE_PRIEST,0,1,0,2,0,100,1,0,50,0,0,11,58053,0,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Holy Light at 50% HP'),
+(@NPC_BATTLE_PRIEST,0,2,0,14,0,100,0,50000,10,20000,30000,11,58053,0,0,0,0,0,7,0,0,0,0,0,0,0,'Cast Holy Light on Friendlies'),
+-- Reanimated Captain
+(@NPC_CAPTAIN,0,0,0,4,0,100,1,0,0,0,0,11,32674,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Avenger''s Shield on Aggro'),
+(@NPC_CAPTAIN,0,1,0,0,0,100,0,5000,5000,17800,19800,11,58154,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Hammer of Injustice'),
+(@NPC_CAPTAIN,0,2,0,2,0,100,1,0,45,0,0,11,58153,0,0,0,0,0,1,0,0,0,0,0,0,0,'Cast Unholy Light at 45% HP'),
+(@NPC_CAPTAIN,0,3,0,14,0,100,0,4000,10,20000,30000,11,58153,0,0,0,0,0,7,0,0,0,0,0,0,0,'Cast Unholy Light on Friendlies'),
+-- Scourge Drudge
+(@NPC_DRUDGE,0,0,0,0,0,100,0,5000,5000,11300,14500,11,51917,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Cleave'),
+(@NPC_DRUDGE,0,1,0,0,0,100,0,7000,9000,17800,20200,11,49678,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Flesh Rot'),
+-- Hideous Plaguebringer
+(@NPC_PLAGEBRINGER,0,0,0,0,0,100,0,3400,4600,11400,16500,11,38761,0,0,0,0,0,2,0,0,0,0,0,0,0,'Cast Arcing Smash');
View
0 src/server/authserver/Authentication/AuthCodes.h 100755 → 100644
File mode changed.
View
0 src/server/authserver/Main.cpp 100755 → 100644
File mode changed.
View
16 src/server/authserver/Realms/RealmList.cpp 100755 → 100644
@@ -31,7 +31,7 @@ void RealmList::Initialize(uint32 updateInterval)
UpdateRealms(true);
}
-void RealmList::UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint16 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build)
+void RealmList::UpdateRealm(uint32 ID, const std::string& name, ACE_INET_Addr const& address, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build)
{
// Create new if not exist or update existed
Realm& realm = m_realms[name];
@@ -45,9 +45,7 @@ void RealmList::UpdateRealm(uint32 ID, const std::string& name, const std::strin
realm.populationLevel = popu;
// Append port to IP address.
- std::ostringstream ss;
- ss << address << ':' << port;
- realm.address = ss.str();
+ address.addr_to_string(realm.address, ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16);
realm.gamebuild = build;
}
@@ -80,8 +78,8 @@ void RealmList::UpdateRealms(bool init)
{
Field* fields = result->Fetch();
uint32 realmId = fields[0].GetUInt32();
- const std::string& name = fields[1].GetString();
- const std::string& address = fields[2].GetString();
+ std::string name = fields[1].GetString();
+ std::string address = fields[2].GetString();
uint16 port = fields[3].GetUInt16();
uint8 icon = fields[4].GetUInt8();
RealmFlags flag = RealmFlags(fields[5].GetUInt8());
@@ -90,10 +88,12 @@ void RealmList::UpdateRealms(bool init)
float pop = fields[8].GetFloat();
uint32 build = fields[9].GetUInt32();
- UpdateRealm(realmId, name, address, port, icon, flag, timezone, (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR), pop, build);
+ ACE_INET_Addr addr(port, address.c_str(), AF_INET);
+
+ UpdateRealm(realmId, name, addr, icon, flag, timezone, (allowedSecurityLevel <= SEC_ADMINISTRATOR ? AccountTypes(allowedSecurityLevel) : SEC_ADMINISTRATOR), pop, build);
if (init)
- sLog->outInfo(LOG_FILTER_AUTHSERVER, "Added realm \"%s\".", fields[1].GetCString());
+ sLog->outInfo(LOG_FILTER_AUTHSERVER, "Added realm \"%s\" at %s.", name.c_str(), m_realms[name].address);
}
while (result->NextRow());
}
View
5 src/server/authserver/Realms/RealmList.h 100755 → 100644
@@ -21,6 +21,7 @@
#include <ace/Singleton.h>
#include <ace/Null_Mutex.h>
+#include <ace/INET_Addr.h>
#include "Common.h"
enum RealmFlags
@@ -39,7 +40,7 @@ enum RealmFlags
// Storage object for a realm
struct Realm
{
- std::string address;
+ char address[ACE_MAX_FULLY_QUALIFIED_NAME_LEN + 16];
std::string name;
uint8 icon;
RealmFlags flag;
@@ -71,7 +72,7 @@ class RealmList
private:
void UpdateRealms(bool init=false);
- void UpdateRealm(uint32 ID, const std::string& name, const std::string& address, uint16 port, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build);
+ void UpdateRealm(uint32 ID, const std::string& name, ACE_INET_Addr const& address, uint8 icon, RealmFlags flag, uint8 timezone, AccountTypes allowedSecurityLevel, float popu, uint32 build);
RealmMap m_realms;
uint32 m_UpdateInterval;
View
0 src/server/authserver/Server/AuthSocket.h 100755 → 100644
File mode changed.
View
0 src/server/authserver/Server/RealmAcceptor.h 100755 → 100644
File mode changed.
View
0 src/server/authserver/Server/RealmSocket.cpp 100755 → 100644
File mode changed.
View
0 src/server/authserver/Server/RealmSocket.h 100755 → 100644
File mode changed.
View
0 src/server/authserver/authserver.rc 100755 → 100644
File mode changed.
View
0 src/server/collision/BoundingIntervalHierarchy.cpp 100755 → 100644
File mode changed.
View
0 src/server/collision/BoundingIntervalHierarchy.h 100755 → 100644
File mode changed.
View
0 src/server/collision/Management/IVMapManager.h 100755 → 100644
File mode changed.
View
0 src/server/collision/Management/VMapFactory.cpp 100755 → 100644
File mode changed.
View
0 src/server/collision/Management/VMapFactory.h 100755 → 100644
File mode changed.
View
0 src/server/collision/Management/VMapManager2.h 100755 → 100644
File mode changed.
View
0 src/server/collision/Maps/MapTree.h 100755 → 100644
File mode changed.
View
0 src/server/collision/Maps/TileAssembler.h 100755 → 100644
File mode changed.
View
0 src/server/collision/Models/ModelInstance.h 100755 → 100644
File mode changed.
View
0 src/server/collision/Models/WorldModel.h 100755 → 100644
File mode changed.
View
0 src/server/collision/VMapTools.h 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/CombatAI.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/CombatAI.h 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/GuardAI.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/GuardAI.h 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/PassiveAI.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/PassiveAI.h 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/PetAI.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/PetAI.h 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/ReactorAI.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/ReactorAI.h 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/TotemAI.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/TotemAI.h 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/UnitAI.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CoreAI/UnitAI.h 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CreatureAI.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CreatureAI.h 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CreatureAIFactory.h 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CreatureAIImpl.h 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CreatureAIRegistry.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CreatureAIRegistry.h 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CreatureAISelector.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/AI/CreatureAISelector.h 100755 → 100644
File mode changed.
View
0 src/server/game/Accounts/AccountMgr.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Accounts/AccountMgr.h 100755 → 100644
File mode changed.
View
5 src/server/game/Achievements/AchievementMgr.h 100755 → 100644
@@ -71,7 +71,6 @@ enum AchievementCriteriaDataType
#define MAX_ACHIEVEMENT_CRITERIA_DATA_TYPE 22 // maximum value in AchievementCriteriaDataType enum
-
struct AchievementCriteriaData
{
AchievementCriteriaDataType dataType;
@@ -175,15 +174,15 @@ struct AchievementCriteriaData
}
bool IsValid(AchievementCriteriaEntry const* criteria);
- bool Meets(uint32 criteria_id, Player const* source, Unit const* target, uint32 miscvalue1 = 0) const;
+ bool Meets(uint32 criteria_id, Player const* source, Unit const* target, uint32 miscValue1 = 0) const;
};
struct AchievementCriteriaDataSet
{
AchievementCriteriaDataSet() : criteria_id(0) {}
typedef std::vector<AchievementCriteriaData> Storage;
void Add(AchievementCriteriaData const& data) { storage.push_back(data); }
- bool Meets(Player const* source, Unit const* target, uint32 miscvalue = 0) const;
+ bool Meets(Player const* source, Unit const* target, uint32 miscValue = 0) const;
void SetCriteriaId(uint32 id) {criteria_id = id;}
private:
uint32 criteria_id;
View
0 src/server/game/Addons/AddonMgr.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Addons/AddonMgr.h 100755 → 100644
File mode changed.
View
1 src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -573,7 +573,6 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player
if (itemRandProp)
{
char* temp = itemRandProp->nameSuffix;
- //char* temp = itemRandProp->nameSuffix;
// dbc local name
if (temp)
View
0 src/server/game/Battlegrounds/ArenaTeam.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/ArenaTeam.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Battleground.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Battleground.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/BattlegroundMgr.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/BattlegroundMgr.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/BattlegroundQueue.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/BattlegroundQueue.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundAB.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundAV.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundBE.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundBE.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundDS.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundEY.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundIC.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundNA.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundNA.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundRL.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundRL.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundRV.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundRV.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundSA.h 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Battlegrounds/Zones/BattlegroundWS.h 100755 → 100644
File mode changed.
View
0 src/server/game/Chat/Channels/Channel.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Chat/Channels/Channel.h 100755 → 100644
File mode changed.
View
0 src/server/game/Chat/Channels/ChannelMgr.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Chat/Channels/ChannelMgr.h 100755 → 100644
File mode changed.
View
0 src/server/game/Chat/Chat.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Combat/HostileRefManager.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Combat/HostileRefManager.h 100755 → 100644
File mode changed.
View
0 src/server/game/Combat/ThreatManager.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Combat/ThreatManager.h 100755 → 100644
File mode changed.
View
0 src/server/game/Combat/UnitEvents.h 100755 → 100644
File mode changed.
View
26 src/server/game/Conditions/ConditionMgr.cpp 100755 → 100644
@@ -106,6 +106,12 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
condMeets = unit->getRaceMask() & ConditionValue1;
break;
}
+ case CONDITION_GENDER:
+ {
+ if (Player* player = object->ToPlayer())
+ condMeets = player->getGender() == ConditionValue1;
+ break;
+ }
case CONDITION_SKILL:
{
if (Player* player = object->ToPlayer())
@@ -443,6 +449,9 @@ uint32 Condition::GetSearcherTypeMaskForCondition()
case CONDITION_SPAWNMASK:
mask |= GRID_MAP_TYPE_MASK_ALL;
break;
+ case CONDITION_GENDER:
+ mask |= GRID_MAP_TYPE_MASK_PLAYER;
+ break;
default:
ASSERT(false && "Condition::GetSearcherTypeMaskForCondition - missing condition handling!");
break;
@@ -1650,6 +1659,20 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
sLog->outError(LOG_FILTER_SQL, "Race condition has useless data in value3 (%u)!", cond->ConditionValue3);
break;
}
+ case CONDITION_GENDER:
+ {
+ if (!Player::IsValidGender(uint8(cond->ConditionValue1)))
+ {
+ sLog->outError(LOG_FILTER_SQL, "Gender condition has invalid gender (%u), skipped", cond->ConditionValue1);
+ return false;
+ }
+
+ if (cond->ConditionValue2)
+ sLog->outError(LOG_FILTER_SQL, "Gender condition has useless data in value2 (%u)!", cond->ConditionValue2);
+ if (cond->ConditionValue3)
+ sLog->outError(LOG_FILTER_SQL, "Gender condition has useless data in value3 (%u)!", cond->ConditionValue3);
+ break;
+ }
case CONDITION_MAPID:
{
MapEntry const* me = sMapStore.LookupEntry(cond->ConditionValue1);
@@ -1909,9 +1932,6 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
}
break;
}
- case CONDITION_UNUSED_20:
- sLog->outError(LOG_FILTER_SQL, "Found ConditionTypeOrReference = CONDITION_UNUSED_20 in `conditions` table - ignoring");
- return false;
case CONDITION_UNUSED_21:
sLog->outError(LOG_FILTER_SQL, "Found ConditionTypeOrReference = CONDITION_UNUSED_21 in `conditions` table - ignoring");
return false;
View
2 src/server/game/Conditions/ConditionMgr.h 100755 → 100644
@@ -53,7 +53,7 @@ enum ConditionTypes
CONDITION_ACHIEVEMENT = 17, // achievement_id 0 0 true if achievement is complete
CONDITION_TITLE = 18, // title id 0 0 true if player has title
CONDITION_SPAWNMASK = 19, // spawnMask 0 0 true if in spawnMask
- CONDITION_UNUSED_20 = 20, //
+ CONDITION_GENDER = 20, // gender 0 0 true if player's gender is equal to gender
CONDITION_UNUSED_21 = 21, //
CONDITION_MAPID = 22, // map_id 0 0 true if in map_id
CONDITION_AREAID = 23, // area_id 0 0 true if in area_id
View
0 src/server/game/Conditions/DisableMgr.cpp 100755 → 100644
File mode changed.
View
0 src/server/game/Conditions/DisableMgr.h 100755 → 100644
File mode changed.
View
0 src/server/game/DataStores/DBCEnums.h 100755 → 100644
File mode changed.
View
0 src/server/game/DataStores/DBCStores.h 100755 → 100644
File mode changed.
View
6 src/server/game/DataStores/DBCStructure.h
@@ -1843,9 +1843,9 @@ struct SpellFocusObjectEntry
struct SpellRadiusEntry
{
uint32 ID;
- float radiusHostile;
- //uint32 Unk //always 0
- float radiusFriend;
+ float RadiusMin;
+ float RadiusPerLevel;
+ float RadiusMax;
};
struct SpellRangeEntry
View
2 src/server/game/DataStores/DBCfmt.h
@@ -135,7 +135,7 @@ const std::string CustomSpellEntryIndex = "Id";
char const SpellFocusObjectfmt[]="nx";
char const SpellItemEnchantmentfmt[]="nxiiiiiixxxiiisiiiiiiix";
char const SpellItemEnchantmentConditionfmt[]="nbbbbbxxxxxbbbbbbbbbbiiiiiXXXXX";
-char const SpellRadiusfmt[]="nfxf";
+char const SpellRadiusfmt[]="nfff";
char const SpellRangefmt[]="nffffixx";
char const SpellReagentsEntryfmt[]="diiiiiiiiiiiiiiii";
char const SpellScalingEntryfmt[]="diiiiffffffffffi";
View
0 src/server/game/DungeonFinding/LFG.h 100755 → 100644
File mode changed.
View
6 src/server/game/DungeonFinding/LFGGroupData.cpp
@@ -34,10 +34,12 @@ void LfgGroupData::SetState(LfgState state)
{
switch (state)
{
- case LFG_STATE_FINISHED_DUNGEON:
case LFG_STATE_NONE:
+ m_Dungeon = 0;
+ m_KicksLeft = LFG_GROUP_MAX_KICKS;
+ case LFG_STATE_FINISHED_DUNGEON:
case LFG_STATE_DUNGEON:
- m_OldState = m_State;
+ m_OldState = state;
// No break on purpose
default:
m_State = state;
View
173 src/server/game/DungeonFinding/LFGMgr.cpp 100755 → 100644
@@ -370,11 +370,13 @@ void LFGMgr::Update(uint32 diff)
for (LfgRolesMap::const_iterator itRoles = roleCheck.roles.begin(); itRoles != roleCheck.roles.end(); ++itRoles)
{
uint64 guid = itRoles->first;
- ClearState(guid, "Remove Obsolete RoleCheck");
+ RestoreState(guid, "Remove Obsolete RoleCheck");
SendLfgRoleCheckUpdate(guid, roleCheck);
if (guid == roleCheck.leader)
SendLfgJoinResult(guid, LfgJoinResultData(LFG_JOIN_FAILED, LFG_ROLECHECK_MISSING_ROLE));
}
+
+ RestoreState(itRoleCheck->first, "Remove Obsolete RoleCheck");
RoleChecksStore.erase(itRoleCheck);
}
@@ -754,7 +756,7 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const
*/
void LFGMgr::LeaveLfg(uint64 guid)
{
- sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::Leave: [" UI64FMTD "]", guid);
+ sLog->outDebug(LOG_FILTER_LFG, "LFGMgr::LeaveLfg: [" UI64FMTD "]", guid);
uint64 gguid = IS_GROUP(guid) ? guid : GetGroup(guid);
LfgState state = GetState(guid);
@@ -765,21 +767,20 @@ void LFGMgr::LeaveLfg(uint64 guid)
{
LFGQueue& queue = GetQueue(gguid);
queue.RemoveFromQueue(gguid);
- RestoreState(gguid, "Leave queue");
+ SetState(gguid, LFG_STATE_NONE);
const LfgGuidSet& players = GetPlayers(gguid);
for (LfgGuidSet::const_iterator it = players.begin(); it != players.end(); ++it)
{
- uint64 guid = (*it);
- ClearState(guid, "Leave queue");
- SendLfgUpdateParty(guid, LfgUpdateData(LFG_UPDATETYPE_REMOVED_FROM_QUEUE));
+ SetState(*it, LFG_STATE_NONE);
+ SendLfgUpdateParty(*it, LfgUpdateData(LFG_UPDATETYPE_REMOVED_FROM_QUEUE));
}