X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/0eeaca4c0e2a8bb571b1182ead50094c03268b81..9cda831cf07982221052583e94e073bda5d3ef4b:/gameserv/gameserv.cpp

diff --git a/gameserv/gameserv.cpp b/gameserv/gameserv.cpp
index 93b17be..2ac1695 100644
--- a/gameserv/gameserv.cpp
+++ b/gameserv/gameserv.cpp
@@ -1,8 +1,10 @@
+#include "aClient.h"
 #include "config.h"
 #include "extern.h"
-#include "sockhelp.h"
-#include "aClient.h"
+#include "flags.h"
 #include "list.h"
+#include "sockhelp.h"
+
 #include <cctype>
 #include <fstream.h>
 
@@ -47,15 +49,23 @@ bool check_password(char *name, char *plaintext); // Finds a password for the gi
 /********** GameServ Booleans **********/
 
 bool is_playing(char *u); // True if the given nickname in the clients list is playing.
-bool has_started(char *u); // True if the given nickname in the clients list has started playing.
+bool is_playing(aClient *user);
+
 bool is_fighting(char *u); // True if the given nick in the clients list is fighting anything.
-bool isnt_fighting(char *u); // True if the given nick isn't fighting. Same as !is_fighting(u).
+bool is_fighting(aClient *user);
+
+bool is_alive(char *u); // True if the given nick is playing and is alive
+bool is_alive(aClient *user); 
+
 bool player_fight(char *u); // True if the player is fighting another player.
+bool player_fight(aClient *user);
+
 bool master_fight(char *u); // True if the player is fighting their master.
+bool master_fight(aClient *user);
 
 /********** GameServ Booleans **********/
 
-
+void display_help(char *u, char *file = NULL);
 void display_monster(char *u);
 void display_players(char *u);
 long int chartoint(char ch);
@@ -69,26 +79,33 @@ void refreshall();
 void reset(aClient *ni);
 void init_masters();
 void init_monsters();
+bool load_monsters();
 void delete_monsters();
 void delete_masters();
 
-void do_list(char *u);
-void do_register(char *u);
+void do_admin(char *u);
+void do_attack(char *u);
+void do_bank(char *u);
+void do_fight(char *u);
+void do_heal(char *u);
+void do_help(char *u);
 void do_identify(char *u);
+void do_inventory(char *u);
+void do_refresh(char *u);
+void do_register(char *u);
+void do_list(char *u);
+void do_master(char *u);
 void do_play(char *u);
 void do_quitg(char *u);
 void do_reset(char *u);
-void do_fight(char *u);
-void do_store(char *u);
-void do_heal(char *u);
-void do_bank(char *u);
-void do_attack(char *u);
 void do_run(char *u);
-void do_master(char *u);
-void see_master(char *u);
 void do_stats(char *u);
+void do_store(char *u);
+void do_tavern(char *u);
+void see_master(char *u);
 
 void showstats(const char *u, const char *nick);
+void showinventory(aClient *from, aClient *to = NULL);
 void showBankBalance(const char *u);
 
 #define WNA 16
