From e9373bb8494f9252c0294483f5b83d4ac1b79ec5 Mon Sep 17 00:00:00 2001 From: Rumble Date: Thu, 29 Jan 2009 13:40:51 +0000 Subject: [PATCH] Jan 29 2009] - Rumble Corrected zcheck MAX_OBJ_GOLD_ALLOWED to compare against Val 0, not Val 1. (th anks Tails) Created new MAX_OBJ_GOLD_ALLOWED define for zcheck. (thanks Tails) Fixed typo in players.c. (thanks Tristen) --- changelog | 4 ++++ lib/text/greetings | 4 ++-- lib/text/motd | 10 +++------- src/act.wizard.c | 11 ++++++----- src/players.c | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/changelog b/changelog index 3fb3dd6..36941ca 100644 --- a/changelog +++ b/changelog @@ -35,6 +35,10 @@ export (QQ's a zone into a tarball)t Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist) (lots of major bugfixes too) tbaMUD 3.59 +[Jan 29 2009] - Rumble + Corrected zcheck MAX_OBJ_GOLD_ALLOWED to compare against Val 0, not Val 1. (thanks Tails) + Created new MAX_OBJ_GOLD_ALLOWED define for zcheck. (thanks Tails) + Fixed typo in players.c. (thanks Tristen) [Jan 25 2009] - Rumble Added new documentation /doc unixshelladminguide. (thanks Jamdog). Added new zone creation limits to prevent misuse of zedit making the MUD unbootable. diff --git a/lib/text/greetings b/lib/text/greetings index dc43465..af36d57 100644 --- a/lib/text/greetings +++ b/lib/text/greetings @@ -1,5 +1,5 @@ - Your MUD Name Here - lib/text/greetings + T B A M U D + D E V E L O P M E N T P O R T Based on CircleMUD, Created by Jeremy Elson diff --git a/lib/text/motd b/lib/text/motd index 6a628fc..909d5ff 100644 --- a/lib/text/motd +++ b/lib/text/motd @@ -1,8 +1,4 @@ -(lib/text/motd) - Welcome to - - T B A M U D - "We addict players for their own enjoyment." - Created by Jeremy Elson - + T B A M U D + D E V E L O P M E N T P O R T + Please be brutal with the bug, idea, and typo commands. -- Rumble diff --git a/src/act.wizard.c b/src/act.wizard.c index 3e42d56..8d8a45c 100644 --- a/src/act.wizard.c +++ b/src/act.wizard.c @@ -3297,7 +3297,7 @@ ACMD(do_links) /*mob limits*/ #define MAX_DAMROLL_ALLOWED MAX(GET_LEVEL(mob)/5, 1) #define MAX_HITROLL_ALLOWED MAX(GET_LEVEL(mob)/3, 1) -#define MAX_GOLD_ALLOWED GET_LEVEL(mob)*3000 +#define MAX_MOB_GOLD_ALLOWED GET_LEVEL(mob)*3000 #define MAX_EXP_ALLOWED GET_LEVEL(mob)*GET_LEVEL(mob) * 120 #define MAX_LEVEL_ALLOWED LVL_IMPL #define GET_OBJ_AVG_DAM(obj) (((GET_OBJ_VAL(obj, 2) + 1) / 2.0) * GET_OBJ_VAL(obj, 1)) @@ -3309,6 +3309,7 @@ ACMD(do_links) /*item limits*/ #define MAX_DAM_ALLOWED 50 /* for weapons - avg. dam*/ #define MAX_AFFECTS_ALLOWED 3 +#define MAX_OBJ_GOLD_ALLOWED 1000000 /* Armor class limits*/ #define TOTAL_WEAR_CHECKS (NUM_ITEM_WEARS-2) /*minus Wield and Take*/ @@ -3469,11 +3470,11 @@ ACMD (do_zcheck) len += snprintf(buf + len, sizeof(buf) - len, "- Both aggresive and agressive to align.\r\n"); - if ((GET_GOLD(mob) > MAX_GOLD_ALLOWED) && (found=1)) + if ((GET_GOLD(mob) > MAX_MOB_GOLD_ALLOWED) && (found=1)) len += snprintf(buf + len, sizeof(buf) - len, "- Set to %d Gold (limit : %d).\r\n", GET_GOLD(mob), - MAX_GOLD_ALLOWED); + MAX_MOB_GOLD_ALLOWED); if (GET_EXP(mob)>MAX_EXP_ALLOWED && (found=1)) len += snprintf(buf + len, sizeof(buf) - len, @@ -3518,10 +3519,10 @@ ACMD (do_zcheck) obj = &obj_proto[i]; switch (GET_OBJ_TYPE(obj)) { case ITEM_MONEY: - if ((value = GET_OBJ_VAL(obj, 1))>MAX_GOLD_ALLOWED && (found=1)) + if ((value = GET_OBJ_VAL(obj, 0))>MAX_OBJ_GOLD_ALLOWED && (found=1)) len += snprintf(buf + len, sizeof(buf) - len, "- Is worth %d (money limit %d coins).\r\n", - value, MAX_GOLD_ALLOWED); + value, MAX_OBJ_GOLD_ALLOWED); break; case ITEM_WEAPON: if (GET_OBJ_VAL(obj, 3) >= NUM_ATTACK_TYPES && (found=1)) diff --git a/src/players.c b/src/players.c index a7f0b84..c57601b 100644 --- a/src/players.c +++ b/src/players.c @@ -561,7 +561,7 @@ void save_char(struct char_data * ch) if (GET_HOST(ch)) fprintf(fl, "Host: %s\n", GET_HOST(ch)); if (GET_HEIGHT(ch) != PFDEF_HEIGHT) fprintf(fl, "Hite: %d\n", GET_HEIGHT(ch)); - if (GET_WEIGHT(ch) != PFDEF_HEIGHT) fprintf(fl, "Wate: %d\n", GET_WEIGHT(ch)); + if (GET_WEIGHT(ch) != PFDEF_WEIGHT) fprintf(fl, "Wate: %d\n", GET_WEIGHT(ch)); if (GET_ALIGNMENT(ch) != PFDEF_ALIGNMENT) fprintf(fl, "Alin: %d\n", GET_ALIGNMENT(ch));