From 603b82fc0f48e061f9085036055db86bcbeb7dc8 Mon Sep 17 00:00:00 2001 From: kinther Date: Wed, 20 Aug 2025 08:04:01 -0700 Subject: [PATCH] Remove auction, grats, gossip --- src/act.comm.c | 26 +------------- src/act.h | 60 ++++++++++++++----------------- src/act.informative.c | 31 ---------------- src/act.item.c | 59 ------------------------------- src/act.other.c | 25 ------------- src/comm.c | 1 - src/config.c | 2 +- src/constants.c | 6 ---- src/fight.c | 3 -- src/interpreter.c | 6 ---- src/prefedit.c | 82 +++++++++++++------------------------------ src/structs.h | 50 ++++++++++++-------------- 12 files changed, 74 insertions(+), 277 deletions(-) diff --git a/src/act.comm.c b/src/act.comm.c index ed92809..955943a 100644 --- a/src/act.comm.c +++ b/src/act.comm.c @@ -157,15 +157,13 @@ static int is_tell_ok(struct char_data *ch, struct char_data *vict) send_to_char(ch, "%s", CONFIG_NOPERSON); else if (ch == vict) send_to_char(ch, "You try to tell yourself something.\r\n"); - else if (!IS_NPC(ch) && PRF_FLAGGED(ch, PRF_NOTELL)) - send_to_char(ch, "You can't tell other people while you have notell on.\r\n"); else if (ROOM_FLAGGED(IN_ROOM(ch), ROOM_SOUNDPROOF) && (GET_LEVEL(ch) < LVL_GOD)) send_to_char(ch, "The walls seem to absorb your words.\r\n"); else if (!IS_NPC(vict) && !vict->desc) /* linkless */ act("$E's linkless at the moment.", FALSE, ch, 0, vict, TO_CHAR | TO_SLEEP); else if (PLR_FLAGGED(vict, PLR_WRITING)) act("$E's writing a message right now; try again later.", FALSE, ch, 0, vict, TO_CHAR | TO_SLEEP); - else if ((!IS_NPC(vict) && PRF_FLAGGED(vict, PRF_NOTELL)) || (ROOM_FLAGGED(IN_ROOM(vict), ROOM_SOUNDPROOF) && (GET_LEVEL(ch) < LVL_GOD))) + else if ((!IS_NPC(vict)) || (ROOM_FLAGGED(IN_ROOM(vict), ROOM_SOUNDPROOF) && (GET_LEVEL(ch) < LVL_GOD))) act("$E can't hear you.", FALSE, ch, 0, vict, TO_CHAR | TO_SLEEP); else return (TRUE); @@ -406,18 +404,11 @@ ACMD(do_gen_comm) int channels[] = { 0, PRF_NOSHOUT, - PRF_NOGOSS, - PRF_NOAUCT, - PRF_NOGRATZ, - PRF_NOGOSS, 0 }; int hist_type[] = { HIST_SHOUT, - HIST_GOSSIP, - HIST_AUCTION, - HIST_GRATS, }; /* com_msgs: [0] Message if you can't perform the action because of noshout @@ -431,21 +422,6 @@ ACMD(do_gen_comm) "Turn off your noshout flag first!\r\n", KYEL}, - {"You cannot gossip!!\r\n", - "gossip", - "You aren't even on the channel!\r\n", - KYEL}, - - {"You cannot auction!!\r\n", - "auction", - "You aren't even on the channel!\r\n", - KMAG}, - - {"You cannot congratulate!\r\n", - "congrat", - "You aren't even on the channel!\r\n", - KGRN}, - {"You cannot gossip your emotions!\r\n", "gossip", "You aren't even on the channel!\r\n", diff --git a/src/act.h b/src/act.h index 03df9d0..d6b87cf 100644 --- a/src/act.h +++ b/src/act.h @@ -27,10 +27,7 @@ /* do_gen_comm */ ACMD(do_gen_comm); #define SCMD_SHOUT 0 -#define SCMD_GOSSIP 1 -#define SCMD_AUCTION 2 -#define SCMD_GRATZ 3 -#define SCMD_GEMOTE 4 +#define SCMD_GEMOTE 1 /* do_qcomm */ ACMD(do_qcomm); #define SCMD_QECHO 0 @@ -134,7 +131,6 @@ ACMD(do_give); ACMD(do_grab); ACMD(do_put); ACMD(do_remove); -ACMD(do_sac); ACMD(do_wear); ACMD(do_wield); @@ -195,35 +191,31 @@ ACMD(do_gen_tog); #define SCMD_BRIEF 2 #define SCMD_COMPACT 3 #define SCMD_NOTELL 4 -#define SCMD_NOAUCTION 5 -#define SCMD_NOSHOUT 6 -#define SCMD_NOGOSSIP 7 -#define SCMD_NOGRATZ 8 -#define SCMD_NOWIZ 9 -#define SCMD_QUEST 10 -#define SCMD_SHOWVNUMS 11 -#define SCMD_NOREPEAT 12 -#define SCMD_HOLYLIGHT 13 -#define SCMD_SLOWNS 14 -#define SCMD_AUTOEXIT 15 -#define SCMD_TRACK 16 -#define SCMD_CLS 17 -#define SCMD_BUILDWALK 18 -#define SCMD_AFK 19 -#define SCMD_AUTOLOOT 20 -#define SCMD_AUTOGOLD 21 -#define SCMD_AUTOSPLIT 22 -#define SCMD_AUTOSAC 23 -#define SCMD_AUTOASSIST 24 -#define SCMD_AUTOMAP 25 -#define SCMD_AUTOKEY 26 -#define SCMD_AUTODOOR 27 -#define SCMD_ZONERESETS 28 -#define SCMD_SYSLOG 29 -#define SCMD_WIMPY 30 -#define SCMD_PAGELENGTH 31 -#define SCMD_SCREENWIDTH 32 -#define SCMD_COLOR 33 +#define SCMD_NOSHOUT 5 +#define SCMD_NOWIZ 6 +#define SCMD_QUEST 7 +#define SCMD_SHOWVNUMS 8 +#define SCMD_NOREPEAT 9 +#define SCMD_HOLYLIGHT 10 +#define SCMD_SLOWNS 11 +#define SCMD_AUTOEXIT 12 +#define SCMD_TRACK 13 +#define SCMD_CLS 14 +#define SCMD_BUILDWALK 15 +#define SCMD_AFK 16 +#define SCMD_AUTOLOOT 17 +#define SCMD_AUTOGOLD 18 +#define SCMD_AUTOSPLIT 19 +#define SCMD_AUTOASSIST 20 +#define SCMD_AUTOMAP 21 +#define SCMD_AUTOKEY 22 +#define SCMD_AUTODOOR 23 +#define SCMD_ZONERESETS 24 +#define SCMD_SYSLOG 25 +#define SCMD_WIMPY 26 +#define SCMD_PAGELENGTH 27 +#define SCMD_SCREENWIDTH 28 +#define SCMD_COLOR 29 /* do_quit */ ACMD(do_quit); diff --git a/src/act.informative.c b/src/act.informative.c index 1e5e347..705982e 100644 --- a/src/act.informative.c +++ b/src/act.informative.c @@ -1324,14 +1324,10 @@ ACMD(do_who) send_to_char(ch, " (Buildwalking)"); if (PRF_FLAGGED(tch, PRF_AFK)) send_to_char(ch, " (AFK)"); - if (PRF_FLAGGED(tch, PRF_NOGOSS)) - send_to_char(ch, " (nogos)"); if (PRF_FLAGGED(tch, PRF_NOWIZ)) send_to_char(ch, " (nowiz)"); if (PRF_FLAGGED(tch, PRF_NOSHOUT)) send_to_char(ch, " (noshout)"); - if (PRF_FLAGGED(tch, PRF_NOTELL)) - send_to_char(ch, " (notell)"); if (PRF_FLAGGED(tch, PRF_QUEST)) send_to_char(ch, " (quest)"); if (PLR_FLAGGED(tch, PLR_THIEF)) @@ -1915,21 +1911,9 @@ ACMD(do_toggle) {"compact", PRF_COMPACT, 0, "Compact mode off.\r\n", "Compact mode on.\r\n"}, - {"notell", PRF_NOTELL, 0, - "You can now hear tells.\r\n", - "You are now deaf to tells.\r\n"}, - {"noauction", PRF_NOAUCT, 0, - "You can now hear auctions.\r\n", - "You are now deaf to auctions.\r\n"}, {"noshout", PRF_NOSHOUT, 0, "You can now hear shouts.\r\n", "You are now deaf to shouts.\r\n"}, - {"nogossip", PRF_NOGOSS, 0, - "You can now hear gossip.\r\n", - "You are now deaf to gossip.\r\n"}, - {"nograts", PRF_NOGRATZ, 0, - "You can now hear gratz.\r\n", - "You are now deaf to gratz.\r\n"}, {"nowiz", PRF_NOWIZ, LVL_IMMORT, "You can now hear the Wiz-channel.\r\n", "You are now deaf to the Wiz-channel.\r\n"}, @@ -1972,9 +1956,6 @@ ACMD(do_toggle) {"autosplit", PRF_AUTOSPLIT, 0, "Autosplit disabled.\r\n", "Autosplit enabled.\r\n"}, - {"autosac", PRF_AUTOSAC, 0, - "Autosac disabled.\r\n", - "Autosac enabled.\r\n"}, {"autoassist", PRF_AUTOASSIST, 0, "Autoassist disabled.\r\n", "Autoassist enabled.\r\n"}, @@ -2061,22 +2042,16 @@ ACMD(do_toggle) " Quest: %-3s\r\n" " Mana Display: %-3s " - " NoTell: %-3s " " NoRepeat: %-3s\r\n" " AutoExits: %-3s " " NoShout: %-3s " " Wimpy: %-3s\r\n" - " NoGossip: %-3s " - " NoAuction: %-3s " - " NoGrats: %-3s\r\n" - " AutoLoot: %-3s " " AutoGold: %-3s " " AutoSplit: %-3s\r\n" - " AutoSac: %-3s " " AutoAssist: %-3s " " AutoMap: %-3s\r\n" @@ -2097,22 +2072,16 @@ ACMD(do_toggle) ONOFF(PRF_FLAGGED(ch, PRF_QUEST)), ONOFF(PRF_FLAGGED(ch, PRF_DISPMANA)), - ONOFF(PRF_FLAGGED(ch, PRF_NOTELL)), ONOFF(PRF_FLAGGED(ch, PRF_NOREPEAT)), ONOFF(PRF_FLAGGED(ch, PRF_AUTOEXIT)), ONOFF(PRF_FLAGGED(ch, PRF_NOSHOUT)), buf2, - ONOFF(PRF_FLAGGED(ch, PRF_NOGOSS)), - ONOFF(PRF_FLAGGED(ch, PRF_NOAUCT)), - ONOFF(PRF_FLAGGED(ch, PRF_NOGRATZ)), - ONOFF(PRF_FLAGGED(ch, PRF_AUTOLOOT)), ONOFF(PRF_FLAGGED(ch, PRF_AUTOGOLD)), ONOFF(PRF_FLAGGED(ch, PRF_AUTOSPLIT)), - ONOFF(PRF_FLAGGED(ch, PRF_AUTOSAC)), ONOFF(PRF_FLAGGED(ch, PRF_AUTOASSIST)), ONOFF(PRF_FLAGGED(ch, PRF_AUTOMAP)), diff --git a/src/act.item.c b/src/act.item.c index 625280c..f53b453 100644 --- a/src/act.item.c +++ b/src/act.item.c @@ -1464,62 +1464,3 @@ ACMD(do_remove) perform_remove(ch, i); } } - -ACMD(do_sac) -{ - char arg[MAX_INPUT_LENGTH]; - struct obj_data *j, *jj, *next_thing2; - - one_argument(argument, arg); - - if (!*arg) { - send_to_char(ch, "Sacrifice what?\n\r"); - return; - } - - if (!(j = get_obj_in_list_vis(ch, arg, NULL, world[IN_ROOM(ch)].contents)) && (!(j = get_obj_in_list_vis(ch, arg, NULL, ch->carrying)))) { - send_to_char(ch, "It doesn't seem to be here.\n\r"); - return; - } - - if (!CAN_WEAR(j, ITEM_WEAR_TAKE)) { - send_to_char(ch, "You can't sacrifice that!\n\r"); - return; - } - - act("$n sacrifices $p.", FALSE, ch, j, 0, TO_ROOM); - - switch (rand_number(0, 5)) { - case 0: - send_to_char(ch, "You sacrifice %s to the Gods.\r\nYou receive one gold coin for your humility.\r\n", GET_OBJ_SHORT(j)); - increase_gold(ch, 1); - break; - case 1: - send_to_char(ch, "You sacrifice %s to the Gods.\r\nThe Gods ignore your sacrifice.\r\n", GET_OBJ_SHORT(j)); - break; - case 2: - send_to_char(ch, "Your sacrifice to the Gods is rewarded with %d gold coins.\r\n", 1+GET_OBJ_LEVEL(j)); - increase_gold(ch, (1+GET_OBJ_LEVEL(j))); - break; - case 3: - send_to_char(ch, "Your sacrifice to the Gods is rewarded with %d gold coins\r\n", (1+2*GET_OBJ_LEVEL(j))); - increase_gold(ch, (1+2*GET_OBJ_LEVEL(j))); - break; - default: - send_to_char(ch, "You sacrifice %s to the Gods.\r\nYou receive one gold coin for your humility.\r\n",GET_OBJ_SHORT(j)); - increase_gold(ch, 1); - break; - } - for (jj = j->contains; jj; jj = next_thing2) { - next_thing2 = jj->next_content; /* Next in inventory */ - obj_from_obj(jj); - - if (j->carried_by) - obj_to_room(jj, IN_ROOM(j)); - else if (IN_ROOM(j) != NOWHERE) - obj_to_room(jj, IN_ROOM(j)); - else - assert(FALSE); - } - extract_obj(j); -} diff --git a/src/act.other.c b/src/act.other.c index 3e16168..0b8b894 100644 --- a/src/act.other.c +++ b/src/act.other.c @@ -684,16 +684,8 @@ ACMD(do_gen_tog) "Brief mode on.\r\n"}, {"Compact mode off.\r\n", "Compact mode on.\r\n"}, - {"You can now hear tells.\r\n", - "You are now deaf to tells.\r\n"}, - {"You can now hear auctions.\r\n", - "You are now deaf to auctions.\r\n"}, {"You can now hear shouts.\r\n", "You are now deaf to shouts.\r\n"}, - {"You can now hear gossip.\r\n", - "You are now deaf to gossip.\r\n"}, - {"You can now hear the congratulation messages.\r\n", - "You are now deaf to the congratulation messages.\r\n"}, {"You can now hear the Wiz-channel.\r\n", "You are now deaf to the Wiz-channel.\r\n"}, {"You are no longer part of the Quest.\r\n", @@ -722,8 +714,6 @@ ACMD(do_gen_tog) "Autogold enabled.\r\n"}, {"Autosplit disabled.\r\n", "Autosplit enabled.\r\n"}, - {"Autosacrifice disabled.\r\n", - "Autosacrifice enabled.\r\n"}, {"Autoassist disabled.\r\n", "Autoassist enabled.\r\n"}, {"Automap disabled.\r\n", @@ -752,21 +742,9 @@ ACMD(do_gen_tog) case SCMD_COMPACT: result = PRF_TOG_CHK(ch, PRF_COMPACT); break; - case SCMD_NOTELL: - result = PRF_TOG_CHK(ch, PRF_NOTELL); - break; - case SCMD_NOAUCTION: - result = PRF_TOG_CHK(ch, PRF_NOAUCT); - break; case SCMD_NOSHOUT: result = PRF_TOG_CHK(ch, PRF_NOSHOUT); break; - case SCMD_NOGOSSIP: - result = PRF_TOG_CHK(ch, PRF_NOGOSS); - break; - case SCMD_NOGRATZ: - result = PRF_TOG_CHK(ch, PRF_NOGRATZ); - break; case SCMD_NOWIZ: result = PRF_TOG_CHK(ch, PRF_NOWIZ); break; @@ -829,9 +807,6 @@ ACMD(do_gen_tog) case SCMD_AUTOSPLIT: result = PRF_TOG_CHK(ch, PRF_AUTOSPLIT); break; - case SCMD_AUTOSAC: - result = PRF_TOG_CHK(ch, PRF_AUTOSAC); - break; case SCMD_AUTOASSIST: result = PRF_TOG_CHK(ch, PRF_AUTOASSIST); break; diff --git a/src/comm.c b/src/comm.c index ed7d609..677fd2a 100644 --- a/src/comm.c +++ b/src/comm.c @@ -2646,7 +2646,6 @@ char *act(const char *str, int hide_invisible, struct char_data *ch, for (i = descriptor_list; i; i = i->next) { if (!i->connected && i->character && - !PRF_FLAGGED(i->character, PRF_NOGOSS) && !PLR_FLAGGED(i->character, PLR_WRITING) && !ROOM_FLAGGED(IN_ROOM(i->character), ROOM_SOUNDPROOF)) { diff --git a/src/config.c b/src/config.c index bd0408e..2690559 100644 --- a/src/config.c +++ b/src/config.c @@ -49,7 +49,7 @@ int pk_allowed = NO; /* Is playerthieving allowed? */ int pt_allowed = NO; -/* Minimum level a player must be to shout/gossip/auction. */ +/* Minimum level a player must be to shout */ int level_can_shout = 1; /* How many people can get into a tunnel? The default is two, but there is diff --git a/src/constants.c b/src/constants.c index d507d3d..961147c 100644 --- a/src/constants.c +++ b/src/constants.c @@ -236,9 +236,6 @@ const char *preference_bits[] = { "NO_WIZ", "L1", "L2", - "NO_AUC", - "NO_GOS", - "NO_GTZ", "RMFLG", "D_AUTO", "CLS", @@ -937,12 +934,9 @@ const char *wtrig_types[] = { const char *history_types[] = { "all", "say", - "gossip", "wiznet", "tell", "shout", - "grats", - "auction", "\n" }; diff --git a/src/fight.c b/src/fight.c index 8913c08..1779641 100644 --- a/src/fight.c +++ b/src/fight.c @@ -793,9 +793,6 @@ int damage(struct char_data *ch, struct char_data *victim, int dam, int attackty if (!IS_NPC(ch) && (ch != victim) && PRF_FLAGGED(ch, PRF_AUTOLOOT)) { do_get(ch, "all corpse", 0, 0); } - if (IS_NPC(victim) && !IS_NPC(ch) && PRF_FLAGGED(ch, PRF_AUTOSAC)) { - do_sac(ch,"corpse",0,0); - } return (-1); } return (dam); diff --git a/src/interpreter.c b/src/interpreter.c index 38fc874..893c3cb 100644 --- a/src/interpreter.c +++ b/src/interpreter.c @@ -89,7 +89,6 @@ cpp_extern const struct command_info cmd_info[] = { { "ask" , "ask" , POS_RESTING , do_spec_comm, 0, SCMD_ASK }, { "astat" , "ast" , POS_DEAD , do_astat , 0, 0 }, { "attach" , "attach" , POS_DEAD , do_attach , LVL_BUILDER, 0 }, - { "auction" , "auc" , POS_SLEEPING, do_gen_comm , 0, SCMD_AUCTION }, { "autoexits" , "autoex" , POS_DEAD , do_gen_tog , 0, SCMD_AUTOEXIT }, { "autoassist","autoass" , POS_DEAD , do_gen_tog , 0, SCMD_AUTOASSIST }, { "autodoor" , "autodoor", POS_DEAD , do_gen_tog , 0, SCMD_AUTODOOR }, @@ -155,10 +154,8 @@ cpp_extern const struct command_info cmd_info[] = { { "give" , "giv" , POS_RESTING , do_give , 0, 0 }, { "goto" , "go" , POS_SLEEPING, do_goto , LVL_IMMORT, 0 }, { "gold" , "gol" , POS_RESTING , do_gold , 0, 0 }, - { "gossip" , "gos" , POS_SLEEPING, do_gen_comm , 0, SCMD_GOSSIP }, { "group" , "gr" , POS_RESTING , do_group , 1, 0 }, { "grab" , "grab" , POS_RESTING , do_grab , 0, 0 }, - { "grats" , "grat" , POS_SLEEPING, do_gen_comm , 0, SCMD_GRATZ }, { "gsay" , "gsay" , POS_SLEEPING, do_gsay , 0, 0 }, { "gtell" , "gt" , POS_SLEEPING, do_gsay , 0, 0 }, @@ -206,9 +203,6 @@ cpp_extern const struct command_info cmd_info[] = { { "mute" , "mute" , POS_DEAD , do_wizutil , LVL_GOD, SCMD_MUTE }, { "news" , "news" , POS_SLEEPING, do_gen_ps , 0, SCMD_NEWS }, - { "noauction", "noauction",POS_DEAD , do_gen_tog , 0, SCMD_NOAUCTION }, - { "nogossip" , "nogossip", POS_DEAD , do_gen_tog , 0, SCMD_NOGOSSIP }, - { "nograts" , "nograts" , POS_DEAD , do_gen_tog , 0, SCMD_NOGRATZ }, { "nohassle" , "nohassle", POS_DEAD , do_gen_tog , LVL_IMMORT, SCMD_NOHASSLE }, { "norepeat" , "norepeat", POS_DEAD , do_gen_tog , 0, SCMD_NOREPEAT }, { "noshout" , "noshout" , POS_SLEEPING, do_gen_tog , 1, SCMD_NOSHOUT }, diff --git a/src/prefedit.c b/src/prefedit.c index 5fbf95b..10f2025 100755 --- a/src/prefedit.c +++ b/src/prefedit.c @@ -204,35 +204,22 @@ static void prefedit_disp_toggles_menu(struct descriptor_data *d) CBWHT(d->character, C_NRM)); /* The top section of the actual menu */ - send_to_char(d->character, "%s1%s) Autoexits %s[%s%3s%s] %sA%s) Gossip %s[%s%3s%s]\r\n" - "%s2%s) Autoloot %s[%s%3s%s] %sB%s) Shout %s[%s%3s%s]\r\n" - "%s3%s) Autogold %s[%s%3s%s] %sC%s) Tell %s[%s%3s%s]\r\n" - "%s4%s) Autosac %s[%s%3s%s] %sD%s) Auction %s[%s%3s%s]\r\n" - "%s5%s) Autoassist %s[%s%3s%s] %sE%s) Gratz %s[%s%3s%s]\r\n" - "%s6%s) Autosplit %s[%s%3s%s]\r\n", -/* Line 1 - autoexits and gossip */ + send_to_char(d->character, "%s1%s) Autoexits %s[%s%3s%s] %sA%s) Autoloot %s[%s%3s%s]\r\n" + "%s2%s) Autogold %s[%s%3s%s] %sB%s) Shout %s[%s%3s%s]\r\n" + "%s3%s) Autoassist %s[%s%3s%s] %sC%s) Autosplit %s[%s%3s%s]\r\n", + +/* Line 1 - autoexits and autoloot */ CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOEXIT) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM), - ONOFF(PREFEDIT_FLAGGED(PRF_AUTOEXIT)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), - PREFEDIT_FLAGGED(PRF_NOGOSS) ? CBRED(d->character, C_NRM) : CBGRN(d->character, C_NRM), ONOFF(!PREFEDIT_FLAGGED(PRF_NOGOSS)), CCCYN(d->character, C_NRM), -/* Line 2 - autoloot and shout */ - CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOLOOT) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM), - ONOFF(PREFEDIT_FLAGGED(PRF_AUTOLOOT)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), - PREFEDIT_FLAGGED(PRF_NOSHOUT) ? CBRED(d->character, C_NRM) : CBGRN(d->character, C_NRM), ONOFF(!PREFEDIT_FLAGGED(PRF_NOSHOUT)), CCCYN(d->character, C_NRM), -/* Line 3 - autogold and tell */ - CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOGOLD) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM), - ONOFF(PREFEDIT_FLAGGED(PRF_AUTOGOLD)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), - PREFEDIT_FLAGGED(PRF_NOTELL) ? CBRED(d->character, C_NRM) : CBGRN(d->character, C_NRM), ONOFF(!PREFEDIT_FLAGGED(PRF_NOTELL)), CCCYN(d->character, C_NRM), -/* Line 4 - autosac and auction */ - CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOSAC) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM), - ONOFF(PREFEDIT_FLAGGED(PRF_AUTOSAC)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), - PREFEDIT_FLAGGED(PRF_NOAUCT) ? CBRED(d->character, C_NRM) : CBGRN(d->character, C_NRM), ONOFF(!PREFEDIT_FLAGGED(PRF_NOAUCT)), CCCYN(d->character, C_NRM), -/* Line 5 - autoassist and grats */ - CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOASSIST) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM), - ONOFF(PREFEDIT_FLAGGED(PRF_AUTOASSIST)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), - PREFEDIT_FLAGGED(PRF_NOGRATZ) ? CBRED(d->character, C_NRM) : CBGRN(d->character, C_NRM), ONOFF(!PREFEDIT_FLAGGED(PRF_NOGRATZ)), CCCYN(d->character, C_NRM), -/* Line 6 - autosplit */ - CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOSPLIT) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM), - ONOFF(PREFEDIT_FLAGGED(PRF_AUTOSPLIT)), CCCYN(d->character, C_NRM) + ONOFF(PREFEDIT_FLAGGED(PRF_AUTOEXIT)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), + PREFEDIT_FLAGGED(PRF_AUTOLOOT) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM), ONOFF(PREFEDIT_FLAGGED(PRF_AUTOLOOT)), CCCYN(d->character, C_NRM), +/* Line 2 - autogold and shout */ + CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOGOLD) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM), + ONOFF(PREFEDIT_FLAGGED(PRF_AUTOGOLD)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), + PREFEDIT_FLAGGED(PRF_NOSHOUT) ? CBRED(d->character, C_NRM) : CBGRN(d->character, C_NRM), ONOFF(!PREFEDIT_FLAGGED(PRF_NOSHOUT)), CCCYN(d->character, C_NRM), +/* Line 3 - autoassist and autosplit */ + CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), PREFEDIT_FLAGGED(PRF_AUTOASSIST) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM), + ONOFF(PREFEDIT_FLAGGED(PRF_AUTOASSIST)), CCCYN(d->character, C_NRM), CBYEL(d->character, C_NRM), CCNRM(d->character, C_NRM), CCCYN(d->character, C_NRM), + PREFEDIT_FLAGGED(PRF_AUTOSPLIT) ? CBGRN(d->character, C_NRM) : CBRED(d->character, C_NRM), ONOFF(PREFEDIT_FLAGGED(PRF_AUTOSPLIT)), CCCYN(d->character, C_NRM) ); send_to_char(d->character, "%s7%s) Automap %s[%s%3s%s]\r\n" @@ -584,23 +571,20 @@ void prefedit_parse(struct descriptor_data * d, char *arg) break; case '2': - TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOLOOT); - break; - - case '3': TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOGOLD); break; - case '4': - TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOSAC); - break; - - case '5': + case '3': TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOASSIST); break; + case '4': + break; + + case '5': + break; + case '6': - TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOSPLIT); break; case '7': @@ -617,7 +601,7 @@ void prefedit_parse(struct descriptor_data * d, char *arg) case 'a': case 'A': - TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOGOSS); + TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOLOOT); break; case 'b': @@ -627,17 +611,15 @@ void prefedit_parse(struct descriptor_data * d, char *arg) case 'c': case 'C': - TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOTELL); + TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOSPLIT); break; case 'd': case 'D': - TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOAUCT); break; case 'e': case 'E': - TOGGLE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOGRATZ); break; case 'f': @@ -857,18 +839,6 @@ void prefedit_Restore_Defaults(struct descriptor_data *d) if (PREFEDIT_FLAGGED(PRF_LOG2)) REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_LOG2); - /* PRF_NOAUCT - Off */ - if (PREFEDIT_FLAGGED(PRF_NOAUCT)) - REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOAUCT); - - /* PRF_NOGOSS - Off */ - if (PREFEDIT_FLAGGED(PRF_NOGOSS)) - REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOGOSS); - - /* PRF_NOGRATZ - Off */ - if (PREFEDIT_FLAGGED(PRF_NOGRATZ)) - REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_NOGRATZ); - /* PRF_SHOWVNUMS - On for Imms */ if (!PREFEDIT_FLAGGED(PRF_SHOWVNUMS) && GET_LEVEL(PREFEDIT_GET_CHAR) > LVL_IMMORT) SET_BIT_AR(PREFEDIT_GET_FLAGS, PRF_SHOWVNUMS); @@ -899,10 +869,6 @@ void prefedit_Restore_Defaults(struct descriptor_data *d) if (PREFEDIT_FLAGGED(PRF_AUTOSPLIT)) REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOSPLIT); - /* PRF_AUTOSAC - Off */ - if (PREFEDIT_FLAGGED(PRF_AUTOSAC)) - REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOSAC); - /* PRF_AUTOASSIST - Off */ if (PREFEDIT_FLAGGED(PRF_AUTOASSIST)) REMOVE_BIT_AR(PREFEDIT_GET_FLAGS, PRF_AUTOASSIST); diff --git a/src/structs.h b/src/structs.h index f233612..877cfc0 100644 --- a/src/structs.h +++ b/src/structs.h @@ -76,7 +76,7 @@ #define ROOM_NOMOB 2 /**< MOBs not allowed in room */ #define ROOM_INDOORS 3 /**< Indoors, no weather */ #define ROOM_PEACEFUL 4 /**< Violence not allowed */ -#define ROOM_SOUNDPROOF 5 /**< Shouts, gossip blocked */ +#define ROOM_SOUNDPROOF 5 /**< Shouts blocked */ #define ROOM_NOTRACK 6 /**< Track won't go through */ #define ROOM_NOMAGIC 7 /**< Magic not allowed */ #define ROOM_TUNNEL 8 /**< Room for only 1 pers */ @@ -128,14 +128,11 @@ /* History */ #define HIST_ALL 0 /**< Index to history of all channels */ #define HIST_SAY 1 /**< Index to history of all 'say' */ -#define HIST_GOSSIP 2 /**< Index to history of all 'gossip' */ -#define HIST_WIZNET 3 /**< Index to history of all 'wiznet' */ -#define HIST_TELL 4 /**< Index to history of all 'tell' */ -#define HIST_SHOUT 5 /**< Index to history of all 'shout' */ -#define HIST_GRATS 6 /**< Index to history of all 'grats' */ -#define HIST_AUCTION 7 /**< Index to history of all 'auction' */ +#define HIST_WIZNET 2 /**< Index to history of all 'wiznet' */ +#define HIST_TELL 3 /**< Index to history of all 'tell' */ +#define HIST_SHOUT 4 /**< Index to history of all 'shout' */ -#define NUM_HIST 8 /**< Total number of history indexes */ +#define NUM_HIST 5 /**< Total number of history indexes */ #define HISTORY_SIZE 5 /**< Number of last commands kept in each history */ @@ -194,7 +191,7 @@ #define PLR_MAILING 5 /**< Player is writing mail */ #define PLR_CRASH 6 /**< Player needs to be crash-saved */ #define PLR_SITEOK 7 /**< Player has been site-cleared */ -#define PLR_NOSHOUT 8 /**< Player not allowed to shout/goss */ +#define PLR_NOSHOUT 8 /**< Player not allowed to shout */ #define PLR_NOTITLE 9 /**< Player not allowed to set title */ #define PLR_DELETED 10 /**< Player deleted - space reusable */ #define PLR_LOADROOM 11 /**< Player uses nonstandard loadroom */ @@ -250,26 +247,23 @@ #define PRF_NOWIZ 15 /**< Can't hear wizline */ #define PRF_LOG1 16 /**< On-line System Log (low bit) */ #define PRF_LOG2 17 /**< On-line System Log (high bit) */ -#define PRF_NOAUCT 18 /**< Can't hear auction channel */ -#define PRF_NOGOSS 19 /**< Can't hear gossip channel */ -#define PRF_NOGRATZ 20 /**< Can't hear grats channel */ -#define PRF_SHOWVNUMS 21 /**< Can see VNUMs */ -#define PRF_DISPAUTO 22 /**< Show prompt HP, MP, MV when < 25% */ -#define PRF_CLS 23 /**< Clear screen in OLC */ -#define PRF_BUILDWALK 24 /**< Build new rooms while walking */ -#define PRF_AFK 25 /**< AFK flag */ -#define PRF_AUTOLOOT 26 /**< Loot everything from a corpse */ -#define PRF_AUTOGOLD 27 /**< Loot gold from a corpse */ -#define PRF_AUTOSPLIT 28 /**< Split gold with group */ -#define PRF_AUTOSAC 29 /**< Sacrifice a corpse */ -#define PRF_AUTOASSIST 30 /**< Auto-assist toggle */ -#define PRF_AUTOMAP 31 /**< Show map at the side of room descs */ -#define PRF_AUTOKEY 32 /**< Automatically unlock locked doors when opening */ -#define PRF_AUTODOOR 33 /**< Use the next available door */ -#define PRF_ZONERESETS 34 /**< Show when zones reset */ -#define PRF_VERBOSE 35 /**< Listings like where are more verbose */ +#define PRF_SHOWVNUMS 18 /**< Can see VNUMs */ +#define PRF_DISPAUTO 19 /**< Show prompt HP, MP, MV when < 25% */ +#define PRF_CLS 20 /**< Clear screen in OLC */ +#define PRF_BUILDWALK 21 /**< Build new rooms while walking */ +#define PRF_AFK 22 /**< AFK flag */ +#define PRF_AUTOLOOT 23 /**< Loot everything from a corpse */ +#define PRF_AUTOGOLD 24 /**< Loot gold from a corpse */ +#define PRF_AUTOSPLIT 25 /**< Split gold with group */ +#define PRF_AUTOSAC 26 /**< Sacrifice a corpse */ +#define PRF_AUTOASSIST 27 /**< Auto-assist toggle */ +#define PRF_AUTOMAP 28 /**< Show map at the side of room descs */ +#define PRF_AUTOKEY 29 /**< Automatically unlock locked doors when opening */ +#define PRF_AUTODOOR 30 /**< Use the next available door */ +#define PRF_ZONERESETS 31 /**< Show when zones reset */ +#define PRF_VERBOSE 32 /**< Listings like where are more verbose */ /** Total number of available PRF flags */ -#define NUM_PRF_FLAGS 36 +#define NUM_PRF_FLAGS 33 /* Affect bits: used in char_data.char_specials.saved.affected_by */ /* WARNING: In the world files, NEVER set the bits marked "R" ("Reserved") */