@@ -135,7 +152,7 @@ void gameserv(char *source, char *buf)
 	ts = strtok(NULL, "\1");
         notice(s_GameServ, source, "\1PING %s\1", ts);
     } else if (stricmp(cmd, "\1VERSION\1") == 0) {
-	notice(s_GameServ, source, "\1VERSION GameServ v1.0.1 +devel\1");
+	notice(s_GameServ, source, "\1VERSION %s %s +devel\1", PACKAGE, VERSION);
     } else if (stricmp(cmd, "SEARCH") == 0) {
 	cmd = strtok(NULL, " ");
 
@@ -143,6 +160,7 @@ void gameserv(char *source, char *buf)
 	    notice(s_GameServ, source, "SYNTAX: /msg %S SEARCH FOREST");
 	else
 	    do_forest(source);
+
     } else if (stricmp(cmd, "FIGHT") == 0) {
 	do_fight(source);
     } else if (stricmp(cmd, "ATTACK") == 0) {
@@ -151,12 +169,20 @@ void gameserv(char *source, char *buf)
 	do_run(source);
     } else if (stricmp(cmd, "HEAL") == 0) {
 	do_heal(source);
+    } else if (stricmp(cmd, "INVENTORY") == 0) {
+	do_inventory(source);
     } else if (stricmp(cmd, "MASTER") == 0) {
 	do_master(source);
     } else if (stricmp(cmd, "STORE") == 0) {
 	do_store(source);
     } else if (stricmp(cmd, "BANK") == 0) {
 	do_bank(source);
+    } else if (stricmp(cmd, "ADMIN") == 0) {
+	do_admin(source);
+    } else if (stricmp(cmd, "REFRESH") == 0) {
+	do_refresh(source);
+    } else if (stricmp(cmd, "TAVERN") == 0) {
+	do_tavern(source);
     } else if (stricmp(cmd, "PRINT") == 0) {
 	cout << "Printing Clients List: " << endl;
 	clients.print();
@@ -169,62 +195,92 @@ void gameserv(char *source, char *buf)
     } else if (stricmp(cmd, "IDENTIFY") == 0) {
 	do_identify(source);
     } else if (stricmp(cmd, "HELP") == 0) {
+	do_help(source);
     } else if (stricmp(cmd, "STATS") == 0) {
 	do_stats(source);
     } else if (stricmp(cmd, "SHUTDOWN") == 0) {
-	char *pass = strtok(NULL, " ");
-	if (pass != NULL && (stricmp(pass, adminpass) == 0))
+	aClient *user;
+
+	if (!(user = find(source)))
 	{
-	    save_gs_dbase();
-	    raw("SQUIT %s :leaving", servername);
+	    notice(s_GameServ, source, "Error: aClient not found. Contact a %S admin");
+	    cout << "Error: aClient not found: " << source << endl;
+	}
+	else if (!isAdmin(user))
+	{
+	    notice(s_GameServ, source, "You must be a %S admin to use this command!");
 	}
 	else
 	{
-	    notice(s_GameServ, source, "SYNTAX: /msg %S SHUTDOWN <password>");
+	    save_gs_dbase();
+	    raw("SQUIT %s :leaving", servername);
 	}
     } else if (stricmp(cmd, "SAVE") == 0) {
-        char *pass = strtok(NULL, " ");
-        if (pass != NULL && (stricmp(pass, adminpass) == 0))
+	aClient *user;
+
+	if (!(user = find(source)))
+	{
+	    notice(s_GameServ, source, "Error: aClient not found. Contact a %S admin");
+	    cout << "Error: aClient not found: " << source << endl;
+	}
+	else if (!isAdmin(user))
+	{
+	    notice(s_GameServ, source, "You must be a %S admin to use this command!");
+	}
+	else
         {
 	    save_gs_dbase();
         }
-        else
-        {
-            notice(s_GameServ, source, "SYNTAX: /msg %S SAVE <password>");
-        }
     } else if (stricmp(cmd, "LOAD") == 0) {
-        char *pass = strtok(NULL, " ");
-        if (pass != NULL && (stricmp(pass, adminpass) == 0))
-        {
-	    load_gs_dbase();
+	aClient *user;
+
+	if (!(user = find(source)))
+	{
+	    notice(s_GameServ, source, "Error: aClient not found. Contact a %S admin");
+	    cout << "Error: aClient not found: " << source << endl;
 	}
-        else
+	else if (!isAdmin(user))
+	{
+	    notice(s_GameServ, source, "You must be a %S admin to use this command!");
+	}
+	else
         {
-            notice(s_GameServ, source, "SYNTAX: /msg %S LOAD <password>");
-        }
+	    char *cmd2 = strtok(NULL, " ");
+	    if (!cmd2)
+	    {
+		notice(s_GameServ, source, "Loading player data from %s", playerdata);
+		load_gs_dbase();
+	    }
+	    else if (stricmp(cmd2, "MONSTERS") == 0)
+	    {
+		notice(s_GameServ, source, "Loading monster data from %s", monsterdata);
+		load_monsters();
+	    }
+	    else
+		display_help(source, cmd);
+	}
     } else if (stricmp(cmd, "RAW") == 0) {
-        char *pass = strtok(NULL, " ");
-        if (pass != NULL && (stricmp(pass, adminpass) == 0))
-        {
-	    char *rest = strtok(NULL, "");
-	    raw("%s", rest);
+	aClient *user;
+
+	if (!(user = find(source)))
+	{
+	    notice(s_GameServ, source, "Error: aClient not found. Contact a %S admin");
+	    cout << "Error: aClient not found: " << source << endl;
 	}
-        else
-        {
-            notice(s_GameServ, source, "SYNTAX: /msg %S RAW <password> <raw>");
-        }
-    } else if (stricmp(cmd, "TESTSTAMP") == 0) {
-	char *pass = strtok(NULL, " ");
-	if (pass != NULL && (stricmp(pass, adminpass) == 0))
+	else if (!isAdmin(user))
 	{
-	    mn = time(NULL);
-	    notice(s_GameServ, source, "Resetting timestamp");
+	    notice(s_GameServ, source, "You must be a %S admin to use this command!");
 	}
 	else
-	    notice(s_GameServ, source, "SYNTAX: /msg %S TESTSTAMP <password>");
-    }
+        {
+	    char *rest = strtok(NULL, "");
+	    raw("%s", rest);
+	}
+    } else {
+	notice(s_GameServ, source, "Unknown command \002%s\002. Type /msg %S \002HELP\002 to get a list of commands.", cmd);
+    } 
 
-   source--;  // Bring the : back so we don't leak memory
+   source--;  // Bring the ':' back so we don't leak memory
    cmd--;     // Same thing :)
 }
 
