diff -i smaug14/src/mud.h smaug18/src/mud.h
8c8
< * Tricops and Fireblade | *
---
> * Tricops, Fireblade, Edmond, Conran | *
25a26,27
> /* uncomment below to add honour to the mix
> #define HONOUR_CODE */
124a127,132
>
> #ifdef MYSTARIC
> typedef struct casino_data CASINO_DATA;
> typedef struct gambler_data GAMBLER_DATA;
> #endif
>
127a136
> typedef struct noauction_data NOAUCTION_DATA;
136a146
> typedef struct mpsleep_data MPSLEEP_DATA;
156,157c166,170
<
<
---
> typedef struct vault_data VAULT_DATA;
> typedef struct member_data MEMBER_DATA;
> typedef struct member_list MEMBER_LIST;
> typedef struct variable_data VARIABLE_DATA;
> typedef struct lmsg_data LMSG_DATA;
218a232,236
> #define MAX_VNUM 1000000000 /* Upper vnum limit */
>
> #define MAX_RGRID_ROOMS 30000
>
>
235,236c253,255
< #define MAX_RACE 20
< #define MAX_NPC_RACE 91
---
> #define MAX_RACE 26
> #define MAX_NPC_RACE 190
> #define MAX_MSG 18
244c263
< #define MAX_CPD 4 /* Maximum council power level difference */
---
> #define MAX_CPD 11 /* Maximum council power level difference */
245a265,266
> #define MAX_MOB_STANCE 200 /* Mobs Master stance at this number */
> #define MAX_PC_STANCE 200 /* PC's Master stance at this number */
248a270
> #define MAX_OINVOKE_QUANTITY 50 /* Max number of objects that can be oinvoked at once */
267d288
<
270a292,295
> #include "news.h" /* Extended News - 12/15/01 - Nopey */
> #include "house.h"
> #include "hint.h"
>
281a307
> #define PULSE_CASINO (8 * PULSE_PER_SECOND)
294c320,329
< #define AREA_VERSION_WRITE 1
---
> /* MAKE COMMENTS BELOW FOR AREA VERSION INCREASES */
> #define AREA_VERSION_WRITE 3
> #define MIN_SAVE_VERSION 3
> /***********************
> *AREA_VERSION_WRITE 1 - Original 4k area version
> *AREA_VERSION_WRITE 2 - Added level in the settable/saveable index values of objects
> *AREA_VERSION_WRITE 3 - Fixed major fuck up of the above area version in saving the flags/level/layers line of objects
> *
> ************************/
>
302c337
< LOG_WARN, LOG_ALL
---
> LOG_WARN, LOG_BUG, LOG_ALL
304a340,354
>
> /* Setup our definitions of stances */
>
> typedef enum
> {
> STANCE_NONE, STANCE_NORMAL, STANCE_VIPER, STANCE_CRANE, STANCE_CRAB,
> STANCE_MONGOOSE, STANCE_BULL, STANCE_MANTIS, STANCE_DRAGON, STANCE_TIGER,
> STANCE_MONKEY, STANCE_SWALLOW, MAX_STANCE
> }
> stance_types;
>
> #define BASIC_STANCE STANCE_MANTIS /* This is one more than the last basic
> * Stance for seting up mobs values if
> * None are specified. SHADDAI */
>
314a365,367
> #ifdef NEWSPELLS /* Need more info from failed spells -- Alty */
> rVICT_HASAFF, rVICT_SAVED,
> #endif
318a372,378
> #ifdef NEWSPELLS
> typedef enum
> {
> cSPELL, cFAIL, cRECAST, cIMMUNE, cSAVED, cNONE = 255
> } spell_chains;
> #endif
>
322a383
> #define ECHOTAR_PK 3
340c401
< #define MAX_BITS XBI * INTBITS
---
> #define MAX_BITS (XBI * INTBITS)
346c407
< int bits[XBI];
---
> unsigned int bits[XBI];
350a412,414
>
>
>
493a558,588
> struct vault_data
> {
> VAULT_DATA * next;
> VAULT_DATA * prev;
> int vnum;
> };
>
>
> typedef enum
> {
> vtNONE, vtINT, vtXBIT, vtSTR
> } variable_types;
>
> /*
> * Variable structure used for putting variable tags on players, mobs
> * or anything else. Will be persistant (save) for players.
> */
> struct variable_data
> {
> VARIABLE_DATA * next;
> char type; /* type of data */
> int flags; /* flags for future use */
> int vnum; /* vnum of mob that set this */
> time_t c_time; /* time created */
> time_t m_time; /* time last modified */
> time_t r_time; /* time last read */
> time_t expires; /* expiry date */
> int timer; /* expiry timer */
> char * tag; /* variable name */
> void * data; /* data pointer */
> };
532a628,637
> struct lmsg_data
> {
> LMSG_DATA *next;
> LMSG_DATA *prev;
> char *name;
> char *text;
> sh_int type;
> };
>
>
573a679,684
> struct noauction_data
> {
> NOAUCTION_DATA *next;
> NOAUCTION_DATA *prev;
> int vnum;
> };
702c813
< SUB_PROJ_DESC,
---
> SUB_PROJ_DESC, SUB_JOURNAL_WRITE, SUB_NEWS_POST, SUB_NEWS_EDIT,
832a944
> #define LANG_GNOME BV20 /* Gnome Language */
836,837c948,949
< | LANG_HALFLING | LANG_GITH )
< /* 18 Languages */
---
> | LANG_HALFLING | LANG_GITH | LANG_GNOME )
> /* 19 Languages */
914a1027,1034
> AT_SHOUT,
> AT_MUSE,
> AT_QUEST,
> AT_ASK,
> AT_THINK,
> AT_STANCE,
> AT_AVATAR,
> AT_MUSIC,
919,969d1038
< #if 0
< #define AT_PLAIN AT_GREY
< #define AT_ACTION AT_GREY
< #define AT_SAY AT_LBLUE
< #define AT_GOSSIP AT_LBLUE
< #define AT_YELL AT_WHITE
< #define AT_TELL AT_WHITE
< #define AT_WHISPER AT_WHITE
< #define AT_HIT AT_WHITE
< #define AT_HITME AT_YELLOW
< #define AT_IMMORT AT_YELLOW
< #define AT_HURT AT_RED
< #define AT_FALLING AT_WHITE + AT_BLINK
< #define AT_DANGER AT_RED + AT_BLINK
< #define AT_MAGIC AT_BLUE
< #define AT_CONSIDER AT_GREY
< #define AT_REPORT AT_GREY
< #define AT_POISON AT_GREEN
< #define AT_SOCIAL AT_CYAN
< #define AT_DYING AT_YELLOW
< #define AT_DEAD AT_RED
< #define AT_SKILL AT_GREEN
< #define AT_CARNAGE AT_BLOOD
< #define AT_DAMAGE AT_WHITE
< #define AT_FLEE AT_YELLOW
< #define AT_RMNAME AT_WHITE
< #define AT_RMDESC AT_YELLOW
< #define AT_OBJECT AT_GREEN
< #define AT_PERSON AT_PINK
< #define AT_LIST AT_BLUE
< #define AT_BYE AT_GREEN
< #define AT_GOLD AT_YELLOW
< #define AT_GTELL AT_BLUE
< #define AT_NOTE AT_GREEN
< #define AT_HUNGRY AT_ORANGE
< #define AT_THIRSTY AT_BLUE
< #define AT_FIRE AT_RED
< #define AT_SOBER AT_WHITE
< #define AT_WEAROFF AT_YELLOW
< #define AT_EXITS AT_WHITE
< #define AT_SCORE AT_LBLUE
< #define AT_RESET AT_DGREEN
< #define AT_LOG AT_PURPLE
< #define AT_DIEMSG AT_WHITE
< #define AT_WARTALK AT_RED
< #define AT_RACETALK AT_DGREEN
< #define AT_IGNORE AT_GREEN
< #define AT_DIVIDER AT_PLAIN
< #define AT_MORPH AT_GREY
< #endif
<
984a1054,1082
> typedef struct {
> char value;
> char suit;
> } CARD;
>
> /*
> * Casino Definitions
> */
>
> #ifdef MYSTARIC
>
> typedef enum {
> BLACKJACK, CRAPS
> } casino_game_states;
>
> casino_game_states casino_games;
>
> typedef enum {
> DONE, READY, CAN_HIT, CAN_BET, CAN_DOUBLE, BET, BUSTED, WINNER
> } player_states;
>
> typedef enum {
> ACCEPT_BETS, NEW_GAME, DEAL_CARDS, HANDLE_DEALER, WAITING,
> PAYOUTS
> } casino_states;
>
> typedef enum {
> PLAYING, NOTPLAYING, HAS_BLACKJACK
> } casino_status;
985a1084,1125
> typedef CARD * DECK;
>
> struct gambler_data
> {
> CHAR_DATA *pGambler; /* List of gamblers playing */
> int current_bet; /* Players current bet */
> int default_bet; /* Players default bet */
> int hand_value;
> DECK player_hand;
> player_states pStates;
> casino_status pStatus;
> GAMBLER_DATA *next; /* First gambler at casino */
> GAMBLER_DATA *prev; /* Last gambler at casino */
> };
>
> struct casino_data
> {
> CASINO_DATA * next; /* Next Casino in linked-list */
> CASINO_DATA * prev; /* Previous Casino in linked-list */
> GAMBLER_DATA * first_gambler;
> GAMBLER_DATA * last_gambler;
> DECK game_deck; /* Casino's deck of cards */
> DECK dealer_deck;
> CHAR_DATA *dealer;
> bool ALL_DONE;
> int dealer_hand;
> int dealer_vnum; /* Vnum of Casino Mobile */
> int deck_slot;
> int dValue;
> int dSuit;
> char *game_short; /* Short descriptiom of casino */
> int wait_time;
> int current_wait;
> char *game; /* Name of Game */
> casino_states game_states; /* State of the casino games */
> int max_bet; /* Maximum bet allowed */
> int min_bet; /* Minimum bet required */
> sh_int max_players; /* Maximum number of gamblers allowed */
> sh_int min_players; /* Minimum number of players required */
> };
>
> #endif
1003a1144
>
1021c1162,1171
< /* Mob program structures */
---
> /* Mob program structures and defines */
> /* Moved these defines here from mud_prog.c as I need them -rkb */
> #define MAX_IFS 20 /* should always be generous */
> #define IN_IF 0
> #define IN_ELSE 1
> #define DO_IF 2
> #define DO_ELSE 3
>
> #define MAX_PROG_NEST 20
>
1034c1184,1185
< void * vo;
---
> CHAR_DATA * victim;
> OBJ_DATA * target;
1046a1198,1224
> /* Used to store sleeping mud progs. -rkb */
> typedef enum {MP_MOB, MP_ROOM, MP_OBJ} mp_types;
> struct mpsleep_data
> {
> MPSLEEP_DATA * next;
> MPSLEEP_DATA * prev;
>
> int timer; /* Pulses to sleep */
> mp_types type; /* Mob, Room or Obj prog */
> ROOM_INDEX_DATA*room; /* Room when type is MP_ROOM */
>
> /* mprog_driver state variables */
> int ignorelevel;
> int iflevel;
> bool ifstate[MAX_IFS][DO_ELSE];
>
> /* mprog_driver arguments */
> char * com_list;
> CHAR_DATA * mob;
> CHAR_DATA * actor;
> OBJ_DATA * obj;
> CHAR_DATA * victim;
> OBJ_DATA * target;
> bool single_step;
> };
>
>
1047a1226
> bool MPSilent;
1054a1234,1239
> char * login; /* Message when logging in */
> char * login_other; /* Message to others logging in */
> char * logout; /* Message when logging out */
> char * logout_other; /* Message others logging out */
> char * reconnect; /* Message when reconnecting */
> char * reconnect_other; /* Message others see */
1123a1309,1328
> struct member_data
> {
> char *name; /* Name of member */
> char *since; /* Member since */
> int class; /* class of member */
> int level; /* level of member */
> int deaths; /* Pdeaths for clans, mdeaths for guilds/orders */
> int kills; /* Pkills for clans, mkills for guilds/orders */
> MEMBER_DATA *next; /* Next member */
> MEMBER_DATA *prev; /* Prev member */
> };
>
> struct member_list
> {
> char *name; /* Clan name */
> MEMBER_DATA *first_member; /* First Member */
> MEMBER_DATA *last_member; /* Last Member */
> MEMBER_LIST *next; /* Next clan */
> MEMBER_LIST *prev; /* Prev clan */
> };
1130a1336
> char * abbrev; /* Clan Abbreviation */
1175a1382
> char * abbrev; /* council abbreviation */
1178a1386
> int storeroom; /* Vnum of council's store room */
1249a1458,1460
> int yestally;
> int notally;
> int abstaintally;
1250a1462
> int no_remove;
1263a1476
> char * extra_ballots; /* Can give rights to read ballot names */
1275a1489
> sh_int min_ballot_level; /* Minimum level to read ballot names */
1300c1514
< sh_int duration;
---
> int duration;
1349a1564
> #define ACT_NOLOCATE 3 /* Nolocate for mob's objs */
1376c1591,1599
< /* 28 acts */
---
> #define ACT_NOSUMMON 31 /* Mob can't be summoned */
> #define ACT_NOSTEAL 32 /* Can't steal from mob */
> #define ACT_INFEST 34 /* For infested mobs */
> #define ACT_BLOCKING 36 /* Same as PLR_BLOCKING */
> #define ACT_IS_CLONE 37 /* Same as PLR_IS_CLONE */
> #define ACT_IS_DREAMFORM 38 /* Same as PLR_IS_DREAMFORM */
> #define ACT_IS_SPIRITFORM 39 /* Same as PLR_IS_SPIRITFORM */
> #define ACT_IS_PROJECTION 40 /* Same as PLR_IS_PROJECTION */
> #define ACT_STOP_SCRIPT 41 /* Don't execute script progs */
1393c1616,1618
< AFF_CONTAGIOUS, AFF_ACIDMIST, AFF_VENOMSHIELD, MAX_AFFECTED_BY
---
> AFF_CONTAGIOUS, AFF_ACIDMIST, AFF_VENOMSHIELD, AFF_ITEM_AURAS,
> AFF_PEOPLE_AURAS, AFF_SENSE_DEAD, AFF_HEAR_DEAD, AFF_SEE_DEAD, AFF_FADE,
> AFF_CHAIN_AGONY, AFF_INFEST, AFF_GRAPPLE, MAX_AFFECTED_BY
1434c1659
< ATCK_WEAKEN, ATCK_SPIRALBLAST, MAX_ATTACK_TYPE
---
> ATCK_WEAKEN, ATCK_SPIRALBLAST, ATCK_POUNCE, MAX_ATTACK_TYPE
1484a1710
> #define PART_HUSK_SHELL BV30
1504a1731
> #define SV_TMPSAVE BV16 /* Tmp file to save into */
1555a1783
> #define SF_NOMOB BV22 /* cannot be cast on mobiles */
1565a1794,1797
> #ifdef NEWSPELLS
> typedef enum { SD_NONE, SD_FIRE, SD_COLD, SD_ELECTRICITY, SD_ENERGY, SD_ACID,
> SD_POISON, SD_DRAIN, SD_HOLY, SD_UNHOLY } spell_dam_types;
> #else
1567a1800
> #endif
1656a1890,1892
> #define OBJ_VNUM_BLOOD_SPLATTER 94
> #define OBJ_VNUM_PUDDLE 95
>
1681,1682c1917,1919
< ITEM_EMPTY1, ITEM_EMPTY2, ITEM_MISSILE_WEAPON, ITEM_PROJECTILE, ITEM_QUIVER,
< ITEM_SHOVEL, ITEM_SALVE, ITEM_COOK, ITEM_KEYRING, ITEM_ODOR, ITEM_CHANCE
---
> ITEM_PUDDLE, ITEM_ABACUS, ITEM_MISSILE_WEAPON, ITEM_PROJECTILE, ITEM_QUIVER,
> ITEM_SHOVEL, ITEM_SALVE, ITEM_COOK, ITEM_KEYRING, ITEM_ODOR, ITEM_CHANCE,
> ITEM_PIECE, ITEM_HOUSEKEY, ITEM_JOURNAL
1685c1922
< #define MAX_ITEM_TYPE ITEM_CHANCE
---
> #define MAX_ITEM_TYPE ITEM_JOURNAL
1699c1936,1938
< ITEM_PROTOTYPE, ITEM_NOLOCATE, ITEM_GROUNDROT, ITEM_LOOTABLE, MAX_ITEM_FLAG
---
> ITEM_PROTOTYPE, ITEM_NOLOCATE, ITEM_GROUNDROT, ITEM_LOOTABLE, ITEM_PERMANENT,
> ITEM_MULTI_INVOKE, ITEM_DEATHDROP, ITEM_SKINNED, ITEM_NOFILL, ITEM_BLACKENED, ITEM_NOSCAVANGE,
> MAX_ITEM_FLAG
1788c2027,2028
< APPLY_AFFECT, APPLY_RESISTANT, APPLY_IMMUNE, APPLY_SUSCEPTIBLE,
---
> APPLY_AFFECT,
> APPLY_RESISTANT, APPLY_IMMUNE, APPLY_SUSCEPTIBLE,
1798c2038,2039
< APPLY_TELEDELAY, MAX_APPLY_TYPE
---
> APPLY_TELEDELAY,
> MAX_APPLY_TYPE,
1853,1882c2094,2106
< #define ROOM_DARK BV00
< #define ROOM_DEATH BV01
< #define ROOM_NO_MOB BV02
< #define ROOM_INDOORS BV03
< #define ROOM_LAWFUL BV04
< #define ROOM_NEUTRAL BV05
< #define ROOM_CHAOTIC BV06
< #define ROOM_NO_MAGIC BV07
< #define ROOM_TUNNEL BV08
< #define ROOM_PRIVATE BV09
< #define ROOM_SAFE BV10
< #define ROOM_SOLITARY BV11
< #define ROOM_PET_SHOP BV12
< #define ROOM_NO_RECALL BV13
< #define ROOM_DONATION BV14
< #define ROOM_NODROPALL BV15
< #define ROOM_SILENCE BV16
< #define ROOM_LOGSPEECH BV17
< #define ROOM_NODROP BV18
< #define ROOM_CLANSTOREROOM BV19
< #define ROOM_NO_SUMMON BV20
< #define ROOM_NO_ASTRAL BV21
< #define ROOM_TELEPORT BV22
< #define ROOM_TELESHOWDESC BV23
< #define ROOM_NOFLOOR BV24
< #define ROOM_NOSUPPLICATE BV25
< #define ROOM_ARENA BV26
< #define ROOM_NOMISSILE BV27
< #define ROOM_PROTOTYPE BV30
< #define ROOM_DND BV31
---
> typedef enum
> { ROOM_DARK, ROOM_DEATH, ROOM_NO_MOB, ROOM_INDOORS, ROOM_HOUSE, ROOM_NEUTRAL
> , ROOM_CHAOTIC, ROOM_NO_MAGIC, ROOM_NOLOCATE, ROOM_PRIVATE, ROOM_SAFE, ROOM_SOLITARY
> , ROOM_PET_SHOP, ROOM_NO_RECALL, ROOM_DONATION, ROOM_NODROPALL, ROOM_SILENCE
> , ROOM_LOGSPEECH, ROOM_NODROP, ROOM_CLANSTOREROOM, ROOM_NO_SUMMON, ROOM_NO_ASTRAL
> , ROOM_TELEPORT, ROOM_TELESHOWDESC, ROOM_NOFLOOR, ROOM_NOSUPPLICATE, ROOM_ARENA
> , ROOM_NOMISSILE, ROOM_AUCTION, ROOM_NOHOVER, ROOM_PROTOTYPE, ROOM_DND, ROOM_TRACK
> , ROOM_LIGHT, ROOM_NOLOG, ROOM_COLOR, ROOM_NOWHERE, ROOM_NOYELL, ROOM_NOQUIT
> , ROOM_NOTRACK, ROOM_NS_CORPSE, ROOM_NS_RECALL
> } room_flags;
>
> #define MAX_ROOM_FLAG ROOM_NS_RECALL
>
2029c2253,2256
< PLR_AUTOGOLD, PLR_AUTOMAP, PLR_AFK, PLR_INVISPROMPT
---
> PLR_AUTOGOLD, PLR_AUTOMAP, PLR_AFK, PLR_INVISPROMPT, PLR_ROOMVIS,
> PLR_NOFOLLOW, PLR_LANDED, PLR_BLOCKING, PLR_IS_CLONE, PLR_IS_DREAMFORM,
> PLR_IS_SPIRITFORM, PLR_IS_PROJECTION, PLR_CLOAK, PLR_COMPASS,
> PLR_NOHOMEPAGE
2051a2279,2286
> #define PCFLAG_NOBIO BV18
> #define PCFLAG_NODESC BV19
> #define PCFLAG_BECKON BV20 /* Cannot be beckoned/beeped */
> #define PCFLAG_NOEXP BV21 /* Will not gain experience */
> #define PCFLAG_NOBECKON BV22 /* Cannot beckon/beep */
> #define PCFLAG_HINTS BV23 /* Hints config */
> #define PCFLAG_NOHTTP BV24
> #define PCFLAG_FREEKILL BV25
2070,2100c2305,2316
< /*
< * Channel bits.
< */
< #define CHANNEL_AUCTION BV00
< #define CHANNEL_CHAT BV01
< #define CHANNEL_QUEST BV02
< #define CHANNEL_IMMTALK BV03
< #define CHANNEL_MUSIC BV04
< #define CHANNEL_ASK BV05
< #define CHANNEL_SHOUT BV06
< #define CHANNEL_YELL BV07
< #define CHANNEL_MONITOR BV08
< #define CHANNEL_LOG BV09
< #define CHANNEL_HIGHGOD BV10
< #define CHANNEL_CLAN BV11
< #define CHANNEL_BUILD BV12
< #define CHANNEL_HIGH BV13
< #define CHANNEL_AVTALK BV14
< #define CHANNEL_PRAY BV15
< #define CHANNEL_COUNCIL BV16
< #define CHANNEL_GUILD BV17
< #define CHANNEL_COMM BV18
< #define CHANNEL_TELLS BV19
< #define CHANNEL_ORDER BV20
< #define CHANNEL_NEWBIE BV21
< #define CHANNEL_WARTALK BV22
< #define CHANNEL_RACETALK BV23
< #define CHANNEL_WARN BV24
< #define CHANNEL_WHISPER BV25
< #define CHANNEL_AUTH BV26
< #define CHANNEL_TRAFFIC BV27
---
> typedef enum
> {
> CHANNEL_AUCTION, CHANNEL_CHAT, CHANNEL_QUEST, CHANNEL_IMMTALK, CHANNEL_MUSIC,
> CHANNEL_ASK, CHANNEL_SHOUT, CHANNEL_YELL, CHANNEL_MONITOR, CHANNEL_LOG,
> CHANNEL_HIGHGOD, CHANNEL_CLAN, CHANNEL_BUILD, CHANNEL_HIGH, CHANNEL_AVTALK,
> CHANNEL_PRAY, CHANNEL_COUNCIL, CHANNEL_GUILD, CHANNEL_COMM, CHANNEL_TELLS,
> CHANNEL_ORDER, CHANNEL_NEWBIE, CHANNEL_WARTALK, CHANNEL_RACETALK,
> CHANNEL_WARN, CHANNEL_WHISPER, CHANNEL_AUTH, CHANNEL_TRAFFIC, CHANNEL_RETIRED,
> CHANNEL_DEATH, CHANNEL_LTRAFFIC, CHANNEL_BUG
> } channel_bits;
>
>
2112a2329,2340
> #define AFLAG_SILENCE BV04
> #define AFLAG_NOSUMMON BV05
> #define AFLAG_SCRAP BV06
> #define AFLAG_HIDDEN BV07 /* Hidden from area list. - Blod*/
> #define AFLAG_NOWHERE BV08
> #define AFLAG_NEWBIE BV09
> #define AFLAG_NOHOVER BV10
> #define AFLAG_NOLOGOUT BV11
> #define AFLAG_NOPORTALIN BV12
> #define AFLAG_NOPORTALOUT BV13
> #define AFLAG_NOASTRAL BV14
> #define AFLAG_NOMAGIC BV15
2124a2353,2357
>
> #ifdef MYSTARIC
> CASINO_DATA * pCasino;
> #endif
>
2131c2364
< sh_int vnum;
---
> int vnum;
2143c2376
< sh_int hitplus;
---
> int hitplus;
2177a2411
> sh_int stances[MAX_STANCE];
2258a2493
> VARIABLE_DATA * variables;
2275,2276c2510,2511
< sh_int hit;
< sh_int max_hit;
---
> int hit;
> int max_hit;
2296a2532,2534
> int stance_immune;
> int stance_resistant;
> int stance_susceptible;
2321c2559
< int deaf;
---
> EXT_BV deaf;
2346a2585
> sh_int stance; /* Stances */
2352c2591
< sh_int vnum;
---
> int vnum;
2378a2618,2619
> char * email;
> char * icq;
2381a2623,2631
> /*Char customization
> char * char_hair_color;
> char * char_hair_length;
> char * char_eye_color;
> char * char_skin_color;
> char * char_sel_height;
> char * char_sel_weight;
> char * char_sel_frame;
> */
2388a2639
> char * betted_on;
2394a2646
> int bet_amt;
2399,2404c2651,2656
< sh_int r_range_lo; /* room range */
< sh_int r_range_hi;
< sh_int m_range_lo; /* mob range */
< sh_int m_range_hi;
< sh_int o_range_lo; /* obj range */
< sh_int o_range_hi;
---
> int r_range_lo; /* room range */
> int r_range_hi;
> int m_range_lo; /* mob range */
> int m_range_hi;
> int o_range_lo; /* obj range */
> int o_range_hi;
2412a2665
> int honour;
2424a2678
> sh_int stances[MAX_STANCE];
2429a2684
> char * see_me; /* who can see me (imm only) */
2437c2692,2693
<
---
> char * recent_site; /* site a player started their most recent session from */
> char * prev_site; /* site a player last quit from */
2536a2793
> char * owner;
2570a2828
> sh_int orig_door; /* Original door direction */
2646,2647c2904,2905
< sh_int low_m_vnum;
< sh_int hi_m_vnum;
---
> int low_m_vnum;
> int hi_m_vnum;
2654a2913
> char * credits; /* Edmond */
2684,2685c2943,2944
< sh_int low_m_vnum;
< sh_int hi_m_vnum;
---
> int low_m_vnum;
> int hi_m_vnum;
2702a2962
> char * port_name; /* Name of port */
2710c2970
< sh_int imc_mail_vnum; /* Board vnum for IMC mail */
---
> int imc_mail_vnum; /* Board vnum for IMC mail */
2727a2988,2990
> sh_int tumble_pk; /* Divide tumble chance by for pk */
> sh_int dam_nonav_vs_mob; /* Damage mod non-avatar vs. mobile */
> sh_int dam_mob_vs_nonav; /* Damage mod mobile vs non-avatar */
2735a2999,3000
> sh_int peaceful_exp_mod; /* Peaceful char exp mod */
> sh_int deadly_exp_mod; /* Deadly char exp mod */
2742a3008,3009
> sh_int pk_channels; /* Turn off all public channels but clantalk and wartalk for pkillers */
> sh_int pk_silence; /* Turn off even clantalk and wartalk */
2747a3015,3019
> char * news_html_path; /* news path to posting file -Nopey */
> int max_html_news; /* max number of news shown on html printout -Nopey */
> sh_int save_version; /* for versions on all files */
> bool wizlock; /* rebooting wizlocked? */
> bool magichell;
2788c3060,3062
< int room_flags;
---
> int weight;
> int max_weight;
> EXT_BV room_flags;
2872a3147
> sh_int alignment; /* Caster has to be this align */
2948c3223,3226
<
---
> extern sh_int gsn_pounce;
> extern sh_int gsn_grapple;
> extern sh_int gsn_meditate;
> extern sh_int gsn_trance;
2965a3244
> extern sh_int gsn_cleave;
3025a3305
> extern sh_int gsn_gnomish;
3315,3319c3595,3596
< #define IS_OUTSIDE(ch) (!IS_SET( \
< (ch)->in_room->room_flags, \
< ROOM_INDOORS) && !IS_SET( \
< (ch)->in_room->room_flags, \
< ROOM_TUNNEL))
---
> #define IS_OUTSIDE( ch ) ( !xIS_SET( (ch)->in_room->room_flags, ROOM_INDOORS ) )
>
3329a3607,3608
> #define IS_CHARMED(ch) (IS_AFFECTED(ch,AFF_CHARM))
>
3388a3668,3679
> #ifdef NEWSPELLS
> #define SPELL_DAMAGE(skill) ( ((skill)->info ) & 15 )
> #define SPELL_ACTION(skill) ( ((skill)->info >> 4) & 7 )
> #define SPELL_CLASS(skill) ( ((skill)->info >> 7) & 7 )
> #define SPELL_POWER(skill) ( ((skill)->info >> 10) & 3 )
> #define SPELL_SAVE(skill) ( ((skill)->info >> 12) & 7 )
> #define SET_SDAM(skill, val) ( (skill)->info = ((skill)->info & SDAM_MASK) + ((val) & 15) )
> #define SET_SACT(skill, val) ( (skill)->info = ((skill)->info & SACT_MASK) + (((val) & 7) << 4) )
> #define SET_SCLA(skill, val) ( (skill)->info = ((skill)->info & SCLA_MASK) + (((val) & 7) << 7) )
> #define SET_SPOW(skill, val) ( (skill)->info = ((skill)->info & SPOW_MASK) + (((val) & 3) << 10) )
> #define SET_SSAV(skill, val) ( (skill)->info = ((skill)->info & SSAV_MASK) + (((val) & 7) << 12) )
> #else
3398a3690,3691
> #endif
>
3463a3757,3758
> #define CMD_FLAG_RETIRED BV03
> #define CMD_FLAG_NO_ABORT BV04
3517c3812
<
---
> extern char * const honour_rank [12][7];
3526a3822
> extern char * const imm_badge [15];
3557a3854,3856
> extern char * const login_msg [];
>
>
3568a3868
>
3571a3872,3876
>
> extern MPSLEEP_DATA * first_mpwait; /* Storing sleeping mud progs */
> extern MPSLEEP_DATA * last_mpwait; /* - */
> extern MPSLEEP_DATA * current_mpwait; /* - */
>
3609a3915,3922
>
> #ifdef MYSTARIC
> extern CASINO_DATA * first_casino;
> extern CASINO_DATA * last_casino;
> extern GAMBLER_DATA * first_gambler;
> extern GAMBLER_DATA * last_gambler;
> #endif
>
3624a3938,3939
> extern NOAUCTION_DATA * first_noauc;
> extern NOAUCTION_DATA * last_noauc;
3630a3946,3947
> extern LMSG_DATA * first_lmsg;
> extern LMSG_DATA * last_lmsg;
3638a3956,3957
> extern MEMBER_LIST * first_member_list;
> extern MEMBER_LIST * last_member_list;
3642a3962,3963
> extern VAULT_DATA * first_vault;
> extern VAULT_DATA * last_vault;
3696a4018
> DECLARE_DO_FUN( do_add_change );
3697a4020,4021
> DECLARE_DO_FUN( do_add_imm_news );
> DECLARE_DO_FUN( do_add_news );
3699a4024
> DECLARE_DO_FUN( do_aecho );
3702a4028
> DECLARE_DO_FUN( do_alinks );
3705a4032
> DECLARE_DO_FUN( do_appear );
3710a4038
> DECLARE_DO_FUN( do_assist );
3724a4053
> DECLARE_DO_FUN( do_beckon );
3741a4071,4077
>
> #ifdef MYSTARIC
> DECLARE_DO_FUN( do_casinostat );
> DECLARE_DO_FUN( do_casinoset );
> DECLARE_DO_FUN( do_casinos );
> #endif
>
3743a4080
> DECLARE_DO_FUN( do_changes );
3750a4088
> DECLARE_DO_FUN( do_cleave );
3756a4095
> DECLARE_DO_FUN( do_colorscheme );
3759a4099,4100
> DECLARE_DO_FUN( do_compass );
> DECLARE_DO_FUN( do_condition );
3760a4102
> DECLARE_DO_FUN( do_connect );
3767a4110
> DECLARE_DO_FUN( do_cscore );
3768a4112,4113
> DECLARE_DO_FUN( do_cwho );
> DECLARE_DO_FUN( do_defeats );
3770a4116
> DECLARE_DO_FUN( do_delete_char );
3776a4123
> DECLARE_DO_FUN( do_die );
3777a4125
> DECLARE_DO_FUN( do_disappear );
3792a4141
> DECLARE_DO_FUN( do_editnews );
3793a4143
> DECLARE_DO_FUN( do_email );
3797a4148
> DECLARE_DO_FUN( do_equipment_full );
3799a4151,4152
> DECLARE_DO_FUN( do_extinguish );
> DECLARE_DO_FUN( do_favor );
3801a4155,4156
> DECLARE_DO_FUN( do_findduped );
> DECLARE_DO_FUN( do_findexit );
3825a4181
> DECLARE_DO_FUN( do_grapple );
3834a4191,4193
> DECLARE_DO_FUN( do_hintedit );
> DECLARE_DO_FUN( do_hints );
> DECLARE_DO_FUN( do_hintsubmit );
3840a4200
> DECLARE_DO_FUN( do_icq );
3846a4207
> DECLARE_DO_FUN( do_imm_news );
3854a4216
> DECLARE_DO_FUN( do_journal );
3860a4223
> DECLARE_DO_FUN( do_lead );
3870a4234
> DECLARE_DO_FUN( do_loop );
3880a4245,4249
>
> #ifdef MYSTARIC
> DECLARE_DO_FUN( do_makecasino );
> #endif
>
3881a4251
> DECLARE_DO_FUN( do_makeretiredlist );
3883a4254,4255
> DECLARE_DO_FUN( do_meditate );
> DECLARE_DO_FUN( do_memberlist );
3884a4257
> DECLARE_DO_FUN( do_message );
3890a4264
> DECLARE_DO_FUN( do_mobinvade );
3897a4272,4275
> DECLARE_DO_FUN( do_mphate );
> DECLARE_DO_FUN( do_mphunt );
> DECLARE_DO_FUN( do_mpoowner );
> DECLARE_DO_FUN( do_mpplace );
3905a4284
> DECLARE_DO_FUN( do_nanny_help );
3908d4286
< DECLARE_DO_FUN( do_news );
3910a4289,4292
> DECLARE_DO_FUN( do_noauction );
> DECLARE_DO_FUN( do_nobeckon );
> DECLARE_DO_FUN( do_nobio );
> DECLARE_DO_FUN( do_nodesc );
3911a4294,4295
> DECLARE_DO_FUN( do_nohomepage );
> DECLARE_DO_FUN( do_nohttp );
3918a4303
> DECLARE_DO_FUN( do_nslay );
3920a4306
> DECLARE_DO_FUN( do_oclaim );
3927a4314
> DECLARE_DO_FUN( do_oowner );
3946a4334
> DECLARE_DO_FUN( do_play );
3948a4337
> DECLARE_DO_FUN( do_pounce );
3965a4355
> DECLARE_DO_FUN( do_randomize );
3970a4361
> DECLARE_DO_FUN( do_rdig );
3976a4368,4369
> DECLARE_DO_FUN( do_retiredtalk );
> DECLARE_DO_FUN( do_retiredlist );
3999a4393
> DECLARE_DO_FUN( do_rgrid );
4002a4397
> DECLARE_DO_FUN( do_rloop );
4003a4399,4400
> DECLARE_DO_FUN( do_roster );
> DECLARE_DO_FUN( do_rpcopy );
4011a4409
> DECLARE_DO_FUN( do_say_to );
4024a4423
> DECLARE_DO_FUN( do_setvault );
4058a4458
> DECLARE_DO_FUN( do_stance );
4067a4468,4469
> DECLARE_DO_FUN( do_stset );
> DECLARE_DO_FUN( do_ststat );
4080a4483
> DECLARE_DO_FUN( do_trance );
4083a4487
> DECLARE_DO_FUN( do_typ );
4093a4498
> DECLARE_DO_FUN( do_vassign );
4098a4504
> DECLARE_DO_FUN( do_vstat );
4159a4566,4571
> DECLARE_DO_FUN( do_mptag );
> DECLARE_DO_FUN( do_mprmtag );
> DECLARE_DO_FUN( do_mptag );
> DECLARE_DO_FUN( do_mprmtag );
> DECLARE_DO_FUN( do_mpflag );
> DECLARE_DO_FUN( do_mprmflag );
4196a4609
> DECLARE_SPELL_FUN( spell_close_portal );
4217a4631,4633
> #ifdef MYSTARIC
> DECLARE_SPELL_FUN( spell_group_teleport );
> #endif
4384a4801
> #define VAULT_DIR "../vault/" /* storage vaults */
4390a4808
>
4394a4813
> #define NOAUCTION_LIST "noauction.lst" /* list of vnums not to allow auction to */
4401a4821,4822
> #define VAULT_LIST "vault.lst" /* list of storage vaults */
>
4417a4839,4841
> #define HINTSUB_FILE SYSTEM_DIR "hintsub.txt" /* For hint suggestions */
> #define CHANGE_FILE SYSTEM_DIR "changes.txt" /* For add_change */
> #define IMMNEWS_FILE SYSTEM_DIR "immnews.txt" /* For add_imm_news */
4418a4843,4844
> #define NOHELP_FILE SYSTEM_DIR "nohelp.txt" /* For tracking help
> files that don't exist */
4420a4847,4850
> #define CHARCOUNT_FILE SYSTEM_DIR "ccount.txt" /* Counting, temp */
> #define OINVOKE_FILE SYSTEM_DIR "oinvoke.txt" /* Obvious */
> #define CUTLINK_FILE SYSTEM_DIR "cutlink.txt" /* Info on cut/dropped links while in combat */
> #define RETIREDLIST_FILE SYSTEM_DIR "RETIREDLIST" /* Retiredlist */
4425a4856
> #define LOGIN_MSG "login.msg" /* List of login msgs */
4438c4869
< #define TEMP_FILE SYSTEM_DIR "charsave.tmp" /* More char save protect */
---
> #define TEMP_FILE PLAYER_DIR "charsave.tmp" /* More char save protect */
4440a4872,4874
> #define MEMBERS_FILE SYSTEM_DIR "members.dat" /* Store the members lists */
> #define STANCE_FILE SYSTEM_DIR "stances.dat"
>
4460a4895
> #define VD VARIABLE_DATA
4492c4927
<
---
> void look_sky args( ( CHAR_DATA *ch ) );
4500c4935
< void teleport args( ( CHAR_DATA *ch, sh_int room, int flags ) );
---
> void teleport args( ( CHAR_DATA *ch, int room, int flags ) );
4510c4945
< void save_clan_storeroom args( ( CHAR_DATA *ch, CLAN_DATA *clan ) );
---
> void save_storeroom args( ( CHAR_DATA *ch, char *vnum ) );
4511a4947
> bool is_lootable args( ( OBJ_DATA *obj ) );
4543a4980,4981
> void load_member_lists args( ( void ) );
> void update_member args( ( CHAR_DATA *ch ) );
4554a4993,4994
> int c_strlen(const char *s);
> int colorlen(const char *s, int goal);
4582a5023
> void show_file_vnum args( ( CHAR_DATA *ch, char *filename, int lo, int hi ) );
4586a5028
> void save_noauctions args( ( void ) );
4592c5034
< MID * get_mob_index args( ( sh_int vnum ) );
---
> MID * get_mob_index args( ( int vnum ) );
4612a5055,5056
> char * smash_color args( ( char *str ) );
> void smash_color_token args( ( char *str ) );
4630c5074
< MID * make_mobile args( ( sh_int vnum, sh_int cvnum, char *name ) );
---
> MID * make_mobile args( ( int vnum, int cvnum, char *name ) );
4635a5080
> void make_adminlist args( ( void ) );
4636a5082
> void make_retiredlist args(( void ) );
4647a5094,5097
> void fread_loginmsg args( ( FILE *fp ) );
> void add_loginmsg args( ( char *name, sh_int type, char *argument ) );
> void check_loginmsg args( ( CHAR_DATA *ch ) );
> void save_loginmsg args( ( void ) );
4693a5144
> void strip_grapple args( ( CHAR_DATA *ch ) );
4713a5165
> void make_puddle args( ( CHAR_DATA *ch, OBJ_DATA *cont ) );
4719a5172,5173
> // This void *vo doesnt seem to be used in the function, so I'll just leave it
> // for now.. -- Alty
4723a5178,5180
> /* variables.c */
> void delete_variable args( ( VARIABLE_DATA *vd ) );
> VD * get_tag args( ( CHAR_DATA *ch, char *tag, int vnum ) );
4730a5188,5201
> /* stances.c */
> int get_stance_mastery args (( CHAR_DATA *ch ));
> char *get_stance_name args ((int stance_num));
> int get_stance_number args ((char *argument));
> bool can_use_stance args ((CHAR_DATA * ch, int new_stance));
> void send_stance_message args ((CHAR_DATA * ch, bool flag));
> void update_stances args ((CHAR_DATA * ch, bool flag));
> int fwrite_stance args ((void));
> int fread_stance args ((FILE * fp));
> int load_stances args ((void));
> int randomize_stances args ((void));
> int get_special_number args ((char *name));
> char *get_special_name args ((int num));
>
4736c5207
< void mprog_wordlist_check args ( ( char * arg, CHAR_DATA *mob,
---
> bool mprog_wordlist_check args ( ( char * arg, CHAR_DATA *mob,
4738c5209
< void* vo, int type ) );
---
> CHAR_DATA *victim, OBJ_DATA *target, int type ) );
4740c5211
< OBJ_DATA* object, void* vo,
---
> OBJ_DATA* object, CHAR_DATA *victim, OBJ_DATA *target,
4744c5215
< void* vo ) );
---
> CHAR_DATA *victim, OBJ_DATA *target ) );
4746a5218
> bool mprog_command_trigger args ( ( CHAR_DATA *ch, char *argument ) );
4758a5231,5235
> void mprog_sell_trigger args ( ( CHAR_DATA *mob, CHAR_DATA *ch, OBJ_DATA *obj ) );
> void mprog_tell_trigger args ( ( char *text, CHAR_DATA *mob ) );
> /* void and login progs by Edmond */
> void mprog_login_trigger args ( ( CHAR_DATA *mob ) );
> void mprog_void_trigger args ( ( CHAR_DATA *mob ) );
4761a5239,5240
> void mpsleep_update args( ( ) );
>
4770a5250
> char * get_honour args( ( CHAR_DATA *ch ) );
4830a5311,5312
> /* hint.c */
> void load_hint args ( ( void ) );
4832a5315,5317
> void insert_dupe args (( OBJ_DATA *obj ));
> void remove_dupe args (( OBJ_DATA *obj ));
> void stamp_serial args(( OBJ_DATA *obj ));
4848a5334
> CD * carried_by args( ( OBJ_DATA *obj ) );
4932d5417
< OD * clone_object args( ( OBJ_DATA *obj ) );
4934a5420
> OD * clone_object args( ( OBJ_DATA *obj ) );
4957a5444
> char * case_argument args( ( char *argument, char *arg_first ) );
4999a5487
> #define OS_VAULT 2
5000a5489
>
5041a5531,5535
> void save_vault_list args( ( void ) );
> void load_vaults args( ( void ) );
> void sort_vaults args( ( VAULT_DATA *vault ) );
> bool fread_storage args( ( int vnum, char *filename ) );
>
5057a5552,5556
>
> #ifdef MYSTARIC
> void casino_update args( (void) );
> #endif
>
5060a5560,5563
> /* variables.c */
> VD * get_tag args( ( CHAR_DATA *ch, char *tag, int vnum ) );
>
>
5074a5578
> #undef VD
5267a5772
> bool oprog_command_trigger( CHAR_DATA *ch, char *argument );
5270a5776,5777
> // This void *vo isnt used either.. *boggle*
> // -- Alty
5313c5820,5821
< USE_PROG
---
> USE_PROG, LOAD_PROG, LOGIN_PROG, VOID_PROG, TELL_PROG, IMMINFO_PROG,
> GREET_IN_FIGHT_PROG, MOVE_PROG, CMD_PROG, SELL_PROG, EMOTE_PROG
5330a5839
> bool rprog_command_trigger( CHAR_DATA *ch, char *argument );
5334a5844,5846
> void rprog_login_trigger( CHAR_DATA *ch );
> void rprog_void_trigger( CHAR_DATA *ch );
> void rprog_imminfo_trigger( CHAR_DATA *ch );
5340c5852
< OBJ_DATA *obj, void *vo );
---
> OBJ_DATA *obj, CHAR_DATA *victim, OBJ_DATA *target );
5345c5857
< OBJ_DATA *obj, void *vo );
---
> OBJ_DATA *obj, CHAR_DATA *victim, OBJ_DATA *target );
5351a5864,5902
>
> /* Take this out later */
> /* Prototypes for our functions */
>
> /* Setup our definitions of stances */
>
> #define STANCE_GRAND_MASTER 200
>
> typedef struct stance_data STANCE_DATA;
>
> /* The following structure holds all the information for the stances.
> * This information is read on bootup from the STANCE_FILE which is in
> * the system dir. SHADDAI
> */
>
> struct stance_data
> {
> bool dual_wield; /* False if you can use two weapons in this stance */
> char *others; /* Message others see when you drop into the stance */
> char *self; /* Message you see when you drop into the stance */
> int class_restrictions; /* What classes can't use this stance */
> int dam_taken; /* Percent times the damage you take */
> int dam_done; /* Percent times the damage you do */
> int dodge; /* How much it helps your chances on dodging */
> int immune; /* Immunities */
> int parry; /* How much it helps your chances on parrying */
> int race_restrictions; /* What races can't use this stance */
> int resist; /* Resistances */
> int special_move; /* Name of special move performed */
> int suscept; /* Susceptabilities */
> sh_int max_weight; /* Max weight you can carry to use this stance */
> sh_int num_attacks; /* Number attacks it adds each round */
> sh_int special_percent; /* Percent of time special move works */
> sh_int stance[2]; /* Stances needed to GM before you can use the stance */
> sh_int wait; /* How long the char has to wait to drop into the stance */
> };
>
> STANCE_DATA stance_index[MAX_STANCE];
>
5378c5929,5933
<
---
>
> #define GET_BETTED_ON( ch ) ( ( ch->betted_on )
> #define GET_BET_AMT( ch ) ( ( ch->bet_amt )
>
>