Commit Graph
29917 Commits
Author SHA1 Message Date
Spp a227a34947 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/AI/CoreAI/PetAI.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
2012-12-17 12:13:51 +01:00
Shauren 7be13b6fda Core/Scripts: Fixed crash on shutdown 2012-12-17 11:44:41 +01:00
Trista 5a52acbe40 Core/Quest: Optimize and clean more last commit
* thx to @Gacko and @click for pointing out problems and give suggestiosn
* Sorry for the mess, forgot I can make more changes after initial change, this should be final...
* https://github.com/TrinityCore/TrinityCore/commit/48141bbfa6887095f5b4a687ca3bde516c751771
2012-12-17 10:39:54 +02:00
Vincent_Michael aa40ddd603 SQL: Fix sql import problems 2012-12-17 07:34:08 +01:00
click aa3980c744 Core: Remove tabs, fix whitespace and fix nonPCH properly (5am, too late for this stuff...) 2012-12-17 05:39:04 +01:00
click 1f88f81c5a Core: Fix non-PCH build again 2012-12-17 04:53:32 +01:00
Trista 48141bbfa6 Core/Quest: Song of Wind and Water
* cleanned a bit and edited old @Treak fix, credits go to him, the quest will* work 100% blizzlike when target_unit_master #8643 gets a fix for vehicle. What concerns the quest is done. I've already fixed the core kill_credit issue, but needs to be discussed.
* leaving the vehicle_AI until they get integrated correctly to SAI, this can be easily converted after. Currently need to make some hacks to make it work close to good if using SAI. (specificly terrain acts weird at that place)

Closes: #5424
2012-12-17 04:37:27 +02:00
Nay 1bd820e50f Core/Player: Fix build 2012-12-17 01:28:38 +00:00
Carlos Vargas 6c6586fa43 Core/Scripts: Adding script hooks to allow for third party scripts to modify damage dealt.
Originally from the VAS Autobalance script, slightly modified.

Only addresses Spells, Dots, and Melee Damage. I'll have look at the current modules on ways of doing this but, Environmental Damage(fire/lava/drowning), Fall Damage, and Potentially AoE aren't covered by these.

Closes #7867

Signed-off-by: Nay <dnpd.dd@gmail.com>
2012-12-17 01:26:56 +00:00
tibbi ae4c4c1822 DB/ToC: correcting a typo at immunities added at 1f9db80b69
Closes #8641

Signed-off-by: Nay <dnpd.dd@gmail.com>
2012-12-17 01:17:03 +00:00
Nay 377d6c7862 Merge pull request #8131 from flippy84/master
Core/Script: Heigan phase 2
2012-12-16 17:03:26 -08:00
Nay 352ed3ec53 Merge pull request #8667 from Kirkhammett/engi_fix
Core/Script: Fix Dimensional Ripper spell learning
2012-12-16 17:01:48 -08:00
Trista 47617bb740 Merge pull request #8565 from Trista/master
Core/Creature: Update template - reinitialize spell bar for vehicles
2012-12-16 17:01:26 -08:00
Nay 815742f44d Merge pull request #8681 from xomachine/master
Core/PetAI: Emote and autocast fixes
2012-12-16 16:56:18 -08:00
thesensei ed4bf13c44 Core/Creature: Update template - reinitialize spell bar for vehicles
* update template didn't change spell bar for players if on vehicle that updates it's template, initialize spells was needed
	* combined with faction changing, since when update is called player faction is ignored and it should be changed to his (based on sniffs)
	* the idea of this automated check inside fix SAI problems mainly, because there you have nothing to use to reinitialize the bar - closes #5254
2012-12-17 02:54:59 +02:00
Roc13x 9776bdfdfa Core/Items: DestroyItemCount also searches bank
Closes #8240

Signed-off-by: Nay <dnpd.dd@gmail.com>
2012-12-17 00:54:47 +00:00
Warpten 70b542a88c Core/Battlegrounds: Fix one typo from e6c763f433. 2012-12-17 01:11:09 +01:00
Shocker 1293de90be Core/Spells: Correct effect index check for Earth's Grasp 2012-12-17 01:53:52 +02:00
Warpten 78017ac222 Core/Guilds: Fixed guild news spam related to guild level-up. 2012-12-17 00:41:46 +01:00
Pitcrawler 5cd2f6fef9 DB/SAI: Fix quest: Foundation for Revenge, closes https://github.com/TrinityCore/TrinityCore/issues/8621 2012-12-17 00:20:02 +01:00
Vincent_Michael f96295f6ca DB/Scripts: Implemented creature_text for Trial of the Champion 2012-12-16 21:05:05 +01:00
Vincent_Michael 728ee3e13c DB/Winter Veil: Add "Red Rider Air Rifle" at "Clockwork Assistant <Jepetto's Companion>" and "Jepetto Joybuzz <Toymaker>" 2012-12-16 02:05:25 +01:00
Vincent_Michael 78c7767cbd DB/Creatures: Add corrects hover for Vyragosa and Chillmaw 2012-12-16 01:05:53 +01:00
ZxBiohazardZx a5e4fc8fd4 DB/Cleanup: actually remove the quest_end_scripts and correct a questid in previous push 2012-12-16 00:08:51 +01:00
ZxBiohazardZx 18da48881b DB/SAI: Convert some more quest_end_scripts 2012-12-16 00:01:12 +01:00
xomachine d39b21df8a Core/PetAI: Fix Ghouls emotions
Correction IDs of COWER and ROAR emotions for ghoul.
2012-12-15 19:26:59 +00:00
xomachine e7f0808d46 Core/PetAI: Fix pet's self-jumping
Fix issue, when pet autocast leap-like spells on itself
2012-12-15 19:23:59 +00:00
Trista bd135718b6 DB/SAI:
EAI -> SAI conversion for Urom adds Closes #8644
Fix quest: Whelps of the Wyrmcult Closes #8650
Remove npc immunity for Galen's Escape Closes #4942
2012-12-15 12:32:42 +01:00
baric 8f3d944adb DB/Pathing: Various improvements to Ashenvale:
Add formation for Alliance Elites pathing in Barrens Closes #8629
Add pathing for Lady Vespia Closes #8630
Add pathing for Prince Raze Closes #8631
Add pathing for Rorgis Jowl Closes #8632
Add pathing for Branch Snapper Closes #8633
Add pathing for Akkrilus Closes #8634
Add pathing for Terrowulf Pack Lord Closes #8635
2012-12-15 12:15:07 +01:00
MrSmite 04f08d26a7 Implements saving of loot (items / money) contained inside lootable inventory items.
* Unlooted items / money persist across player sessions
* Loot inside items is tied to the item rather than the player so if trading
  partially looted items becomes possible, this implementation will still work

