MMO Base News - World of Warcraft

Порталы в Ульдуаре

Administrator — Sat, 07 Jan 2012 10:30:39 GMT

Так сказать реализует порталы в Ульдуаре через го на.
Тп работает в:
Главный лагерь экспедиции.
Плац.
Гигантская кузня.
Мусорная свалка.
Вестибюль.
Разрушенная аллея.
Консерватория.

У каво залит хак:

Code

DELETE FROM areatrigger_teleport WHERE id = '5420';

Code

        {
          player->ADD_GOSSIP_ITEM(0, "Перенестись в Главный лагерь экспедиции", GOSSIP_SENDER_MAIN, BASE_CAMP);
          player->ADD_GOSSIP_ITEM(0, "Перенестись на Плац", GOSSIP_SENDER_MAIN, GROUNDS);
          player->ADD_GOSSIP_ITEM(0, "Перенестись в Гигантскую кузню", GOSSIP_SENDER_MAIN, FORGE);
          player->ADD_GOSSIP_ITEM(0, "Перенестись на Мусорную свалку", GOSSIP_SENDER_MAIN, SCRAPYARD);
          player->ADD_GOSSIP_ITEM(0, "Перенестись в Вестибюль", GOSSIP_SENDER_MAIN, ANTECHAMBER);
          player->ADD_GOSSIP_ITEM(0, "Перенестись на Разрушенную аллею", GOSSIP_SENDER_MAIN, WALKWAY);
          player->ADD_GOSSIP_ITEM(0, "Перенестись в Консерваторию", GOSSIP_SENDER_MAIN, CONSERVATORY);
          }
          player->SEND_GOSSIP_MENU(DEFAULT_GOSSIP_MESSAGE, creature->GetGUID());

          return true;
}

bool GossipSelect_npc_ulduar_teleporter(Player *player, Creature *creature, uint32 sender, uint32 action)
{
          if(sender != GOSSIP_SENDER_MAIN) return true;
          if(!player->getAttackers().empty()) return true;

          switch(action)
          {
          case BASE_CAMP:
              player->TeleportTo(603, -706.122, -92.6024, 429.876, 0);
              player->CLOSE_GOSSIP_MENU(); break;
          case GROUNDS:
              player->TeleportTo(603, 131.248, -35.3802, 409.804, 0);
              player->CLOSE_GOSSIP_MENU(); break;
          case FORGE:
              player->TeleportTo(603, 553.233, -12.3247, 409.679, 0);
              player->CLOSE_GOSSIP_MENU(); break;
          case SCRAPYARD:
              player->TeleportTo(603, 926.292, -11.4635, 418.595, 0);
              player->CLOSE_GOSSIP_MENU(); break;
          case ANTECHAMBER:
              player->TeleportTo(603, 1498.09, -24.246, 420.967, 0);
              player->CLOSE_GOSSIP_MENU(); break;
          case WALKWAY:
              player->TeleportTo(603, 1859.45, -24.1, 448.9, 0);
              player->CLOSE_GOSSIP_MENU(); break;
          case CONSERVATORY:
              player->TeleportTo(603, 2086.27, -24.3134, 421.239, 0);
              player->CLOSE_GOSSIP_MENU(); break;
          }

          return true;
}

void AddSC_npc_ulduar_teleporter()
{
          Script *newscript;
          newscript = new Script;
          newscript->Name = "npc_ulduar_teleporter";
          newscript->pGossipHello = &GossipHello_npc_ulduar_teleporter;
          newscript->pGossipSelect = &GossipSelect_npc_ulduar_teleporter;
          newscript->RegisterSelf();
}

Ето заливаем в базу:

Code

insert into `creature_template` (`entry`,`heroic_entry`,`modelid_A`,`modelid_A2`,`modelid_H`,`modelid_H2`,`name`,`subname`,`IconName`,`minlevel`,`maxlevel`,`minhealth`,`max health`,`minmana`,`maxmana`,`armor`,`faction_A`,`faction_H`,`npcflag`,`speed`,`scale`,`rank`,`mindmg`,`maxdmg`,`dmgschool`,`attackpower` ,` ba seattacktime`,`rangeattacktime`,`unit_flags`,`dynamicflags`,`family`,`trainer_type`,`trainer_spell`,`trainer_class`,`trainer_race`,`minr ange dmg`,`maxrangedmg`,`rangedattackpower`,`type`,`type_flags`,`lootid`,`pickpocketloot`,`skinloot`,`resistance1`,`resistance2`,`resistanc e3`,`r esistance4`,`resistance5`,`resistance6`,`spell1`,`spell2`,`spell3`,`spell4`,`PetSpellDataId`,`mingold`,`maxgold`,`AIName`,`MovementT ype`,`In habitType`,`unk16`,`unk17`,`RacialLeader`,`RegenHealth`,`equipment_id`,`mechanic_immune_mask`,`flags_extra`,`ScriptName`) VALUES ('99005','0','22448','0','22448','0','Ulduar teleporter','',NULL,'80','80','64200','64200','12300','12300','31200','35','35','1','1.48','0.5','0','3170','6182','0','33235','1400','1900' ,'0','0','0','0','0','0','0','0','0','100','7','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','0','','1','3','1','1','0 ', '1 ','99003','0','0','npc_ulduar_teleporter');
insert into `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `emote`, `moveflags`, `auras`) values('99005','0','0','0','0','0','48143 0');
insert into `locales_creature` (`entry`, `name_loc1`, `name_loc2`, `name_loc3`, `name_loc4`, `name_loc5`, `name_loc6`, `name_loc7`, `name_loc8`, `subname_loc1`, `subname_loc2`, `subname_loc3`, `subname_loc4`, `subname_loc5`, `subname_loc6`, `subname_loc7`, `subname_loc8`) values('99005','','','','','','','','Ульдуарский телепорт',NULL,NULL,NULL,NULL,NULL,NULL,NULL,'');
insert into `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`) values('500000','99005','571','1','1','0','99003','9025.76','-1179.12','1060.18','4.59386','25','0','0','64200','12300','0','0');
insert into `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`) values('500001','99005','603','2','1','0','99003','1497.84','-23.9801','421.367','5.0242','25','0','0','64200','12300','0','0');
insert into `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`) values('500002','99005','603','2','1','0','99003','131.248','-35.3802','410.204','0','25','0','0','64200','12300','0','0');
insert into `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`) values('500003','99005','603','2','1','0','99003','553.233','-12.3247','410.079','0','25','0','0','64200','12300','0','0');
insert into `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`) values('500004','99005','603','2','1','0','99003','926.292','-11.4635','418.995','0','25','0','0','64200','12300','0','0');
insert into `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `DeathState`, `MovementType`) values('500005','99005','603','2','1','0','99003','2086.17','-24.3111','421.639','3.11803','25','0','0','64200','12300','0','0');