@@ -272,7 +328,7 @@ void showstats(const char *u, const char *nick)
         notice(s_GameServ, sender->getNick(), "%s%sGold in Bank: %ld", buf, space, ni->stats->bank);
         delete [] space;
 
-        notice(s_GameServ, sender->getNick(), "Health Points: %d of %d", ni->stats->hp,
+        notice(s_GameServ, sender->getNick(), "Hit Points: %d of %d", ni->stats->hp,
                  ni->stats->maxhp);
 
         sprintf(buf, "Strength: %d", ni->stats->strength + webonus[ni->stats->weapon]);
@@ -299,10 +355,10 @@ void showstats(const char *u, const char *nick)
 char *spaces(int len, char *seperator)
 {
     char *final;
-    final = new char[40];
+    final = new char[30];
     int y;
     strcpy(final, seperator);
-    for (y = 0; y < 40 - len; y++)
+    for (y = 0; y < 30 - len; y++)
         strcat(final, seperator);
     return final;
 }
@@ -344,6 +400,9 @@ void raw(const char *fmt, ...)
 
 void notice(const char *source, const char *dest, const char *fmt, ...)
 {
+    if (fmt[0] == '\0')
+	return;
+
     va_list args;
     char *input;
     const char *t = fmt;
@@ -440,6 +499,7 @@ void do_list(char *u)
     else
 	notice(s_GameServ, u, "No one is playing");
 }
+
 void do_register(char *u)
 {
     char *password;
@@ -462,10 +522,11 @@ void do_register(char *u)
         if (!user->stats)
         {
 	    user->stats = new Player(user);
-	    user->stats->started = 1;
 	    user->stats->user = user; // Set the backwards pointer
 	    strcpy(user->stats->password, crypt(password, salt));
 	    players.insertAtBack(user);
+	    notice(s_GameServ, u, "Player %s registered with password %s.", user->stats->name, password);
+	    notice(s_GameServ, u, "Write this password down. If you lose it, there is no way to retrieve it!");
 	}
 	else
 	{
@@ -480,19 +541,26 @@ void do_identify(char *u)
     aClient *user, *p;
     name = strtok(NULL, " ");
     password = strtok(NULL, " ");
-
+    user = find(u);
     if (!password || !name)
     {
 	notice(s_GameServ, u, "SYNTAX: /msg %S IDENTIFY NAME PASSWORD");
     }
+    else if (!user)
+	    notice(s_GameServ, u, "Fatal error. Cannot find aClient. Buf: %s", strtok(NULL, ""));
     else if (!(p = findplayer(name)) || !p->stats)
 	    notice(s_GameServ, u, "Player %s not found", name);
-    else if (!check_password(name, password))
+    else if (!check_password(name, password) && !isAdmin(user))
     {
 	    notice(s_GameServ, u, "Password incorrect");
     }
-    else if ((user = find(u)))
+    else
     {
+	if (p->stats->user && !isAdmin(user))
+	{
+	    notice(s_GameServ, u, "That player has already identified.");
+	    return;
+	}
         if (!user->stats)
         {
 	    ListNode<aClient> *temp;
@@ -542,7 +610,7 @@ void init_masters()
 
     strcpy(masters[0]->name, "Old Bones");
     strcpy(masters[0]->weapon, "Dull Sword Cane");
-    masters[0]->strength = 30;
+    masters[0]->strength = 15;
     masters[0]->gold = 0;
     masters[0]->exp = 0;
     masters[0]->maxhp = 30;
@@ -551,7 +619,7 @@ void init_masters()
 
     strcpy(masters[1]->name, "Master Chang");
     strcpy(masters[1]->weapon, "Nanchaku");
-    masters[1]->strength = 57;
+    masters[1]->strength = 30;
     masters[1]->gold = 0;
     masters[1]->exp = 0;
     masters[1]->maxhp = 40;
@@ -651,6 +719,7 @@ void init_monsters()
 	    monsters[x][y] = new Monster();
 
     // Hard coded for now - Kain
+/*
 
     strcpy(monsters[0][0]->name, "Slime");
     strcpy(monsters[0][0]->weapon, "Acid Goo");
@@ -1804,6 +1873,8 @@ void init_monsters()
 		monsters[11][11]->exp = 1;
 		monsters[11][11]->maxhp = 1;
     strcpy(	monsters[11][11]->death, "");
+
+*/
 }
 
 void delete_monsters()
@@ -1870,6 +1941,30 @@ bool is_playing(char *u)
     }
 }
 
+bool is_playing(aClient *user)
+{
+    return user->stats != NULL;
+}
+
+bool is_alive(char *u)
+{
+    aClient *user;
+    if (!(user = find(u)))
+	return false;
+    else if (user->stats == NULL)
+	return false;
+    else
+	return user->stats->alive;
+}
+
+bool is_alive(aClient *user)
+{
+    if (user->stats == NULL)
+	return false;
+    else
+	return user->stats->alive;
+}
+	
 bool is_fighting(char *u)
 {
     aClient *user;
@@ -1886,6 +1981,13 @@ bool is_fighting(char *u)
     else
     	return false;
 }
+bool is_fighting(aClient *user)
+{
+    if (!is_playing(user))
+	return false;
+    else
+	return (user->stats->fight != NULL || user->stats->battle != NULL || user->stats->master != NULL);
+}
 
 bool player_fight(char *u)
 {
@@ -1898,6 +2000,13 @@ bool player_fight(char *u)
     else
 	return false;
 }
+bool player_fight(aClient *user)
+{
+    if (!is_fighting(user))
+	return false;
+    else
+	return user->stats->battle != NULL;
+}
 
 bool master_fight(char *u)
 {
@@ -1910,10 +2019,12 @@ bool master_fight(char *u)
     else
 	return false;
 }
-
-bool isnt_fighting(char *u)
+bool master_fight(aClient *user)
 {
-    return !is_fighting(u);
+    if (!is_playing(user))
+	return false;
+    else
+	return user->stats->master != NULL;
 }
 
 void do_fight(char *u)
@@ -1928,13 +2039,14 @@ void do_fight(char *u)
     }
     else if (!(ni = find(u)))
     {
+	notice(s_GameServ, u, "Fatal error. Contact a(n) %S admin. buf: %s", strtok(NULL, ""));
 	return;
     }
     else if (!(battle = find(nick)))
     {
 	notice(s_GameServ, u, "You can't attack %s while they aren't playing!", nick);
     }
-    else if (!is_playing(u))
+    else if (!is_playing(ni))
     {
 	notice(s_GameServ, u, "You are not playing!");
     }
@@ -1951,7 +2063,12 @@ void do_fight(char *u)
  *       display_players(u);
  *   }
  */
