Changeset 288 for trunk

Show
Ignore:
Timestamp:
11/22/08 06:35:03 (17 years ago)
Author:
yumileroy
Message:

*Add UNIT_FLAG_NOT_ATTACKABLE_2. Not attackable, but can be hit by entry-target spells (I guess).

Original author: megamage
Date: 2008-11-22 00:31:24-06:00

Location:
trunk/src
Files:
5 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp

    r279 r288  
    19151915 
    19161916    m_creature->SetUInt32Value(UNIT_FIELD_DISPLAYID, 21135); 
    1917     m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNKNOWN2); 
     1917    m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2); 
    19181918    m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); 
    19191919    m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); 

  • trunk/src/bindings/scripts/scripts/zone/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp

    r279 r288  
    228228        m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); 
    229229        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); 
    230         m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNKNOWN2); 
     230        m_creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2); 
    231231        m_creature->addUnitState(UNIT_STAT_STUNNED); 
    232232        m_creature->CastSpell(m_creature, SPELL_SHADOW_CAGE_C, true); 

  • trunk/src/bindings/scripts/scripts/zone/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp

    r279 r288  
    9595    void Reset() 
    9696    { 
    97         m_creature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_UNKNOWN2); 
     97        m_creature->SetFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_ATTACKABLE_2); 
    9898 
    9999        if( Intro ) 
    … …  
    155155    void Aggro(Unit *who) 
    156156    { 
    157         m_creature->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_UNKNOWN2); 
     157        m_creature->RemoveFlag(UNIT_FIELD_FLAGS,UNIT_FLAG_NOT_ATTACKABLE_2); 
    158158    } 
    159159 

  • trunk/src/game/Unit.cpp

    r285 r288  
    85568556        return false; 
    85578557 
    8558     if(HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE)) 
     8558    if(HasFlag(UNIT_FIELD_FLAGS,  
     8559        UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_NOT_ATTACKABLE_2)) 
    85598560        return false; 
    85608561 

  • trunk/src/game/Unit.h

    r284 r288  
    454454    UNIT_FLAG_UNKNOWN9         = 0x00000040, 
    455455    UNIT_FLAG_NOT_ATTACKABLE_1 = 0x00000080,                // ?? (UNIT_FLAG_PVP_ATTACKABLE | UNIT_FLAG_NOT_ATTACKABLE_1) is NON_PVP_ATTACKABLE 
    456     UNIT_FLAG_UNKNOWN2        = 0x00000100,                // 2.0.8 
     456    UNIT_FLAG_NOT_ATTACKABLE_2 = 0x00000100,                // 2.0.8 
    457457    UNIT_FLAG_UNKNOWN11        = 0x00000200, 
    458458    UNIT_FLAG_LOOTING          = 0x00000400,                // loot animation