[patch] Fire and Brimstone

Administrator — Tue, 22 Feb 2011 14:18:24 GMT

Реализует вторую часть таланта, а именно отвечающую за усиление дамага - если цель под Иммолейтом

Code

diff --git a/Unit.cpp b/Unit.cpp
index 2db68f7..0581f12 100644
--- a/Unit.cpp
+++ b/Unit.cpp
@@ -7799,7 +7799,21 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
              }
          }
      }
-
+    // custom scripted mod from dummy(while only two spell in 3.1.3 and future implementation)
+    AuraList const& mDummy = owner->GetAurasByType(SPELL_AURA_DUMMY);
+    for(AuraList::const_iterator i = mDummy.begin(); i != mDummy.end(); ++i)
+    {
+        SpellEntry const *spell = (*i)->GetSpellProto();
+        //Fire and Brimstone
+        if (spell->SpellFamilyName == SPELLFAMILY_WARLOCK && spell->SpellIconID == 3173)
+        {
+            if (pVictim->HasAuraState(AURA_STATE_IMMOLATE) && (spellProto->SpellFamilyName == SPELLFAMILY_WARLOCK && spellProto->SpellFamilyFlags & UI64LIT(0x0002004000000000)))
+            {
+                DoneTotalMod *= ((*i)->GetModifier()->m_amount+100.0f) / 100.0f;
+                break;
+            }
+        }
+    }
      // Custom scripted damage
      // Ice Lance
      if (spellProto->SpellFamilyName == SPELLFAMILY_MAGE && spellProto->SpellIconID == 186)

Основная тема!

Kxam — Sun, 23 Jan 2011 19:44:37 GMT

Тут основные патчи!(Люди просто отказываются юзать гугл).

*Победные медальки за БГ*
Описание: Выбираем за какое БГ что будет даваться/их кол-во.

*Reset hp/mana/spells*
Описание: Восстановление хп/маны и перезарядка магий при начале дуэли.

*История арены*
Описание: После каждого рейтингового матча в базу записывается информация о том:
- кто выйграл (winner_team)
- кто проиграл (loser_team)
- новые рейтинги команд (winner_rating, loser_rating)
- карта (map)
- тип (type)
- время игры (play_time)

Code

diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index f30d223..d66bc45 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -827,6 +827,9 @@ void BattleGround::EndBattleGround(uint32 winner)
                    // this way all arena team members will get notified, not only the ones who participated in this match
                    winner_arena_team->NotifyStatsChanged();
                    loser_arena_team->NotifyStatsChanged();
+        CharacterDatabase.BeginTransaction();
+        CharacterDatabase.PExecute("INSERT INTO arena_team_history (winner_team, winner_rating, loser_team, loser_rating, type, map) VALUES ('%u', '%u', '%u', '%u', '%u', '%u')", winner_arena_team->GetId(), winner_arena_team->GetRating(), loser_arena_team->GetId(), loser_arena_team->GetRating(), winner_arena_team->GetType(), GetMapId());
+        CharacterDatabase.CommitTransaction();
                }

                if (winmsg_id)

sql

Code

