X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/3f243b0be519a8112e77adb77930bcb5f8a8a898..7a9afc848c82b853c9a560c5e5d888007b25cb46:/gameserv/gameserv.cpp

diff --git a/gameserv/gameserv.cpp b/gameserv/gameserv.cpp
index dedff63..6a68086 100644
--- a/gameserv/gameserv.cpp
+++ b/gameserv/gameserv.cpp
@@ -732,13 +732,17 @@ void do_register(char *u)
     {
         if (!is_playing(user))
         {
+	    ListNode<aClient> *temp;
 	    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);
+	    user->stats->reset(); // set the user up
+	    strncpy(user->stats->password, crypt(password, salt), 255);
+	    strncpy(user->stats->name, name, 255);
 	    unsigned long hv = iHASH((unsigned char *) name);
 	    updateTS(user->stats);
-	    players[hv].insertAtBack(user);
+	    temp = players[hv].insertAtBack_RLN(user);
+	    temp->setPtr(user); // This is an extra step, but necessary for now
+
 	    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);
@@ -1211,7 +1215,7 @@ void do_fight(char *u)
 	// You can't fight someone below you by more than X level(s)
 	// level 12 can fight level (12 - X) but not < (12 - X)
 	notice(s_GameServ, u, "You may not fight %s. You're too strong!", 
-		battle->stats->level);
+		battle->stats->name);
     }
     else if (battle->stats->level - ni->stats->level > maxafightdistance)
     {
@@ -1303,7 +1307,7 @@ void do_use(char *u)
 	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 += 3 + rand() % 8; // 3-10 Strength Added
+	user->stats->strength += 1 + (rand() % 10 >= 8 ? 1 : 0); // 1-2
 	notice(s_GameServ, u, "You gain %d Strength points!", user->stats->strength - oldstrength);
 	p->decStrength();
     }
@@ -1317,7 +1321,7 @@ void do_use(char *u)
 	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 += 3 + rand() % 8; // 3 - 10 Defense Added
+	user->stats->defense += 1 + (rand() % 10 >= 8 ? 1 : 0); // 1-2
 	notice(s_GameServ, u, "You gain %d Defense points!", user->stats->defense - olddefense);
 	p->decDefense();
     }
@@ -1330,7 +1334,9 @@ void do_use(char *u)
 	}
 	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 += 5 + rand() % 6; // 5-10 Maxhp
+	user->stats->maxhp += 4 + 
+	(rand() % 100 > 50 ? (rand() % 6) : (rand() % 2) );
+
 	notice(s_GameServ, u, "You gain %d Maximum hit points!", user->stats->maxhp - oldHP);
 	p->decHP();
     }
@@ -1986,6 +1992,7 @@ int save_gs_dbase()
     while(ptr)
     {
 	it = ptr->getData()->stats;
+	clearYourTurn(it);
 	outfile << it->name << ' ' << it->level << ' ' << it->exp << ' ' << it->gold << ' ' << it->bank << ' '
 		<< it->hp << ' ' << it->maxhp << ' ' << it->strength << ' ' << it->defense << ' '
 		<< it->armor << ' ' << it->weapon << ' '
@@ -2386,10 +2393,10 @@ void do_tavern(char *u)
     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, "4. HP Potions for %ld Gold", 2300 * p->level + (p->exp / 10));
