Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-04-06 04:17:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove holler command

Browse source
This commit is contained in:
kinther 2025-08-17 11:34:46 -07:00
parent 1f707eee74
commit dbf38a2c38
10 changed files with 9 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/act.comm.c
View file

@ -414,7 +414,6 @@ ACMD(do_gen_comm)
};
int hist_type[] = {
HIST_HOLLER,
HIST_SHOUT,
HIST_GOSSIP,
HIST_AUCTION,
@ -426,10 +425,6 @@ ACMD(do_gen_comm)
* [2] message if you're not on the channel
* [3] a color string. */
const char *com_msgs[][4] = {
{"You cannot holler!!\r\n",
"holler",
"",
KYEL},
{"You cannot shout!!\r\n",
"shout",
@ -494,13 +489,6 @@ ACMD(do_gen_comm)
send_to_char(ch, "Yes, %s, fine, %s we must, but WHAT???\r\n", com_msgs[subcmd][1], com_msgs[subcmd][1]);
return;
}
if (subcmd == SCMD_HOLLER) {
if (GET_MOVE(ch) < CONFIG_HOLLER_MOVE_COST) {
send_to_char(ch, "You're too exhausted to holler.\r\n");
return;
} else
GET_MOVE(ch) -= CONFIG_HOLLER_MOVE_COST;
}
/* Set up the color on code. */
strlcpy(color_on, com_msgs[subcmd][3], sizeof(color_on));

11
src/act.h
View file

@ -26,12 +26,11 @@
/* functions with subcommands */
/* do_gen_comm */
ACMD(do_gen_comm);
#define SCMD_HOLLER 0
#define SCMD_SHOUT 1
#define SCMD_GOSSIP 2
#define SCMD_AUCTION 3
#define SCMD_GRATZ 4
#define SCMD_GEMOTE 5
#define SCMD_SHOUT 0
#define SCMD_GOSSIP 1
#define SCMD_AUCTION 2
#define SCMD_GRATZ 3
#define SCMD_GEMOTE 4
/* do_qcomm */
ACMD(do_qcomm);
#define SCMD_QSAY 0

23
src/cedit.c
View file

@ -82,7 +82,6 @@ static void cedit_setup(struct descriptor_data *d)
OLC_CONFIG(d)->play.pk_allowed = CONFIG_PK_ALLOWED;
OLC_CONFIG(d)->play.pt_allowed = CONFIG_PT_ALLOWED;
OLC_CONFIG(d)->play.level_can_shout = CONFIG_LEVEL_CAN_SHOUT;
OLC_CONFIG(d)->play.holler_move_cost = CONFIG_HOLLER_MOVE_COST;
OLC_CONFIG(d)->play.tunnel_size = CONFIG_TUNNEL_SIZE;
OLC_CONFIG(d)->play.max_exp_gain = CONFIG_MAX_EXP_GAIN;
OLC_CONFIG(d)->play.max_exp_loss = CONFIG_MAX_EXP_LOSS;
@ -186,7 +185,6 @@ static void cedit_save_internally(struct descriptor_data *d)
CONFIG_PK_ALLOWED = OLC_CONFIG(d)->play.pk_allowed;
CONFIG_PT_ALLOWED = OLC_CONFIG(d)->play.pt_allowed;
CONFIG_LEVEL_CAN_SHOUT = OLC_CONFIG(d)->play.level_can_shout;
CONFIG_HOLLER_MOVE_COST = OLC_CONFIG(d)->play.holler_move_cost;
CONFIG_TUNNEL_SIZE = OLC_CONFIG(d)->play.tunnel_size;
CONFIG_MAX_EXP_GAIN = OLC_CONFIG(d)->play.max_exp_gain;
CONFIG_MAX_EXP_LOSS = OLC_CONFIG(d)->play.max_exp_loss;
@ -344,8 +342,6 @@ int save_config( IDXTYPE nowhere )
"pt_allowed = %d\n\n", CONFIG_PT_ALLOWED);
fprintf(fl, "* What is the minimum level a player can shout/gossip/etc?\n"
"level_can_shout = %d\n\n", CONFIG_LEVEL_CAN_SHOUT);
fprintf(fl, "* How many movement points does shouting cost the player?\n"
"holler_move_cost = %d\n\n", CONFIG_HOLLER_MOVE_COST);
fprintf(fl, "* How many players can fit in a tunnel?\n"
"tunnel_size = %d\n\n", CONFIG_TUNNEL_SIZE);
fprintf(fl, "* Maximum experience gainable per kill?\n"
@ -619,7 +615,6 @@ static void cedit_disp_game_play_options(struct descriptor_data *d)
"%sA%s) Player Killing Allowed : %s%s\r\n"
"%sB%s) Player Thieving Allowed : %s%s\r\n"
"%sC%s) Minimum Level To Shout : %s%d\r\n"
"%sD%s) Holler Move Cost : %s%d\r\n"
"%sE%s) Tunnel Size : %s%d\r\n"
"%sF%s) Maximum Experience Gain : %s%d\r\n"
"%sG%s) Maximum Experience Loss : %s%d\r\n"
@ -647,7 +642,6 @@ static void cedit_disp_game_play_options(struct descriptor_data *d)
grn, nrm, cyn, CHECK_VAR(OLC_CONFIG(d)->play.pk_allowed),
grn, nrm, cyn, CHECK_VAR(OLC_CONFIG(d)->play.pt_allowed),
grn, nrm, cyn, OLC_CONFIG(d)->play.level_can_shout,
grn, nrm, cyn, OLC_CONFIG(d)->play.holler_move_cost,
grn, nrm, cyn, OLC_CONFIG(d)->play.tunnel_size,
grn, nrm, cyn, OLC_CONFIG(d)->play.max_exp_gain,
grn, nrm, cyn, OLC_CONFIG(d)->play.max_exp_loss,
@ -897,12 +891,6 @@ void cedit_parse(struct descriptor_data *d, char *arg)
OLC_MODE(d) = CEDIT_LEVEL_CAN_SHOUT;
return;
case 'd':
case 'D':
write_to_output(d, "Enter the amount it costs (in move points) to holler : ");
OLC_MODE(d) = CEDIT_HOLLER_MOVE_COST;
return;
case 'e':
case 'E':
write_to_output(d, "Enter the maximum number of people allowed in a tunnel : ");
@ -1321,17 +1309,6 @@ void cedit_parse(struct descriptor_data *d, char *arg)
}
break;
case CEDIT_HOLLER_MOVE_COST:
if (!*arg) {
write_to_output(d,
"That is an invalid choice!\r\n"
"Enter the amount it costs (in move points) to holler : ");
} else {
OLC_CONFIG(d)->play.holler_move_cost = atoi(arg);
cedit_disp_game_play_options(d);
}
break;
case CEDIT_TUNNEL_SIZE:
if (!*arg) {
write_to_output(d,

5
src/config.c
View file

@ -49,12 +49,9 @@ int pk_allowed = NO;
/* Is playerthieving allowed? */
int pt_allowed = NO;
/* Minimum level a player must be to shout/holler/gossip/auction. */
/* Minimum level a player must be to shout/gossip/auction. */
int level_can_shout = 1;
/* Number of movement points it costs to holler. */
int holler_move_cost = 20;
/* How many people can get into a tunnel? The default is two, but there is
* also an alternate message in the case of one person being allowed. */
int tunnel_size = 2;

1
src/config.h
View file

@ -18,7 +18,6 @@ extern int pk_allowed;
extern int script_players;
extern int pt_allowed;
extern int level_can_shout;
extern int holler_move_cost;
extern int tunnel_size;
extern int max_exp_gain;
extern int max_exp_loss;

1
src/constants.c
View file

@ -942,7 +942,6 @@ const char *history_types[] = {
"tell",
"shout",
"grats",
"holler",
"auction",
"\n"
};

5
src/db.c
View file

@ -3839,7 +3839,6 @@ static void load_default_config( void )
CONFIG_PK_ALLOWED = pk_allowed;
CONFIG_PT_ALLOWED = pt_allowed;
CONFIG_LEVEL_CAN_SHOUT = level_can_shout;
CONFIG_HOLLER_MOVE_COST = holler_move_cost;
CONFIG_TUNNEL_SIZE = tunnel_size;
CONFIG_MAX_EXP_GAIN = max_exp_gain;
CONFIG_MAX_EXP_LOSS = max_exp_loss;
@ -4006,9 +4005,7 @@ void load_config( void )
break;
case 'h':
if (!str_cmp(tag, "holler_move_cost"))
CONFIG_HOLLER_MOVE_COST = num;
else if (!str_cmp(tag, "huh")) {
if (!str_cmp(tag, "huh")) {
char tmp[READ_SIZE];
if (CONFIG_HUH)
free(CONFIG_HUH);

1
src/interpreter.c
View file

@ -174,7 +174,6 @@ cpp_extern const struct command_info cmd_info[] = {
{ "history" , "history" , POS_DEAD , do_history, 0, 0},
{ "hit" , "hit" , POS_FIGHTING, do_hit , 0, SCMD_HIT },
{ "hold" , "hold" , POS_RESTING , do_grab , 1, 0 },
{ "holler" , "holler" , POS_RESTING , do_gen_comm , 1, SCMD_HOLLER },
{ "holylight", "holy" , POS_DEAD , do_gen_tog , LVL_IMMORT, SCMD_HOLYLIGHT },
{ "house" , "house" , POS_RESTING , do_house , 0, 0 },

6
src/structs.h
View file

@ -132,10 +132,9 @@
#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_HOLLER 7 /**< Index to history of all 'holler' */
#define HIST_AUCTION 8 /**< Index to history of all 'auction' */
#define HIST_AUCTION 7 /**< Index to history of all 'auction' */
#define NUM_HIST 9 /**< Total number of history indexes */
#define NUM_HIST 8 /**< Total number of history indexes */
#define HISTORY_SIZE 5 /**< Number of last commands kept in each history */
@ -1285,7 +1284,6 @@ struct game_data
int pk_allowed; /**< Is player killing allowed? */
int pt_allowed; /**< Is player thieving allowed? */
int level_can_shout; /**< Level player must be to shout. */
int holler_move_cost; /**< Cost to holler in move points. */
int tunnel_size; /**< Number of people allowed in a tunnel.*/
int max_exp_gain; /**< Maximum experience gainable per kill.*/
int max_exp_loss; /**< Maximum experience losable per death.*/

2
src/utils.h
View file

@ -929,8 +929,6 @@ do \
#define CONFIG_PT_ALLOWED config_info.play.pt_allowed
/** What level to use the shout command? */
#define CONFIG_LEVEL_CAN_SHOUT config_info.play.level_can_shout
/** How many move points does holler cost? */
#define CONFIG_HOLLER_MOVE_COST config_info.play.holler_move_cost
/** How many characters can fit in a room marked as tunnel? */
#define CONFIG_TUNNEL_SIZE config_info.play.tunnel_size
/** What is the max experience that can be gained at once? */