diff --git a/changelog b/changelog index 1642889..4113ccd 100644 --- a/changelog +++ b/changelog @@ -34,6 +34,11 @@ OLC copy and delete options. export (QQ's a zone into a tarball) Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist) (lots of major bugfixes too) +@ +tbaMUD 3.6 +[Jul 04 2009] - Rumble + added trigedit variable armor to return AC. (thanks Fizban) + Fixed typo in do_advance PLR to PRF. (thanks Drefs) [Jun 08 2009] - Jamdog Bug-Fix: DG-Scripts: If %actor% dies during a script, then %force% %actor% no longer crashes the MUD. Added 'set help' now displays a list of available set options (thanks Super) @@ -70,6 +75,7 @@ Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist) Bug-Fix: Changing a player name no longer allows two words (thanks Slicer) [Apr 05 2009] - Jamdog Bug-Fix: Now frees memory used by qedit and hedit when closing a socket (Thanks Xiuhtecuhtli) +@ tbaMUD 3.59 [Apr 05 2009] - Rumble Updated World and files for 3.59 release. diff --git a/lib/world/qst/1.qst b/lib/world/qst/1.qst new file mode 100644 index 0000000..f18a255 --- /dev/null +++ b/lib/world/qst/1.qst @@ -0,0 +1,15 @@ +#100 +Kill the Mice!~ +mice~ + I really need some help killing these mice or the Sarge is going to make my +life a living hell. +~ + Well done! You have completed your quest! +~ +You have abandoned the quest. +~ +3 179 0 194 -1 -1 -1 +0 0 1 34 60 -1 3 +10 0 65535 +S +$~ diff --git a/src/act.wizard.c b/src/act.wizard.c index 4e3d057..6d6c0b9 100644 --- a/src/act.wizard.c +++ b/src/act.wizard.c @@ -1505,8 +1505,8 @@ ACMD(do_advance) REMOVE_BIT_AR(PRF_FLAGS(victim), PRF_LOG1); REMOVE_BIT_AR(PLR_FLAGS(victim), PRF_LOG2); REMOVE_BIT_AR(PRF_FLAGS(victim), PRF_NOHASSLE); - REMOVE_BIT_AR(PLR_FLAGS(victim), PRF_HOLYLIGHT); - REMOVE_BIT_AR(PLR_FLAGS(victim), PRF_SHOWVNUMS); + REMOVE_BIT_AR(PRF_FLAGS(victim), PRF_HOLYLIGHT); + REMOVE_BIT_AR(PRF_FLAGS(victim), PRF_SHOWVNUMS); if (!PLR_FLAGGED(victim, PLR_NOWIZLIST)) run_autowiz(); } else if (oldlevel < LVL_IMMORT && newlevel >= LVL_IMMORT) { diff --git a/src/dg_variables.c b/src/dg_variables.c index 7f0442d..8a1ec5e 100644 --- a/src/dg_variables.c +++ b/src/dg_variables.c @@ -17,6 +17,7 @@ #include "handler.h" #include "dg_event.h" #include "db.h" +#include "fight.h" #include "screen.h" #include "constants.h" #include "spells.h" @@ -558,8 +559,10 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig, int addition = atoi(subfield); GET_ALIGNMENT(c) = MAX(-1000, MIN(addition, 1000)); } - snprintf(str, slen, "%d", GET_ALIGNMENT(c)); + snprintf(str, slen, "%d", GET_ALIGNMENT(c)); } + else if (!str_cmp(field, "armor")) + snprintf(str, slen, "%d", compute_armor_class(c)); break; case 'c': if (!str_cmp(field, "canbeseen")) {