// this will be hash.cpp start
// thank you wcampbel
-unsigned long HASH(const unsigned char *name, int size_of_table);
+unsigned long sHASH(const unsigned char *name);
+unsigned long iHASH(const unsigned char *name);
List<aClient> players[U_TABLE_SIZE];
// this will be hash.cpp end
void gameserv(char *source, char *buf)
{
- char *cmd;
+ char *cmd, z;
cmd = strtok(buf, " ");
#ifndef P10
source++; // Get rid of that : at the beginning of a :Nick privmsg Gameserv :text
#endif
- if (cmd[0] == ':')
+ z = cmd[0];
+ if (z == ':')
cmd++; // Get rid of that : at the beginning of the :text (command)
#ifdef DEBUGMODE
}
#endif
} else {
- notice(s_GameServ, source, "Unknown command \002%s\002. Type /msg %S \002HELP\002 to get a list of commands.", cmd);
+ aClient *user;
+ if ((user = find(source)))
+ {
+ if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ }
+ 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
- cmd--; // Same thing :)
+ #ifndef P10
+ source--; // Bring the ':' back so we don't leak memory
+ #endif
+ if (z == ':')
+ cmd--; // Same thing :)
}
int stricmp(const char *s1, const char *s2)
void do_list(char *u)
{
+ aClient *user;
+ if (!(user = find(u)))
+ {
+ log("Fatal Error: Couldn't find %s in the client list", u);
+ return;
+ }
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s. Command LIST", user->getNick());
+ #endif
+ return;
+ }
+
ListNode<aClient> *temp;
bool header = false;
for (unsigned long x = 0; x < U_TABLE_SIZE; x++)
log("Could not find aClient Buf: %s LOGOUT",
u);
}
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ return;
+ }
else if (!is_playing(user))
{
notice(s_GameServ, u, "You're not logged in!");
logout(user);
}
}
+
void logout(aClient *user)
{
if (is_playing(user))
{
ListNode<aClient> *it;
aClient *temp;
- unsigned long hv = HASH((unsigned char *) user->stats->name,
- U_TABLE_SIZE);
+ unsigned long hv = iHASH((unsigned char *) user->stats->name);
it = players[hv].Find(user);
+
if (!it)
{
notice(s_GameServ, user->getNick(), "Fatal error. Contact "\
user->stats = NULL;
temp->stats->client = NULL;
#ifdef P10
- temp->setRealNick("!NULL!");
+ temp->setRealNick("Not Playing");
#endif
- temp->setNick("!NULL!");
+ temp->setNick("Not Playing");
it->setNewPtr(temp);
#ifdef DEBUGMODE
);
#endif
}
+ clearPlaying(user);
}
+
void do_register(char *u)
{
char *password, *name;
notice(s_GameServ, u, "%s is already registered!", name);
notice(s_GameServ, u, "Choose another name!");
}
- else if ((user = find(u)))
+ else if (!(user = find(u)))
+ {
+ log("Fatal Error: Couldn't find %s in the clients list", u);
+ }
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ return;
+ }
+ else
{
- if (!user->stats)
+ if (!is_playing(user))
{
user->stats = new Player(user);
user->stats->client = user; // Set the backwards pointer
strcpy(user->stats->password, crypt(password, salt));
strcpy(user->stats->name, name);
- unsigned long hv = HASH((unsigned char *) name, U_TABLE_SIZE);
+ unsigned long hv = iHASH((unsigned char *) name);
updateTS(user->stats);
players[hv].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!");
log("Nickname %s registered player %s.", u, user->stats->name);
+ setPlaying(user); // set the playing flag
}
else
{
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)
+ else if (!(user = find(u)))
{
notice(s_GameServ, u, "Fatal error. Cannot find aClient. Buf: %s", strtok(NULL, ""));
log("Error: aClient not found: %s", u);
}
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ return;
+ }
else if (!(p = findplayer(name)) || !p->stats)
notice(s_GameServ, u, "Player %s not found", name);
else if (is_playing(user))
}
else {
ListNode<aClient> *temp;
- unsigned long hv = HASH((unsigned char *) p->stats->name,
- U_TABLE_SIZE);
+ unsigned long hv = iHASH((unsigned char *) p->stats->name);
temp = players[hv].Find(p);
if (!temp)
{
#ifdef DEBUGMODE
log("Setting data for identified");
#endif
+ user->stats->setData(p->stats);
+ user->stats->client = user;
updateTS(user->stats);
- user->stats->setData(p->stats);
#ifdef DEBUGMODE
- log("Player Identified");
+ log("Player %s IRC: %s Identified", user->stats->name,
+ user->getNick());
#endif
+ setPlaying(user); // set the playing flag
+
temp->setPtr(user);
notice(s_GameServ, u, "Password Accepted. Identified.");
}
nick = strtok(NULL, " ");
- if (!nick)
+ if (!(user = find(u)))
{
- if (!(user = find(u)))
- {
- notice(s_GameServ, u, "Fatal Error in do_stats(). Contact a %S admin for help!");
- log("Error: aClient not found: %s", u);
- return;
- }
- else if (!is_playing(user))
+ log("Fatal Error: %s not found in client list", u);
+ return;
+ }
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ return;
+ }
+ else if (!nick)
+ {
+ if (!is_playing(user))
{
notice(s_GameServ, u, "You're not playing, so you have no stats!");
return;
else
showstats(u, nick);
}
+
void init_masters()
{
#ifdef DEBUGMODE
strcpy(masters[0]->name, "Old Bones");
strcpy(masters[0]->weapon, "Dull Sword Cane");
- masters[0]->strength = 15;
+ masters[0]->strength = 25;
masters[0]->gold = 0;
masters[0]->exp = 0;
masters[0]->maxhp = 30;
strcpy(masters[1]->name, "Master Chang");
strcpy(masters[1]->weapon, "Nanchaku");
- masters[1]->strength = 30;
+ masters[1]->strength = 35;
masters[1]->gold = 0;
masters[1]->exp = 0;
masters[1]->maxhp = 40;
strcpy(masters[2]->name, "Chuck Norris");
strcpy(masters[2]->weapon, "Ranger Kick");
- masters[2]->strength = 85;
+ masters[2]->strength = 95;
masters[2]->gold = 0;
masters[2]->exp = 0;
masters[2]->maxhp = 70;
strcpy(masters[3]->name, "Mr. Miagi");
strcpy(masters[3]->weapon, "Petrified Bonsai");
- masters[3]->strength = 120;
+ masters[3]->strength = 130;
masters[3]->gold = 0;
masters[3]->exp = 0;
masters[3]->maxhp = 120;
strcpy(masters[4]->name, "Jackie Chan");
strcpy(masters[4]->weapon, "Kung Fu Kick");
- masters[4]->strength = 135;
+ masters[4]->strength = 145;
masters[4]->gold = 0;
masters[4]->exp = 0;
masters[4]->maxhp = 200;
strcpy(masters[5]->name, "Jet Li");
strcpy(masters[5]->weapon, "Motorcycle");
- masters[5]->strength = 160;
+ masters[5]->strength = 170;
masters[5]->gold = 0;
masters[5]->exp = 0;
masters[5]->maxhp = 400;
strcpy(masters[6]->name, "Muhammad Ali");
strcpy(masters[6]->weapon, "Quick Jab");
- masters[6]->strength = 185;
+ masters[6]->strength = 195;
masters[6]->gold = 0;
masters[6]->exp = 0;
masters[6]->maxhp = 600;
strcpy(masters[7]->name, "Li Mu Bai");
strcpy(masters[7]->weapon, "Green Destiny");
- masters[7]->strength = 210;
+ masters[7]->strength = 220;
masters[7]->gold = 0;
masters[7]->exp = 0;
masters[7]->maxhp = 800;
strcpy(masters[8]->name, "Jimmy Wang Yu");
strcpy(masters[8]->weapon, "Flying Guillotine");
- masters[8]->strength = 275;
+ masters[8]->strength = 285;
masters[8]->gold = 0;
masters[8]->exp = 0;
masters[8]->maxhp = 1200;
strcpy(masters[9]->name, "Wong Fei Hung");
strcpy(masters[9]->weapon, "Drunken Boxing");
- masters[9]->strength = 360;
+ masters[9]->strength = 375;
masters[9]->gold = 0;
masters[9]->exp = 0;
masters[9]->maxhp = 1800;
strcpy(masters[10]->name, "Bruce Lee");
strcpy(masters[10]->weapon, "Fists of fury");
- masters[10]->strength = 575;
+ masters[10]->strength = 590;
masters[10]->gold = 0;
masters[10]->exp = 0;
masters[10]->maxhp = 2500;
bool is_playing(aClient *user)
{
- return user->stats != NULL;
+ if (user->stats == NULL)
+ {
+ return false;
+ }
+ else if (user->stats->client == NULL)
+ {
+ return false;
+ }
+ else if (!FL_is_playing(user))
+ {
+ return false;
+ }
+ else
+ return true;
}
bool is_fighting(char *u)
if (!is_playing(user))
return false;
else
- return (user->stats->fight != NULL || user->stats->battle != NULL || user->stats->master != NULL);
+ return player_fight(user) || master_fight(user) || user->stats->fight != NULL;
}
bool player_fight(char *u)
else
return player_fight(user);
}
+
bool player_fight(aClient *user)
{
- if (!is_fighting(user))
+ if (!is_playing(user))
return false;
else
return user->stats->battle != NULL;
notice(s_GameServ, u, "Fatal error. Contact a(n) %S admin. buf: %s", strtok(NULL, ""));
return;
}
+ else if (isIgnore(ni))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", ni->getNick());
+ #endif
+ return;
+ }
else if (!is_playing(ni))
{
notice(s_GameServ, u, "You are not playing!");
{
notice(s_GameServ, u, "Player %s not found!", nick);
}
+ else if (!isAlive(ni->stats))
+ {
+ notice(s_GameServ, u, "You are dead. Wait until tomorrow to fight others!");
+ }
else if (!is_playing(battle))
{
notice(s_GameServ, u, "You can't attack %s while they aren't playing!", nick);
* display_players(u);
* }
*/
- else if (!isAlive(ni->stats))
- {
- notice(s_GameServ, u, "You are dead. Wait until tomorrow to fight others!");
- }
else if (stricmp(ni->stats->name, battle->stats->name) == 0)
{
notice(s_GameServ, u, "Are you trying to commit suicide!?");
{
notice(s_GameServ, u, "%s is fighting %s already!", battle->stats->name, battle->stats->battle->stats->name);
}
+ else if (master_fight(battle))
+ {
+ notice(s_GameServ, u, "%s is fighting their master!", battle->stats->name);
+ }
else if (is_fighting(battle))
{
notice(s_GameServ, u, "%s is fighting %s already!", battle->stats->name, battle->stats->fight->name);
ni->stats->battle = battle;
// Set the other player's battle pointer to you
- battle->stats->battle = ni;
+ ni->stats->battle->stats->battle = ni;
// The initiator gets the first move (perhaps this should be 50/50)
setYourTurn(ni->stats);
notice(s_GameServ, u, "Fatal Error in do_use. Contact a(n) %S Admin");
return;
}
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ return;
+ }
else if (!is_playing(user))
{
notice(s_GameServ, u, "You must be playing to use items!");
int oldstrength = user->stats->strength;
notice(s_GameServ, u, "As you grip the flask containing pure power, you feel adrenaline coarse through your veins!");
notice(s_GameServ, u, "In one swallow you drink the potion and feel your muscle fibers bulging andgrowing!");
- user->stats->strength += 1 + rand() % 2; // 1 - 2 Strength Added
+ user->stats->strength += 3 + rand() % 8; // 3-10 Strength Added
notice(s_GameServ, u, "You gain %d Strength points!", user->stats->strength - oldstrength);
p->decStrength();
}
int olddefense = user->stats->defense;
notice(s_GameServ, u, "You drink the foul tasting viscous liquid while pinching your nose in disgust.");
notice(s_GameServ, u, "It tasted bad, but you feel like you are unbeatable!");
- user->stats->defense += 1 + rand() % 2; // 1 - 2 Defense Added
+ user->stats->defense += 3 + rand() % 8; // 3 - 10 Defense Added
notice(s_GameServ, u, "You gain %d Defense points!", user->stats->defense - olddefense);
p->decDefense();
}
}
int oldHP = user->stats->maxhp;
notice(s_GameServ, u, "You feel your life growing longer as you drink the green glowing liquid.");
- user->stats->maxhp += 1 + rand() % 5; // 1 - 5 Maxhp
+ user->stats->maxhp += 5 + rand() % 6; // 5-10 Maxhp
notice(s_GameServ, u, "You gain %d Maximum hit points!", user->stats->maxhp - oldHP);
p->decHP();
}
notice(s_GameServ, u, "Couldn't find you. Error. Contact a %S admin");
return;
}
-
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ return;
+ }
else if (!is_playing(user))
{
notice(s_GameServ, u, "You must be playing to run!");
notice(s_GameServ, u, "Fatal error in do_attack. Contact a(n) %S admin for help.");
return;
}
+ else if (isIgnore(ni))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", ni->getNick());
+ #endif
+ return;
+ }
else if (!is_playing(ni))
{
notice(s_GameServ, u, "You're not playing!");
notice(s_GameServ, u, "Fatal error. Contact a(n) %S admin. buf: %s", strtok(NULL, ""));
return;
}
+ else if (isIgnore(ni))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", ni->getNick());
+ #endif
+ return;
+ }
else if (!is_playing(ni))
{
notice(s_GameServ, u, "You aren't playing!");
password = strtok(NULL, " ");
strcpy(p->password, password);
- temp->setNick("!NULL!");
+ temp->setNick("Not Playing");
#ifdef P10
- temp->setRealNick("!NULL!");
+ temp->setRealNick("Not Playing");
#endif
p->inventory.reset(); // Set inventory to all 0s
tempname = strtok(NULL, " ");
if (tempname)
p->inventory.setHP(stringtoint(tempname));
- unsigned long hv = HASH((unsigned char *) temp->stats->name, U_TABLE_SIZE);
+ unsigned long hv = iHASH((unsigned char *) temp->stats->name);
temp->stats->client = NULL;
players[hv].insertAtBack(temp);
notice(s_GameServ, u, " \ 2STORE BUY {ARMOR | WEAPON} \1fNUMBER\1f\ 2");
return;
}
- else if (!(user = find(u)) || !is_playing(user))
+ else if (!(user = find(u)))
+ {
+ log("Fatal Error: could not find %s in client list", u);
+ return;
+ }
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ return;
+ }
+ else if (!is_playing(user))
{
notice(s_GameServ, u, "You must be playing to use the store!");
return;
notice(s_GameServ, u, "Fatal Error. Contact a %S admin!");
return;
}
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ return;
+ }
else if (!is_playing(user))
{
notice(s_GameServ, u, "You must be playing to check your inventory!");
notice(s_GameServ, u, "Fatal Error. See a %S admin for help");
return;
}
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ return;
+ }
else if (!is_playing(user))
{
notice(s_GameServ, u, "You must be playing to go to the Tavern");
log("Fatal Error. Couldn't find %s while executing do_bank()", u);
return;
}
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ return;
+ }
else if (!is_playing(user))
{
notice(s_GameServ, u, "You must be playing to use the bank!");
void do_master(char *u)
{
aClient *user;
- user = find(u);
- if (!user)
+
+ if (!(user = find(u)))
{
notice(s_GameServ, u, "Fatal error. Contact a(n) %S admin. buf: %s", strtok(NULL, ""));
return;
}
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ return;
+ }
else if (is_fighting(user))
{
notice(s_GameServ, u, "You're in the middle of a fight! Pay attention!");
log("Error: aClient not found: %s", u);
return;
}
+ else if (isIgnore(user))
+ {
+ #ifdef DEBUGMODE
+ log("Ignoring %s.", user->getNick());
+ #endif
+ return;
+ }
else if (!isAdmin(user))
{
notice(s_GameServ, u, "You must be a %S admin to use this command!");
{
if (!p)
return;
+
+ #ifdef DEBUGMODE
+ log("Old timestamp for %s: %ld", p->name, p->lastcommand);
+ #endif
p->lastcommand = time(NULL);
+ #ifdef DEBUGMODE
+ log("New timestamp for %s: %ld", p->name, p->lastcommand);
+ #endif
+
}
bool timedOut(Player *p)
{
if (!p)
return false;
+ else if (p->lastcommand == 0)
+ return false;
else
- return ((time(NULL) - p->lastcommand) >= maxidletime);
+ {
+ if ((time(NULL) - p->lastcommand) >= maxidletime)
+ return true;
+
+ return false;
+ }
}
void timeOutEvent(Player *p)
{
- aClient *user = p->client;
+ aClient *user = findplayer(p->name);
if (!user) // then they're not playing
return;
char *nick = user->getNick();
- notice(s_GameServ, nick, "You just idle timed out");
- logout(user);
+ if (player_fight(user) && isYourTurn(p))
+ {
+ // Check to see if they were the idler or if it was the other
+ // person
+ if (p->lastcommand != p->battle->stats->lastcommand)
+ {
+ // This person's last command was given earlier,
+ // so this person is the idler
+ notice(s_GameServ, nick, "You timed out "\
+ "during a fight. You lose your turn!");
+ notice(s_GameServ, p->battle->getNick(),
+ "%s hesitated for too long. Your move.", p->name);
+ clearYourTurn(p);
+ setYourTurn(p->battle->stats);
+
+ // Update the TS for both players to give them another
+ // Chance to wake up, but if the other player doesn't
+ // Attack now, they both get logged out.
+ updateTS(p);
+ p->battle->stats->lastcommand = p->lastcommand;
+ display_players(p->battle);
+ return;
+ }
+ else
+ {
+ notice(s_GameServ, p->battle->getNick(),
+ "You and %s timed out at the same time."\
+ " Don't fight if you're just going to "\
+ "sit there!", p->name);
+ notice(s_GameServ, user->getNick(),
+ "You and %s timed out at the same time."\
+ " Don't fight if you're just going to "\
+ "sit there!", p->battle->stats->name);
+ logout(p->battle);
+ logout(user);
+ return;
+ }
+ }
+ else if (!player_fight(user))
+ {
+ // Place fun stuff here :)
+ int randnum = 1 + rand() % 100; // 1-100
+
+ if (randnum < 50)
+ {
+ #define GSN(s) notice(s_GameServ, nick, s)
+ #define GSN2(s, f) notice(s_GameServ, nick, s, f)
+ int stolen = ((35 + rand() % 66)/100) * user->stats->gold;
+
+ GSN("You stop for a moment to rest on the "\
+ "street corner. All of a sudden, you "\
+ "are ambushed from all sides by a hoarde "\
+ "of knife wielding thugs.");
+ GSN2("The thugs beat you into utter submission "\
+ "and steal %d gold from you!", stolen);
+ user->stats->gold -= stolen;
+ }
+
+
+ // Always log out the user
+ logout(user);
+ }
}
void do_reset(char *u)
notice(s_GameServ, u, "You must be a %S admin to use this command!");
return;
}
+
if (!nick)
{
notice(s_GameServ, u, "SYNTAX: RESET {ALL | NICK}");
notice(s_GameServ, u, "Error: aClient not found. Contact %S admin.");
return;
}
+
if (!pass)
{
notice(s_GameServ, u, "SYNTAX: \ 2ADMIN\ 2 \ 2\1fpassword\1f\ 2");
// this will be hash.cpp start
// thank you wcampbel
-unsigned long HASH(const unsigned char *name, int size_of_table)
+unsigned long sHASH(const unsigned char *name)
{
unsigned long h = 0, g;
while (*name)
{
- #ifdef P10
- h = (h << 4) + (*name++); // Case sensitive for numerics
- #else
- h = (h << 4) + tolower(*name++);
- #endif
+ h = (h << 4) + (*name++); // Case sensitive for numerics
+ if ((g = (h & 0xF0000000)))
+ h ^= g >> 24;
+ h &= ~g;
+ }
+ return h % U_TABLE_SIZE;
+}
+
+unsigned long iHASH(const unsigned char *name)
+{
+ unsigned long h = 0, g;
+
+ while (*name)
+ {
+ h = (h << 4) + tolower(*name++);
if ((g = (h & 0xF0000000)))
h ^= g >> 24;
h &= ~g;
}
- return h % size_of_table;
+ return h % U_TABLE_SIZE;
}
// this will be hash.cpp end
projects / irc / gameservirc.git / blobdiff