DROP TABLE IF EXISTS `arena_team_history`;
CREATE TABLE `arena_team_history` (
             `id` int(11) NOT NULL auto_increment COMMENT 'Identifier',
             `winner_team` int(10) unsigned NOT NULL default '0',
             `winner_rating` int(10) unsigned NOT NULL default '0',
             `loser_team` int(10) unsigned NOT NULL default '0',
             `loser_rating` int(10) unsigned NOT NULL default '0',
             `change` int(10) unsigned NOT NULL default '0',
             `type` int(2) unsigned NOT NULL default '0',
             `map` int(10) unsigned NOT NULL default '0',
             `play_time` timestamp NOT NULL default CURRENT_TIMESTAMP,
             PRIMARY KEY  (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1669 DEFAULT CHARSET=utf8;

Добавлено (22.12.2010, 22:33)
---------------------------------------------
*PvP Token System*
Описание: За убийство в PvP Зонах будет выдаваться игроку поощрение, в виде Badge of Justice/либо то что выберете вы, кол-во предметов/и в каких PvP Зонах, Всего их 4: на аренах(включая гурубаши) на бг, на бг и на аренах и везде.

Code

diff --git a/src/mangosd/mangosd.conf.dist.in b/src/mangosd/mangosd.conf.dist.in
index 0bb942e..339b5a1 100644
--- a/src/mangosd/mangosd.conf.dist.in
+++ b/src/mangosd/mangosd.conf.dist.in
@@ -1375,3 +1375,33 @@ Ra.IP = 0.0.0.0
                 Ra.Port = 3443
                 Ra.MinLevel = 3
                 Ra.Secure = 1
+
+######################################################################################################### #### ## ## ## #
+    # PvP Token System
+#
+#    PvPToken.Enable
+#         Enable/disable PvP Token system.
+#         Default: 1 (enabled)
+#                  0 (disabled)
+#
+#    PvPToken.ItemID
+#         The item ID of the token that players will receive after killing an enemy.
+#         Default: 29434 (Badge of Justice)
+#
+#    PvPToken.ItemCount
+#         The count amount of the ItemID
+#         Default: 1
+#
+#    PvPToken.MapRestriction
+#         The type of maps where players can receive the token
+#         Default: 4 - all maps
+#                  3 - battlegrounds only
+#                  2 - FFA areas only (both instanced and world arenas)
+#                  1 - battlegrounds and FFA areas only
+#
+##################################################################################################### #### ## ## ## ## ##
+
+  PvPToken  .Enable = 0
+PvPToken.ItemID = 29434
+PvPToken.ItemCount = 1
+PvPToken.MapRestriction = 4
diff --git a/src/game/Language.h b/src/game/Language.h
index 823d6d5..938755b 100644
--- a/src/game/Language.h
+++ b/src/game/Language.h
@@ -848,7 +848,7 @@ enum MangosStrings
                     //                    10000-10999

                     // Use for custom patches             11000-11999
-
+  LANG_YOU_RECEIVE_TOKEN              = 11050,
                     // NOT RESERVED IDS                   12000-1999999999
                     // `db_script_string` table index     2000000000-2000009999 (MIN_DB_SCRIPT_STRING_ID-MAX_DB_SCRIPT_STRING_ID)
                     // For other tables maybe             2000010000-2147483647 (max index)
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 65c6ac0..34535df 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -21017,6 +21017,35 @@ void Player::ResummonPetTemporaryUnSummonedIfAny()
                     m_temporaryUnsummonedPetNumber = 0;
                 }

+void Player::ReceiveToken()
+{
+    if(!sWorld.getConfig(CONFIG_PVP_TOKEN_ENABLE))
+        return;
+
+    uint8 MapRestriction = sWorld.getConfig(CONFIG_PVP_TOKEN_RESTRICTION);
+
+    if( MapRestriction == 1 && !InBattleGround() && !HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP) ||
+        MapRestriction == 2 && !HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_FFA_PVP) ||
+        MapRestriction == 3 && !InBattleGround())
+        return;
+
+    uint32 itemID = sWorld.getConfig(CONFIG_PVP_TOKEN_ITEMID);
+    uint32 itemCount = sWorld.getConfig(CONFIG_PVP_TOKEN_ITEMCOUNT);
+
+    ItemPosCountVec dest;
+    uint8 msg = CanStoreNewItem( NULL_BAG, NULL_SLOT, dest, itemID, itemCount);
+    if( msg != EQUIP_ERR_OK )   // convert to possible store amount
+    {
+        SendEquipError( msg, NULL, NULL );
+        return;
+    }
+
+    Item* item = StoreNewItem( dest, itemID, true, Item::GenerateItemRandomPropertyId(itemID));
+    SendNewItem(item,itemCount,true,false);
+
+    ChatHandler(this).PSendSysMessage(LANG_YOU_RECEIVE_TOKEN);
+}
+
                 bool Player::canSeeSpellClickOn(Creature const *c) const
                 {
                     if(!c->HasFlag(UNIT_NPC_FLAGS,UNIT_NPC_FLAG_SPELLCLICK))
d iff  --git a/src/game/Player.h b/src/game/Player.h
index a1ea792..158da81 100644
--- a/src/game/Player.h
+++ b/src/game/Player.h
@@ -1950,7 +1950,9 @@ class MANGOS_DLL_SPEC Player : public Unit
                         void ModifyHonorPoints( int32 value );
                         void ModifyArenaPoints( int32 value );
                         uint32 GetMaxPersonalArenaRatingRequirement();
-
+
+        void ReceiveToken();
+
                         //End of PvP System

                         void SetDrunkValue(uint16 newDrunkValue, uint32 itemid=0);
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 06d1533..98af84b 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -580,6 +580,11 @@ uint32 Unit::DealDamage(Unit *pVictim, uint32 damage, CleanDamage const* cleanDa
                             player->RewardPlayerAndGroupAtKill(pVictim);
                             player->ProcDamageAndSpell(pVictim, PROC_FLAG_KILL, PROC_FLAG_KILLED, PROC_EX_NONE, 0);

+   // PvP Token
+   int8 leveldiff = player->getLevel() - pVictim->getLevel();
+   if(!pVictim->HasAuraType(SPELL_AURA_NO_PVP_CREDIT) && leveldiff < 10)
+   player->ReceiveToken();
+
                             WorldPacket data(SMSG_PARTYKILLLOG, (8+8)); //send event PARTY_KILL
                             data << uint64(player->GetGUID()); //player with killing blow
                             data << uint64(pVictim->GetGUID()); //victim
diff --git a/src/game/World.cpp b/src/game/World.cpp
index 3361b5e..c9a4ffb 100644
--- a/src/game/World.cpp
+++ b/src/game/World.cpp
@@ -954,6 +954,15 @@ void World::LoadConfigSettings(bool reload)

                     m_configs[CONFIG_THREAT_RADIUS] = sConfig.GetIntDefault("ThreatRadius", 100);

+     /* PvP Token System */
+    m_configs[CONFIG_PVP_TOKEN_ENABLE] = sConfig.GetBoolDefault("PvPToken.Enable", true);
+    m_configs[CONFIG_PVP_TOKEN_ITEMID] = sConfig.GetIntDefault("PvPToken.ItemID", 29434);
+    m_configs[CONFIG_PVP_TOKEN_ITEMCOUNT] = sConfig.GetIntDefault("PvPToken.ItemCount", 1);
+    m_configs[CONFIG_PVP_TOKEN_RESTRICTION] = sConfig.GetIntDefault("PvPToken.MapRestriction", 4);
+
+    if(m_configs[CONFIG_PVP_TOKEN_ITEMCOUNT] <= 0)
+        m_configs[CONFIG_PVP_TOKEN_ENABLE] = 0;
+
                     // always use declined names in the russian client
                     m_configs[CONFIG_DECLINED_NAMES_USED] =
                         (m_configs[CONFIG_REALM_ZONE] == REALM_ZONE_RUSSIAN) ? true : sConfig.GetBoolDefault("DeclinedNames", false);
diff --git a/src/game/World.h b/src/game/World.h
index 977a440..f67cd72 100644
--- a/src/game/World.h
+++ b/src/game/World.h
@@ -199,6 +199,10 @@ enum WorldConfigs
                     CONFIG_LISTEN_RANGE_SAY,
                     CONFIG_LISTEN_RANGE_TEXTEMOTE,
                     C     O NFIG_L ISTEN_ RANGE_ YELL,
+     C ONF IG_PVP_TOKEN_E NABLE,
+    CONFIG_PVP_TOKEN_ITEMID,
+    CONFIG_PVP_TOKEN_ITEMCOUNT,
+    CONFIG_PVP_TOKEN_RES TRIC TION,
                     CONFIG_SKILL_MILLING,
                     CONFIG_BATTLEGROUND_CAST_DESERTER,
                     C    O NFIG_B ATTLEG ROUND_ QUEUE_ ANNOUN CER_EN ABLE,
- -
1.6.3 .3

*Патч на команду .server info*
Описание: Убираем версии ядра/базы/скриптов, оставляем статистику: Аптайм/Онлайн/

Добавлено (22.12.2010, 22:42)
---------------------------------------------
Так долго не было стоящих античитов для Мангоса и вот он появился!

Добавлено (22.12.2010, 22:49)
---------------------------------------------
Dalaran Sewers (Даларанская арена)

Патч!

Code

diff --git a/src/game/BattleGroundDS.cpp b/src/game/BattleGroundDS.cpp
index e6a298d..4f2fcd3 100644
--- a/src/game/BattleGroundDS.cpp
+++ b/src/game/BattleGroundDS.cpp
@@ -16,14 +16,16 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */

+#include "Object.h"
  #include "Player.h"
  #include "BattleGround.h"
  #include "BattleGroundDS.h"
+#include "ObjectMgr.h"
+#include "WorldPacket.h"
  #include "Language.h"

  BattleGroundDS::BattleGroundDS()
  {
-
      m_StartDelayTimes[BG_STARTING_EVENT_FIRST]  = BG_START_DELAY_1M;
      m_StartDelayTimes[BG_STARTING_EVENT_SECOND] = BG_START_DELAY_30S;
      m_StartDelayTimes[BG_STARTING_EVENT_THIRD]  = BG_START_DELAY_15S;
@@ -43,6 +45,24 @@ BattleGroundDS::~BattleGroundDS()
  void BattleGroundDS::Update(uint32 diff)
  {
      BattleGround::Update(diff);
+    if (GetStatus() == STATUS_IN_PROGRESS)
+    {
+        // knockback
+        if(m_uiKnockback < diff)
+        {
+            for(BattleGroundPlayerMap::const_iterator itr = GetPlayers().begin(); itr != GetPlayers().end(); ++itr)
+            {
+                Player * plr = sObjectMgr.GetPlayer(itr->first);
+                if (plr && plr->IsWithinLOS(1214,765,14) && plr->GetDistance2d(1214, 765) <= 50)
+                    plr->KnockBackPlayerWithAngle(6.40f,55,7);
+                if (plr && plr->IsWithinLOS(1369,817,14) && plr->GetDistance2d(1369, 817) <= 50)
+                    plr->KnockBackPlayerWithAngle(3.03f,55,7);
+            }
+            m_uiKnockback = 1000;
+        }
+        else
+            m_uiKnockback -= diff;
+    }
  }

  void BattleGroundDS::StartingEventCloseDoors()
@@ -51,6 +71,7 @@ void BattleGroundDS::StartingEventCloseDoors()

  void BattleGroundDS::StartingEventOpenDoors()
  {
+    OpenDoorEvent(BG_EVENT_DOOR);
  }

  void BattleGroundDS::AddPlayer(Player *plr)
@@ -60,19 +81,76 @@ void BattleGroundDS::AddPlayer(Player *plr)
      BattleGroundDSScore* sc = new BattleGroundDSScore;

      m_PlayerScores[plr->GetGUID()] = sc;
+
+    UpdateWorldState(0xe11, GetAlivePlayersCountByTeam(ALLIANCE));
+    UpdateWorldState(0xe10, GetAlivePlayersCountByTeam(HORDE));
+}
+
+void BattleGroundDS::RemovePlayer(Player* /*plr*/, uint64 /*guid*/)
+{
+    if (GetStatus() == STATUS_WAIT_LEAVE)
+        return;
+
+    UpdateWorldState(0xe11, GetAlivePlayersCountByTeam(ALLIANCE));
+    UpdateWorldState(0xe10, GetAlivePlayersCountByTeam(HORDE));
+
+    CheckArenaWinConditions();
  }

-void BattleGroundDS::RemovePlayer(Player * /*plr*/, uint64 /*guid*/)
+void BattleGroundDS::HandleKillPlayer(Player *player, Player *killer)
  {
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    if (!killer)
+    {
+        sLog.outError("BattleGroundDS: Killer player not found");
+        return;
+    }
+
+    BattleGround::HandleKillPlayer(player,killer);
+
+    UpdateWorldState(0xe11, GetAlivePlayersCountByTeam(ALLIANCE));
+    UpdateWorldState(0xe10, GetAlivePlayersCountByTeam(HORDE));
+
+    CheckArenaWinConditions();
+}
+
+bool BattleGroundDS::HandlePlayerUnderMap(Player *player)
+{
+    player->TeleportTo(GetMapId(),1299.046f,784.825f,9.338f,player->GetOrientation(),false);
+    return true;
+}
+
+void BattleGroundDS::HandleAreaTrigger(Player *Source, uint32 Trigger)
+{
+    if (GetStatus() != STATUS_IN_PROGRESS)
+        return;
+
+    switch(Trigger)
+    {
+        case 5347:
+        case 5348:
+            break;
+        default:
+            sLog.outError("WARNING: Unhandled AreaTrigger in Battleground: %u", Trigger);
+            Source->GetSession()->SendAreaTriggerMessage("Warning: Unhandled AreaTrigger in Battleground: %u", Trigger);
+            break;
+    }
  }

-void BattleGroundDS::HandleKillPlayer(Player* player, Player* killer)
+void BattleGroundDS::FillInitialWorldStates(WorldPacket &data, uint32& count)
  {
-    BattleGround::HandleKillPlayer(player, killer);
+    FillInitialWorldState(data, count, 0xe11, GetAlivePlayersCountByTeam(ALLIANCE));
+    FillInitialWorldState(data, count, 0xe10, GetAlivePlayersCountByTeam(HORDE));
+    FillInitialWorldState(data, count, 0xe1a, 1);
  }

-void BattleGroundDS::HandleAreaTrigger(Player * /*Source*/, uint32 /*Trigger*/)
+void BattleGroundDS::Reset()
  {
+    //call parent's class reset
+    BattleGround::Reset();
+    m_uiKnockback = 5000;
  }

  bool BattleGroundDS::SetupBattleGround()
diff --git a/src/game/BattleGroundDS.h b/src/game/BattleGroundDS.h
index 0034226..2d21b58 100644
--- a/src/game/BattleGroundDS.h
+++ b/src/game/BattleGroundDS.h
@@ -45,6 +45,11 @@ class BattleGroundDS : public BattleGround
          void RemovePlayer(Player *plr, uint64 guid);
          void HandleAreaTrigger(Player *Source, uint32 Trigger);
          bool SetupBattleGround();
+        virtual void Reset();
+        virtual void FillInitialWorldStates(WorldPacket &d, uint32& count);
          void HandleKillPlayer(Player* player, Player *killer);
+        bool HandlePlayerUnderMap(Player * plr);
+    private:
+        uint32 m_uiKnockback;
  };
  #endif
diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp
index e4715ea..1015832 100644
--- a/src/game/BattleGroundMgr.cpp
+++ b/src/game/BattleGroundMgr.cpp
@@ -1485,8 +1485,8 @@ BattleGround * BattleGroundMgr::CreateNewBattleGround(BattleGroundTypeId bgTypeI
      //for arenas there is random map used
      if (bg_template->isArena())
      {
-        BattleGroundTypeId arenas[] = {BATTLEGROUND_NA, BATTLEGROUND_BE, BATTLEGROUND_RL/*, BATTLEGROUND_DS, BATTLEGROUND_RV*/};
-        uint32 arena_num = urand(0,2/*4*/);
+        BattleGroundTypeId arenas[] = {BATTLEGROUND_NA, BATTLEGROUND_BE, BATTLEGROUND_RL, BATTLEGROUND_DS/*, BATTLEGROUND_RV*/};
+        uint32 arena_num = urand(0,3/*4*/);
          bgTypeId = arenas[arena_num];
          bg_template = GetBattleGroundTemplate(bgTypeId);
          if (!bg_template)
@@ -1897,7 +1897,8 @@ bool BattleGroundMgr::IsArenaType(BattleGroundTypeId bgTypeId)
      return ( bgTypeId == BATTLEGROUND_AA ||
          bgTypeId == BATTLEGROUND_BE ||
          bgTypeId == BATTLEGROUND_NA ||
-        bgTypeId == BATTLEGROUND_RL );
+        bgTypeId == BATTLEGROUND_RL ||
+        bgTypeId == BATTLEGROUND_DS);
  }

  BattleGroundQueueTypeId BattleGroundMgr::BGQueueTypeId(BattleGroundTypeId bgTypeId, uint8 arenaType)
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 0372f37..d31f19e 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -8381,6 +8381,16 @@ void Player::SendInitWorldStates(uint32 zoneid, uint32 areaid)
                  FillInitialWorldState(data,count,0xbba,0x0);// 9 show
              }
              break;
