Question Cedit and Player Corpses

diff -BbuprN -x '*.o' "tbamud-master (1)/tbamud-master/src/cedit.c" tbamud-master/src/cedit.c --- "tbamud-master (1)/tbamud-master/src/cedit.c" 2018-01-28 15:49:00.000000000 +0000 +++ tbamud-master/src/cedit.c 2018-12-09 10:00:55.505968500 +0000 @@ -88,6 +88,8 @@ static void cedit_setup(struct descripto OLC_CONFIG(d)->play.max_exp_loss = CONFIG_MAX_EXP_LOSS; OLC_CONFIG(d)->play.max_npc_corpse_time = CONFIG_MAX_NPC_CORPSE_TIME; OLC_CONFIG(d)->play.max_pc_corpse_time = CONFIG_MAX_PC_CORPSE_TIME; + OLC_CONFIG(d)->play.corpse_decay_behavior = CONFIG_CORPSE_DECAY; + OLC_CONFIG(d)->play.corpse_create_level = CONFIG_CORPSE_LEVEL; OLC_CONFIG(d)->play.idle_void = CONFIG_IDLE_VOID; OLC_CONFIG(d)->play.idle_rent_time = CONFIG_IDLE_RENT_TIME; OLC_CONFIG(d)->play.idle_max_level = CONFIG_IDLE_MAX_LEVEL; /* Crash Saves */ OLC_CONFIG(d)->csd.free_rent = CONFIG_FREE_RENT; @@ -192,6 +195,8 @@ static void cedit_save_internally(struct CONFIG_MAX_EXP_LOSS = OLC_CONFIG(d)->play.max_exp_loss; CONFIG_MAX_NPC_CORPSE_TIME = OLC_CONFIG(d)->play.max_npc_corpse_time; CONFIG_MAX_PC_CORPSE_TIME = OLC_CONFIG(d)->play.max_pc_corpse_time; + CONFIG_CORPSE_DECAY = OLC_CONFIG(d)->play.corpse_decay_behavior; + CONFIG_CORPSE_LEVEL = OLC_CONFIG(d)->play.corpse_create_level; CONFIG_IDLE_VOID = OLC_CONFIG(d)->play.idle_void; CONFIG_IDLE_RENT_TIME = OLC_CONFIG(d)->play.idle_rent_time; CONFIG_IDLE_MAX_LEVEL = OLC_CONFIG(d)->play.idle_max_level; /* Crash Saves */ CONFIG_FREE_RENT = OLC_CONFIG(d)->csd.free_rent; @@ -356,6 +362,10 @@ int save_config( IDXTYPE nowhere ) "max_npc_corpse_time = %d\n\n", CONFIG_MAX_NPC_CORPSE_TIME); fprintf(fl, "* Number of tics before PC corpses decompose.\n" "max_pc_corpse_time = %d\n\n", CONFIG_MAX_PC_CORPSE_TIME); + fprintf(fl, "* Minimum PC level when items are left in a corpse.\n" + "corpse_create_level = %d\n\n", CONFIG_CORPSE_LEVEL); + fprintf(fl, "* What happens to items when a PC corpse decays.\n" + "corpse_decay_behavior = %d\n\n", CONFIG_CORPSE_DECAY); fprintf(fl, "* Number of tics before a PC is sent to the void.\n" "idle_void = %d\n\n", CONFIG_IDLE_VOID); fprintf(fl, "* Number of tics before a PC is autorented.\n" strcpy(buf, CONFIG_OK); @@ -625,6 +637,8 @@ static void cedit_disp_game_play_options "%sG%s) Maximum Experience Loss : %s%d\r\n" "%sH%s) Max Time for NPC Corpse : %s%d\r\n" "%sI%s) Max Time for PC Corpse : %s%d\r\n" + "%sT%s) PC level corpse retrieval begins at : %s%d\r\n" + "%sU%s) Corpse decay behavior : %s%d\r\n" "%sJ%s) Tics before PC sent to void : %s%d\r\n" "%sK%s) Tics before PC is autosaved : %s%d\r\n" "%sL%s) Level Immune To IDLE : %s%d\r\n" @@ -653,7 +668,8 @@ static void cedit_disp_game_play_options grn, nrm, cyn, OLC_CONFIG(d)->play.max_exp_loss, grn, nrm, cyn, OLC_CONFIG(d)->play.max_npc_corpse_time, grn, nrm, cyn, OLC_CONFIG(d)->play.max_pc_corpse_time, - + grn, nrm, cyn, OLC_CONFIG(d)->play.corpse_create_level, + grn, nrm, cyn, OLC_CONFIG(d)->play.corpse_decay_behavior, grn, nrm, cyn, OLC_CONFIG(d)->play.idle_void, grn, nrm, cyn, OLC_CONFIG(d)->play.idle_rent_time, grn, nrm, cyn, OLC_CONFIG(d)->play.idle_max_level, @@ -981,6 +997,22 @@ void cedit_parse(struct descriptor_data TOGGLE_VAR(OLC_CONFIG(d)->play.no_mort_to_immort); break; + case 't': + case 'T': + write_to_output(d, "Enter the level at which PCs begin corpse retrieval :\r\n"); + OLC_MODE(d) = CEDIT_CORPSE_CREATE_LEVEL; + return; + + case 'u': + case 'U': + write_to_output(d, "Select behavior of items upon PC corpse decomposition\r\n"); + write_to_output(d, "0) Default: items are left in the room\r\n"); + write_to_output(d, "1) Items are donated to random donation rooms\r\n"); + write_to_output(d, "2) Items are purged\r\n"); + write_to_output(d, "Enter choice: "); + OLC_MODE(d) = CEDIT_CORPSE_DECAY_BEHAVIOR; + return; + case '1': write_to_output(d, "Enter the OK message : "); OLC_MODE(d) = CEDIT_OK; @@ -1379,6 +1418,28 @@ void cedit_parse(struct descriptor_data } break; + case CEDIT_CORPSE_CREATE_LEVEL: + if (!*arg) { + write_to_output(d, + "That is an invalid choice!\r\n" + "Enter the level PCs need to begin retrieving corpses : "); + } else { + OLC_CONFIG(d)->play.corpse_create_level = atoi(arg); + cedit_disp_game_play_options(d); + } + break; + + case CEDIT_CORPSE_DECAY_BEHAVIOR: + if (!*arg) { + write_to_output(d, + "That is an invalid choice!\r\n" + "Enter the decay behavior : "); + } else { + OLC_CONFIG(d)->play.corpse_decay_behavior = atoi(arg); + cedit_disp_game_play_options(d); + } + break; + case CEDIT_IDLE_VOID: if (!*arg) { write_to_output(d, diff -BbuprN -x '*.o' "tbamud-master (1)/tbamud-master/src/config.c" tbamud-master/src/config.c --- "tbamud-master (1)/tbamud-master/src/config.c" 2018-01-28 15:49:00.000000000 +0000 +++ tbamud-master/src/config.c 2018-12-09 09:53:26.257434600 +0000 @@ -67,6 +67,13 @@ int max_exp_loss = 500000; /* max losabl int max_npc_corpse_time = 5; int max_pc_corpse_time = 10; +/* Minimum level for PCs to lose items into corpses upon death */ +int corpse_create_level = 0; + +/* Behavior of items in decaying corpses */ +int corpse_decay_behavior = CONFIG_DEFAULT_DECAY; + + /* How many ticks before a player is sent to the void or idle-rented. */ int idle_void = 8; int idle_rent_time = 48; diff -BbuprN -x '*.o' "tbamud-master (1)/tbamud-master/src/config.h" tbamud-master/src/config.h --- "tbamud-master (1)/tbamud-master/src/config.h" 2018-01-28 15:49:00.000000000 +0000 +++ tbamud-master/src/config.h 2018-12-09 09:53:26.288676500 +0000 @@ -24,6 +25,8 @@ extern int max_exp_gain; extern int max_exp_loss; extern int max_npc_corpse_time; extern int max_pc_corpse_time; +extern int corpse_create_level; +extern int corpse_decay_behavior; extern int idle_void; extern int idle_rent_time; extern int idle_max_level; diff -BbuprN -x '*.o' "tbamud-master (1)/tbamud-master/src/db.c" tbamud-master/src/db.c --- "tbamud-master (1)/tbamud-master/src/db.c" 2018-01-28 15:49:00.000000000 +0000 +++ tbamud-master/src/db.c 2018-12-09 09:53:26.241813900 +0000 @@ -3777,6 +3778,8 @@ static void load_default_config( void ) CONFIG_MAX_EXP_LOSS = max_exp_loss; CONFIG_MAX_NPC_CORPSE_TIME = max_npc_corpse_time; CONFIG_MAX_PC_CORPSE_TIME = max_pc_corpse_time; + CONFIG_CORPSE_DECAY = corpse_decay_behavior; + CONFIG_CORPSE_LEVEL = corpse_create_level; CONFIG_IDLE_VOID = idle_void; CONFIG_IDLE_RENT_TIME = idle_rent_time; CONFIG_IDLE_MAX_LEVEL = idle_max_level; @@ -3882,6 +3885,12 @@ void load_config( void ) case 'c': if (!str_cmp(tag, "crash_file_timeout")) CONFIG_CRASH_TIMEOUT = num; + else if (!str_cmp(tag, "corpse_create_level")) + CONFIG_CORPSE_LEVEL = num; + else if (!str_cmp(tag, "corpse_decay_behavior")) + CONFIG_CORPSE_DECAY = num; break; case 'd': diff -BbuprN -x '*.o' "tbamud-master (1)/tbamud-master/src/fight.c" tbamud-master/src/fight.c --- "tbamud-master (1)/tbamud-master/src/fight.c" 2018-01-28 15:49:00.000000000 +0000 +++ tbamud-master/src/fight.c 2018-12-09 10:51:32.935668500 +0000 @@ -189,7 +189,9 @@ static void make_corpse(struct char_data SET_BIT_AR(GET_OBJ_WEAR(corpse), ITEM_WEAR_TAKE); SET_BIT_AR(GET_OBJ_EXTRA(corpse), ITEM_NODONATE); GET_OBJ_VAL(corpse, 0) = 0; /* You can't store stuff in a corpse */ - GET_OBJ_VAL(corpse, 3) = 1; /* corpse identifier */ + + GET_OBJ_VAL(corpse, 3) = IS_NPC(ch) ? NPC_CORPSE : PC_CORPSE; /* corpse identifier */ + GET_OBJ_WEIGHT(corpse) = GET_WEIGHT(ch) + IS_CARRYING_W(ch); GET_OBJ_RENT(corpse) = 100000; if (IS_NPC(ch)) @@ -197,6 +199,10 @@ static void make_corpse(struct char_data else GET_OBJ_TIMER(corpse) = CONFIG_MAX_PC_CORPSE_TIME; + /* Begin item transferal */ + if (!IS_NPC(ch) && (GET_LEVEL(ch) < CONFIG_CORPSE_LEVEL)) { + Crash_rentsave(ch, 0); + } else { /* transfer character's inventory to the corpse */ corpse->contains = ch->carrying; for (o = corpse->contains; o != NULL; o = o->next_content) @@ -226,7 +232,8 @@ static void make_corpse(struct char_data ch->carrying = NULL; IS_CARRYING_N(ch) = 0; IS_CARRYING_W(ch) = 0; - + } + /* End item transferal */ obj_to_room(corpse, IN_ROOM(ch)); } diff -BbuprN -x '*.o' "tbamud-master (1)/tbamud-master/src/limits.c" tbamud-master/src/limits.c --- "tbamud-master (1)/tbamud-master/src/limits.c" 2018-01-28 15:49:00.000000000 +0000 +++ tbamud-master/src/limits.c 2018-12-09 10:21:00.849934600 +0000 @@ -373,12 +373,75 @@ static void check_idling(struct char_dat } } } +/* Deletes corpse object and leaves all contents in the room ++ * CONFIG_DEFAULT_DECAY ++ **/ +void corpse_decay_default(struct obj_data *j) +{ + struct obj_data *jj, *next_thing2; + for (jj = j->contains; jj; jj = next_thing2) { + next_thing2 = jj->next_content; /* Next in inventory */ + obj_from_obj(jj); + + if (j->in_obj) + obj_to_obj(jj, j->in_obj); + else if (j->carried_by) + obj_to_room(jj, IN_ROOM(j->carried_by)); + else if (IN_ROOM(j) != NOWHERE) + obj_to_room(jj, IN_ROOM(j)); + else + core_dump(); + } + extract_obj(j); +} + +/* Donates all objects from corpse + * CONFIG_DONATION_DECAY + * CONFIG_PROTECTED_DONATION_DECAY + */ +void corpse_decay_donate(struct obj_data *j) { + room_rnum RDR = 0; + int num_don_rooms; + struct obj_data *jj, *next_thing2; + + num_don_rooms = (CONFIG_DON_ROOM_1 != NOWHERE) + + (CONFIG_DON_ROOM_2 != NOWHERE) + + (CONFIG_DON_ROOM_3 != NOWHERE); + + switch (rand_number(1, num_don_rooms)) { + case 1: + RDR = real_room(CONFIG_DON_ROOM_1); + break; + case 2: + RDR = real_room(CONFIG_DON_ROOM_2); + break; + case 3: + default: + RDR = real_room(CONFIG_DON_ROOM_3); + break; + + } + if (RDR == NOWHERE) { + mudlog(BRF, LVL_IMPL, TRUE, "SYSERR: No valid donation room configured, corpse_decay_donate()"); + RDR = j->in_room; + } + + for (jj = j->contains; jj; jj = next_thing2) { + next_thing2 = jj->next_content; /* Next in inventory */ + obj_from_obj(jj); + obj_to_room(jj, RDR); + act("$p suddenly appears in a puff a smoke!", FALSE, 0, jj, 0, TO_ROOM); + } + + extract_obj(j); +} + /* Update PCs, NPCs, and objects */ void point_update(void) { struct char_data *i, *next_char; - struct obj_data *j, *next_thing, *jj, *next_thing2; + struct obj_data *j, *next_thing; /* characters */ for (i = character_list; i; i = next_char) { @@ -432,35 +495,37 @@ void point_update(void) act("A quivering horde of maggots consumes $p.", TRUE, world[IN_ROOM(j)].people, j, 0, TO_CHAR); } - for (jj = j->contains; jj; jj = next_thing2) { - next_thing2 = jj->next_content; /* Next in inventory */ - obj_from_obj(jj); - - if (j->in_obj) - obj_to_obj(jj, j->in_obj); - else if (j->carried_by) - obj_to_room(jj, IN_ROOM(j->carried_by)); - else if (IN_ROOM(j) != NOWHERE) - obj_to_room(jj, IN_ROOM(j)); - else - core_dump(); - } - extract_obj(j); - } - } + if (IS_PC_CORPSE(j)) { + switch (CONFIG_CORPSE_DECAY) { + case CONFIG_DONATION_DECAY: + corpse_decay_donate(j); + break; + case CONFIG_PURGE_DECAY: + extract_obj(j); + break; + case CONFIG_DEFAULT_DECAY: + default: + corpse_decay_default(j); + break; + } + } else + corpse_decay_default(j); + + } /* If the timer is set, count it down and at 0, try the trigger diff -BbuprN -x '*.o' "tbamud-master (1)/tbamud-master/src/oasis.h" tbamud-master/src/oasis.h --- "tbamud-master (1)/tbamud-master/src/oasis.h" 2018-01-28 15:49:00.000000000 +0000 +++ tbamud-master/src/oasis.h 2018-12-09 09:53:26.288676500 +0000 @@ -380,6 +380,9 @@ extern const char *nrm, *grn, *cyn, *yel #define CEDIT_MAP_SIZE 55 #define CEDIT_MINIMAP_SIZE 56 #define CEDIT_DEBUG_MODE 57 +#define CEDIT_CORPSE_CREATE_LEVEL 58 +#define CEDIT_CORPSE_DECAY_BEHAVIOR 59 /* Hedit Submodes of connectedness. */ #define HEDIT_CONFIRM_SAVESTRING 0 diff -BbuprN -x '*.o' "tbamud-master (1)/tbamud-master/src/structs.h" tbamud-master/src/structs.h --- "tbamud-master (1)/tbamud-master/src/structs.h" 2018-01-28 15:49:00.000000000 +0000 +++ tbamud-master/src/structs.h 2018-12-09 10:15:24.923320200 +0000 @@ -427,6 +428,10 @@ /** Total number of item flags */ #define NUM_ITEM_FLAGS 18 +/* Corpse identifiers */ +#define PC_CORPSE 1 +#define NPC_CORPSE 2 + /* Modifier constants used with obj affects ('A' fields) */ #define APPLY_NONE 0 /**< No effect */ #define APPLY_STR 1 /**< Apply to strength */ @@ -1298,6 +1303,8 @@ struct game_data int max_exp_loss; /**< Maximum experience losable per death.*/ int max_npc_corpse_time; /**< Num tics before NPC corpses decompose*/ int max_pc_corpse_time; /**< Num tics before PC corpse decomposes.*/ + int corpse_decay_behavior; /**< Corpse decay behavior settings */ + int corpse_create_level; /**< Minimum PC level before items are transferred to their corpse */ int idle_void; /**< Num tics before PC sent to void(idle)*/ int idle_rent_time; /**< Num tics before PC is autorented. */ int idle_max_level; /**< Level of players immune to idle. */ diff -BbuprN -x '*.o' "tbamud-master (1)/tbamud-master/src/utils.h" tbamud-master/src/utils.h --- "tbamud-master (1)/tbamud-master/src/utils.h" 2018-01-28 15:49:00.000000000 +0000 +++ tbamud-master/src/utils.h 2018-12-09 10:15:24.916338900 +0000 @@ -18,6 +18,9 @@ #ifndef _UTILS_H_ /* Begin header file protection */ #define _UTILS_H_ +#include "structs.h" + + /** Definition of the action command, for the do_ series of in game functions. * This macro is placed here (for now) because it's too general of a macro * to be first defined in interpreter.h. The reason for using a macro is @@ -728,7 +731,11 @@ do /** Defines if an obj is a corpse. */ #define IS_CORPSE(obj) (GET_OBJ_TYPE(obj) == ITEM_CONTAINER && \ - GET_OBJ_VAL((obj), 3) == 1) + GET_OBJ_VAL((obj), 3) > 0) + +/** Defines if an obj is a players corpse. */ +#define IS_PC_CORPSE(obj) (GET_OBJ_TYPE(obj) == ITEM_CONTAINER && \ + GET_OBJ_VAL((obj), 3) == PC_CORPSE) /** Can the obj be worn on body part? */ #define CAN_WEAR(obj, part) OBJWEAR_FLAGGED((obj), (part)) @@ -953,6 +960,18 @@ do #define CONFIG_MAX_NPC_CORPSE_TIME config_info.play.max_npc_corpse_time /** How long will pc corpses last before decomposing? */ #define CONFIG_MAX_PC_CORPSE_TIME config_info.play.max_pc_corpse_time + +/** Behavior of corpses at decay time */ +#define CONFIG_CORPSE_DECAY config_info.play.corpse_decay_behavior + +/* Corpse decay defines */ +#define CONFIG_DEFAULT_DECAY 0 /* Default: items are left in the room */ +#define CONFIG_DONATION_DECAY 1 /* Items are sent to random donation rooms */ +#define CONFIG_PURGE_DECAY 2 /* Items are purged */ + +/** What level must a PC be before subject to corpse creation */ +#define CONFIG_CORPSE_LEVEL config_info.play.corpse_create_level + /** How long can a pc be idled before being pulled into the void? */ #define CONFIG_IDLE_VOID config_info.play.idle_void /** How long until the idle pc is force rented? */