Merge remote branch 'plbot/master'

Conflicts:
	README.PLAYERBOT
	mangos_botguy.sql
	src/game/CharacterHandler.cpp
	src/game/Chat.cpp
	src/game/Chat.h
	src/game/ChatHandler.cpp
	src/game/Creature.h
	src/game/GossipDef.h
	src/game/Group.cpp
	src/game/Makefile.am
	src/game/NPCHandler.cpp
	src/game/Player.cpp
	src/game/Player.h
	src/game/QuestHandler.cpp
	src/game/World.cpp
	src/game/WorldSession.cpp
	src/game/playerbot/PlayerbotClassAI.cpp
	src/mangosd/mangosd.conf.dist.in
	win/VC100/game.vcxproj
	win/VC100/game.vcxproj.filters
	win/VC90/game.vcproj

Signed-off-by: unknown <Clément@.(none)>

README.PLAYERBOT

@@ -21,8 +21,7 @@ Commands:
 /t BOTNAME stay
 /t BOTNAME assist (you'll need to be attacking something and the bot only does melee atm)
 /t BOTNAME spells (replies with all spells known to bot)
-/t BOTNAME cast <SPELLID>
-/t BOTNAME cast <SPELL SUBSTRING>
+/t BOTNAME cast <SPELLID | (part of) SPELLNAME | SPELLLINK>
 /t BOTNAME use <ITEM LINK>
 /t BOTNAME equip <ITEM LINK>
 /t BOTNAME reset (will reset states, orders and loot list)
@@ -32,6 +31,14 @@ Commands:
 /t BOTNAME survey (bot shows all available gameobjects, within a local perimeter around the bot)
 /t BOTNAME find <GAMEOBJECT LINK> (bot will travel to the gameobject location and then wait)
 /t BOTNAME get <GAMEOBJECT LINK> (bot will fetch the selected gameobject and then return to the player)
+/t BOTNAME quests (List bot's current quests)
+/t BOTNAME drop <QUESTLINK> (Drop a quest)
+/t BOTNAME orders (Shows bot's combat orders)
+/t BOTNAME pet spells (Shows spells known to bot's pet. Autocast spells will be shown in green)
+/t BOTNAME pet cast <SPELLID | (part of) SPELLNAME | SPELLLINK>
+/t BOTNAME pet toggle <SPELLID | (part of) SPELLNAME | SPELLLINK> (Toggle autocast for a given spell)
+/t BOTNAME pet state (Shows current react mode of bot's pet)
+/t BOTNAME pet react <(a)ggressive | (d)efensive | (p)assive> (Set bot's pet reaction mode)
 
 Shortcuts:
 c = cast

TODO.PLAYERBOT

@@ -16,7 +16,7 @@ Combat order TANK
 Combat order HEAL
 
 ///---Temporary item enchantments---///
-Rogue	: Poison
+[DONE] Rogue	: Poison
 Warrior	: Sharpening Stone, Rune of Warding, Rune of Shielding.
 
 //---After fear bot's lose target---///
@@ -26,4 +26,4 @@ Needs some fix.
 Rogue	: some abilitys require Rogue to be stealthed and behind target.
 
 ///---Implement locale independet way of getting spellIDs---///
-Hardcode lowest rank spellID, use function to get highest rank 
+[DONE] Hardcode lowest rank spellID, use function to get highest rank

configure.ac

@@ -360,6 +360,9 @@ AC_CONFIG_FILES([
    src/shared/Database/Makefile
    src/shared/SystemConfig.h
    src/game/Makefile
+   src/game/playerbot/Makefile
+   src/game/playerbot/config.h
+   src/game/playerbot/playerbot.conf.dist
    src/game/vmap/Makefile
    src/realmd/Makefile
    src/realmd/realmd.conf.dist

src/game/Makefile.am

@@ -7,7 +7,7 @@
 #
 # 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
+# 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
@@ -17,7 +17,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ## Sub-directories to parse
-SUBDIRS = vmap AuctionHouseBot
+SUBDIRS = PlayerBot vmap AuctionHouseBot
 
 ## CPP flags for includes, defines, etc.
 AM_CPPFLAGS = $(MANGOS_INCLUDES) -I$(top_builddir)/src/shared -I$(srcdir) -I$(srcdir)/../../dep/include -I$(srcdir)/../framework -I$(srcdir)/../shared -I$(srcdir)/vmap -I$(srcdir)/../realmd -I$(srcdir)/../../dep/include/g3dlite -DSYSCONFDIR=\"$(sysconfdir)/\"

src/game/Map.cpp

@@ -629,7 +629,7 @@ void Map::Remove(Player *player, bool remove)
     SendRemoveTransports(player);
     UpdateObjectVisibility(player,cell,p);
 
-    player->ResetMap();
+    // player->ResetMap();
     if( remove )
         DeleteFromWorld(player);
 }

src/game/Player.h

@@ -55,8 +55,8 @@ class Spell;
 class Item;
 
 // Playerbot mod
-class PlayerbotAI;
-class PlayerbotMgr;
+#include "playerbot/PlayerbotMgr.h"
+#include "playerbot/PlayerbotAI.h"
 
 typedef std::deque<Mail*> PlayerMails;
 
@@ -1631,6 +1631,10 @@ class MANGOS_DLL_SPEC Player : public Unit
         void AddTimedQuest( uint32 quest_id ) { m_timedquests.insert(quest_id); }
         void RemoveTimedQuest( uint32 quest_id ) { m_timedquests.erase(quest_id); }
 
+        void chompAndTrim(std::string& str);
+        bool getNextQuestId(const std::string& pString, unsigned int& pStartPos, unsigned int& pId);
+        bool requiredQuests(const char* pQuestIdString);
+
         /*********************************************************/
         /***                   LOAD SYSTEM                     ***/
         /*********************************************************/