+        case 4378:                    // Dalaran Severs
+            if (bg && bg->GetTypeID(true) == BATTLEGROUND_DS)
+                bg->FillInitialWorldStates(data, count);
+            else
+            {
+                FillInitialWorldState(data,count,0xe11,0x0);// 7 gold
+                FillInitialWorldState(data,count,0xe10,0x0);// 8 green
+                FillInitialWorldState(data,count,0xe1a,0x0);// 9 show
+            }
+            break;
          case 3703:                    // Shattrath City
&

MaNGOS Chat system

Administrator — Sat, 01 May 2010 16:28:21 GMT

Давно копились мысли на тему того как улучшить данный аспект сервера, и вот сегодня выкроил чутка времени на первую часть.
Для начала я попытался объединить две нитки ChannelMgr от разных фракций в одну, и использовать ее для обеих фракций. Это позволит например гейммастерам читать и говорить одновременно в общие каналы обеих фракций. Так же теоретически это должно слегка снизить потребление памяти на густонаселенных серверах(ведь для одной и той же локации не создается две копии дженерал чата).

Вот что у меня получилось наклепать на скорую руку(есть во вложении в виде файла):

Code

diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp
index e0fca88..cef1551 100644
--- a/src/game/Channel.cpp
+++ b/src/game/Channel.cpp
@@ -456,7 +456,8 @@ void Channel::List(Player* player)
               // PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
               // MODERATOR, GAME MASTER, ADMINISTRATOR can see all
               if (plr && (player->GetSession()->GetSecurity() > SEC_PLAYER || plr->GetSession()->GetSecurity() <= gmLevelInWhoList) &&
-                plr->IsVisibleGloballyFor(player))
+    plr->IsVisibleGloballyFor(player) &&
+    (player->GetSession()->GetSecurity() > SEC_PLAYER || player->GetTeam() == plr->GetTeam() || sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL)))
               {
                   data << uint64(i->first);
                   data << uint8(i->second.flags);             // flags seems to be changed...
@@ -663,26 +664,25 @@ void Channel::SetOwner(uint64 guid, bool exclaim)

   void Channel::SendToAll(WorldPacket *data, uint64 p)
   {
+    Player *player = objmgr.GetPlayer(GUID_LOPART(p));
       for(PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
       {
           Player *plr = objmgr.GetPlayer(i->first);
-        if(plr)
-        {
-            if(!p || !plr->GetSocial()->HasIgnore(GUID_LOPART(p)))
-                plr->GetSession()->SendPacket(data);
-        }
+  if(plr && player && (sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL) || player->isGameMaster() || plr->isGameMaster() || player->GetTeam() == plr->GetTeam()) && !plr->GetSocial()->HasIgnore(GUID_LOPART(p)))
+                    plr->GetSession()->SendPacket(data);
       }
   }

-void Channel::SendToAllButOne(WorldPacket *data, uint64 who)
+void Channel::SendToAllButOne(WorldPacket *data, uint64 who, uint64 p)
   {
+    Player *player = objmgr.GetPlayer(GUID_LOPART(p));
       for(PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
       {
           if(i->first != who)
           {
               Player *plr = objmgr.GetPlayer(i->first);
-            if(plr)
-                plr->GetSession()->SendPacket(data);
+            if(plr && player && (sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL) || player->isGameMaster() || plr->isGameMaster() || player->GetTeam() == plr->GetTeam()))
+                    plr->GetSession()->SendPacket(data);
           }
       }
   }
diff --git a/src/game/Channel.h b/src/game/Channel.h
index 6e2fab2..8444e11 100644
--- a/src/game/Channel.h
+++ b/src/game/Channel.h
@@ -198,7 +198,7 @@ class Channel
           void MakeVoiceOff(WorldPacket *data, uint64 guid);                      //+ 0x23

           void SendToAll(WorldPacket *data, uint64 p = 0);
-        void SendToAllButOne(WorldPacket *data, uint64 who);
+        void SendToAllButOne(WorldPacket *data, uint64 who, uint64 p = 0);
           void SendToOne(WorldPacket *data, uint64 who);

           bool IsOn(uint64 who) const { return players.find(who) != players.end(); }
diff --git a/src/game/ChannelHandler.cpp b/src/game/ChannelHandler.cpp
index a2d28f2..82cc1cb 100644
--- a/src/game/ChannelHandler.cpp
+++ b/src/game/ChannelHandler.cpp
@@ -34,7 +34,7 @@ void WorldSession::HandleJoinChannel(WorldPacket& recvPacket)
           return;

       recvPacket >> pass;
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetJoinChannel(channelname, channel_id))
               chn->Join(_player->GetGUID(), pass.c_str());
   }