+	notice(s_GameServ, u, "1. Healing Potions for %ld Gold", 100 * p->level + (p->exp / 10));
+	notice(s_GameServ, u, "2. Strength Potions for %ld Gold", 205 * p->level + (p->exp / 10));
+	notice(s_GameServ, u, "3. Defense Potions for %ld Gold", 200 * p->level + (p->exp / 10));
+	notice(s_GameServ, u, "4. HP Potions for %ld Gold", 230 * 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!");
@@ -2409,10 +2416,10 @@ void do_tavern(char *u)
 	{
 	    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, "4. HP Potions for %ld Gold", 2300 * p->level + (p->exp / 10));
+	    notice(s_GameServ, u, "1. Healing Potions for %ld Gold", 100 * p->level + (p->exp / 10));
+	    notice(s_GameServ, u, "2. Strength Potions for %ld Gold", 205 * p->level + (p->exp / 10));
+	    notice(s_GameServ, u, "3. Defense Potions for %ld Gold", 200 * p->level + (p->exp / 10));
+	    notice(s_GameServ, u, "4. HP Potions for %ld Gold", 230 * 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!");
 	    return;
@@ -2420,7 +2427,7 @@ void do_tavern(char *u)
 	switch(num)
 	{
 	    case 1:
-		price = (1000 * p->level) + (p->exp / 10);
+		price = (100 * p->level) + (p->exp / 10);
 		if (p->gold >= price)
 		{
 		    notice(s_GameServ, u, "One healing potion coming right up!");
@@ -2431,7 +2438,7 @@ void do_tavern(char *u)
 		    notice(s_GameServ, u, "You don't have enough gold!");
 		break;
 	    case 2:
-		price = (2050 * p->level) + (p->exp / 10);
+		price = (205 * p->level) + (p->exp / 10);
 		if (p->gold >= price)
 		{
 		    notice(s_GameServ, u, "One strength boost coming right up!");
@@ -2442,7 +2449,7 @@ void do_tavern(char *u)
 		    notice(s_GameServ, u, "You don't have enough gold!");
 		break;
 	    case 3:
-		price = (2000 * p->level) + (p->exp / 10);
+		price = (200 * p->level) + (p->exp / 10);
 		if (p->gold >= price)
 		{
 		    notice(s_GameServ, u, "One defense boost coming right up!");
@@ -2453,7 +2460,7 @@ void do_tavern(char *u)
 		    notice(s_GameServ, u, "You don't have enough gold!");
 		break;
 	    case 4:
-		price = (2300 * p->level) + (p->exp / 10);
+		price = (230 * p->level) + (p->exp / 10);
 		if (p->gold >= price)
 		{
 		    notice(s_GameServ, u, "One HP Potion coming right up!");
@@ -2855,7 +2862,7 @@ void do_refresh(char *u)
 	notice(s_GameServ, u, "Refreshing everyone's stats!");
 	refreshall();
     }
-    else if ((user = findbyrealnick(nick)))
+    else if ((user = findplayer(nick)))
     {
 	if (is_playing(user))
 	{
@@ -2943,7 +2950,7 @@ void timeOutEvent(Player *p)
 {
     aClient *user = findplayer(p->name);
 
-    if (!user) // then they're not playing
+    if (!user || !p->client) // then they're not playing
 	return;
 
     char *nick = user->getNick();
@@ -2990,13 +2997,14 @@ void timeOutEvent(Player *p)
     {
 	// Place fun stuff here :)
 	int randnum = 1 + rand() % 100; // 1-100
+	#define GSN(s) notice(s_GameServ, nick, s)
+	#define GSN2(s, f) notice(s_GameServ, nick, s, f)
 
         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;
-
+	    // 35-100% of your gold goes pffft - kain
+	    int stolen = (35 + (rand() % 66)) * user->stats->gold / 100;
+	    
 	    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 "\
@@ -3005,6 +3013,26 @@ void timeOutEvent(Player *p)
 	    "and steal %d gold from you!", stolen);
 	    user->stats->gold -= stolen;
 	}
+	else if (randnum >= 50 && randnum < 75)
+	{
+	    // 25-65% of your gold goes pffft - kain
+	    int stolen = (25 + (rand() % 41)) * user->stats->gold / 100;
+	    GSN("While dilly dallying around, you lose "\
+	    "your sense of time. Little did you know, "\
+	    "but thieves lifted your gold while you "\
+	    "weren't watching.");
+	    GSN2("Better luck next time... you lose %d gold", stolen);
+	    user->stats->gold -= stolen;
+	}
+	else if (randnum >= 75)
+	{
+	    // 25-75% of your gold goes pffft - kain
+	    int stolen = (25 + (rand() % 51)) * user->stats->gold / 100;
+	    GSN("Good grief! A gaggle of gooey green ghostlike "\
+		"goblins grabbed your gold!");
+	    GSN2("They stole %d gold from you!", stolen);
+	    user->stats->gold -= stolen;
+	}
 
 
 	// Always log out the user