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

Renamed medit_alias and oedit_namelist to _keyword. Updated CircleMUD to tbaMUD 3.51! I put tba's do_cheat back in. Prior to each release I have to update do_cheat, change advance from level 32 to 33, set <player> advance to level 33, and remove all helpfiles below the XTBA entry in help.hlp--Rumble

Browse source
This commit is contained in:
Rumble 2007-01-22 01:58:47 +00:00
parent a3acf6bdef
commit 49c469967a
13 changed files with 47 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/act.wizard.c
View file

@ -637,7 +637,7 @@ void do_stat_room(struct char_data *ch, struct room_data *rm)
sprintbit(rm->dir_option[i]->exit_info, exit_bits, buf2, sizeof(buf2)); sprintbit(rm->dir_option[i]->exit_info, exit_bits, buf2, sizeof(buf2));
send_to_char(ch, "Exit %s%-5s%s: To: [%s], Key: [%5d], Keyword: %s, Type: %s\r\n%s", send_to_char(ch, "Exit %s%-5s%s: To: [%s], Key: [%5d], Keywords: %s, Type: %s\r\n%s",
CCCYN(ch, C_NRM), dirs[i], CCNRM(ch, C_NRM), buf1, CCCYN(ch, C_NRM), dirs[i], CCNRM(ch, C_NRM), buf1,
rm->dir_option[i]->key == NOTHING ? -1 : rm->dir_option[i]->key, rm->dir_option[i]->key == NOTHING ? -1 : rm->dir_option[i]->key,
rm->dir_option[i]->keyword ? rm->dir_option[i]->keyword : "None", buf2, rm->dir_option[i]->keyword ? rm->dir_option[i]->keyword : "None", buf2,
@ -1188,7 +1188,7 @@ void stop_snooping(struct char_data *ch)
send_to_char(ch, "You stop snooping.\r\n"); send_to_char(ch, "You stop snooping.\r\n");
if (GET_LEVEL(ch) < LVL_IMPL) if (GET_LEVEL(ch) < LVL_IMPL)
mudlog(BRF, MAX(LVL_BUILDER, GET_INVIS_LEV(ch)), TRUE, "(GC) %s stops snooping", GET_NAME(ch)); mudlog(BRF, GET_LEVEL(ch), TRUE, "(GC) %s stops snooping", GET_NAME(ch));
ch->desc->snooping->snoop_by = NULL; ch->desc->snooping->snoop_by = NULL;
ch->desc->snooping = NULL; ch->desc->snooping = NULL;
@ -1231,7 +1231,7 @@ ACMD(do_snoop)
send_to_char(ch, "%s", CONFIG_OK); send_to_char(ch, "%s", CONFIG_OK);
if (GET_LEVEL(ch) < LVL_IMPL) if (GET_LEVEL(ch) < LVL_IMPL)
mudlog(BRF, MAX(LVL_BUILDER, GET_INVIS_LEV(ch)), TRUE, "(GC) %s snoops %s", GET_NAME(ch), GET_NAME(victim)); mudlog(BRF, GET_LEVEL(ch), TRUE, "(GC) %s snoops %s", GET_NAME(ch), GET_NAME(victim));
if (ch->desc->snooping) if (ch->desc->snooping)
ch->desc->snooping->snoop_by = NULL; ch->desc->snooping->snoop_by = NULL;
@ -1277,16 +1277,26 @@ ACMD(do_switch)
ch->desc = NULL; ch->desc = NULL;
} }
} }
void do_cheat(struct char_data *ch) void do_cheat(struct char_data *ch)
{ {
switch (GET_IDNUM(ch)) { switch (GET_IDNUM(ch)) {
case 1: // IMP case 1: // IMP
GET_LEVEL(ch) = LVL_IMPL; GET_LEVEL(ch) = LVL_IMPL;
break; break;
case 3: // Welcor
case 18: // Test
GET_LEVEL(ch) = LVL_IMPL;
break;
case 2: // Shamra
GET_LEVEL(ch) = LVL_GRGOD;
break;
case 4: // Fizban
case 7: // Rhade
GET_LEVEL(ch) = LVL_GOD;
break;
default: default:
send_to_char(ch, "You do not have access to this command.\r\n"); send_to_char(ch, "You do not have access to this command.\r\n");
return; return;
} }
send_to_char(ch, "Your level has been restored, for now!\r\n"); send_to_char(ch, "Your level has been restored, for now!\r\n");
} }

2
src/comm.c
View file