@@ -52,7 +52,7 @@ void WorldSession::HandleLeaveChannel(WorldPacket& recvPacket)
       if(channelname.empty())
           return;

-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
       {
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->Leave(_player->GetGUID(), true);
@@ -67,7 +67,7 @@ void WorldSession::HandleChannelList(WorldPacket& recvPacket)
       std::string channelname;
       recvPacket >> channelname;

-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->List(_player);
   }
@@ -81,7 +81,7 @@ void WorldSession::HandleChannelPassword(WorldPacket& recvPacket)

       recvPacket >> pass;

-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->Password(_player->GetGUID(), pass.c_str());
   }
@@ -98,7 +98,7 @@ void WorldSession::HandleChannelSetOwner(WorldPacket& recvPacket)
       if(!normalizePlayerName(newp))
           return;

-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->SetOwner(_player->GetGUID(), newp.c_str());
   }
@@ -109,7 +109,7 @@ void WorldSession::HandleChannelOwner(WorldPacket& recvPacket)
       //recvPacket.hexlike();
       std::string channelname;
       recvPacket >> channelname;
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->SendWhoOwner(_player->GetGUID());
   }
@@ -126,7 +126,7 @@ void WorldSession::HandleChannelModerator(WorldPacket& recvPacket)
       if(!normalizePlayerName(otp))
           return;

