X-Git-Url: https://jfr.im/git/irc/gameservirc.git/blobdiff_plain/6f727d4c9eb5c886f14598577f40da583577444e..903cd8615208a3e02ac9efbd881d73c409f996e2:/gameserv/gameserv.cpp

diff --git a/gameserv/gameserv.cpp b/gameserv/gameserv.cpp
index 164a90c..1929a2f 100644
--- a/gameserv/gameserv.cpp
+++ b/gameserv/gameserv.cpp
@@ -929,7 +929,7 @@ void init_masters()
 
     strcpy(masters[4]->name, "Jackie Chan");
     strcpy(masters[4]->weapon, "Kung Fu Kick");
-    masters[4]->strength = 145;
+    masters[4]->strength = 156;
     masters[4]->gold = 0;
     masters[4]->exp = 0;
     masters[4]->maxhp = 200;
@@ -938,7 +938,7 @@ void init_masters()
 
     strcpy(masters[5]->name, "Jet Li");
     strcpy(masters[5]->weapon, "Motorcycle");
-    masters[5]->strength = 170;
+    masters[5]->strength = 180;
     masters[5]->gold = 0;
     masters[5]->exp = 0;
     masters[5]->maxhp = 400;
@@ -948,7 +948,7 @@ void init_masters()
 
     strcpy(masters[6]->name, "Muhammad Ali");
     strcpy(masters[6]->weapon, "Quick Jab");
-    masters[6]->strength = 195;
+    masters[6]->strength = 200;
     masters[6]->gold = 0;
     masters[6]->exp = 0;
     masters[6]->maxhp = 600;
@@ -957,7 +957,7 @@ void init_masters()
 
     strcpy(masters[7]->name, "Li Mu Bai");
     strcpy(masters[7]->weapon, "Green Destiny");
-    masters[7]->strength = 220;
+    masters[7]->strength = 225;
     masters[7]->gold = 0;
     masters[7]->exp = 0;
     masters[7]->maxhp = 800;
@@ -967,7 +967,7 @@ void init_masters()
 
     strcpy(masters[8]->name, "Jimmy Wang Yu");
     strcpy(masters[8]->weapon, "Flying Guillotine");
-    masters[8]->strength = 285;
+    masters[8]->strength = 290;
     masters[8]->gold = 0;
     masters[8]->exp = 0;
     masters[8]->maxhp = 1200;
@@ -976,7 +976,7 @@ void init_masters()
 
     strcpy(masters[9]->name, "Wong Fei Hung");
     strcpy(masters[9]->weapon, "Drunken Boxing");
-    masters[9]->strength = 375;
+    masters[9]->strength = 385;
     masters[9]->gold = 0;
     masters[9]->exp = 0;
     masters[9]->maxhp = 1800;
@@ -985,7 +985,7 @@ void init_masters()
 
     strcpy(masters[10]->name, "Bruce Lee");
     strcpy(masters[10]->weapon, "Fists of fury");
-    masters[10]->strength = 590;
+    masters[10]->strength = 600;
     masters[10]->gold = 0;
     masters[10]->exp = 0;
     masters[10]->maxhp = 2500;
@@ -1351,8 +1351,8 @@ 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 += 4 + 
-	(rand() % 100 > 50 ? (rand() % 6) : (rand() % 2) );
+	user->stats->maxhp += 2 + 
+	(rand() % 100 > 70 ? (rand() % 7) : (rand() % 2) );
 
 	notice(s_GameServ, u, "You gain %d Maximum hit points!", user->stats->maxhp - oldHP);
 	p->decHP();
@@ -3012,6 +3012,8 @@ void timeOutEvent(Player *p)
     }
     else if (!player_fight(user))
     {
+      if (isAlive(user) && user->stats->gold > 0)
+      {
 	// Place fun stuff here :)
 	int randnum = 1 + rand() % 100; // 1-100
 	#define GSN(s) notice(s_GameServ, nick, s)
@@ -3050,7 +3052,7 @@ void timeOutEvent(Player *p)
 	    GSN2("They stole %d gold from you!", stolen);
 	    user->stats->gold -= stolen;
 	}
-
+      }
 
 	// Always log out the user
 	logout(user);