Commit graph

248 commits

Author SHA1 Message Date
VladimirMangos
8858aacfb0 [7829] Rename 3d (x,y,.. versions of IsWithinDist/IsWithinDist functions with adding 3d explict posfix to name for avoid wrong use. 2009-05-14 21:42:32 +04:00
VladimirMangos
788cdf9b3a [7826] Avoid use GetDistance* that used slow sqrt call where possible, other related speedups. 2009-05-14 18:51:13 +04:00
tomrus88
5ab735d374 Merge commit 'origin/master' into 310 2009-05-10 21:46:26 +04:00
VladimirMangos
f117ce3420 [7809] Replace repeating "remove cooldown and send update to client" code by function call. 2009-05-09 19:32:24 +04:00
Astellar
09046df744 [7808] Move corpse search code in function with template arg for class-check.
This let reuse code for other similar near corpse target selection spells.
Also provided currently not used class-checks for 2 spells

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-05-09 18:48:18 +04:00
tomrus88
3c43e9dd52 Merge commit 'origin/master' into 310 2009-05-09 16:03:32 +04:00
VladimirMangos
f53d06ad70 [7801] Apply damage mods from scripts or target state not in DealDamage but in new function before send data to client.
* Fixed bug with health decrease (client side visual bug) at spell damage by target with AI::DamageTaken damage set to 0
* Fixed bug with ignore .die command and instant kill damage in some cases.
2009-05-08 17:07:40 +04:00
tomrus88
c9f5062955 Merge commit 'origin/master' into 310 2009-05-08 15:31:27 +04:00
VladimirMangos
3989212ad1 [7797] Use DBC data for mount model selection in more cases.
* Use alt.team mount data for take player team model id if DB not provide own team creature id in spell taxi call case.
* Remove unddeded hacks for model ids from Spell::EffectSendTaxi
* Provide spell target for SPELL_EFFECT_SEND_TAXI for spell with target mode 0 for this effect.
2009-05-07 22:40:37 +04:00
tomrus88
e75e66063e Merge commit 'origin/master' into 310
Conflicts:
	src/game/UpdateData.cpp
2009-05-05 10:44:12 +04:00
AlexDereka
27fabf7ace [7745] Fixed gcc warnings. 2009-05-03 20:25:27 +04:00
tomrus88
335b32dbc3 Merge commit 'origin/master' into 310 2009-05-02 19:56:19 +04:00
tomrus88
b980e9ac59 Updated to 3.1.2.9855 client build, fixed quests, some work on monster movement. Not tested. 2009-05-02 19:41:00 +04:00
ApoC
8168b0f2eb [7742] Fix my prev. commit
Use already defined method for getting charmer or owner player or player itself.

Signed-off-by: ApoC <apoc@nymfe.net>
2009-05-02 00:27:47 +02:00
ApoC
8e39ea0151 [7741] Allow pets/charmed NPCs to count master's spell cast conditions in quests.
Signed-off-by: ApoC <apoc@nymfe.net>
2009-05-02 00:15:59 +02:00
tomrus88
d4323e0071 Merge commit 'origin/master' into 310
Conflicts:
	src/game/CharacterHandler.cpp
	src/game/Player.cpp
2009-04-29 11:51:15 +04:00
zhenya
8144f30199 [7730] Some optimizantion and code style.
Signed-off-by: AlexDereka <dereka.alex@gmail.com>
2009-04-29 01:05:21 +04:00
tomrus88
950a4bf13f Merge commit 'origin/master' into 310
Conflicts:
	src/game/Player.cpp
2009-04-28 19:08:53 +04:00
VladimirMangos
73db1cbe01 [7723] New AI call EnterCombat called at enter creature to combat (and re-enter if leave by some reason). 2009-04-27 03:40:50 +04:00
tomrus88
55d6fbe3cb Merge commit 'origin/master' into 310 2009-04-25 17:24:05 +04:00
Trazom
7c0201f834 [7701] Move explicit healing repeating code to DealHeal functions.
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-04-23 04:54:57 +04:00
tomrus88
a9e148edac Merge commit 'origin/master' into 310
Conflicts:
	src/game/AchievementMgr.cpp
	src/game/BattleGroundHandler.cpp
	src/game/CreatureEventAIMgr.cpp
	src/game/DBCStructure.h
	src/game/Player.cpp
	src/game/Spell.cpp
	src/shared/revision_nr.h
2009-04-21 15:20:45 +04:00
VladimirMangos
fc0e1ecdf1 [7690] Move GetCreature/GetGameobject to class Map.
* This let get objects at map without reference to player or another object.
* Simplify future implementation for per-map storage for like objects
2009-04-20 19:08:13 +04:00
Lightguard
f97735f519 [7686] Implement aura SPELL_AURA_ADD_CASTER_HIT_TRIGGER (111).
Fixed bug with triggering SPELL_AURA_SPELL_MAGNET at non-magic casts (special weapon attacks).

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-04-19 00:42:16 +04:00
tomrus88
66f554f74d Merge 'master' into 310
Please enter the commit message for your changes. Lines starting
2009-04-18 17:21:29 +04:00
VladimirMangos
75d8c0b604 [7681] Check guid type before lookup request for seldom GO-caster case. 2009-04-17 17:04:51 +04:00
VladimirMangos
b4bc910d32 [7680] Fixed work spell effects with 17/0 spell target mode. Including many summon/teleport spells. 2009-04-17 16:44:20 +04:00
VladimirMangos
09c32b5429 [7678] Implement spell target mode 7 and cleanup target mode 17. 2009-04-17 13:41:36 +04:00
VladimirMangos
30d8be94ce [7676] Fixed typo in [7675] 2009-04-16 18:51:25 +04:00
VladimirMangos
b576b2382d [7675] Move spell targets in area selection code to function. 2009-04-16 18:41:35 +04:00
tomrus88
d6f6272f8c Merge branch 'master' into 310 2009-04-14 15:54:43 +04:00
VladimirMangos
d85e95295d [7668] Cleanup In CreatureAI function descriptions and AttackStart/AttackedBy use.
* Use AI::AttackStart calls only in case explicit request creature attack from core or AI code "attack it if can".
  Like taunt, pet handler attack command.
* Use AI::AttackedBy for reaction at hostile action "do something at hostile action"
  Like non-dot damage, swing, negative spell landing, or fade fear/etc.
  And provided by default call AttackStart if no current target.

This fix some problems, like:
* Civilian will react propertly at attack by another creature (not pet or player).
* Will not cases (at least triggred by core) when attack target start run to attacker before any real hostile action apply.
2009-04-14 10:14:10 +04:00
tomrus88
17d86309fa Merge branch 'master' into 310
Conflicts:
	src/game/Unit.cpp
2009-04-03 11:28:51 +04:00
VladimirMangos
fd26dbccda [7605] Counting in ACHIEVEMENT_CRITERIA_TYPE_USE_ITEM only for not triggered item casted spells. 2009-04-02 23:40:39 +04:00
VladimirMangos
284b3a4865 [7601] Not check reagents for triggered spells, it checked and taken at triggered spell casting moment in original spell. 2009-04-02 05:13:52 +04:00
tomrus88
abae3cac91 Merge branch 'master' into 310
Conflicts:
	src/game/Unit.cpp
	src/shared/Database/SQLStorage.cpp
2009-03-30 15:01:04 +04:00
VladimirMangos
840d7d5e0a [7588] Remove redendent GO support and switch back to original suggested by Lightguard version with Unit only case 2009-03-30 02:07:43 +04:00
VladimirMangos
e090283840 [7587] Hmm, lost change. 2009-03-30 00:51:40 +04:00
Lightguard
4717f68984 [7586] New caster AI::SpellHitTarget call at casted spell landing to target (player/creature/pet/go)
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-03-30 00:44:35 +04:00
arrai
5dd3ce31bc [7576] Fixed spell range check for spells with minimal distances 2009-03-28 22:27:39 +01:00
DasMy
6762744452 [7570] respect UNIT_FIELD_COMBATREACH for spell range check
Signed-off-by: arrai <array.of.intellect@gmail.com>
2009-03-28 16:16:46 +01:00
arrai
4e66d61da9 [7557] Fixed triggered spells which ImplicitTarget is 0 like 50516 and ranks 2009-03-28 00:05:56 +01:00
tomrus88
963aed5e0b Merge branch 'master' into 310
Conflicts:
	src/game/Player.cpp
	src/game/Player.h
	src/game/Unit.cpp
2009-03-26 14:28:37 +03:00
Triply
3d6c7e59a7 [7522] Fixed typo in spell cast check code. 2009-03-23 11:26:29 +03:00
tomrus88
9debf4dfc0 Merge branch 'master' into 310
Conflicts:
	src/game/MiscHandler.cpp
	src/game/Player.cpp
	src/game/Player.h
	src/shared/Database/DBCStores.cpp
2009-03-22 09:41:17 +03:00
VladimirMangos
b14bf188c5 [7517] Add tick targets amount limitations to 48505 and ranks. 2009-03-22 06:51:09 +03:00
tomrus88
28dc20c6e2 Small code cleanup and partial merge with dev branch 2009-03-21 19:07:38 +03:00
tomrus88
9d2acc22b4 Merge branch 'master' into 310
Conflicts:
	src/game/GameObject.cpp
2009-03-18 07:45:29 +03:00
VladimirMangos
7f125ce0c3 [7481] Implement special target selection for spell 57669.
Patch writed by kozelo, rechapa79 with active support from Lightguard.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
2009-03-17 23:27:00 +03:00
Lightguard
bde638ace7 [7476] Implement druid's talent 61336.
Signed-off-by: VladimirMangos <vladimir@getmangos.com>

Some improvements added to patch. Related cleanups.
2009-03-17 01:27:16 +03:00