-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->SetModerator(_player->GetGUID(), otp.c_str());
   }
@@ -143,7 +143,7 @@ void WorldSession::HandleChannelUnmoderator(WorldPacket& recvPacket)
       if(!normalizePlayerName(otp))
           return;

-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->UnsetModerator(_player->GetGUID(), otp.c_str());
   }
@@ -160,7 +160,7 @@ void WorldSession::HandleChannelMute(WorldPacket& recvPacket)
       if(!normalizePlayerName(otp))
           return;

-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->SetMute(_player->GetGUID(), otp.c_str());
   }
@@ -178,7 +178,7 @@ void WorldSession::HandleChannelUnmute(WorldPacket& recvPacket)
       if(!normalizePlayerName(otp))
           return;

-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->UnsetMute(_player->GetGUID(), otp.c_str());
   }
@@ -195,7 +195,7 @@ void WorldSession::HandleChannelInvite(WorldPacket& recvPacket)
       if(!normalizePlayerName(otp))
           return;

-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->Invite(_player->GetGUID(), otp.c_str());
   }
@@ -211,7 +211,7 @@ void WorldSession::HandleChannelKick(WorldPacket& recvPacket)
       if(!normalizePlayerName(otp))
           return;

-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->Kick(_player->GetGUID(), otp.c_str());
   }
@@ -228,7 +228,7 @@ void WorldSession::HandleChannelBan(WorldPacket& recvPacket)
       if(!normalizePlayerName(otp))
           return;

-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->Ban(_player->GetGUID(), otp.c_str());
   }
@@ -246,7 +246,7 @@ void WorldSession::HandleChannelUnban(WorldPacket& recvPacket)
       if(!normalizePlayerName(otp))
           return;

-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->UnBan(_player->GetGUID(), otp.c_str());
   }
@@ -257,7 +257,7 @@ void WorldSession::HandleChannelAnnouncements(WorldPacket& recvPacket)
       //recvPacket.hexlike();
       std::string channelname;
       recvPacket >> channelname;
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->Announce(_player->GetGUID());
   }
@@ -268,7 +268,7 @@ void WorldSession::HandleChannelModerate(WorldPacket& recvPacket)
       //recvPacket.hexlike();
       std::string channelname;
       recvPacket >> channelname;
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->Moderate(_player->GetGUID());
   }
@@ -279,7 +279,7 @@ void WorldSession::HandleChannelDisplayListQuery(WorldPacket &recvPacket)
       //recvPacket.hexlike();
       std::string channelname;
       recvPacket >> channelname;
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->List(_player);
   }
@@ -290,7 +290,7 @@ void WorldSession::HandleGetChannelMemberCount(WorldPacket &recvPacket)
       //recvPacket.hexlike();
       std::string channelname;
       recvPacket >> channelname;
-    if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    if(ChannelMgr* cMgr = channelMgr())
       {
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
           {
@@ -309,7 +309,7 @@ void WorldSession::HandleSetChannelWatch(WorldPacket &recvPacket)
       //recvPacket.hexlike();
       std::string channelname;
       recvPacket >> channelname;
-    /*if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+    /*if(ChannelMgr* cMgr = channelMgr())
           if(Channel *chn = cMgr->GetChannel(channelname, _player))
               chn->JoinNotify(_player->GetGUID());*/
   }
diff --git a/src/game/ChannelMgr.cpp b/src/game/ChannelMgr.cpp
index e3b54d3..7aaddd5 100644
--- a/src/game/ChannelMgr.cpp
+++ b/src/game/ChannelMgr.cpp
@@ -20,20 +20,11 @@
   #include "Policies/SingletonImp.h"
   #include "World.h"

-INSTANTIATE_SINGLETON_1( AllianceChannelMgr );
-INSTANTIATE_SINGLETON_1( HordeChannelMgr );
+INSTANTIATE_SINGLETON_1( CommonChannelMgr );

-ChannelMgr* channelMgr(uint32 team)
+ChannelMgr* channelMgr()
   {
-    if (sWorld.getConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
-        return &MaNGOS::Singleton::Instance();        // cross-faction
-
-    if(team == ALLIANCE)
-        return &MaNGOS::Singleton::Instance();
-    if(team == HORDE)
-        return &MaNGOS::Singleton::Instance();
-
-    return NULL;
+    return &MaNGOS::Singleton::Instance();
   }

   ChannelMgr::~ChannelMgr()
@@ -61,13 +52,6 @@ Channel *ChannelMgr::GetChannel(std::string name, Player *p, bool pkt)

       if(i == channels.end())
       {
-        if(pkt)
-        {
-            WorldPacket data;
-            MakeNotOnPacket(&data,name);
-            p->GetSession()->SendPacket(&data);
-        }
-
           return NULL;
       }
       else
@@ -89,9 +73,3 @@ void ChannelMgr::LeftChannel(std::string name)
           delete channel;
       }
   }
