jff...

Archives · Dec 20, 2010 · 5f30d2c · 5f30d2c
1 parent 5f4fd45
commit 5f30d2c
Show file tree

Hide file tree

Showing 21 changed files with 2,950 additions and 2,445 deletions.
diff --git a/addition/999_mangos_hkill_string.sql b/addition/999_mangos_hkill_string.sql
@@ -1,3 +1,3 @@
-DELETE FROM `mangos_string` WHERE `entry` = '1400';
+DELETE FROM `mangos_string` WHERE `entry` = '1500';
 INSERT INTO `mangos_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)
-VALUES (1400, 'The honorable kills of %s was set to %u!', 'Les victoires honorables de %s sont mises à %u!', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+VALUES (1500, 'The honorable kills of %s was set to %u!', 'Les victoires honorables de %s sont mises à %u!', NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/src/game/PlayerBot/PlayerbotDeathKnightAI.cpp b/src/game/PlayerBot/PlayerbotDeathKnightAI.cpp
diff --git a/src/game/PlayerBot/PlayerbotDeathKnightAI.h b/src/game/PlayerBot/PlayerbotDeathKnightAI.h
@@ -1,21 +1,3 @@
-/*
- * Copyright (C) 2005-2010 MaNGOS <http://getmangos.com/>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
 #ifndef _PLAYERDEATHKNIGHTAI_H
 #define _PLAYERDEATHKNIGHTAI_H
 
@@ -82,88 +64,36 @@ enum DeathKnightSpells
 class MANGOS_DLL_SPEC PlayerbotDeathKnightAI : PlayerbotClassAI
 {
 public:
-    PlayerbotDeathKnightAI(Player* const bot, PlayerbotAI* const ai);
+    PlayerbotDeathKnightAI(Player * const master, Player * const bot, PlayerbotAI * const ai);
     virtual ~PlayerbotDeathKnightAI();
 
-private:
-    void InitSpells(PlayerbotAI* const ai);
+    // all combat actions go here
     void DoNextCombatManeuver(Unit*);
+
+    // all non combat actions go here, ex buffs, heals, rezzes
     void DoNonCombatActions();
-    bool HealTarget(Unit* target, uint8 hp);
 
-protected:
+    // buff a specific player, usually a real PC who is not in group
+    //void BuffPlayer(Player *target);
+
+private:
+
     // Unholy
-    uint32 BONE_SHIELD,
-           PLAGUE_STRIKE,
-           DEATH_GRIP,
-           DEATH_COIL,
-           DEATH_STRIKE,
-           UNHOLY_BLIGHT,
-           SCOURGE_STRIKE,
-           DEATH_AND_DECAY,
-           UNHOLY_PRESENCE,
-           RAISE_DEAD,
-           ARMY_OF_THE_DEAD,
-           SUMMON_GARGOYLE,
-           ANTI_MAGIC_SHELL,
-           ANTI_MAGIC_ZONE,
-           GHOUL_FRENZY,
-           CORPSE_EXPLOSION;
+    uint32 BONE_SHIELD, PLAGUE_STRIKE, DEATH_GRIP, DEATH_COIL, DEATH_STRIKE, UNHOLY_BLIGHT, SCOURGE_STRIKE, DEATH_AND_DECAY, UNHOLY_PRESENCE, RAISE_DEAD, ARMY_OF_THE_DEAD, SUMMON_GARGOYLE, ANTI_MAGIC_SHELL, ANTI_MAGIC_ZONE, GHOUL_FRENZY, CORPSE_EXPLOSION;
 
     // Frost
-    uint32 ICY_TOUCH,
-           OBLITERATE,
-           HOWLING_BLAST,
-           FROST_STRIKE,
-           CHAINS_OF_ICE,
-           RUNE_STRIKE,
-           ICY_CLUTCH,
-           HORN_OF_WINTER,
-           KILLING_MACHINE,
-           FROST_PRESENCE,
-           DEATHCHILL,
-           ICEBOUND_FORTITUDE,
-           MIND_FREEZE,
-           EMPOWER_WEAPON,
-           HUNGERING_COLD,
-           UNBREAKABLE_ARMOR;
+    uint32 ICY_TOUCH, OBLITERATE, HOWLING_BLAST, FROST_STRIKE, CHAINS_OF_ICE, RUNE_STRIKE, ICY_CLUTCH, HORN_OF_WINTER, KILLING_MACHINE, FROST_PRESENCE, DEATHCHILL, ICEBOUND_FORTITUDE, MIND_FREEZE, EMPOWER_WEAPON, HUNGERING_COLD, UNBREAKABLE_ARMOR;
 
     // Blood
-    uint32 BLOOD_STRIKE,
-           PESTILENCE,
-           STRANGULATE,
-           BLOOD_BOIL,
-           HEART_STRIKE,
-           MARK_OF_BLOOD,
-           BLOOD_PRESENCE,
-           RUNE_TAP,
-           VAMPIRIC_BLOOD,
-           DEATH_PACT,
-           DEATH_RUNE_MASTERY,
-           HYSTERIA,
-           DANCING_WEAPON,
-           DARK_COMMAND;
+    uint32 BLOOD_STRIKE, PESTILENCE, STRANGULATE, BLOOD_BOIL, HEART_STRIKE, MARK_OF_BLOOD, BLOOD_PRESENCE, RUNE_TAP, VAMPIRIC_BLOOD, DEATH_PACT, DEATH_RUNE_MASTERY, HYSTERIA, DANCING_WEAPON, DARK_COMMAND;
 
     // first aid
     uint32 RECENTLY_BANDAGED;
 
     // racial
-    uint32 ARCANE_TORRENT,
-           GIFT_OF_THE_NAARU,
-           STONEFORM,
-           ESCAPE_ARTIST,
-           EVERY_MAN_FOR_HIMSELF,
-           SHADOWMELD,
-           BLOOD_FURY,
-           WAR_STOMP,
-           BERSERKING,
-           WILL_OF_THE_FORSAKEN;
+    uint32 ARCANE_TORRENT, GIFT_OF_THE_NAARU, STONEFORM, ESCAPE_ARTIST, EVERY_MAN_FOR_HIMSELF, SHADOWMELD, BLOOD_FURY, WAR_STOMP, BERSERKING, WILL_OF_THE_FORSAKEN;
 
-    uint32 SpellSequence,
-           LastSpellUnholyDK,
-           LastSpellFrostDK,
-           LastSpellBloodDK;
+    uint32 SpellSequence, LastSpellUnholyDK, LastSpellFrostDK, LastSpellBloodDK;
 };
 
 #endif
-