-    else if (is_playing(u) && is_playing(nick) && stricmp(ni->stats->name, battle->stats->name) != 0)
+    else if (!is_alive(ni))
+    {
+	notice(s_GameServ, u, "You are dead. Wait until tomorrow to fight others!");
+	return;
+    }
+    else if (is_playing(ni) && is_playing(battle) && stricmp(ni->stats->name, battle->stats->name) != 0)
     {
 	// Set your battle pointer to the other player
         ni->stats->battle = battle;
@@ -1987,25 +2104,25 @@ void do_run(char *u)
     if (p->battle)
 	p2 = p->battle->stats;
 
-    if (!is_fighting(u))
+    if (!is_fighting(user))
 	notice(s_GameServ, u, "You run in place... try fighting next time.");
-    else if (!player_fight(u) && !master_fight(u))
+    else if (!player_fight(user) && !master_fight(user))
     {
 	notice(s_GameServ, u, "You run away from %s like a little baby!", p->fight->name);
 	delete p->fight;
 	p->fight = NULL;
     }
-    else if (player_fight(u) && p->yourturn)
+    else if (player_fight(user) && p->yourturn)
     {
 	notice(s_GameServ, u, "You run away from %s like a little baby!", p2->name);
 	notice(s_GameServ, p->battle->getNick(), "%s ran away from you like a little baby!", p->name);
 	p2->battle = NULL;
     }
-    else if (player_fight(u) && !p->yourturn)
+    else if (player_fight(user) && !p->yourturn)
     {
 	notice(s_GameServ, u, "It is not your turn. Please wait until %s decides what to do.", p2->name);
     }
-    else if (master_fight(u))
+    else if (master_fight(user))
     {
 	notice(s_GameServ, u, "You cannot run from %s! FIGHT!", p->master->name);
     }
@@ -2040,7 +2157,7 @@ void do_attack(char *u)
 	// We wouldn't be here if they were all NULL
     }
 
-    if (!player_fight(u))
+    if (!player_fight(ni))
     {
 	// Player's Hit
         hit = ((ni->stats->strength + webonus[ni->stats->weapon]) / 2) +
@@ -2064,7 +2181,7 @@ void do_attack(char *u)
                (battle->stats->defense + arbonus[battle->stats->armor]));
     }
 