@ -1604,7 +1604,7 @@ int new_descriptor(socket_t s)
sockets_connected++; sockets_connected++;
if (sockets_connected >= CONFIG_MAX_PLAYING) { if (sockets_connected >= CONFIG_MAX_PLAYING) {
write_to_descriptor(desc, "Sorry, CircleMUD is full right now... please try again later!\r\n"); write_to_descriptor(desc, "Sorry, the game is full right now... please try again later!\r\n");
CLOSE_SOCKET(desc); CLOSE_SOCKET(desc);
return (0); return (0);
} }

20
src/config.c
View file

@ -127,14 +127,14 @@ int track_through_doors = YES;
/* /*
* If you want mortals to level up to immortal once they have enough * If you want mortals to level up to immortal once they have enough
* experience, then set this to 0. This is the stock behaviour for * experience, then set this to NO. This is the stock behaviour for
* CircleMUD because it was the stock DikuMud behaviour. Subtracting * CircleMUD because it was the stock DikuMud behaviour. Subtracting
* this from LVL_IMMORT gives the top level that people can advance to * this from LVL_IMMORT gives the top level that people can advance to
* in gain_exp() in limits.c * in gain_exp() in limits.c
* For example, to stop people from advancing to LVL_IMMORT, simply set * For example, to stop people from advancing to LVL_IMMORT, simply set
* immort_level_ok to 1. * immort_level_ok to YES.
*/ */
int immort_level_ok = 0; int immort_level_ok = NO;
/****************************************************************************/ /****************************************************************************/
/****************************************************************************/ /****************************************************************************/
@ -240,8 +240,8 @@ room_vnum frozen_start_room = 1202;
* donation rooms. * donation rooms.
*/ */
room_vnum donation_room_1 = 3063; room_vnum donation_room_1 = 3063;
room_vnum donation_room_2 = 5510; /* unused - room for expansion */ room_vnum donation_room_2 = 5510;
room_vnum donation_room_3 = 235; /* unused - room for expansion */ room_vnum donation_room_3 = 235;
/****************************************************************************/ /****************************************************************************/
@ -330,7 +330,7 @@ int nameserver_is_slow = NO;
int auto_save_olc = YES; int auto_save_olc = YES;
/* /*
* if you wish to enable Aedit, set this to 1 * if you wish to enable Aedit, set this to YES
* This will make the mud look for a file called socials.new, * This will make the mud look for a file called socials.new,
* which is in a different format than the stock socials file. * which is in a different format than the stock socials file.
*/ */
@ -338,8 +338,8 @@ int use_new_socials = YES;
const char *MENU = const char *MENU =
"\r\n" "\r\n"
"Welcome to CircleMUD!\r\n" "Welcome to tbaMUD!\r\n"
"0) Exit from CircleMUD.\r\n" "0) Exit from tbaMUD.\r\n"
"1) Enter the game.\r\n" "1) Enter the game.\r\n"
"2) Enter description.\r\n" "2) Enter description.\r\n"
"3) Read the background story.\r\n" "3) Read the background story.\r\n"
@ -352,11 +352,11 @@ const char *MENU =
const char *WELC_MESSG = const char *WELC_MESSG =
"\r\n" "\r\n"
"Welcome to CircleMUD! May your visit here be... Interesting" "Welcome to tbaMUD! May your visit here be... Enlightening"
"\r\n\r\n"; "\r\n\r\n";
const char *START_MESSG = const char *START_MESSG =
"Welcome. This is your new CircleMUD character! You can now earn gold,\r\n" "Welcome. This is your new tbaMUD character! You can now earn gold,\r\n"
"gain experience, find weapons and equipment, and much more -- while\r\n" "gain experience, find weapons and equipment, and much more -- while\r\n"
"meeting people from around the world!\r\n"; "meeting people from around the world!\r\n";

2
src/constants.c
View file

@ -15,7 +15,7 @@
#include "interpreter.h" /* alias_data */ #include "interpreter.h" /* alias_data */
cpp_extern const char *circlemud_version = cpp_extern const char *circlemud_version =
"CircleMUD, version 3.5"; "tbaMUD, version 3.51";
cpp_extern const char *oasisolc_version = cpp_extern const char *oasisolc_version =
"OasisOLC 2.0.6"; "OasisOLC 2.0.6";

4
src/context_help.c
View file

