From 30a82beeebf74cc6faad3a7371315fb712a04c48 Mon Sep 17 00:00:00 2001 From: Rumble Date: Sat, 5 Dec 2009 22:24:22 +0000 Subject: [PATCH] [Dec 05 2009] - Rumble Changed zedit clear level restrictions to dump you back at main zedit menu ins tead of in the level menu. Changed zone level restriction to level recommendation so players would not be blocked from zones. Changed Zcheck to level 31. [Nov 19 2009] - Rumble Fixed list obj max/min from room to obj. (thanks Elervan) [Nov 13 2009] - Rumble Removed con_app 2nd apply type shock that was for "resurrection?" This was not used in 3.1. [Nov 12 2009] - Rumble Fixed overflow in prefedit.c. (thanks Xiu) [Nov 01 2009] - Rumble Renamed autorun log entries from autoscript killed to terminated so it wouldn' t go into the log/rip file. --- autorun | 2 +- autorun.cmd | 2 +- autorun.pl | 2 +- autorun.sh | 2 +- changelog | 13 +++++++++++ lib/world/zon/2.zon | 2 +- macrun.pl | 2 +- src/act.movement.c | 9 ++------ src/constants.c | 54 ++++++++++++++++++++++----------------------- src/interpreter.c | 2 +- src/oasis_list.c | 2 +- src/prefedit.c | 2 +- src/structs.h | 1 - src/zedit.c | 2 +- 14 files changed, 52 insertions(+), 45 deletions(-) diff --git a/autorun b/autorun index 15377fe..324f3bf 100755 --- a/autorun +++ b/autorun @@ -148,7 +148,7 @@ while ( : ) do if [ -r .killscript ]; then DATE=`date`; - echo "autoscript killed $DATE" >> syslog + echo "autoscript terminated $DATE" >> syslog rm .killscript proc_syslog exit diff --git a/autorun.cmd b/autorun.cmd index 5facced..a16c5e9 100755 --- a/autorun.cmd +++ b/autorun.cmd @@ -69,7 +69,7 @@ Do forever if (stream("killscr","c","query exists")<>"") then do Say "Exiting autorun" - "echo autoscript killed "DATE() ">> syslog" + "echo autoscript terminated "DATE() ">> syslog" "del killscr" exit end diff --git a/autorun.pl b/autorun.pl index 6c917a9..9bbc8d0 100755 --- a/autorun.pl +++ b/autorun.pl @@ -89,7 +89,7 @@ while (1) { if (-r '.killscript') { unlink '.killscript'; open (SYSLOG, '>> log/syslog.1'); - print SYSLOG "autoscript killed ", `date`; + print SYSLOG "autoscript terminated ", `date`; exit; } diff --git a/autorun.sh b/autorun.sh index 15e6e44..8b401fd 100755 --- a/autorun.sh +++ b/autorun.sh @@ -75,7 +75,7 @@ while ( : ) do if [ -r .killscript ]; then DATE=`date`; - echo "autoscript killed $DATE" >> syslog + echo "autoscript terminated $DATE" >> syslog rm .killscript exit fi diff --git a/changelog b/changelog index bd27594..1d12285 100644 --- a/changelog +++ b/changelog @@ -36,6 +36,18 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist) (lots of major bugfixes too) @ tbaMUD 3.61 +[Dec 05 2009] - Rumble + Changed zedit clear level restrictions to dump you back at main zedit menu instead of in the level menu. + Changed zone level restriction to level recommendation so players would not be blocked from zones. + Changed Zcheck to level 31. +[Nov 19 2009] - Rumble + Fixed list obj max/min from room to obj. (thanks Elervan) +[Nov 13 2009] - Rumble + Removed con_app 2nd apply type shock that was for "resurrection?" This was not used in 3.1. +[Nov 12 2009] - Rumble + Fixed overflow in prefedit.c. (thanks Xiu) +[Nov 01 2009] - Rumble + Renamed autorun log entries from autoscript killed to terminated so it wouldn't go into the log/rip file. [Nov 01 2009] - Fizban Changed MOB_OR_IMPL macro to allow player-attachable scripts to work properly and edited the output of 'show zones'. [Oct 27 2009] - Rumble @@ -43,6 +55,7 @@ tbaMUD 3.61 PLR_BUG/IDEA/TYPO flag cleanup. [Oct 24 2009] - Jamdog Added new IBT system for Ideas, Bugs and Typos (thanks Frenze) + **WARNING** This will create new files so backup your old ones first. [Oct 23 2009] - Rumble Fixed bug in renumbering zone table after deleting mobiles. (thanks Drefs) Fixed bug in renumbering zone table after deleting objects. (thanks Drefs) diff --git a/lib/world/zon/2.zon b/lib/world/zon/2.zon index df88a9f..7bb600d 100644 --- a/lib/world/zon/2.zon +++ b/lib/world/zon/2.zon @@ -2,10 +2,10 @@ Rumble~ Sanctus II~ 200 299 10 2 d 0 0 0 -1 -1 +M 0 169 3 200 (a citizen) M 0 162 3 237 (a statesman) E 1 140 99 12 (a cloth jacket) O 0 116 1 237 (the bench) -M 0 169 3 200 (a citizen) M 0 13 1 235 (a kind soul) M 0 125 3 254 (the young girl) M 0 164 1 254 (the drunk) diff --git a/macrun.pl b/macrun.pl index d44793f..b500327 100644 --- a/macrun.pl +++ b/macrun.pl @@ -117,7 +117,7 @@ while (1) { unlink(".killscript"); open (SYSLOG, ">>:log:syslog.1"); - print (SYSLOG "autoscript killed ", localtime()); #seconds since epoch + print (SYSLOG "autoscript terminated ", localtime()); #seconds since epoch exit; } diff --git a/src/act.movement.c b/src/act.movement.c index 9eeb144..4610b43 100644 --- a/src/act.movement.c +++ b/src/act.movement.c @@ -213,14 +213,9 @@ int do_simple_move(struct char_data *ch, int dir, int need_specials_check) } } - /* Check zone level restrictions */ + /* Check zone level recommendations */ if ((ZONE_MINLVL(GET_ROOM_ZONE(going_to)) != -1) && ZONE_MINLVL(GET_ROOM_ZONE(going_to)) > GET_LEVEL(ch)) { - send_to_char(ch, "You are not ready to enter that area.\r\n"); - return (0); - } -if ((GET_LEVEL(ch) < LVL_IMMORT) && (ZONE_MAXLVL(GET_ROOM_ZONE(going_to)) != -1) && ZONE_MAXLVL(GET_ROOM_ZONE(going_to)) < GET_LEVEL(ch)) { - send_to_char(ch, "You are too powerful for that area.\r\n"); - return (0); + send_to_char(ch, "This zone is above your recommended level.\r\n"); } /* Check zone flag restrictions */ diff --git a/src/constants.c b/src/constants.c index 8cd040d..8d98641 100644 --- a/src/constants.c +++ b/src/constants.c @@ -677,34 +677,34 @@ cpp_extern const struct dex_app_type dex_app[] = { }; /** Constitution attribute affects. - * The fields referenced are hit points and system shock survival. */ + * The field referenced is for hitpoint bonus. */ cpp_extern const struct con_app_type con_app[] = { - {-4, 20}, /* con = 0 */ - {-3, 25}, /* con = 1 */ - {-2, 30}, - {-2, 35}, - {-1, 40}, - {-1, 45}, /* con = 5 */ - {-1, 50}, - {0, 55}, - {0, 60}, - {0, 65}, - {0, 70}, /* con = 10 */ - {0, 75}, - {0, 80}, - {0, 85}, - {0, 88}, - {1, 90}, /* con = 15 */ - {2, 95}, - {2, 97}, - {3, 99}, /* con = 18 */ - {3, 99}, - {4, 99}, /* con = 20 */ - {5, 99}, - {5, 99}, - {5, 99}, - {6, 99}, - {6, 99} /* con = 25 */ + {-4}, /* con = 0 */ + {-3}, /* con = 1 */ + {-2}, + {-2}, + {-1}, + {-1}, /* con = 5 */ + {-1}, + {0}, + {0}, + {0}, + {0}, /* con = 10 */ + {0}, + {0}, + {0}, + {0}, + {1}, /* con = 15 */ + {2}, + {2}, + {3}, /* con = 18 */ + {3}, + {4}, /* con = 20 */ + {5}, + {5}, + {5}, + {6}, + {6} /* con = 25 */ }; /** Intelligence attribute affects. diff --git a/src/interpreter.c b/src/interpreter.c index 10b9f4e..deb2b58 100644 --- a/src/interpreter.c +++ b/src/interpreter.c @@ -344,7 +344,7 @@ cpp_extern const struct command_info cmd_info[] = { { "zlist" , "zlist" , POS_DEAD , do_oasis_list, LVL_BUILDER, SCMD_OASIS_ZLIST }, { "zlock" , "zlock" , POS_DEAD , do_zlock , LVL_GOD, 0 }, { "zunlock" , "zunlock" , POS_DEAD , do_zunlock , LVL_GOD, 0 }, - { "zcheck" , "zcheck" , POS_DEAD , do_zcheck , LVL_GOD, 0 }, + { "zcheck" , "zcheck" , POS_DEAD , do_zcheck , LVL_BUILDER, 0 }, { "zpurge" , "zpurge" , POS_DEAD , do_zpurge , LVL_BUILDER, 0 }, { "\n", "zzzzzzz", 0, 0, 0, 0 } }; /* this must be last */ diff --git a/src/oasis_list.c b/src/oasis_list.c index f80167f..f222d88 100644 --- a/src/oasis_list.c +++ b/src/oasis_list.c @@ -318,7 +318,7 @@ static void list_mobiles(struct char_data *ch, zone_rnum rnum, mob_vnum vmin, mo } /* List all objects in a zone. */ -static void list_objects(struct char_data *ch, zone_rnum rnum, room_vnum vmin, room_vnum vmax) +static void list_objects(struct char_data *ch, zone_rnum rnum, obj_vnum vmin, obj_vnum vmax) { obj_rnum i; obj_vnum bottom, top; diff --git a/src/prefedit.c b/src/prefedit.c index 088f12f..29eaf82 100755 --- a/src/prefedit.c +++ b/src/prefedit.c @@ -264,7 +264,7 @@ static void prefedit_disp_toggles_menu(struct descriptor_data *d) static void prefedit_disp_prompt_menu(struct descriptor_data *d) { - char prompt_string[6]; + char prompt_string[7]; if (PREFEDIT_FLAGGED(PRF_DISPAUTO)) sprintf(prompt_string, ""); diff --git a/src/structs.h b/src/structs.h index f1540f8..00bf4d6 100644 --- a/src/structs.h +++ b/src/structs.h @@ -1191,7 +1191,6 @@ struct int_app_type struct con_app_type { sh_int hitp; /**< Added to a character's new MAXHP at each new level. */ - sh_int shock; /**< Historically affects resurrection chances. */ }; /** Stores, and used to deliver, the current weather information diff --git a/src/zedit.c b/src/zedit.c index 149bf69..6a2174a 100644 --- a/src/zedit.c +++ b/src/zedit.c @@ -857,7 +857,7 @@ void zedit_parse(struct descriptor_data *d, char *arg) case '3': OLC_ZONE(d)->min_level = -1; OLC_ZONE(d)->max_level = -1; OLC_ZONE(d)->number = 1; - zedit_disp_levels(d); + zedit_disp_menu(d); break; case '0':