-  if (!player_fight(u))
+  if (!player_fight(ni))
   {
     if (hit > 0)
         notice(s_GameServ, u, "You attack %s for %d points!", fight->name, hit);
@@ -2073,7 +2190,7 @@ void do_attack(char *u)
 
     if (hit >= fight->hp)
     {
-        if (master_fight(u))
+        if (master_fight(ni))
             notice(s_GameServ, u, "You have bested %s!", fight->name);
         else
             notice(s_GameServ, u, "You have killed %s!", fight->name);
@@ -2092,7 +2209,7 @@ void do_attack(char *u)
 				ni->stats->gold + fight->gold);
 
 
-        if (master_fight(u))
+        if (master_fight(ni))
         {
             notice(s_GameServ, u, "You are now level %d!", ni->stats->level + 1);
             notice(s_GameServ, u, "You gain %d Strength, and %d Defense points!",
@@ -2138,7 +2255,7 @@ void do_attack(char *u)
 
         if (mhit >= ni->stats->hp)
         {
-            if (!master_fight(u))
+            if (!master_fight(ni))
             {
                 notice(s_GameServ, u, "You have been killed by %s!", fight->name);
                 notice(s_GameServ, u, "You lose all gold on hand and lose 10 percent "\
@@ -2146,6 +2263,7 @@ void do_attack(char *u)
                 ni->stats->gold = 0;
                 ni->stats->exp -= (long int)(ni->stats->exp * .10);
                 ni->stats->fight = NULL;
+		ni->stats->alive = false;
                 return;
             }
             else
@@ -2166,7 +2284,7 @@ void do_attack(char *u)
         }
     }
   }
-  else if (player_fight(u))
+  else if (player_fight(ni))
   {
 /* Offline fighting not available yet
    if (!(online = finduser(ni->stats->battle->nick)) || !nick_identified(online))
@@ -2286,7 +2404,7 @@ void do_attack(char *u)
                 (long int)(battle->stats->exp * .10), battle->stats->gold);
         notice(s_GameServ, battle->getNick(), "You have been killed by %s!", u);
         battle->stats->hp = 0;
-        battle->stats->alive = 0;
+        battle->stats->alive = false;
 
         if (2000000000 - ni->stats->exp > (long int)(battle->stats->exp * .10))
         {
@@ -2348,11 +2466,22 @@ void do_heal(char *u)
     {
 	notice(s_GameServ, u, "SYNTAX: /msg %S HEAL {ALL | #}");
     }
-    else if (!(ni = find(u)) || !ni->stats)
+    else if (!(ni = find(u)))
+    {
+	notice(s_GameServ, u, "Fatal error. Contact a(n) %S admin. buf: %s", strtok(NULL, ""));
+	return;
+    }
+    else if (!is_playing(ni))
     {
 	notice(s_GameServ, u, "You aren't playing!");
+	return;
     }
-    else if (is_fighting(u))
+    else if (!is_alive(ni))
+    {
+	notice(s_GameServ, u, "You are dead. Wait until tomorrow for healing.");
+	return;
+    }
+    else if (is_fighting(ni))
     {
 	notice(s_GameServ, u, "You can't heal in battle!");
     }
@@ -2469,7 +2598,7 @@ int save_gs_dbase()
 
     if (!outfile)
     {
-	cerr << "Error opening " << playerdata << endl;
+	cout << "Error opening " << playerdata << endl;
 	return 0;
     }
 
@@ -2480,7 +2609,7 @@ int save_gs_dbase()
 		<< it->hp << ' ' << it->maxhp << ' ' << it->strength << ' ' << it->defense << ' '
 		<< it->armor << ' ' << it->weapon << ' ' << (it->alive ? "alive" : "dead") << ' '
 		<< it->forest_fights << ' ' << it->player_fights <<  ' ' 
-		<< it->password << endl;
+		<< it->getFlags() << ' ' << it->password << endl;
 	ptr = ptr->Next();
     }
 outfile.close();
@@ -2499,7 +2628,7 @@ int load_gs_dbase()
 
     if (infile.fail())
     {
-	cerr << "Error opening " << playerdata << endl;
+	cout << "Error opening " << playerdata << endl;
 	return 0;
     }
 
@@ -2524,6 +2653,7 @@ int load_gs_dbase()
 	p->alive = (stricmp(alive, "ALIVE") == 0 ? true : false);
 	p->forest_fights = stringtoint(strtok(NULL, " "));
 	p->player_fights = stringtoint(strtok(NULL, " "));
+	p->setFlags(stringtoint(strtok(NULL, " ")));
 	password = strtok(NULL, " ");
 	strcpy(p->password, password);
 	temp->setNick("NULL");
@@ -2584,14 +2714,19 @@ void do_store(char *u)
     aClient *user;
     Player *p;
 
-    if (!is_playing(u) || !(user = find(u)))
-	notice(s_GameServ, u, "You must be playing to use the store!");
-    else if (!cmd || !item)
+    if (!cmd || !item)
     {
 	notice(s_GameServ, u, "SYNTAX: STORE LIST {ARMOR | WEAPONS}");
 	notice(s_GameServ, u, "        STORE SELL {ARMOR | WEAPON}");
 	notice(s_GameServ, u, "        STORE BUY {ARMOR | WEAPON} NUMBER");
     }
+    else if (!(user = find(u)) || !is_playing(user))
+	notice(s_GameServ, u, "You must be playing to use the store!");
+    else if (!is_alive(user))
+    {
+	notice(s_GameServ, u, "You are dead. Wait until tomorrow to purchase weapons and armor!");
+	return;
+    }
     else if (stricmp(cmd, "LIST") == 0)
     {
 	if (stricmp(item, "WEAPONS") == 0)
@@ -2747,6 +2882,141 @@ void do_store(char *u)
 	}
     }
 }
+void do_inventory(char *u)
+{
+    aClient *user;
+
+    if (!(user = find(u)))
+    {
+	notice(s_GameServ, u, "Fatal Error. Contact a %S admin!");
+	return;
+    }
+    else if (!is_playing(user))
+    {
+	notice(s_GameServ, u, "You must be playing to check your inventory!");
+	return;
+    }
+    showinventory(user, user);
+}
+void showinventory(aClient *from, aClient *to)
+{
+    char *nick = to->getNick();
+
+    if (!to)
+	to = from;
+    if (is_playing(from))
+    {
+	Pouch *p = &from->stats->inventory;
+	notice(s_GameServ, nick, "Inventory for %s:", from->getNick());
+	notice(s_GameServ, nick, " Healing Potions: %d", p->Healing());
+	notice(s_GameServ, nick, "Strength Potions: %d", p->Strength());
+	notice(s_GameServ, nick, " Defense Potions: %d", p->Defense());
+    }
+}
+void do_tavern(char *u)
+{
+    char *cmd = strtok(NULL, " ");
+    long int price;
+
+    aClient *user;
+    Player *p;
+    if (!(user = find(u)))
+    {
+	notice(s_GameServ, u, "Fatal Error. See a %S admin for help");
+	return;
+    }
+    else if (!is_playing(user))
+    {
+	notice(s_GameServ, u, "You must be playing to go to the Tavern");
+	return;
+    }
+    else if (is_fighting(user))
+    {
+	notice(s_GameServ, u, "You cannot go to the Tavern during a fight!");
+	return;
+    }
+    p = user->stats;
+    if (!cmd)
+    {
+	notice(s_GameServ, u, "Welcome to Boot Liquors Mystic Apothecary");
+	notice(s_GameServ, u, "Your commands:");
+	notice(s_GameServ, u, "/msg %S TAVERN {LIST | BUY} [NUMBER]");
+	notice(s_GameServ, u, "What'll it be?");
+    }
+    else if (stricmp(cmd, "LIST") == 0)
+    {
+	notice(s_GameServ, u, "Here is a list of what we have to offer:");
+	notice(s_GameServ, u, "1. Healing Potions for %ld Gold", 1000 * p->level + (p->exp / 10));
+	notice(s_GameServ, u, "2. Strength Potions for %ld Gold", 2050 * p->level + (p->exp / 10));
+	notice(s_GameServ, u, "3. Defense Potions for %ld Gold", 2000 * p->level + (p->exp / 10));
+	notice(s_GameServ, u, "To buy a potion, type /msg %S TAVERN BUY #");
+	notice(s_GameServ, u, "Example: /msg %S TAVERN BUY 1 buys a healing potion!");
+	notice(s_GameServ, u, "By something will ya!");
+    }
+    else if (stricmp(cmd, "BUY") == 0)
+    {
+	char *chnum = strtok(NULL, " ");
+	int num = stringtoint(chnum);
+
+	if (!chnum)
+	{
+	    notice(s_GameServ, u, "SYNTAX: TAVERN BUY #");
+	    notice(s_GameServ, u, "Example: /msg %S TAVERN BUY 1");
+	    return;
+	}
+	if (num < 1 || num > 3)
+	{
+	    notice(s_GameServ, u, "Invalid Choice!");
+	    notice(s_GameServ, u, "Here is a list of what we have to offer:");
+	    notice(s_GameServ, u, "1. Healing Potions for %ld Gold", 1000 * p->level + (p->exp / 10));
+	    notice(s_GameServ, u, "2. Strength Potions for %ld Gold", 2050 * p->level + (p->exp / 10));
+	    notice(s_GameServ, u, "3. Defense Potions for %ld Gold", 2000 * p->level + (p->exp / 10));
+	    notice(s_GameServ, u, "To buy a potion, type /msg %S TAVERN BUY #");
+	    notice(s_GameServ, u, "Example: /msg %S TAVERN BUY 1 buys a healing potion!");
+	}
+	switch(num)
+	{
+	    case 1:
+		price = (1000 * p->level) + (p->exp / 10);
+		if (p->gold >= price)
+		{
+		    notice(s_GameServ, u, "One healing potion coming right up!");
+		    p->inventory.incHealing();
+		} 
+		else
+		    notice(s_GameServ, u, "You don't have enough gold!");
+		break;
+	    case 2:
+		price = (2050 * p->level) + (p->exp / 10);
+		if (p->gold >= price)
+		{
+		    notice(s_GameServ, u, "One strength boost coming right up!");
+		    p->inventory.incStrength();
+		}
+		else
+		    notice(s_GameServ, u, "You don't have enough gold!");
+		break;
+	    case 3:
+		price = (2000 * p->level) + (p->exp / 10);
+		if (p->gold >= price)
+		{
+		    notice(s_GameServ, u, "One defense boost coming right up!");
+		    p->inventory.incDefense();
+		}
+		else
+		    notice(s_GameServ, u, "You don't have enough gold!");
+		break;
+	    default:
+		notice(s_GameServ, u, "Logical Error. See a %S admin for help!");
+		break;
+	}
+    }
+    else
+    {
+	notice(s_GameServ, u, "Improper Syntax.");
+	notice(s_GameServ, u, "Type /msg %S HELP TAVERN for help");
+    }
+}
 
 void do_bank(char *u)
 {
@@ -2763,11 +3033,18 @@ void do_bank(char *u)
 	notice (s_GameServ, u, "BANK BALANCE");
 	return;
     }
-    else if (!is_playing(u) || !(user = find(u)))
+
+    user = find(u);
+    if (!is_playing(user))
     {
 	notice(s_GameServ, u, "You must be playing to use the bank!");
 	return;
     }
+    else if (!is_alive(user))
+    {
+	notice(s_GameServ, u, "You are dead. We don't accept gold from dead folk! Wait 'til tomorrow!");
+	return;
+    }
     else if (!isstringnum(amount) && stricmp(amount, "ALL") != 0)
     {
         notice(s_GameServ, u, "I don't know how to convert alphabet letters into currency, sire!");
@@ -2888,26 +3165,41 @@ void do_bank(char *u)
 void do_master(char *u)
 {
     aClient *user;
-    if (!(user = find(u)))
+    user = find(u);
+
+    if (!user)
     {
 	notice(s_GameServ, u, "Fatal error. Contact a(n) %S admin. buf: %s", strtok(NULL, ""));
 	return;
     }
-
-    if (is_fighting(u))
+    else if (is_fighting(user))
     {
 	notice(s_GameServ, u, "You're in the middle of a fight! Pay attention!");
 	return;
     }
-    else if (!is_playing(u))
+    else if (!is_alive(user))
+    {
+	notice(s_GameServ, u, "You're dead. Wait until tomorrow to see your master!");
+	return;
+    }
+    else if (!is_playing(user))
     {
 	notice(s_GameServ, u, "You must be playing to see your master!");
 	return;
     }
-    else
+    
+    char *cmd = strtok(NULL, " ");
+    Player *p = user->stats;
+    long int need = 0;
+
+    if (seenMaster(p))
+    {
+	notice(s_GameServ, u, "You have already seen your master today. Wait until tomorrow to try again");
+	return;
+    }
+
+    if (cmd != NULL)
     {
-	Player *p = user->stats;
-        long int need = 0;
 	switch(p->level)
 	{
 	    case 1:
@@ -2950,24 +3242,51 @@ void do_master(char *u)
 	    default:
 		need = p->exp + 1; // Unknown level... don't let them fight a fake master!
 		break;
-	}
+	}   
+    }
+    else
+    {
+	notice(s_GameServ, u, "SYNTAX: MASTER {FIGHT | QUESTION}");
+	return;
+    }
+
+    if (stricmp(cmd, "FIGHT") == 0)
+    {
 	if (p->exp >= need)
+	{
+	    setMaster(p);
 	    see_master(u);
+	}
 	else
 	    notice(s_GameServ, u, "You are not worthy of fighting %s! You need %ld more experience.", masters[p->level - 1]->name, (need - p->exp));
+	return;
+    }
+    else if (stricmp(cmd, "QUESTION") == 0)
+    {
+	if (p->exp >= need)
+	    notice(s_GameServ, u, "%s looks you up and down and decides you are more ready than you will ever be.", masters[p->level - 1]->name);
+	else
+	    notice(s_GameServ, u, "You pathetic fool! You are no match for %s, %s!", masters[p->level - 1]->name, p->name);
+
+	return;
+    }
+    else
+    {
+	notice(s_GameServ, u, "SYNTAX: MASTER {FIGHT | QUESTION}");
     }
 }
 
 void see_master(char *u)
 {
     aClient *user;
+
     if (!(user = find(u)))
     {
 	notice(s_GameServ, u, "Fatal error. Contact a(n) %S admin. buf: %s", strtok(NULL, ""));
 	return;	
     }
 
-    if (!is_fighting(u) && is_playing(u))
+    if (!is_fighting(user) && is_playing(user))
     {
 	Player *p = user->stats;
 	p->master = new Monster(masters[p->level - 1]);
@@ -2980,6 +3299,7 @@ void showBankBalance(const char *u)
 {
     aClient *user;
     Player *p;
+
     if (!(user = find(u)))
         return;
 
@@ -3013,7 +3333,188 @@ void refresh(Player *p)
 	return;
 
     p->hp = p->maxhp;
-    p->forest_fights = 100;
+    p->forest_fights = forestfights;
     p->player_fights = 3;
     p->alive = true;
+    clearMaster(p);
+}
+
+void do_refresh(char *u)
+{
+    char *nick = strtok(NULL, " ");
+    aClient *user;
+
+    if (!(user = find(u)))
+    {
+	notice(s_GameServ, u, "Error: aClient not found. Contact a %S admin");
+	cout << "Error: aClient not found: " << u << endl;
+	return;
+    }
+    else if (!isAdmin(user))
+    {
+	notice(s_GameServ, u, "You must be a %S admin to use this command!");
+	return;
+    }
+    if (!nick)
+    {
+	notice(s_GameServ, u, "SYNTAX: REFRESH {ALL | NICK}");
+	return;
+    }
+    else if (stricmp(nick, "ALL") == 0)
+    {
+	notice(s_GameServ, u, "Refreshing everyone's stats!");
+	refreshall();
+    }
+    else if ((user = find(nick)))
+    {
+	if (is_playing(user))
+	{
+	    notice(s_GameServ, u, "Refreshing %s.", user->getNick());
+	    refresh(user->stats);
+	}
+	else
+	{
+	    notice(s_GameServ, u, "%s is not playing.", user->getNick());
+	}
+    }
+    else
+    {
+	notice(s_GameServ, u, "Nick %s not found.", nick);
+	return;
+    }
+}
+
+void do_help(char *u)
+{
+    char *cmd = strtok(NULL, " ");
+
+    display_help(u, cmd);
+}
+
+void display_help(char *u, char *file)
+{
+    ifstream infile;
+    char *buf;
+
+    if (!file)
+    {
+	infile.open("helpfiles/help");
+	if (infile.fail())
+	{
+	    cout << "Error opening helpfiles/help" << endl;
+	    notice(s_GameServ, u, "Error opening helpfiles/help");
+	    return;
+	}
+	buf = new char[1024];
+	while(infile.getline(buf, 1024))
+	{
+	    // Written this way, it will process %S in the helpfiles
+	    // Instead of notice(s_GameServ, u, "%s", buf);
+	    	notice(s_GameServ, u, buf);
+	}
+
+	// Minor recursion
+	aClient *user = find(u);
+	if (user && isAdmin(user))
+	    display_help(u, "admin_commands");
+    }
+    else
+    {
+	char *filename;
+
+	for (unsigned int x = 0; x < strlen(file); x++)
+	    file[x] = tolower(file[x]);
+
+	filename = new char[strlen(file) + 12];
+	sprintf(filename, "helpfiles/%s", file);
+	infile.open(filename);
+	delete [] filename;
+	if (infile.fail())
+	{
+	    notice(s_GameServ, u, "No help for %s", file);
+	    return;
+	}
+	buf = new char[1024];
+	while(infile.getline(buf, 1024))
+	{
+	    // Written this way, it will process %S in the helpfiles
+	    // Instead of notice(s_GameServ, u, "%s", buf);
+	    notice(s_GameServ, u, buf);
+	}
+    }
+    infile.close();
+    delete [] buf;
+}
+
+void do_admin(char *u)
+{
+    aClient *user;
+    char *pass = strtok(NULL, " ");
+
+    if (!(user = find(u)))
+    {
+	cout << "Error: aClient not found: " << u << endl;
+	notice(s_GameServ, u, "Error: aClient not found. Contact %S admin.");
+	return;
+    }
+    if (!pass)
+    {
+	notice(s_GameServ, u, "SYNTAX: ADMIN password");
+	return;
+    }
+
+    if (isAdmin(user))
+    {
+	notice(s_GameServ, u, "You already have administrator privledges.");
+	return;
+    }
+    else if (strcmp(pass, adminpass) == 0)
+    {
+	notice(s_GameServ, u, "Password accepted. You now have administrator privledges.");
+	setAdmin(user);
+    }
+    else
+    {
+	notice(s_GameServ, u, "Invalid password. Remember: case sensitive");
+	return;
+    }
+}
+
+bool load_monsters()
+{
+    ifstream infile;
+    infile.open("monsters.dat");
+
+    char *buf;
+
+    if (infile.fail())
+    {
+	cout << "Error opening monsters.dat" << endl;
+	return false;
+    }
+    init_monsters();
+    buf = new char[2048];
+
+  for (int l = 0; l < REALLEVELS; l++)
+  {
+    for (int m = 0; m < MONSTERS;)
+    {
+	infile.getline(buf, 2048);
+	if (buf[0] == '\n' || buf[0] == '\0' || buf[0] == '#')
+	    continue;
+	else
+	{
+	    strcpy(monsters[l][m]->name, strtok(buf, "~"));
+	    strcpy(monsters[l][m]->weapon, strtok(NULL, "~"));
+	    monsters[l][m]->strength = stringtoint(strtok(NULL, "~"));
+	    monsters[l][m]->gold = stringtoint(strtok(NULL, "~"));
+	    monsters[l][m]->exp = stringtoint(strtok(NULL, "~"));
+	    monsters[l][m]->maxhp = stringtoint(strtok(NULL, "~"));
+	    strcpy(monsters[l][m]->death, strtok(NULL, ""));
+	    m++;
+	}
+    }
+  }
+    delete [] buf;
+return true;
 }