* New tables added:

    characters_database.sql (first time users)
    characters_create_item_loot.sql (existing users)

Implementation Can be tested with:

 Watertight Trunk [21113]
 Bulging Sack of Gems [25422]
 Fat Sack of Coins [11937]

Closes #2048
2012-12-15 00:06:32 -05:00
Subv 136dbd69fd Merge pull request #8583 from Gacko/scripttexts
Core/DB: Drop table script_texts
2012-12-14 18:11:31 -08:00
Filip 6611947a2a Core/Script: Fix Dimensional Ripper spell learning 2012-12-15 02:04:53 +01:00
Vincent_Michael db6195789d Core: Fix non pch build 2012-12-14 23:31:08 +01:00
Vincent_Michael d2cc278283 Core/Spells: Rename spell script scripts in correct script name 2012-12-14 23:19:03 +01:00
click aa420be109 Core/QuestHandler: Minor change on output from two logentries to make more sense 2012-12-14 17:49:57 +01:00
Subv 4b1e65d057 Core/PetAI: Fixed a crash in PetAI::CanAttack
Closes #8660
2012-12-14 11:06:56 -05:00
Vincent_Michael 36c3e46fdb DB/Misc: Fix startup errors 2012-12-14 11:47:16 +01:00
kaelima 1f869ce3a5 DB/SpellClick: Remove redundant spellclick spell for npc 30228, as it is already indirectly applied from npc 30500 2012-12-14 02:37:36 +01:00
CeIa b87cc31106 Scripts/Events/Achievement: fix 'Out With It'
Credits to @darkman1983

Closes #8211
Closes #8126

Signed-off-by: Nay <dnpd.dd@gmail.com>
2012-12-14 01:23:53 +00:00
Nay 388bb43610 DB/World: Correct some waypoint_data and properly add PK to this table 2012-12-14 01:16:14 +00:00
Nay 8798daca0e DB/World: Create a new sql with the code fixed in 294d7c0707, also fix typo 2012-12-14 00:10:54 +00:00
Nay 294d7c0707 DB/World: Fix a typo in file 2012_11_24_03_world_varius_fixes.sql
>ERROR 1264 (22003) at line 359: Out of range value for column 'ConditionTarget'

The above error is only present when using MySQL strict mode (and that is **recommended**)
To enable strict mode add `sql_mode=STRICT_ALL_TABLES` to my.init MySQL configuration file
2012-12-14 00:07:28 +00:00
click 45052f1f63 Merge pull request #8517 from cody-/master
Core/Tools: Fix a minor issue with compiling the vmap4 extractor on MacOS X (this should be made more generic at a later time in space...)
2012-12-13 09:40:37 -08:00
kaelima 9731607c9d Core/Protocol: Enable SMSG_RESURRECT_REQUEST 2012-12-13 17:53:52 +01:00
Gacko c65ccba1e1 Core/DB: Drop table script_texts 2012-12-13 14:48:01 +01:00
Nay b9b14652e8 DB/World: Add missing primary keys to 5 tables
Initial patch by @thebillkidy - ref #8646
2012-12-13 00:48:22 +00:00
Vincent_Michael 36c3395bea Core/Quest: Fix reputation calculation for SPELL_AURA_MOD_REPUTATION_GAIN 2012-12-12 20:32:05 +01:00
baric 205cb06df9 DB/Creature: Add pathings and formations for various creatures:
Add formation for Razormane Wolves and Hunters Closes #8514
Add missing Raptor Egg nests Closes #8594
Add pathing for Twilight Prophet Closes #8601
Add pathing for Setis Closes #8602
Add pathing for Lapress Closes #8604
Add pathing for Ghost Howl Closes #8605
Add formation and pathing for Magram Pack Runners & Bonepaws Closes #8606
Add formation for Caliph Scorpidsting Closes #8608
2012-12-10 14:02:47 +01:00
Shauren bd51d033f6 Core/StatSystem: Fixed possible crash when calculating health bonus from stamina
Closes #8595
Closes #8620
2012-12-10 11:50:17 +01:00
Vincent_Michael ebae4ab249 Core/Hunter: Fix Call of the Wild targets
Closes #8618
Closes #8610
2012-12-10 10:36:59 +01:00