pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-04-15 00:22:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge git://github.com/EQEmu/Server into Development

Browse Source 
Conflicts:
	changelog.txt
	common/eq_packet_structs.h
	common/patches/underfoot_structs.h
	common/spdat.h
	zone/effects.cpp
	zone/mob.cpp
	zone/spells.cpp
This commit is contained in:
KayenEQ 2014-11-10 10:22:50 -05:00
commit 720e80377e
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -5,6 +5,7 @@ EQEMu Changelog (Started on Sept 24, 2003 15:50)
Kayen: Implemented support for spell target type (45) 'Target Rings' on Underfoot (does work earlier expansions) Kayen: Implemented support for spell target type (45) 'Target Rings' on Underfoot (does work earlier expansions)
Thanks to Lecht for figuring out the op_code side. Thanks to Lecht for figuring out the op_code side.
Implement new Live-like faction adjustment message using rule Client:UseLiveFactionMessage. Implement new Live-like faction adjustment message using rule Client:UseLiveFactionMessage.
JJ: Implement new Live-like faction adjustment message using rule Client:UseLiveFactionMessage.
Optional SQL: utils/sql/git/optional/2014_11_09_LiveFactionMessages.sql Optional SQL: utils/sql/git/optional/2014_11_09_LiveFactionMessages.sql
== 11/06/2014 == == 11/06/2014 ==

4
zone/client_packet.cpp
View File

@ -4038,6 +4038,10 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
return; return;
} }
targetring_x = castspell->x_pos;
targetring_y = castspell->y_pos;
targetring_z = castspell->z_pos;
CastSpell(spell_to_cast, castspell->target_id, castspell->slot); CastSpell(spell_to_cast, castspell->target_id, castspell->slot);
} }
/* Spell Slot or Potion Belt Slot */ /* Spell Slot or Potion Belt Slot */

8
zone/effects.cpp
View File

@ -765,10 +765,10 @@ void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_
if (curmob == caster && !affect_caster) //watch for caster too if (curmob == caster && !affect_caster) //watch for caster too
continue; continue;
if (spells[spell_id].targettype == ST_Ring){ if (spells[spell_id].targettype == ST_Ring) {
dist_targ = curmob->DistNoRoot(caster->GetTargetRingX(), caster->GetTargetRingY(),caster->GetTargetRingZ()); dist_targ = curmob->DistNoRoot(caster->GetTargetRingX(), caster->GetTargetRingY(), caster->GetTargetRingZ());
} }
else if (center){ else if (center) {
dist_targ = center->DistNoRoot(*curmob); dist_targ = center->DistNoRoot(*curmob);
} }
@ -795,7 +795,7 @@ void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_
continue; continue;
if (center && !center->CheckLosFN(curmob)) if (center && !center->CheckLosFN(curmob))
continue; continue;
if (!center && !caster->CheckLosFN(caster->GetTargetRingX(), caster->GetTargetRingY(),caster->GetTargetRingZ(), curmob->GetSize())) if (!center && !caster->CheckLosFN(caster->GetTargetRingX(), caster->GetTargetRingY(), caster->GetTargetRingZ(), curmob->GetSize()))
continue; continue;
} else { // check to stop casting beneficial ae buffs (to wit: bard songs) on enemies... } else { // check to stop casting beneficial ae buffs (to wit: bard songs) on enemies...
// This does not check faction for beneficial AE buffs..only agro and attackable. // This does not check faction for beneficial AE buffs..only agro and attackable.

3
zone/spells.cpp
View File

@ -2175,7 +2175,8 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, uint16 slot, uint16
break; break;
} }
case TargetRing:{ case TargetRing:
{
entity_list.AESpell(this, nullptr, spell_id, false, resist_adjust); entity_list.AESpell(this, nullptr, spell_id, false, resist_adjust);
break; break;
} }