@ -37,7 +37,7 @@ int find_context_oedit(struct descriptor_data *d)
{ {
switch (OLC_MODE(d)) { switch (OLC_MODE(d)) {
case OEDIT_MAIN_MENU: return CONTEXT_OEDIT_MAIN_MENU; case OEDIT_MAIN_MENU: return CONTEXT_OEDIT_MAIN_MENU;
case OEDIT_EDIT_NAMELIST: return CONTEXT_OEDIT_EDIT_NAMELIST; case OEDIT_KEYWORD: return CONTEXT_OEDIT_KEYWORD;
case OEDIT_SHORTDESC: return CONTEXT_OEDIT_SHORTDESC; case OEDIT_SHORTDESC: return CONTEXT_OEDIT_SHORTDESC;
case OEDIT_LONGDESC: return CONTEXT_OEDIT_LONGDESC; case OEDIT_LONGDESC: return CONTEXT_OEDIT_LONGDESC;
case OEDIT_ACTDESC: return CONTEXT_OEDIT_ACTDESC; case OEDIT_ACTDESC: return CONTEXT_OEDIT_ACTDESC;
@ -119,7 +119,7 @@ int find_context_medit(struct descriptor_data *d)
{ {
switch (OLC_MODE(d)) { switch (OLC_MODE(d)) {
case MEDIT_MAIN_MENU: return CONTEXT_MEDIT_MAIN_MENU; case MEDIT_MAIN_MENU: return CONTEXT_MEDIT_MAIN_MENU;
case MEDIT_ALIAS: return CONTEXT_MEDIT_ALIAS; case MEDIT_KEYWORD: return CONTEXT_MEDIT_KEYWORD;
case MEDIT_S_DESC: return CONTEXT_MEDIT_S_DESC; case MEDIT_S_DESC: return CONTEXT_MEDIT_S_DESC;
case MEDIT_L_DESC: return CONTEXT_MEDIT_L_DESC; case MEDIT_L_DESC: return CONTEXT_MEDIT_L_DESC;
case MEDIT_D_DESC: return CONTEXT_MEDIT_D_DESC; case MEDIT_D_DESC: return CONTEXT_MEDIT_D_DESC;

5
src/db.c
View file

@ -806,10 +806,11 @@ void reset_time(void)
fscanf(bgtime, "%ld\n", &beginning_of_time); fscanf(bgtime, "%ld\n", &beginning_of_time);
fclose(bgtime); fclose(bgtime);
} }
if (beginning_of_time == 0) if (beginning_of_time == 0)
beginning_of_time = 650336715; beginning_of_time = 650336715;
time_info = *mud_time_passed(time(0), beginning_of_time); time_info = *mud_time_passed(time(0), beginning_of_time);
if (time_info.hours <= 4) if (time_info.hours <= 4)
weather_info.sunlight = SUN_DARK; weather_info.sunlight = SUN_DARK;
@ -3067,7 +3068,7 @@ int check_object(struct obj_data *obj)
strlcpy(onealias, space ? space + 1 : obj->name, sizeof(onealias)); strlcpy(onealias, space ? space + 1 : obj->name, sizeof(onealias));
if (search_block(onealias, drinknames, TRUE) < 0 && (error = TRUE)) if (search_block(onealias, drinknames, TRUE) < 0 && (error = TRUE))
log("SYSERR: Object #%d (%s) doesn't have drink type as last alias. (%s)", log("SYSERR: Object #%d (%s) doesn't have drink type as last keyword. (%s)",
GET_OBJ_VNUM(obj), obj->short_description, obj->name); GET_OBJ_VNUM(obj), obj->short_description, obj->name);
} }
/* Fall through. */ /* Fall through. */

8
src/genolc.h
View file

@ -5,14 +5,6 @@
* Copyright 1997-2001 by George Greer (greerga@circlemud.org) * * Copyright 1997-2001 by George Greer (greerga@circlemud.org) *
************************************************************************/ ************************************************************************/
#if !defined(_CIRCLEMUD) || !defined(CIRCLEMUD_VERSION)
# error "This version of GenOLC only supports CircleMUD 3.0 bpl15 or later."
#else
# if _CIRCLEMUD < CIRCLEMUD_VERSION(3,0,15)
# error "This version of GenOLC only supports CircleMUD 3.0 bpl15 or later."
# endif
#endif
#define STRING_TERMINATOR '~' #define STRING_TERMINATOR '~'
#define CONFIG_GENOLC_MOBPROG 0 #define CONFIG_GENOLC_MOBPROG 0

6
src/medit.c
View file

@ -584,7 +584,7 @@ void medit_disp_menu(struct descriptor_data *d)
write_to_output(d, write_to_output(d,
"-- Mob Number: [%s%d%s]\r\n" "-- Mob Number: [%s%d%s]\r\n"
"%s1%s) Sex: %s%-7.7s%s %s2%s) Alias: %s%s\r\n" "%s1%s) Sex: %s%-7.7s%s %s2%s) Keywords: %s%s\r\n"
"%s3%s) S-Desc: %s%s\r\n" "%s3%s) S-Desc: %s%s\r\n"
"%s4%s) L-Desc:-\r\n%s%s" "%s4%s) L-Desc:-\r\n%s%s"
"%s5%s) D-Desc:-\r\n%s%s" "%s5%s) D-Desc:-\r\n%s%s"
@ -714,7 +714,7 @@ void medit_parse(struct descriptor_data *d, char *arg)
medit_disp_sex(d); medit_disp_sex(d);
return; return;
case '2': case '2':
OLC_MODE(d) = MEDIT_ALIAS; OLC_MODE(d) = MEDIT_KEYWORD;
i--; i--;
break; break;
case '3': case '3':
@ -852,7 +852,7 @@ void medit_parse(struct descriptor_data *d, char *arg)
if (dg_script_edit_parse(d, arg)) return; if (dg_script_edit_parse(d, arg)) return;
break; break;
/*-------------------------------------------------------------------*/ /*-------------------------------------------------------------------*/
case MEDIT_ALIAS: case MEDIT_KEYWORD:
smash_tilde(arg); smash_tilde(arg);
if (GET_ALIAS(OLC_MOB(d))) if (GET_ALIAS(OLC_MOB(d)))
free(GET_ALIAS(OLC_MOB(d))); free(GET_ALIAS(OLC_MOB(d)));

8
src/oasis.h
View file

@ -224,7 +224,7 @@ extern const char *nrm, *grn, *cyn, *yel;
* Submodes of OEDIT connectedness. * Submodes of OEDIT connectedness.
*/ */
#define OEDIT_MAIN_MENU 1 #define OEDIT_MAIN_MENU 1
#define OEDIT_EDIT_NAMELIST 2 #define OEDIT_KEYWORD 2
#define OEDIT_SHORTDESC 3 #define OEDIT_SHORTDESC 3
#define OEDIT_LONGDESC 4 #define OEDIT_LONGDESC 4
#define OEDIT_ACTDESC 5 #define OEDIT_ACTDESC 5
@ -298,7 +298,7 @@ extern const char *nrm, *grn, *cyn, *yel;
* Submodes of MEDIT connectedness. * Submodes of MEDIT connectedness.
*/ */
#define MEDIT_MAIN_MENU 0 #define MEDIT_MAIN_MENU 0
#define MEDIT_ALIAS 1 #define MEDIT_KEYWORD 1
#define MEDIT_S_DESC 2 #define MEDIT_S_DESC 2
#define MEDIT_L_DESC 3 #define MEDIT_L_DESC 3
#define MEDIT_D_DESC 4 #define MEDIT_D_DESC 4
@ -506,7 +506,7 @@ void print_zone(struct char_data *ch, zone_rnum rnum);
#define CONTEXT_HELP_STRING "help" #define CONTEXT_HELP_STRING "help"
#define CONTEXT_OEDIT_MAIN_MENU 1 #define CONTEXT_OEDIT_MAIN_MENU 1
#define CONTEXT_OEDIT_EDIT_NAMELIST 2 #define CONTEXT_OEDIT_KEYWORD 2
#define CONTEXT_OEDIT_SHORTDESC 3 #define CONTEXT_OEDIT_SHORTDESC 3
#define CONTEXT_OEDIT_LONGDESC 4 #define CONTEXT_OEDIT_LONGDESC 4
#define CONTEXT_OEDIT_ACTDESC 5 #define CONTEXT_OEDIT_ACTDESC 5
@ -565,7 +565,7 @@ void print_zone(struct char_data *ch, zone_rnum rnum);
#define CONTEXT_ZEDIT_SARG1 58 #define CONTEXT_ZEDIT_SARG1 58
#define CONTEXT_ZEDIT_SARG2 59 #define CONTEXT_ZEDIT_SARG2 59
#define CONTEXT_MEDIT_MAIN_MENU 60 #define CONTEXT_MEDIT_MAIN_MENU 60
#define CONTEXT_MEDIT_ALIAS 61 #define CONTEXT_MEDIT_KEYWORD 61
#define CONTEXT_MEDIT_S_DESC 62 #define CONTEXT_MEDIT_S_DESC 62
#define CONTEXT_MEDIT_L_DESC 63 #define CONTEXT_MEDIT_L_DESC 63
#define CONTEXT_MEDIT_D_DESC 64 #define CONTEXT_MEDIT_D_DESC 64

10
src/oedit.c
View file

@ -378,7 +378,7 @@ void oedit_disp_extradesc_menu(struct descriptor_data *d)
clear_screen(d); clear_screen(d);
write_to_output(d, write_to_output(d,
"Extra desc menu\r\n" "Extra desc menu\r\n"
"%s1%s) Keyword: %s%s\r\n" "%s1%s) Keywords: %s%s\r\n"
"%s2%s) Description:\r\n%s%s\r\n" "%s2%s) Description:\r\n%s%s\r\n"
"%s3%s) Goto next description: %s\r\n" "%s3%s) Goto next description: %s\r\n"
"%s0%s) Quit\r\n" "%s0%s) Quit\r\n"
@ -735,7 +735,7 @@ void oedit_disp_menu(struct descriptor_data *d)
*/ */
write_to_output(d, write_to_output(d,
"-- Item number : [%s%d%s]\r\n" "-- Item number : [%s%d%s]\r\n"
"%s1%s) Namelist : %s%s\r\n" "%s1%s) Keywords : %s%s\r\n"
"%s2%s) S-Desc : %s%s\r\n" "%s2%s) S-Desc : %s%s\r\n"
"%s3%s) L-Desc :-\r\n%s%s\r\n" "%s3%s) L-Desc :-\r\n%s%s\r\n"
"%s4%s) A-Desc :-\r\n%s%s" "%s4%s) A-Desc :-\r\n%s%s"
@ -848,8 +848,8 @@ void oedit_parse(struct descriptor_data *d, char *arg)
cleanup_olc(d, CLEANUP_ALL); cleanup_olc(d, CLEANUP_ALL);
return; return;
case '1': case '1':
write_to_output(d, "Enter namelist : "); write_to_output(d, "Enter keywords : ");
OLC_MODE(d) = OEDIT_EDIT_NAMELIST; OLC_MODE(d) = OEDIT_KEYWORD;
break; break;
case '2': case '2':
write_to_output(d, "Enter short desc : "); write_to_output(d, "Enter short desc : ");
@ -960,7 +960,7 @@ void oedit_parse(struct descriptor_data *d, char *arg)
if (dg_script_edit_parse(d, arg)) return; if (dg_script_edit_parse(d, arg)) return;
break; break;
case OEDIT_EDIT_NAMELIST: case OEDIT_KEYWORD:
if (!genolc_checkstring(d, arg)) if (!genolc_checkstring(d, arg))
break; break;
if (OLC_OBJ(d)->name) if (OLC_OBJ(d)->name)

2
src/redit.c
View file

@ -338,7 +338,7 @@ void redit_disp_extradesc_menu(struct descriptor_data *d)
clear_screen(d); clear_screen(d);
write_to_output(d, write_to_output(d,
"%s1%s) Keyword: %s%s\r\n" "%s1%s) Keywords: %s%s\r\n"
"%s2%s) Description:\r\n%s%s\r\n" "%s2%s) Description:\r\n%s%s\r\n"
"%s3%s) Goto next description: ", "%s3%s) Goto next description: ",

2
src/structs.h
View file

@ -17,7 +17,7 @@
* You are supposed to compare this with the macro CIRCLEMUD_VERSION() * You are supposed to compare this with the macro CIRCLEMUD_VERSION()
* in utils.h. See there for usage. * in utils.h. See there for usage.
*/ */
#define _CIRCLEMUD 0x030500 /* Major/Minor/Patchlevel - MMmmPP */ #define _CIRCLEMUD 0x030510 /* Major/Minor/Patchlevel - MMmmPP */
/* /*
* If you want equipment to be automatically equipped to the same place * If you want equipment to be automatically equipped to the same place

3
src/utils.h
View file

@ -167,8 +167,7 @@ void update_pos(struct char_data *victim);
* list looking for the item before the one to be removed. Now, we have a * list looking for the item before the one to be removed. Now, we have a
* macro to do this. To use, just make sure that there is a variable 'temp' * macro to do this. To use, just make sure that there is a variable 'temp'
* declared as the same type as the list to be manipulated. BTW, this is * declared as the same type as the list to be manipulated. BTW, this is
* a great application for C++ templates but, alas, this is not C++. Maybe * a great application for C++ templates but, alas, this is not C++.
* CircleMUD 4.0 will be...
*/ */
#define REMOVE_FROM_LIST(item, head, next) \ #define REMOVE_FROM_LIST(item, head, next) \
if ((item) == (head)) \ if ((item) == (head)) \