-
-void ChannelMgr::MakeNotOnPacket(WorldPacket *data, std::string name)
-{
-    data->Initialize(SMSG_CHANNEL_NOTIFY, (1+10));  // we guess size
-    (*data) << (uint8)0x05 << name;
-}
diff --git a/src/game/ChannelMgr.h b/src/game/ChannelMgr.h
index 27c3dca..da70ad8 100644
--- a/src/game/ChannelMgr.h
+++ b/src/game/ChannelMgr.h
@@ -40,9 +40,8 @@ class ChannelMgr
           void MakeNotOnPacket(WorldPacket *data, std::string name);
   };

-class AllianceChannelMgr : public ChannelMgr {};
-class HordeChannelMgr    : public ChannelMgr {};
+class CommonChannelMgr : public ChannelMgr {};

-ChannelMgr* channelMgr(uint32 team);
+ChannelMgr* channelMgr();

   #endif
diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp
index edd647e..2b285f5 100644
--- a/src/game/ChatHandler.cpp
+++ b/src/game/ChatHandler.cpp
@@ -441,7 +441,7 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
               if(msg.empty())
                   break;

-            if(ChannelMgr* cMgr = channelMgr(_player->GetTeam()))
+            if(ChannelMgr* cMgr = channelMgr())
               {
                   if(Channel *chn = cMgr->GetChannel(channel,_player))
                       chn->Say(_player->GetGUID(),msg.c_str(),lang);
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 63f6a34..c0b5910 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -4554,7 +4554,7 @@ void Player::CleanupChannels()
           Channel* ch = *m_channels.begin();
           m_channels.erase(m_channels.begin());               // remove from player's channel list
           ch->Leave(GetGUID(), false);                        // not send to client, not remove from player's channel list
-        if (ChannelMgr* cMgr = channelMgr(GetTeam()))
+        if (ChannelMgr* cMgr = channelMgr())
               cMgr->LeftChannel(ch->GetName());               // deleted channel if empty

       }
@@ -4570,7 +4570,7 @@ void Player::UpdateLocalChannels(uint32 newZone )
       if(!current_zone)
           return;

-    ChannelMgr* cMgr = channelMgr(GetTeam());
+    ChannelMgr* cMgr = channelMgr();
       if(!cMgr)
           return;

Прошу потестить, и отписаться о результатах, а я пока пострадаю быдлокодерством в сторону решения следующих проблем:
1. отдельные базовые каналы(т.е. те, которые есть в ChatChannels.DBC) для клиентов с разными локалями
2. некорректная отработка флагов базовых каналов(поможет реализовать близзлайк трейд, скорректирует работу остальных каналов)

[mini fix][8523] Battlemaster's trinkets

Administrator — Sat, 01 May 2010 16:27:41 GMT

Спелл Tremendous Fortitude, который используется на пвп тринках 80лвл увеличивает только максимум хп, но собственно хп не добавляет. Его аналог с 70лвл (44055) работает как надо, так что фикс действительно минимальный:

Code

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 5ae984a..9a2a114 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -4751,7 +4751,7 @@ void Aura::HandleAuraModIncreaseHealth(bool apply, bool Real)
           case 12976:                    // Warrior Last Stand triggered spell
           case 28726:                    // Nightmare Seed ( Nightmare Seed )
           case 34511:                    // Valor (Bulwark of Kings, Bulwark of the Ancient Kings)
-        case 44055:                    // Tremendous Fortitude (Battlemaster's Alacrity)
+        case 44055: case 55915: case 55917:                 // Tremendous Fortitude (Battlemaster's trinkets)
           case 50322:                    // Survival Instincts
           {
               if(Real)

» [patch] Vehicles (

Administrator — Sat, 01 May 2010 16:26:50 GMT

Форум: Патчи в ядро Mangos
Автор темы: Administrator
Автор последнего сообщения: TKach
Количество ответов: 0

[patch][8525] Glyph of Earth Shield

Administrator — Sat, 01 May 2010 16:26:09 GMT

Исправляет работу http://www.wowhead.com/?item=45775

Code

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 03b34cb..e8e5419 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -6134,8 +6134,11 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
              // Earth Shield
              if (dummySpell->SpellFamilyFlags & UI64LIT(0x0000040000000000))
              {
-                basepoints0 = triggerAmount;
                  target = this;
+                // Glyph of Earth Shield
+                Aura* aur = target->GetAura(63279,0);
+                int32 aur_mod = (aur) ? aur->GetModifier()->m_amount : 0;
+                basepoints0 = triggerAmount * (aur_mod + 100.0f) / 100.0f;
                  triggered_spell_id = 379;
                  break;
              }

[fix][8708] Drain Soul

Administrator — Sat, 01 May 2010 16:25:56 GMT

Исправляет дамаг от спелла Похищение души, а именно вот эту часть:

Quote

Если у противника осталось 25% здоровья или менее того, заклинание наносит вчетверо больше урона.

Под ревизию 8684

Code

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 8015555..f781916 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -4469,6 +4469,16 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
                  }
                  break;
              }
+           case SPELLFAMILY_WARLOCK:
+           {
+               if (m_spellProto->SpellIconID == 113)
+               {
+                   if (m_target->GetHealth() <= m_target->GetMaxHealth()*0.25f)
+                       m_modifier.m_amount *= 4;
+                   return;
+               }
+               break;
+           }
              case SPELLFAMILY_WARRIOR:
              {
                  // Rend

[patch] Death Coil (Warlock)

Administrator — Sat, 01 May 2010 16:25:26 GMT

Code

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 44fe64a..692ac06 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -2723,10 +2723,6 @@ void Spell::finish(bool ok)
                }
        }

-    // Heal caster for all health leech from all targets
-    if (m_healthLeech)
-        m_caster->DealHeal(m_caster, uint32(m_healthLeech), m_spellInfo);
-
        if (IsMeleeAttackResetSpell())
        {
            m_caster->resetAttackTimer(BASE_ATTACK);
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 5d39fab..e1042aa 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -2544,12 +2544,12 @@ void Spell::EffectHealthLeech(uint32 i)
        if(Player *modOwner = m_caster->GetSpellModOwner())
            modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_MULTIPLE_VALUE, multiplier);

-    int32 new_damage = int32(damage*multiplier);
        uint32 curHealth = unitTarget->GetHealth();
-    new_damage = m_caster->SpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, new_damage );
+    int32 new_damage = m_caster->SpellNonMeleeDamageLog(unitTarget, m_spellInfo->Id, damage );
        if(curHealth < new_damage)
            new_damage = curHealth;

