X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/c7340cbda3026cff96c6250c7d35e51a194658f5..1af35752f2d368fd53598eb57dc837076e862b15:/gameserv/gameserv.cpp diff --git a/gameserv/gameserv.cpp b/gameserv/gameserv.cpp index dcef785..6de2a5a 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 #include @@ -47,11 +49,19 @@ 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 **********/ @@ -72,6 +82,7 @@ void init_monsters(); void delete_monsters(); void delete_masters(); +void do_admin(char *u); void do_attack(char *u); void do_bank(char *u); void do_fight(char *u); @@ -137,7 +148,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, " "); @@ -145,6 +156,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) { @@ -159,16 +171,10 @@ void gameserv(char *source, char *buf) 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) { - char *pass = strtok(NULL, " "); - if (pass != NULL && (stricmp(pass, adminpass) == 0)) - { - do_refresh(source); - } - else - { - notice(s_GameServ, source, "SYNTAX: /msg %S REFRESH {ALL | NICK}"); - } + do_refresh(source); } else if (stricmp(cmd, "PRINT") == 0) { cout << "Printing Clients List: " << endl; clients.print(); @@ -185,47 +191,73 @@ void gameserv(char *source, char *buf) } 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 "); + 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 "); - } } else if (stricmp(cmd, "LOAD") == 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 { load_gs_dbase(); } - else - { - notice(s_GameServ, source, "SYNTAX: /msg %S LOAD "); - } } else if (stricmp(cmd, "RAW") == 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 { char *rest = strtok(NULL, ""); raw("%s", rest); } - else - { - notice(s_GameServ, source, "SYNTAX: /msg %S RAW "); - } + } 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 @@ -303,10 +335,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; } @@ -447,6 +479,7 @@ void do_list(char *u) else notice(s_GameServ, u, "No one is playing"); } + void do_register(char *u) { char *password; @@ -469,7 +502,6 @@ 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); @@ -1879,6 +1911,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; @@ -1895,6 +1951,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) { @@ -1907,6 +1970,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) { @@ -1919,10 +1989,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) @@ -1937,13 +2009,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!"); } @@ -1960,7 +2033,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; @@ -1996,25 +2074,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); } @@ -2049,7 +2127,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) + @@ -2073,7 +2151,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); @@ -2082,7 +2160,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); @@ -2101,7 +2179,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!", @@ -2147,7 +2225,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 "\ @@ -2155,6 +2233,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 @@ -2175,7 +2254,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)) @@ -2295,7 +2374,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)) { @@ -2357,11 +2436,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_alive(ni)) + { + notice(s_GameServ, u, "You are dead. Wait until tomorrow for healing."); + return; } - else if (is_fighting(u)) + else if (is_fighting(ni)) { notice(s_GameServ, u, "You can't heal in battle!"); } @@ -2478,7 +2568,7 @@ int save_gs_dbase() if (!outfile) { - cerr << "Error opening " << playerdata << endl; + cout << "Error opening " << playerdata << endl; return 0; } @@ -2489,7 +2579,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(); @@ -2508,7 +2598,7 @@ int load_gs_dbase() if (infile.fail()) { - cerr << "Error opening " << playerdata << endl; + cout << "Error opening " << playerdata << endl; return 0; } @@ -2533,6 +2623,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"); @@ -2593,14 +2684,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) @@ -2772,11 +2868,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!"); @@ -2897,18 +3000,24 @@ 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; @@ -2918,6 +3027,12 @@ void do_master(char *u) 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) { switch(p->level) @@ -2973,7 +3088,10 @@ void do_master(char *u) 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; @@ -2996,13 +3114,14 @@ void do_master(char *u) 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]); @@ -3015,6 +3134,7 @@ void showBankBalance(const char *u) { aClient *user; Player *p; + if (!(user = find(u))) return; @@ -3051,6 +3171,7 @@ void refresh(Player *p) p->forest_fights = 100; p->player_fights = 3; p->alive = true; + clearMaster(p); } void do_refresh(char *u) @@ -3058,9 +3179,20 @@ 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}"); + notice(s_GameServ, u, "SYNTAX: REFRESH {ALL | NICK}"); return; } else if (stricmp(nick, "ALL") == 0) @@ -3070,7 +3202,7 @@ void do_refresh(char *u) } else if ((user = find(nick))) { - if (user->stats) + if (is_playing(user)) { notice(s_GameServ, u, "Refreshing %s.", user->getNick()); refresh(user->stats); @@ -3120,7 +3252,9 @@ void display_help(char *u, char *file) } // Minor recursion - display_help(u, "admin"); + aClient *user = find(u); + if (user && isAdmin(user)) + display_help(u, "admin_commands"); } else { @@ -3145,3 +3279,38 @@ void display_help(char *u, char *file) 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; + } +} +