Index: extras/map_extractor/System.cpp
===================================================================
--- extras/map_extractor/System.cpp (revision 190)
+++ extras/map_extractor/System.cpp (working copy)
@@ -202,7 +202,7 @@
printf("============================================================\n\n");
// const char* archiveNames[] = {"common.mpq", "enUS/locale-enUS.MPQ",0 };
- const char* archiveNames[] = {"common.mpq", "enUS/locale-enUS.MPQ", "expansion.mpq", "enUS/expansion-locale-enUS.MPQ", "patch.MPQ", "enUS/patch-enUS.MPQ",0 };
+ const char* archiveNames[] = {"common.mpq", "enGB/locale-enGB.MPQ", "expansion.mpq", "enGB/expansion-locale-enGB.MPQ", "patch.MPQ", "enGB/patch-enGB.MPQ",0 };
for (size_t i=0; archiveNames[i] != 0; i++)
{
char tmp[100];
Index: src/game/Level0.cpp
===================================================================
--- src/game/Level0.cpp (revision 190)
+++ src/game/Level0.cpp (working copy)
@@ -355,9 +355,10 @@
if(itr->second->GetSession()->GetPermissionCount())
{
if(first)
- GreenSystemMessage(m_session, "There are following active GMs on this server:");
+ //GreenSystemMessage(m_session, "There are following active GMs on this server:");
+ GreenSystemMessage(m_session, "There are currently GM's online, feel free to write a ticket.");
- SystemMessage(m_session, "%s [%s]", itr->second->GetName(), itr->second->GetSession()->GetPermissions());
+ //SystemMessage(m_session, "%s [%s]", itr->second->GetName(), itr->second->GetSession()->GetPermissions());
first = false;
}
Index: src/game/Player.h
===================================================================
--- src/game/Player.h (revision 190)
+++ src/game/Player.h (working copy)
@@ -30,7 +30,7 @@
#define PLAYER_NORMAL_RUN_SPEED 7.0
#define PLAYER_NORMAL_SWIM_SPEED 4.722222
#define PLAYER_NORMAL_FLIGHT_SPEED 7.0
-#define PLAYER_LEVEL_CAP 70
+#define PLAYER_LEVEL_CAP 500
#define PLAYER_HONORLESS_TARGET_SPELL 2479
//====================================================================
// Inventory
Index: src/scripts/projects/GossipScripts2003.vcproj
===================================================================
--- src/scripts/projects/GossipScripts2003.vcproj (revision 190)
+++ src/scripts/projects/GossipScripts2003.vcproj (working copy)
@@ -142,6 +142,9 @@
+
+
Index: src/scripts/projects/GossipScripts2005.vcproj
===================================================================
--- src/scripts/projects/GossipScripts2005.vcproj (revision 190)
+++ src/scripts/projects/GossipScripts2005.vcproj (working copy)
@@ -1,7 +1,7 @@
+
+
Index: src/scripts/src/GossipScripts/Setup.cpp
===================================================================
--- src/scripts/src/GossipScripts/Setup.cpp (revision 190)
+++ src/scripts/src/GossipScripts/Setup.cpp (working copy)
@@ -11,6 +11,7 @@
SetupInnkeepers(mgr);
SetupBattlemaster(mgr);
SetupGuardGossip(mgr);
+ SetupTeleporterGossip(mgr);
}
#ifdef WIN32
Index: src/scripts/src/GossipScripts/Setup.h
===================================================================
--- src/scripts/src/GossipScripts/Setup.h (revision 190)
+++ src/scripts/src/GossipScripts/Setup.h (working copy)
@@ -4,5 +4,6 @@
void SetupInnkeepers(ScriptMgr * mgr);
void SetupGuardGossip(ScriptMgr * mgr);
void SetupBattlemaster(ScriptMgr * mgr);
+void SetupTeleporterGossip(ScriptMgr * mgr);
#endif
Index: src/scripts/src/GossipScripts/Teleporter.cpp
===================================================================
--- src/scripts/src/GossipScripts/Teleporter.cpp (revision 0)
+++ src/scripts/src/GossipScripts/Teleporter.cpp (revision 0)
@@ -0,0 +1,147 @@
+#include "StdAfx.h"
+#include "Setup.h"
+
+/************************************************************************/
+/* GENERAL TELEPORTER SCRIPT */
+/************************************************************************/
+
+//Created by Ziemas.
+
+
+
+#define BACK_BUTTON
+
+#ifdef BACK_BUTTON
+
+// Make code neater with this define. //not really needed for this script but i will keep it here.
+#define SendQuickMenu(textid) objmgr.CreateGossipMenuForPlayer(&Menu, pCreature->GetGUID(), textid, Plr); \
+ Menu->SendTo(Plr);
+
+#else
+
+// Make code neater with this define. //not really needed for this script but i will keep it here.
+#define SendQuickMenu(textid) objmgr.CreateGossipMenuForPlayer(&Menu, pCreature->GetGUID(), textid, Plr); \
+ Menu->AddItem(0, "I was looking for something else.", 0); \
+ Menu->SendTo(Plr);
+
+#endif
+
+/************************************************************************/
+/* Alliance teleporters */
+/************************************************************************/
+
+class SCRIPT_DECL TeleporterAlliance : public GossipScript
+{
+public:
+ ADD_GOSSIP_FACTORY_FUNCTION(TeleporterAlliance);
+ void GossipHello(Creature * pCreature, Player * Plr, bool AutoSend)
+ {
+ GossipMenu *Menu;
+ objmgr.CreateGossipMenuForPlayer(&Menu, pCreature->GetGUID(), 2593, Plr);
+
+ //adding menu items
+ Menu->AddItem(5, "Teleport me to Stormwind", 1);
+ Menu->AddItem(5, "Teleport me to Ironforge", 2);
+ Menu->AddItem(5, "Teleport me to Darnassus", 3);
+ Menu->AddItem(5, "Teleport me to Exodar" , 4);
+
+ if(AutoSend)
+ Menu->SendTo(Plr);
+ }
+
+ void GossipSelectOption(Creature* pCreature, Player* Plr, uint32 Id, uint32 IntId)
+ {
+ GossipMenu * Menu;
+ switch(IntId)
+ {
+ case 0: // Return to start
+ GossipHello(pCreature, Plr, true);
+ break;
+
+ //////////////////////
+ // Main menu handlers
+ /////
+
+ case 1: // Teleport Stormwind
+ Plr->EventTeleport(0, -8886.2 , 574.577 , 92.7699);
+ break;
+
+ case 2: // Teleport Ironforge
+ Plr->EventTeleport(0, -4919.979980 , -957.887024 , 501.503998);
+ break;
+
+ case 3: // Teleport Darnassus
+ Plr->EventTeleport(1 , 8795.8 , 969.427 , 30.1955);
+ break;
+
+ case 4: // Teleport Exodar
+ Plr->EventTeleport(530 , -4014.08 , -11895.8 , -1.99324);
+
+
+ }
+ }
+};
+
+/************************************************************************/
+/* Horde teleporters */
+/************************************************************************/
+
+class SCRIPT_DECL TeleporterHorde : public GossipScript
+{
+public:
+ ADD_GOSSIP_FACTORY_FUNCTION(TeleporterHorde);
+ void GossipHello(Creature * pCreature, Player * Plr, bool AutoSend)
+ {
+ GossipMenu *Menu;
+ objmgr.CreateGossipMenuForPlayer(&Menu, pCreature->GetGUID(), 2593, Plr);
+
+ //adding menu items
+ Menu->AddItem(5, "Teleport me to Orgrimmar" , 1);
+ Menu->AddItem(5, "Teleport me to Thunderbluff" , 2);
+ Menu->AddItem(5, "Teleport me to Undercity" , 3);
+ Menu->AddItem(5, "Teleport me to Silvermoon City", 4);
+
+ if(AutoSend)
+ Menu->SendTo(Plr);
+ }
+
+ void GossipSelectOption(Creature* pCreature, Player* Plr, uint32 Id, uint32 IntId)
+ {
+ GossipMenu * Menu;
+ switch(IntId)
+ {
+ case 0: // Return to start
+ GossipHello(pCreature, Plr, true);
+ break;
+
+ //////////////////////
+ // Main menu handlers
+ /////
+
+ case 1: // Teleport Orgrimmar
+ Plr->EventTeleport(1 , 1484.36 , -4417.03 , 24.4709);
+ break;
+
+ case 2: // Teleport Thunderbluff
+ Plr->EventTeleport(1 , -1285.42 , 176.523 , 129.994);
+ break;
+
+ case 3: // Teleport Undercity
+ Plr->EventTeleport(0 , 1831.26 , 238.53 , 60.52);
+ break;
+
+ case 4: // Teleport Silvermoon City
+ Plr->EventTeleport(530 , 9402.765 , -7286.773 , 14.256);
+
+
+ }
+ }
+};
+
+
+void SetupTeleporterGossip(ScriptMgr * mgr) //adding the scripts to the correct npc's.
+{
+ /* Teleporter List */
+ mgr->register_gossip_script(999999, &TeleporterAlliance::Create); // Alliance Teleporter
+ mgr->register_gossip_script(999998, &TeleporterHorde::Create); // Horde Teleporter
+}
Index: src/scripts/src/ServerStatusPlugin/ServerStatusPlugin.cpp
===================================================================
--- src/scripts/src/ServerStatusPlugin/ServerStatusPlugin.cpp (revision 190)
+++ src/scripts/src/ServerStatusPlugin/ServerStatusPlugin.cpp (working copy)
@@ -279,7 +279,7 @@
fprintf(f, buf);
fprintf(f, " \n");
}
- {
+ /*{
// GM Information
fprintf(f, " \n");
while(!gms.empty())
@@ -304,7 +304,7 @@
}
fprintf(f, " \n");
- }
+ }*/
{
fprintf(f, " \n");