+    new_damage = int32(new_damage*multiplier);
        if(m_caster->isAlive())
        {
            new_damage = m_caster->SpellHealingBonus(m_caster, m_spellInfo, new_damage, HEAL);
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index fb91db4..f010f05 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -7964,8 +7964,7 @@ uint32 Unit::SpellDamageBonus(Unit *pVictim, SpellEntry const *spellProto, uint3
            // 50% for damage and healing spells for leech spells from damage bonus and 0% from healing
            for(int j = 0; j < 3; ++j)
            {
-            if( spellProto->Effect[j] == SPELL_EFFECT_HEALTH_LEECH ||
-                spellProto->Effect[j] == SPELL_EFFECT_APPLY_AURA && spellProto->EffectApplyAuraName[j] == SPELL_AURA_PERIODIC_LEECH )
+            if( spellProto->Effect[j] == SPELL_EFFECT_APPLY_AURA && spellProto->EffectApplyAuraName[j] == SPELL_AURA_PERIODIC_LEECH )
                {
                    CastingTime /= 2;
                    break;

[patch] Improved Fire Nova Totem и Earthen Power

Administrator — Sat, 01 May 2010 16:24:59 GMT

реализует стан от Improved Fire Nova Totem и снятие snare от Earthen Power

Code

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 89ce2fd..645f86f 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -31,6 +31,7 @@
   #include "Player.h"
   #include "Pet.h"
   #include "Unit.h"
+#include "Totem.h"
   #include "Spell.h"
   #include "DynamicObject.h"
   #include "Group.h"
@@ -792,6 +793,10 @@ void Spell::prepareDataForTriggerSystem()
                   if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0001000900B80400))
                       m_canTrigger = true;
                   break;
+            case SPELLFAMILY_SHAMAN: // Allow any totem triggered spell to trigger (used for improved totem talents)
+                if (m_caster->GetTypeId()==TYPEID_UNIT && ((Creature*)m_caster)->isTotem() && ((Totem*)m_caster)->GetTotemType()!=TOTEM_STATUE)
+                    m_canTrigger = true;
+                break;
               default:
                   break;
           }
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index da7496d..3ed9a46 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -4306,6 +4306,13 @@ void Unit::SendPeriodicAuraLog(SpellPeriodicAuraLogInfo *pInfo)

   void Unit::ProcDamageAndSpell(Unit *pVictim, uint32 procAttacker, uint32 procVictim, uint32 procExtra, uint32 amount, WeaponAttackType attType, SpellEntry const *procSpell)
   {
+    //totems proc spells on their owner
+    if(GetTypeId()==TYPEID_UNIT && ((Creature*)this)->isTotem() && ((Totem*)this)->GetTotemType()!=TOTEM_STATUE)
+    {
+        if(Unit* owner = GetOwner())
+            owner->ProcDamageAndSpellFor(false,this,procAttacker,procExtra,attType,procSpell,amount);
+            return;
+    }
        // Not much to do if no flags are set.
       if (procAttacker)
           ProcDamageAndSpellFor(false,pVictim,procAttacker, procExtra,attType, procSpell, amount);
@@ -5849,6 +5856,16 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, Aura* triggeredByAu
                       triggered_spell_id = 58879;
                       break;
                   }
+                // Improved Fire Nova (Rank 2)
+                case 16544:
+                    triggered_spell_id = 51880;
+                    break;
+                // Earthen Power (Rank 1,2) note: replace 59566 when 63532 will exist in dbc (3.1.0)
+                case 51523:
+                case 51524:
+                    triggered_spell_id = 59566;
+                    break;
+
               }
               // Ancestral Awakening
               if (dummySpell->SpellIconID == 3065)

Code

delete from `spell_proc_event` where `entry`= `16544`;
delete from `spell_proc_event` where `entry`= `51523`;
delete from `spell_proc_event` where `entry`= `51524`;
insert into `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) values('16544','4','11','9224497937835360256','0','0','69632','0','0','0','0');
insert into `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) values('51523','0','0','0','1','0','69632','0','0','0','0');
insert into `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) values('51524','0','0','0','1','0','69632','0','0','0','0');

[Fixed]Rune cost

Administrator — Sat, 01 May 2010 16:24:13 GMT

исправляет дефект, когда руны все еще гашеные, даже если ультрасовременно, ибо никакая стоимость не присутствует, как воспроизвести:
1)take Рифма как талант
2)convert весь мороз & нечистые руны насмерть
3) приводите вой blast -death рун будет все еще браться даже думал, что никаких рун не нужно потреблять

Code

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 2ed2111..2ebd7f8 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -3752,19 +3752,24 @@ SpellCastResult Spell::CheckOrTakeRunePower(bool take)
       for(uint32 i = 0; i < MAX_RUNES; ++i)
       {
           RuneType rune = plr->GetCurrentRune(i);
+        RuneType real = plr->GetBaseRune(i);
+
+        if (runeCost[real] > 0)
+        {
+            int32 runeCostTemp = runeCost[real] * 1000;
+            if(Player* modOwner = plr->GetSpellModOwner())
+                modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_COST, runeCostTemp, this);
+
+            if (runeCostTemp <= 0)
+            {
+                --runeCost[real];
+                continue;
+            }
+        }
+
           if (runeCost[rune] <= 0)
               continue;

-        int32 runeCostTemp = runeCost[rune] * 10000;
-        if(Player* modOwner = plr->GetSpellModOwner())
-            modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_COST, runeCostTemp, this);
-
-        if (runeCostTemp <= 0)
-        {
-            --runeCost[rune];
-            continue;
-        }
-
           if(plr->GetRuneCooldown(i) == 0)
           {
               if (take)

[patch] Dual Talent Specializations

Administrator — Sat, 01 May 2010 16:23:28 GMT

На 40 уровне подходим к тренеру и изучаем за 1000 голда вторую специализацию. Меняются и забиваются таланты нормально. Таланты из разных специализаций реально действуют.
P.S патч лично проверил на чистых исходниках, и так же с карателем, всё работает отлично, никаких поблем ненаблюдается.
В аттаче патчи под различные версии, ds.zip под комуль карателя, остальные на чистые исходники.

http://datawow.3dn.ru/_fr/3/4_dual_spec_879.patch

http://datawow.3dn.ru/_fr/3/123.rar