mirror of
https://github.com/tbamud/tbamud.git
synced 2026-01-20 07:56:09 +01:00
jeremyosborne | 2008-04-04 02:36:38 +0200 (Fri, 04 Apr 2008) | 1 line
Minor Bugfix: All game configuration settings now reference the world config structure, not the individual config variables found in config.c. ------------------------------------------------------------------------ rumble | 2008-03-22 13:27:00 +0100 (Sat, 22 Mar 2008) | 1 line Added lib/world/qst/ directory, index, index.mini, and 0.qst. ------------------------------------------------------------------------ jeremyosborne | 2008-03-08 03:27:51 +0100 (Sat, 08 Mar 2008) | 3 lines Bugfix: the include directory (for .h files) is now referenced correctly in the depend statement. Deletion: listrent.c removed as a separate utility. ------------------------------------------------------------------------ jeremyosborne | 2008-03-08 03:08:51 +0100 (Sat, 08 Mar 2008) | 1 line Enhancement: utils/ Makefile will now use a depends file, and looks for dependen cies in the ../ directory (shrinks the necessary information to make each utilit y). ------------------------------------------------------------------------ Rumble | 2008-03-06 23:39:35 +0100 (Thu, 06 Mar 2008) | 1 line Made TBA specific changes. do_cheat, removed help level checking, and advance to level 32. ------------------------------------------------------------------------ jeremyosborne | 2008-03-06 18:37:12 +0100 (Thu, 06 Mar 2008) | 1 line Minor Update: Changed header of Makefile.in to read 'tbaMUD' and also added in a ttribution for the changes. (Thanks seqwith.) ------------------------------------------------------------------------ jeremyosborne | 2008-03-06 18:31:07 +0100 (Thu, 06 Mar 2008) | 4 lines Changed Makefile.in to use glob expressions when building the objects. This translates into no longer a need to update Makefile.in whenever a new .c file is added to the mud code. Other Makefile.* have not yet been changed (and need review, anyway). All CXREF cruft left in Makefile.in has been removed. tbaMUD is now using Doxygen. Technically, CXREF provides a bit more auto-documentation than Doxygen does, however the tbaMUD (and legacy circle code) has never been marked-up with the special CXREF codes required to effectively use the program. Since Doxygen is easier to use, and provides almost as much functionality as CXREF, CXREF support has been dropped. ------------------------------------------------------------------------ jeremyosborne | 2008-03-06 08:31:02 +0100 (Thu, 06 Mar 2008) | 1 line Bug Fix: asciiflag_conv* functions now can handle a negative numeric value. ------------------------------------------------------------------------ jeremyosborne | 2008-03-06 08:16:06 +0100 (Thu, 06 Mar 2008) | 1 line Bug fix/enhancement: Charmed mobs (specifically charmed mobs with a ->master) will no longer attempt to wander off. ------------------------------------------------------------------------ jeremyosborne | 2008-03-06 08:13:38 +0100 (Thu, 06 Mar 2008) | 6 lines Based on the compiler warning about mag_materials being an unused function, and the clone spell being unused. Bug fix: Clone can now be cast. It is an 'ignore' target spell. Fix and Modification: Clone, being an effectively unused spell that is only used by mortal Magic Users at level 30, is now implemented as very simple example of how to use mag_materials(). The item required by mag_materials is vnum 161, which in stock tbaMUD is some sacrificial entrails. ------------------------------------------------------------------------ jeremyosborne | 2008-03-05 01:43:09 +0100 (Wed, 05 Mar 2008) | 3 lines Bug Fix for "Did you mean:" including DG commands. ------------------------------------------------------------------------ jeremyosborne | 2008-03-05 01:29:18 +0100 (Wed, 05 Mar 2008) | 3 lines Bug Fix: do_simple_move slightly rewritten to handle Leave triggers that purge a door. Documentation: do_simple_move documented. ------------------------------------------------------------------------ Laoris | 2008-03-01 08:22:12 +0100 (Sat, 01 Mar 2008) | 1 line Trial run of columnizer function on commands list to see how people like it. ------------------------------------------------------------------------ jeremyosborne | 2008-02-26 22:36:17 +0100 (Tue, 26 Feb 2008) | 1 line asciimap, an in game automap, along with a couple of minor bug fixes to do with the automap, patched in (Thanks Jamdog). ------------------------------------------------------------------------ jeremyosborne | 2008-02-22 04:08:05 +0100 (Fri, 22 Feb 2008) | 1 line Minor update: Relocate local variable declaration to the top of ACMD(do_help) ------------------------------------------------------------------------ jeremyosborne | 2008-02-22 04:04:37 +0100 (Fri, 22 Feb 2008) | 6 lines Checked in the following placeholders for do_gen_tog: #define SCMD_AUTOLOOT 24 #define SCMD_AUTOGOLD 25 #define SCMD_AUTOSPLIT 26 #define SCMD_AUTOSAC 27 #define SCMD_AUTOASSIST 28 ------------------------------------------------------------------------ jeremyosborne | 2008-02-22 03:57:06 +0100 (Fri, 22 Feb 2008) | 1 line The Autoquest patch, along with a couple of minor bug fixes, has been integrated into tbaMUD. (Thanks Jamdog, Kenneth Ray and Morgaelin.) ------------------------------------------------------------------------ jeremyosborne | 2008-02-18 21:46:45 +0100 (Mon, 18 Feb 2008) | 2 lines Minor Fix: Casted NOWHERE, NOTHING, NOBODY and NOFLAG as IDXTYPE for the signed short int index types. ------------------------------------------------------------------------ jeremyosborne | 2008-02-18 03:36:16 +0100 (Mon, 18 Feb 2008) | 7 lines Added a new atoidx() conversion function for dealing with string to IDXTYPE conversions (in utils.c, prototype exported through utils.h). Added IDXTYPE_MIN and IDXTYPE_MAX defines (in structs.h). Replaced atoi references with atoidx in do_oasis_zedit (in zedit.c). ------------------------------------------------------------------------ Rumble | 2008-02-18 01:44:13 +0100 (Mon, 18 Feb 2008) | 1 line Fixed direction mapping to give readable directions instead of sub commands. ------------------------------------------------------------------------ jeremyosborne | 2008-02-18 00:26:15 +0100 (Mon, 18 Feb 2008) | 5 lines Since general olc editing are automatically saved to disk, 'shutdown reboot' has been changed to not-autosave by default. (Small change made to do_shutdown in act.wizard.c). ------------------------------------------------------------------------ jeremyosborne | 2008-02-18 00:12:12 +0100 (Mon, 18 Feb 2008) | 3 lines Changed: struct attack_hit_type moved to fight.h attack_hit_text exported through fight.h ------------------------------------------------------------------------ jeremyosborne | 2008-02-17 22:32:51 +0100 (Sun, 17 Feb 2008) | 7 lines - do_file heads or tails files correctly and has also been enhanced to return file info (act.wizard.c) - defines made for common log files created by autorun, and those used by do_file (db.h) - utility functions added: file_head(), file_tail(), file_sizeof(), and file_numlines() (defined utils.c and exported through utils.h) ------------------------------------------------------------------------ Rumble | 2008-02-16 23:24:05 +0100 (Sat, 16 Feb 2008) | 1 line Fixed export command. (thanks Kyle) ------------------------------------------------------------------------ jeremyosborne | 2008-02-16 22:42:46 +0100 (Sat, 16 Feb 2008) | 1 line Files are now tagged as executable. Should be able to be checked out from subver sion and executed without running chmod. ------------------------------------------------------------------------ Rumble | 2008-02-15 17:03:06 +0100 (Fri, 15 Feb 2008) | 1 line Fixed strcat() writing out of bounds in cedit.c since strdup() only malloc() strlen(str)+1 bytes. (thanks Buggo) and moved attack_hit_text back. ------------------------------------------------------------------------ jeremyosborne | 2008-02-13 20:41:02 +0100 (Wed, 13 Feb 2008) | 1 line Event queue function definitions, global variables and defines doxygenated. ------------------------------------------------------------------------ Rumble | 2008-02-12 00:23:38 +0100 (Tue, 12 Feb 2008) | 1 line Updated levels command to use an arg/range and added color parsing to greetings. (thanks Jamdog) ------------------------------------------------------------------------ jeremyosborne | 2008-02-11 21:06:10 +0100 (Mon, 11 Feb 2008) | 1 line Doxygen comments completed for weather.c ------------------------------------------------------------------------ Rumble | 2008-02-11 03:52:50 +0100 (Mon, 11 Feb 2008) | 1 line Corrected several 64-bit warnings. (thanks Buggo) ------------------------------------------------------------------------ Rumble | 2008-02-10 22:56:56 +0100 (Sun, 10 Feb 2008) | 1 line Added get_flag_by_name allowing for new trigedit variable checks like %actor.pref(FLAG)% checks. (thanks Jamdog) ------------------------------------------------------------------------ jeremyosborne | 2008-02-08 21:22:26 +0100 (Fri, 08 Feb 2008) | 3 lines COMPLETE: tbaMUD code re-org of global and local scope function and variable declarations. There may be a few things that I did not catch (some non extern keyword declarations of function prototypes within other functions, for example). BUG FIX: Unused functions encrypt_hex() and decrypt_hex() removed from mail.c. ------------------------------------------------------------------------ jeremyosborne | 2008-02-05 23:31:09 +0100 (Tue, 05 Feb 2008) | 2 lines Continued clean-up of 'extern' references to functions and variables. BUG UNCOVERED: set_title() in class.c incorrectly handles the const nature of the char * returned from title_female and title_male. ------------------------------------------------------------------------ jeremyosborne | 2008-02-05 19:38:17 +0100 (Tue, 05 Feb 2008) | 3 lines More work on mud clean-up. New file: spec_procs.h Created this file to house the legacy special procedures (spec_procs.c and castle.c) and special feature assignment in general. ------------------------------------------------------------------------ jeremyosborne | 2008-02-05 00:59:44 +0100 (Tue, 05 Feb 2008) | 3 lines - Minor Bugfix: Fixed parse error in mobact.c - Minor Bugfix: act.h is now included in all of the act functions. Forgot to do that the first time :( - Additions: ban.h has been added as the external entry point into the ban.c globals and functions. Files needing ban.h have been updated. ------------------------------------------------------------------------ jeremyosborne | 2008-02-04 20:02:11 +0100 (Mon, 04 Feb 2008) | 1 line All act*.c functions, defines and globals have been prototyped/declared in act.h. The file act.h does not contain every ACMD, only those ACMDs and utility functions available within the act*.c files. ------------------------------------------------------------------------ Rumble | 2008-02-04 17:59:47 +0100 (Mon, 04 Feb 2008) | 1 line Fixed the last few flags missed for the 128 bit conversion. ------------------------------------------------------------------------ Laoris | 2008-02-04 07:27:56 +0100 (Mon, 04 Feb 2008) | 3 lines Adding a column formatter for lists. Accepts printf-like arguments. Only used by medit right now. ------------------------------------------------------------------------ jeremyosborne | 2008-02-04 07:09:19 +0100 (Mon, 04 Feb 2008) | 2 lines - Changed the 'struct queue' to 'struct dg_queue' to avoid namespace conflicts. - Ongoing cleanup to mud project. ------------------------------------------------------------------------ Rumble | 2008-02-04 00:07:09 +0100 (Mon, 04 Feb 2008) | 1 line Fixed run_autowiz which ran twice on advancement. ------------------------------------------------------------------------ jeremyosborne | 2008-02-03 03:46:22 +0100 (Sun, 03 Feb 2008) | 1 line act.h created and added. This header will be the external entry point for the functions, function subcommands and variables within the act*.c files. It is not designed to be the entry point for all ACMD functions. ------------------------------------------------------------------------ jeremyosborne | 2008-02-03 02:44:29 +0100 (Sun, 03 Feb 2008) | 1 line Merge of another part of the code cleanup, the dg script stuff. ------------------------------------------------------------------------ jeremyosborne | 2008-02-02 08:56:03 +0100 (Sat, 02 Feb 2008) | 1 line Modularizing and organizing files continues. Committing comm.c and comm.h because they are hairy, and I don't want to do them over if my hard drive crashes. ------------------------------------------------------------------------ jeremyosborne | 2008-02-02 07:05:08 +0100 (Sat, 02 Feb 2008) | 4 lines - Marking all file scope functions as 'static' - Reorganization of the global variables and functions. ------------------------------------------------------------------------ jeremyosborne | 2008-01-31 10:20:47 +0100 (Thu, 31 Jan 2008) | 1 line * Protected the conf.h.* system config files from multiple calls. ------------------------------------------------------------------------ jeremyosborne | 2008-01-31 09:56:18 +0100 (Thu, 31 Jan 2008) | 1 line * Removed extraneous references to TRUE / FALSE and YES / NO defines. ------------------------------------------------------------------------ jeremyosborne | 2008-01-31 09:46:20 +0100 (Thu, 31 Jan 2008) | 2 lines * BUGFIX: NUM_POSITIONS set to 8 (was incorrectly set to 15 before) * Migrated NUM_* settings from oasis.h to more appropriate locations near where they are defined. (For Example: NUM_POSITIONS moved to structs.h next to the POSITION_* defines.) ------------------------------------------------------------------------ jeremyosborne | 2008-01-31 03:58:28 +0100 (Thu, 31 Jan 2008) | 1 line Added Appendix A - Coder Support. Right now, it simply speaks to the fact that we have included doxygen config files, are working to document the source code, and provides a rudimentary "do this" guide to create the doxygen cross references. ------------------------------------------------------------------------ jeremyosborne | 2008-01-30 07:12:07 +0100 (Wed, 30 Jan 2008) | 2 lines - All .h files now have doxygen recognized headers, and the format is slightly altered to ease editing of headers. - Protected all .h files from multiple calls. (Standard format is #ifndef _HEADE R_H_ #define _HEADER_H_ .... #endif) ------------------------------------------------------------------------ jeremyosborne | 2008-01-29 11:18:14 +0100 (Tue, 29 Jan 2008) | 1 line constants.h, structs.h and utils.h now protected from multiple includes. This is sometimes overkill, but good practice overall. ------------------------------------------------------------------------ jeremyosborne | 2008-01-29 10:38:18 +0100 (Tue, 29 Jan 2008) | 1 line Updated documentation for constants.c and constants.h. ------------------------------------------------------------------------ jeremyosborne | 2008-01-29 10:15:25 +0100 (Tue, 29 Jan 2008) | 3 lines The standard Doxygen configuration doxyfiles (config files) for tbaMUD. One is to be used with the Graphviz DOT (dox_withGraphs), one is designed to be used if Graphviz is not available. Now just need a short document describing the usage of doxygen. ------------------------------------------------------------------------ jeremyosborne | 2008-01-29 10:11:36 +0100 (Tue, 29 Jan 2008) | 1 line Minor document correction in struct dex_app_tpe. ------------------------------------------------------------------------ jeremyosborne | 2008-01-28 20:53:51 +0100 (Mon, 28 Jan 2008) | 1 line *bugfix* do_drink command: When a container is empty, the correct, "It is empty." message is now displayed. ------------------------------------------------------------------------ jeremyosborne | 2008-01-28 07:58:15 +0100 (Mon, 28 Jan 2008) | 3 lines Merging changes to trunk for: * utils.h, utils.c and structs.h doxygen comments * adding file dox_withGraphs.doxyfile
This commit is contained in:
parent
70f648c85b
commit
ebc985f010
120 changed files with 9028 additions and 4364 deletions
178
src/magic.c
178
src/magic.c
|
|
@ -19,20 +19,14 @@
|
|||
#include "interpreter.h"
|
||||
#include "constants.h"
|
||||
#include "dg_scripts.h"
|
||||
#include "class.h"
|
||||
#include "fight.h"
|
||||
|
||||
/* external variables */
|
||||
extern int mini_mud;
|
||||
extern struct spell_info_type spell_info[];
|
||||
|
||||
/* external functions */
|
||||
byte saving_throws(int class_num, int type, int level); /* class.c */
|
||||
void clearMemory(struct char_data *ch);
|
||||
/* local file scope function prototypes */
|
||||
static int mag_materials(struct char_data *ch, IDXTYPE item0, IDXTYPE item1, IDXTYPE item2, int extract, int verbose);
|
||||
static void perform_mag_groups(int level, struct char_data *ch, struct char_data *tch, int spellnum, int savetype);
|
||||
|
||||
/* local functions */
|
||||
int mag_materials(struct char_data *ch, int item0, int item1, int item2, int extract, int verbose);
|
||||
void perform_mag_groups(int level, struct char_data *ch, struct char_data *tch, int spellnum, int savetype);
|
||||
int mag_savingthrow(struct char_data *ch, int type, int modifier);
|
||||
void affect_update(void);
|
||||
|
||||
/* Negative apply_saving_throw[] values make saving throws better! So do
|
||||
* negative modifiers. Though people may be used to the reverse of that.
|
||||
|
|
@ -83,56 +77,113 @@ void affect_update(void)
|
|||
}
|
||||
}
|
||||
|
||||
/* mag_materials: Checks for up to 3 vnums (spell reagents) in the player's
|
||||
* inventory. No spells currently use mag_materials, but you can use it to
|
||||
* implement your own spells which require ingredients (i.e. heal spells which
|
||||
* requires a rare herb or some such.) */
|
||||
int mag_materials(struct char_data *ch, int item0, int item1, int item2,
|
||||
int extract, int verbose)
|
||||
/* Checks for up to 3 vnums (spell reagents) in the player's inventory. If
|
||||
* multiple vnums are passed in, the function ANDs the items together as
|
||||
* requirements (ie. if one or more are missing, the spell will not fail).
|
||||
* @param ch The caster of the spell.
|
||||
* @param item0 The first required item of the spell, NOTHING if not required.
|
||||
* @param item1 The second required item of the spell, NOTHING if not required.
|
||||
* @param item2 The third required item of the spell, NOTHING if not required.
|
||||
* @param extract TRUE if mag_materials should consume (destroy) the items in
|
||||
* the players inventory, FALSE if not. Items will only be removed on a
|
||||
* successful cast.
|
||||
* @param verbose TRUE to provide some generic failure or success messages,
|
||||
* FALSE to send no in game messages from this function.
|
||||
* @retval int TRUE if ch has all materials to cast the spell, FALSE if not.
|
||||
*/
|
||||
static int mag_materials(struct char_data *ch, IDXTYPE item0,
|
||||
IDXTYPE item1, IDXTYPE item2, int extract, int verbose)
|
||||
{
|
||||
struct obj_data *tobj;
|
||||
/* Begin Local variable definitions. */
|
||||
/*------------------------------------------------------------------------*/
|
||||
/* Used for object searches. */
|
||||
struct obj_data *tobj = NULL;
|
||||
/* Points to found reagents. */
|
||||
struct obj_data *obj0 = NULL, *obj1 = NULL, *obj2 = NULL;
|
||||
/*------------------------------------------------------------------------*/
|
||||
/* End Local variable definitions. */
|
||||
|
||||
for (tobj = ch->carrying; tobj; tobj = tobj->next_content) {
|
||||
if ((item0 > 0) && (GET_OBJ_VNUM(tobj) == item0)) {
|
||||
/* Begin success checks. Checks must pass to signal a success. */
|
||||
/*------------------------------------------------------------------------*/
|
||||
/* Check for the objects in the players inventory. */
|
||||
for (tobj = ch->carrying; tobj; tobj = tobj->next_content)
|
||||
{
|
||||
if ((item0 != NOTHING) && (GET_OBJ_VNUM(tobj) == item0))
|
||||
{
|
||||
obj0 = tobj;
|
||||
item0 = -1;
|
||||
} else if ((item1 > 0) && (GET_OBJ_VNUM(tobj) == item1)) {
|
||||
item0 = NOTHING;
|
||||
}
|
||||
else if ((item1 != NOTHING) && (GET_OBJ_VNUM(tobj) == item1))
|
||||
{
|
||||
obj1 = tobj;
|
||||
item1 = -1;
|
||||
} else if ((item2 > 0) && (GET_OBJ_VNUM(tobj) == item2)) {
|
||||
item1 = NOTHING;
|
||||
}
|
||||
else if ((item2 != NOTHING) && (GET_OBJ_VNUM(tobj) == item2))
|
||||
{
|
||||
obj2 = tobj;
|
||||
item2 = -1;
|
||||
item2 = NOTHING;
|
||||
}
|
||||
}
|
||||
if ((item0 > 0) || (item1 > 0) || (item2 > 0)) {
|
||||
if (verbose) {
|
||||
switch (rand_number(0, 2)) {
|
||||
|
||||
/* If we needed items, but didn't find all of them, then the spell is a
|
||||
* failure. */
|
||||
if ((item0 != NOTHING) || (item1 != NOTHING) || (item2 != NOTHING))
|
||||
{
|
||||
/* Generic spell failure messages. */
|
||||
if (verbose)
|
||||
{
|
||||
switch (rand_number(0, 2))
|
||||
{
|
||||
case 0:
|
||||
send_to_char(ch, "A wart sprouts on your nose.\r\n");
|
||||
break;
|
||||
send_to_char(ch, "A wart sprouts on your nose.\r\n");
|
||||
break;
|
||||
case 1:
|
||||
send_to_char(ch, "Your hair falls out in clumps.\r\n");
|
||||
break;
|
||||
send_to_char(ch, "Your hair falls out in clumps.\r\n");
|
||||
break;
|
||||
case 2:
|
||||
send_to_char(ch, "A huge corn develops on your big toe.\r\n");
|
||||
break;
|
||||
send_to_char(ch, "A huge corn develops on your big toe.\r\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* Return fales, the material check has failed. */
|
||||
return (FALSE);
|
||||
}
|
||||
if (extract) {
|
||||
if (item0 < 0)
|
||||
/*------------------------------------------------------------------------*/
|
||||
/* End success checks. */
|
||||
|
||||
/* From here on, ch has all required materials in their inventory and the
|
||||
* material check will return a success. */
|
||||
|
||||
/* Begin Material Processing. */
|
||||
/*------------------------------------------------------------------------*/
|
||||
/* Extract (destroy) the materials, if so called for. */
|
||||
if (extract)
|
||||
{
|
||||
if (obj0 != NULL)
|
||||
extract_obj(obj0);
|
||||
if (item1 < 0)
|
||||
if (obj1 != NULL)
|
||||
extract_obj(obj1);
|
||||
if (item2 < 0)
|
||||
if (obj2 != NULL)
|
||||
extract_obj(obj2);
|
||||
/* Generic success messages that signals extracted objects. */
|
||||
if (verbose)
|
||||
{
|
||||
send_to_char(ch, "A puff of smoke rises from your pack.\r\n");
|
||||
act("A puff of smoke rises from $n's pack.", TRUE, ch, NULL, NULL, TO_ROOM);
|
||||
}
|
||||
}
|
||||
if (verbose) {
|
||||
send_to_char(ch, "A puff of smoke rises from your pack.\r\n");
|
||||
act("A puff of smoke rises from $n's pack.", TRUE, ch, NULL, NULL, TO_ROOM);
|
||||
|
||||
/* Don't extract the objects, but signal materials successfully found. */
|
||||
if(!extract && verbose)
|
||||
{
|
||||
send_to_char(ch, "Your pack rumbles.\r\n");
|
||||
act("Something rumbles in $n's pack.", TRUE, ch, NULL, NULL, TO_ROOM);
|
||||
}
|
||||
/*------------------------------------------------------------------------*/
|
||||
/* End Material Processing. */
|
||||
|
||||
/* Signal to calling function that the materials were successfully found
|
||||
* and processed. */
|
||||
return (TRUE);
|
||||
}
|
||||
|
||||
|
|
@ -489,7 +540,7 @@ void mag_affects(int level, struct char_data *ch, struct char_data *victim,
|
|||
|
||||
/* This function is used to provide services to mag_groups. This function is
|
||||
* the one you should change to add new group spells. */
|
||||
void perform_mag_groups(int level, struct char_data *ch,
|
||||
static void perform_mag_groups(int level, struct char_data *ch,
|
||||
struct char_data *tch, int spellnum, int savetype)
|
||||
{
|
||||
switch (spellnum) {
|
||||
|
|
@ -605,9 +656,13 @@ void mag_areas(int level, struct char_data *ch, int spellnum, int savetype)
|
|||
}
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* Begin Magic Summoning - Generic Routines and Local Globals */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
/* Every spell which summons/gates/conjours a mob comes through here. */
|
||||
/* These use act(), don't put the \r\n. */
|
||||
const char *mag_summon_msgs[] = {
|
||||
static const char *mag_summon_msgs[] = {
|
||||
"\r\n",
|
||||
"$n makes a strange magical gesture; you feel a strong breeze!",
|
||||
"$n animates a corpse!",
|
||||
|
|
@ -624,7 +679,7 @@ const char *mag_summon_msgs[] = {
|
|||
};
|
||||
|
||||
/* Keep the \r\n because these use send_to_char. */
|
||||
const char *mag_summon_fail_msgs[] = {
|
||||
static const char *mag_summon_fail_msgs[] = {
|
||||
"\r\n",
|
||||
"There are no such creatures.\r\n",
|
||||
"Uh oh...\r\n",
|
||||
|
|
@ -635,11 +690,10 @@ const char *mag_summon_fail_msgs[] = {
|
|||
"There is no corpse!\r\n"
|
||||
};
|
||||
|
||||
/* Defined mobiles. */
|
||||
#define MOB_ELEMENTAL_BASE 20
|
||||
#define MOB_CLONE 10
|
||||
#define MOB_ZOMBIE 11
|
||||
#define MOB_AERIALSERVANT 19
|
||||
/* Defines for Mag_Summons */
|
||||
#define MOB_CLONE 10 /**< vnum for the clone mob. */
|
||||
#define OBJ_CLONE 161 /**< vnum for clone material. */
|
||||
#define MOB_ZOMBIE 11 /**< vnum for the zombie mob. */
|
||||
|
||||
void mag_summons(int level, struct char_data *ch, struct obj_data *obj,
|
||||
int spellnum, int savetype)
|
||||
|
|
@ -657,7 +711,19 @@ void mag_summons(int level, struct char_data *ch, struct obj_data *obj,
|
|||
msg = 10;
|
||||
fmsg = rand_number(2, 6); /* Random fail message. */
|
||||
mob_num = MOB_CLONE;
|
||||
pfail = 50; /* 50% failure, should be based on something later. */
|
||||
/*
|
||||
* We have designated the clone spell as the example for how to use the
|
||||
* mag_materials function.
|
||||
* In stock tbaMUD it checks to see if the character has item with
|
||||
* vnum 161 which is a set of sacrificial entrails. If we have the entrails
|
||||
* the spell will succeed, and if not, the spell will fail 102% of the time
|
||||
* (prevents random success... see below).
|
||||
* The object is extracted and the generic cast messages are displayed.
|
||||
*/
|
||||
if( !mag_materials(ch, OBJ_CLONE, NOTHING, NOTHING, TRUE, TRUE) )
|
||||
pfail = 102; /* No materials, spell fails. */
|
||||
else
|
||||
pfail = 0; /* We have the entrails, spell is successfully cast. */
|
||||
break;
|
||||
|
||||
case SPELL_ANIMATE_DEAD:
|
||||
|
|
@ -712,6 +778,16 @@ void mag_summons(int level, struct char_data *ch, struct obj_data *obj,
|
|||
}
|
||||
}
|
||||
|
||||
/* Clean up the defines used for mag_summons. */
|
||||
#undef MOB_CLONE
|
||||
#undef OBJ_CLONE
|
||||
#undef MOB_ZOMBIE
|
||||
|
||||
/*----------------------------------------------------------------------------*/
|
||||
/* End Magic Summoning - Generic Routines and Local Globals */
|
||||
/*----------------------------------------------------------------------------*/
|
||||
|
||||
|
||||
void mag_points(int level, struct char_data *ch, struct char_data *victim,
|
||||
int spellnum, int savetype)
|
||||
{
|
||||
|
|
@ -811,7 +887,7 @@ void mag_alter_objs(int level, struct char_data *ch, struct obj_data *obj,
|
|||
}
|
||||
break;
|
||||
case SPELL_INVISIBLE:
|
||||
if (!OBJ_FLAGGED(obj, ITEM_NOINVIS | ITEM_INVISIBLE)) {
|
||||
if (!OBJ_FLAGGED(obj, ITEM_NOINVIS) || !OBJ_FLAGGED(obj, ITEM_INVISIBLE)) {
|
||||
SET_BIT_AR(GET_OBJ_EXTRA(obj), ITEM_INVISIBLE);
|
||||
to_char = "$p vanishes.";
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue