pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-30 21:52:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into shared_mem

Browse Source
This commit is contained in:
KimLS 2013-02-26 21:29:34 -08:00
commit 92ed7e694f
4 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/sql/git/required/2013_02_25_Impr_HT_LT.sql Normal file
View File

@ -0,0 +1,4 @@
/* SK AA Touch of the Wicked should reduce reuse timers for */
/* Improved Harm Touch & Leech Touch as well as regular HT */
update aa_actions set redux_aa=596, redux_rate=17 where aaid=207;
update aa_actions set redux_aa=596, redux_rate=17 where aaid=208;

8
zone/effects.cpp
View File

@ -467,6 +467,14 @@ bool Client::TrainDiscipline(uint32 itemid) {
item->Name[2] == 'm' && item->Name[2] == 'm' &&
item->Name[3] == 'e' && item->Name[3] == 'e' &&
item->Name[4] == ' ' item->Name[4] == ' '
) && !(
item->Name[0] == 'S' &&
item->Name[1] == 'k' &&
item->Name[2] == 'i' &&
item->Name[3] == 'l' &&
item->Name[4] == 'l' &&
item->Name[5] == ':' &&
item->Name[6] == ' '
)) { )) {
Message(13, "This item is not a tome."); Message(13, "This item is not a tome.");
//summon them the item back... //summon them the item back...

8
zone/questmgr.cpp
View File

@ -667,6 +667,14 @@ bool QuestManager::isdisctome(int item_id) {
item->Name[2] == 'm' && item->Name[2] == 'm' &&
item->Name[3] == 'e' && item->Name[3] == 'e' &&
item->Name[4] == ' ' item->Name[4] == ' '
) && !(
item->Name[0] == 'S' &&
item->Name[1] == 'k' &&
item->Name[2] == 'i' &&
item->Name[3] == 'l' &&
item->Name[4] == 'l' &&
item->Name[5] == ':' &&
item->Name[6] == ' '
)) { )) {
return(false); return(false);
} }

4
zone/spells.cpp
View File

@ -1306,8 +1306,8 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
case ST_SummonedPet: case ST_SummonedPet:
{ {
uint8 body_type = spell_target ? spell_target->GetBodyType() : 0; uint8 body_type = spell_target ? spell_target->GetBodyType() : 0;
if(!spell_target || (spell_target != GetPet()) || if(spell_target && (spell_target == GetPet()) &&
(body_type != BT_Summoned && body_type != BT_Summoned2 && body_type != BT_Summoned3 && body_type != BT_Animal)) (body_type == BT_Summoned || body_type == BT_Summoned2 || body_type == BT_Summoned3 || body_type == BT_Animal))
{ {
mlog(SPELLS__CASTING_ERR, "Spell %d canceled: invalid target of body type %d (summoned pet)", mlog(SPELLS__CASTING_ERR, "Spell %d canceled: invalid target of body type %d (summoned pet)",
spell_id, body_type); spell_id, body_type);