From d5e5340c3926d1cf97f6cba151ffaecb20bfb35f Mon Sep 17 00:00:00 2001 From: dshaligram Date: Wed, 2 Aug 2006 12:54:15 +0000 Subject: Integrated travel patch as of 20060727 git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7 c06c8d41-db1a-0410-9941-cceddc491573 --- trunk/source/initfile.cc | 1433 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 1087 insertions(+), 346 deletions(-) (limited to 'trunk/source/initfile.cc') diff --git a/trunk/source/initfile.cc b/trunk/source/initfile.cc index 706e98ea72..46bf73e40e 100644 --- a/trunk/source/initfile.cc +++ b/trunk/source/initfile.cc @@ -20,10 +20,16 @@ #include #include +#include "clua.h" +#include "Kills.h" +#include "files.h" #include "externs.h" #include "defines.h" +#include "libutil.h" #include "player.h" +#include "stash.h" #include "stuff.h" +#include "travel.h" #include "items.h" #include "view.h" @@ -44,25 +50,13 @@ static std::string & tolower_string( std::string &str ); const static char *obj_syms = ")([/%.?=!.+\\0}X$"; const static int obj_syms_len = 16; -// also used with macros -std::string & trim_string( std::string &str ) -{ - // OK, this is really annoying. Borland C++ seems to define - // basic_string::erase to take iterators, and basic_string::remove - // to take size_t or integer. This is ass-backwards compared to - // nearly all other C++ compilers. Crap. (GDL) - // - // Borland 5.5 does this correctly now... leaving the old code - // around for now in case anyone needs it. -- bwr -// #ifdef __BCPLUSPLUS__ -// str.remove( 0, str.find_first_not_of( " \t\n\r" ) ); -// str.remove( str.find_last_not_of( " \t\n\r" ) + 1 ); -// #else - str.erase( 0, str.find_first_not_of( " \t\n\r" ) ); - str.erase( str.find_last_not_of( " \t\n\r" ) + 1 ); -// #endif +static void read_startup_prefs(); +static void read_options(InitLineInput &il, bool runscript); - return (str); +template void append_vector( + std::vector &dest, const std::vector &src) +{ + dest.insert( dest.end(), src.begin(), src.end() ); } // returns -1 if unmatched else returns 0-15 @@ -92,11 +86,21 @@ static short str_to_colour( const std::string &str ) ret = 8; } + if (ret == 16) + { + // Check if we have a direct colour index + const char *s = str.c_str(); + char *es = NULL; + int ci = (int) strtol(s, &es, 10); + if (s != (const char *) es && es && ci >= 0 && ci < 16) + ret = ci; + } + return ((ret == 16) ? -1 : ret); } // returns -1 if unmatched else returns 0-15 -static short str_to_channel_colour( const std::string &str ) +static int str_to_channel_colour( const std::string &str ) { int ret = str_to_colour( str ); @@ -115,28 +119,36 @@ static short str_to_channel_colour( const std::string &str ) return (ret); } +static const std::string message_channel_names[ NUM_MESSAGE_CHANNELS ] = +{ + "plain", "prompt", "god", "duration", "danger", "warning", "food", + "recovery", "talk", "intrinsic_gain", "mutation", "monster_spell", + "monster_enchant", "monster_damage", "rotten_meat", "equipment", + "diagnostic", +}; + // returns -1 if unmatched else returns 0-15 -static short str_to_channel( const std::string &str ) +int str_to_channel( const std::string &str ) { short ret; - const std::string cols[ NUM_MESSAGE_CHANNELS ] = - { - "plain", "prompt", "god", "duration", "danger", "warning", "food", - "recovery", "talk", "intrinsic_gain", "mutation", "monster_spell", - "monster_enchant", "monster_damage", "rotten_meat", "equipment", - "diagnostic", - }; - for (ret = 0; ret < NUM_MESSAGE_CHANNELS; ret++) { - if (str == cols[ret]) + if (str == message_channel_names[ret]) break; } return (ret == NUM_MESSAGE_CHANNELS ? -1 : ret); } +std::string channel_to_str( int channel ) +{ + if (channel < 0 || channel >= NUM_MESSAGE_CHANNELS) + return ""; + + return message_channel_names[channel]; +} + static int str_to_weapon( const std::string &str ) { if (str == "shortsword" || str == "short sword") @@ -155,6 +167,27 @@ static int str_to_weapon( const std::string &str ) return (WPN_UNKNOWN); } +static std::string weapon_to_str( int weapon ) +{ + switch (weapon) + { + case WPN_SHORT_SWORD: + return "short sword"; + case WPN_MACE: + return "mace"; + case WPN_SPEAR: + return "spear"; + case WPN_TRIDENT: + return "trident"; + case WPN_HAND_AXE: + return "hand axe"; + case WPN_RANDOM: + return "random"; + default: + return "random"; + } +} + static unsigned int str_to_fire_types( const std::string &str ) { if (str == "launcher") @@ -261,13 +294,72 @@ static bool read_bool( const std::string &field, bool def_value ) return (ret); } -void read_init_file(void) +static unsigned curses_attribute(const std::string &field) +{ + if (field == "standout") // probably reverses + return CHATTR_STANDOUT; + else if (field == "bold") // probably brightens fg + return CHATTR_BOLD; + else if (field == "blink") // probably brightens bg + return CHATTR_BLINK; + else if (field == "underline") + return CHATTR_UNDERLINE; + else if (field == "reverse") + return CHATTR_REVERSE; + else if (field == "dim") + return CHATTR_DIM; + else if (field.find("hi:") == 0 || field.find("hilite:") == 0 || + field.find("highlight:") == 0) + { + int col = field.find(":"); + int colour = str_to_colour(field.substr(col + 1)); + if (colour == -1) + fprintf(stderr, "Bad highlight string -- %s\n", field.c_str()); + else + return CHATTR_HILITE | (colour << 8); + } + else + fprintf( stderr, "Bad colour -- %s\n", field.c_str() ); + return CHATTR_NORMAL; +} + + +static void reset_startup_options(bool clear_name = true) { - unsigned int i; + if (clear_name) + you.your_name[0] = '\0'; + Options.race = '\0'; + Options.cls = '\0'; + Options.weapon = WPN_UNKNOWN; + Options.random_pick = false; + Options.chaos_knight = GOD_NO_GOD; + Options.death_knight = DK_NO_SELECTION; + Options.priest = GOD_NO_GOD; +} +void reset_options(bool clear_name) +{ // Option initialization + Options.activity_interrupts[ ACT_MULTIDROP ] = + AI_HP_LOSS | AI_STAT_CHANGE | AI_TELEPORT; + Options.activity_interrupts[ ACT_RUNNING ] = + 0xFFFF ^ AI_SEE_MONSTER; + Options.activity_interrupts[ ACT_TRAVELING ] = + 0xFFFF ^ (AI_MESSAGE | AI_SEE_MONSTER); + + reset_startup_options(clear_name); + Options.prev_race = 0; + Options.prev_cls = 0; + Options.prev_ck = GOD_NO_GOD; + Options.prev_dk = DK_NO_SELECTION; + Options.prev_pr = GOD_NO_GOD; + Options.prev_weapon = WPN_UNKNOWN; + Options.prev_randpick = false; + Options.remember_name = false; + Options.autopickups = 0x0000; Options.verbose_dump = false; + Options.detailed_stat_dump = true; Options.colour_map = false; Options.clean_map = false; Options.show_uncursed = true; @@ -277,22 +369,51 @@ void read_init_file(void) Options.easy_butcher = false; Options.easy_confirm = CONFIRM_SAFE_EASY; Options.easy_quit_item_prompts = false; - Options.weapon = WPN_UNKNOWN; - Options.random_pick = false; - Options.chaos_knight = GOD_NO_GOD; - Options.death_knight = DK_NO_SELECTION; - Options.priest = GOD_NO_GOD; Options.hp_warning = 10; Options.hp_attention = 25; - Options.race = '\0'; - Options.cls = '\0'; Options.terse_hand = true; Options.auto_list = false; Options.delay_message_clear = false; + Options.pickup_dropped = true; + Options.travel_colour = true; + Options.travel_delay = -1; + Options.travel_stair_cost = 500; + Options.travel_exclude_radius2 = 68; + Options.show_waypoints = true; + Options.item_colour = false; + + Options.detected_item_colour = DARKGREY; + Options.detected_monster_colour= DARKGREY; + Options.remembered_monster_colour = 0; + + Options.easy_exit_menu = true; + Options.dos_use_background_intensity = false; + Options.assign_item_slot = SS_FORWARD; + + Options.macro_meta_entry = true; + + // 10 was the cursor step default on Linux. + Options.level_map_cursor_step = 10; + +#ifdef STASH_TRACKING + Options.stash_tracking = STM_NONE; +#endif + Options.explore_stop = ES_ITEM | ES_STAIR | ES_SHOP | ES_ALTAR; + Options.target_zero_exp = true; + Options.target_wrap = false; + Options.target_oos = true; + Options.target_los_first = true; + Options.dump_kill_places = KDO_ONE_PLACE; + Options.dump_message_count = 4; + Options.dump_item_origins = IODS_ARTIFACTS | IODS_RODS; + Options.dump_item_origin_price = -1; + + Options.drop_mode = DM_SINGLE; Options.flush_input[ FLUSH_ON_FAILURE ] = true; Options.flush_input[ FLUSH_BEFORE_COMMAND ] = false; Options.flush_input[ FLUSH_ON_MESSAGE ] = false; + Options.flush_input[ FLUSH_LUA ] = true; Options.lowercase_invocations = false; @@ -303,7 +424,7 @@ void read_init_file(void) Options.fire_order[1] = FIRE_DART; // then only consider darts // clear the reast of the list - for (i = 2; i < NUM_FIRE_TYPES; i++) + for (int i = 2; i < NUM_FIRE_TYPES; i++) Options.fire_order[i] = FIRE_NONE; // These are only used internally, and only from the commandline: @@ -311,10 +432,13 @@ void read_init_file(void) Options.sc_entries = 0; Options.sc_format = SCORE_REGULAR; -#ifdef USE_COLOUR_OPTS - Options.friend_brand = CHATTR_NORMAL; +//#ifdef USE_COLOUR_OPTS + Options.friend_brand = CHATTR_NORMAL; + Options.heap_brand = CHATTR_NORMAL; + Options.stab_brand = CHATTR_NORMAL; + Options.may_stab_brand = CHATTR_NORMAL; Options.no_dark_brand = 0; -#endif +//#endif #ifdef WIZARD Options.wiz_mode = WIZ_NO; @@ -322,26 +446,46 @@ void read_init_file(void) // map each colour to itself as default #ifdef USE_8_COLOUR_TERM_MAP - for (i = 0; i < 16; i++) + for (int i = 0; i < 16; i++) Options.colour[i] = i % 8; Options.colour[ DARKGREY ] = COL_TO_REPLACE_DARKGREY; #else - for (i = 0; i < 16; i++) + for (int i = 0; i < 16; i++) Options.colour[i] = i; #endif - + // map each channel to plain (well, default for now since I'm testing) for (int i = 0; i < NUM_MESSAGE_CHANNELS; i++) Options.channels[i] = MSGCOL_DEFAULT; + // Clear vector options. + Options.banned_objects.clear(); + Options.stop_travel.clear(); + Options.sound_mappings.clear(); + Options.menu_colour_mappings.clear(); + Options.drop_filter.clear(); + + Options.named_options.clear(); + + // Map each category to itself. The user can override in init.txt + Options.kill_map[KC_YOU] = KC_YOU; + Options.kill_map[KC_FRIENDLY] = KC_FRIENDLY; + Options.kill_map[KC_OTHER] = KC_OTHER; + + // Setup travel information. What's a better place to do this? + initialise_travel(); +} + +void read_init_file(bool runscript) +{ FILE *f; - char s[255]; - unsigned int line = 0; - int j; char name_buff[kPathLen]; - you.your_name[0] = '\0'; + reset_options(!runscript); + + if (!runscript) + you.your_name[0] = '\0'; if (SysEnv.crawl_rc) { @@ -379,380 +523,977 @@ void read_init_file(void) if (f == NULL) return; - while (!feof(f)) + if (!runscript) + read_startup_prefs(); + + read_options(f, runscript); + fclose(f); +} // end read_init_file() + +static void read_startup_prefs() +{ + std::string fn = get_prefs_filename(); + FILE *f = fopen(fn.c_str(), "r"); + if (!f) + return; + read_options(f); + fclose(f); + + Options.prev_randpick = Options.random_pick; + Options.prev_weapon = Options.weapon; + Options.prev_pr = Options.priest; + Options.prev_dk = Options.death_knight; + Options.prev_ck = Options.chaos_knight; + Options.prev_cls = Options.cls; + Options.prev_race = Options.race; + Options.prev_name = you.your_name; + + reset_startup_options(); +} + +static void write_newgame_options(FILE *f) +{ + // Write current player name + fprintf(f, "name = %s\n", you.your_name); + + if (Options.prev_randpick) + Options.prev_race = Options.prev_cls = '?'; + + // Race selection + if (Options.prev_race) + fprintf(f, "race = %c\n", Options.prev_race); + if (Options.prev_cls) + fprintf(f, "class = %c\n", Options.prev_cls); + + if (Options.prev_weapon != WPN_UNKNOWN) + fprintf(f, "weapon = %s\n", weapon_to_str(Options.prev_weapon).c_str()); + + if (Options.prev_ck != GOD_NO_GOD) + { + fprintf(f, "chaos_knight = %s\n", + Options.prev_ck == GOD_XOM? "xom" : + Options.prev_ck == GOD_MAKHLEB? "makhleb" : + "random"); + } + if (Options.prev_dk != DK_NO_SELECTION) { - fgets(s, 255, f); + fprintf(f, "death_knight = %s\n", + Options.prev_dk == DK_NECROMANCY? "necromancy" : + Options.prev_dk == DK_YREDELEMNUL? "yredelemnul" : + "random"); + } + if (Options.prev_pr != GOD_NO_GOD) + { + fprintf(f, "priest = %s\n", + Options.prev_pr == GOD_ZIN? "zin" : + Options.prev_pr == GOD_YREDELEMNUL? "yredelemnul" : + "random"); + } +} - line++; +void write_newgame_options_file() +{ + std::string fn = get_prefs_filename(); + FILE *f = fopen(fn.c_str(), "w"); + if (!f) + return; + write_newgame_options(f); + fclose(f); +} - std::string str = s; - trim_string( str ); +void save_player_name() +{ + if (!Options.remember_name) + return ; - // This is to make some efficient comments - if (s[0] == '#' || s[0] == '\0') - continue; + std::string playername = you.your_name; - std::string key = ""; - std::string subkey = ""; - std::string field = ""; + // Read other preferences + read_startup_prefs(); - int first_equals = str.find('='); - int first_dot = str.find('.'); + // Put back your name + strncpy(you.your_name, playername.c_str(), kNameLen); + you.your_name[kNameLen - 1] = 0; - // all lines with no equal-signs we ignore - if (first_equals < 0) - continue; + // And save + write_newgame_options_file(); +} + +void read_options(FILE *f, bool runscript) +{ + FileLineInput fl(f); + read_options(fl, runscript); +} - if (first_dot > 0 && first_dot < first_equals) - { - key = str.substr( 0, first_dot ); - subkey = str.substr( first_dot + 1, first_equals - first_dot - 1 ); - field = str.substr( first_equals + 1 ); - } - else - { - // no subkey (dots are okay in value field) - key = str.substr( 0, first_equals ); - subkey = ""; - field = str.substr( first_equals + 1 ); - } +void read_options(const std::string &s, bool runscript) +{ + StringLineInput st(s); + read_options(st, runscript); +} - // Clean up our data... - tolower_string( trim_string( key ) ); - tolower_string( trim_string( subkey ) ); +static void read_options(InitLineInput &il, bool runscript) +{ + unsigned int line = 0; + + bool inscriptblock = false; + bool inscriptcond = false; + bool isconditional = false; - // some fields want capitals... none care about external spaces - trim_string( field ); - if (key != "name" && key != "crawl_dir" - && key != "race" && key != "class") - { - tolower_string( field ); - } + bool l_init = false; - // everything not a valid line is treated as a comment - if (key == "autopickup") - { - for (i = 0; i < field.length(); i++) - { - char type = field[i]; + std::string luacond; + std::string luacode; + while (!il.eof()) + { + std::string s = il.getline(); + std::string str = s; + line++; - // Make the amulet symbol equiv to ring -- bwross - switch (type) - { - case '"': - // also represents jewellery - type = '='; - break; - - case '|': - // also represents staves - type = '\\'; - break; - - case ':': - // also represents books - type = '+'; - break; - - case 'x': - // also corpses - type = 'X'; - break; - } + trim_string( str ); - for (j = 0; j < obj_syms_len && type != obj_syms[j]; j++) - ; + // This is to make some efficient comments + if ((str.empty() || str[0] == '#') && !inscriptcond && !inscriptblock) + continue; + + if (!inscriptcond && (str.find("L<") == 0 || str.find("<") == 0)) + { + // The init file is now forced into isconditional mode. + isconditional = true; + inscriptcond = true; + + str = str.substr( str.find("L<") == 0? 2 : 1 ); + // Is this a one-liner? + if (!str.empty() && str[ str.length() - 1 ] == '>') { + inscriptcond = false; + str = str.substr(0, str.length() - 1); + } - if (j < obj_syms_len) - Options.autopickups |= (1L << j); - else + if (!str.empty() && runscript) + { + // If we're in the middle of an option block, close it. + if (luacond.length() && l_init) { - fprintf( stderr, "Bad object type '%c' for autopickup.\n", - type ); + luacond += "]] )\n"; + l_init = false; } + luacond += str + "\n"; } + continue; } - else if (key == "name") - { - // field is already cleaned up from trim_string() - strncpy(you.your_name, field.c_str(), kNameLen); - you.your_name[ kNameLen - 1 ] = '\0'; - } - else if (key == "verbose_dump") - { - // gives verbose info in char dumps - Options.verbose_dump = read_bool( field, Options.verbose_dump ); - } - else if (key == "clean_map") + else if (inscriptcond && + (str.find(">") == str.length() - 1 || str == ">L")) { - // removes monsters/clouds from map - Options.clean_map = read_bool( field, Options.clean_map ); + inscriptcond = false; + str = str.substr(0, str.length() - 1); + if (!str.empty() && runscript) + luacond += str + "\n"; + continue; } - else if (key == "colour_map" || key == "color_map") + else if (inscriptcond) { - // colour-codes play-screen map - Options.colour_map = read_bool( field, Options.colour_map ); + if (runscript) + luacond += s + "\n"; + continue; } - else if (key == "easy_confirm") + + // Handle blocks of Lua + if (!inscriptblock && (str.find("Lua{") == 0 || str.find("{") == 0)) { - // allows both 'Y'/'N' and 'y'/'n' on yesno() prompts - if (field == "none") - Options.easy_confirm = CONFIRM_NONE_EASY; - else if (field == "safe") - Options.easy_confirm = CONFIRM_SAFE_EASY; - else if (field == "all") - Options.easy_confirm = CONFIRM_ALL_EASY; + inscriptblock = true; + luacode.clear(); + + // Strip leading Lua[ + str = str.substr( str.find("Lua{") == 0? 4 : 1 ); + + if (!str.empty() && str.find("}") == str.length() - 1) + { + str = str.substr(0, str.length() - 1); + inscriptblock = false; + } + + if (!str.empty()) + luacode += str + "\n"; + + if (!inscriptblock && runscript) + { +#ifdef CLUA_BINDINGS + clua.execstring(luacode.c_str()); + if (clua.error.length()) + fprintf(stderr, "Lua error: %s\n", clua.error.c_str()); + luacode.clear(); +#endif + } + + continue; } - else if (key == "easy_quit_item_lists") + else if (inscriptblock && (str == "}Lua" || str == "}")) { - // allow aborting of item lists with space - Options.easy_quit_item_prompts = read_bool( field, - Options.easy_quit_item_prompts ); + inscriptblock = false; +#ifdef CLUA_BINDINGS + if (runscript) + { + clua.execstring(luacode.c_str()); + if (clua.error.length()) + fprintf(stderr, "Lua error: %s\n", + clua.error.c_str()); + } +#endif + luacode.clear(); + continue; } - else if (key == "easy_open") + else if (inscriptblock) { - // automatic door opening with movement - Options.easy_open = read_bool( field, Options.easy_open ); + luacode += s + "\n"; + continue; } - else if (key == "easy_armour" || key == "easy_armour") + + if (isconditional && runscript) { - // automatic removal of armour when dropping - Options.easy_armour = read_bool( field, Options.easy_armour ); + if (!l_init) + { + luacond += "crawl.setopt( [[\n"; + l_init = true; + } + + luacond += s + "\n"; + continue; } - else if (key == "easy_butcher") + + parse_option_line(str, runscript); + } + +#ifdef CLUA_BINDINGS + if (runscript && !luacond.empty()) + { + if (l_init) + luacond += "]] )\n"; + clua.execstring(luacond.c_str()); + if (clua.error.length()) { - // automatic knife switching - Options.easy_butcher = read_bool( field, Options.easy_butcher ); + mpr( ("Lua error: " + clua.error).c_str() ); } - else if (key == "colour" || key == "color") + } +#endif +} + +static int str_to_killcategory(const std::string &s) +{ + static const char *kc[] = { + "you", + "friend", + "other", + }; + + for (unsigned i = 0; i < sizeof(kc) / sizeof(*kc); ++i) { + if (s == kc[i]) + return i; + } + return -1; +} + +static void do_kill_map(const std::string &from, const std::string &to) +{ + int ifrom = str_to_killcategory(from), + ito = str_to_killcategory(to); + if (ifrom != -1 && ito != -1) + Options.kill_map[ifrom] = ito; +} + +void parse_option_line(const std::string &str, bool runscript) +{ + std::string key = ""; + std::string subkey = ""; + std::string field = ""; + + int first_equals = str.find('='); + int first_dot = str.find('.'); + + // all lines with no equal-signs we ignore + if (first_equals < 0) + return; + + if (first_dot > 0 && first_dot < first_equals) + { + key = str.substr( 0, first_dot ); + subkey = str.substr( first_dot + 1, first_equals - first_dot - 1 ); + field = str.substr( first_equals + 1 ); + } + else + { + // no subkey (dots are okay in value field) + key = str.substr( 0, first_equals ); + subkey = ""; + field = str.substr( first_equals + 1 ); + } + + // Clean up our data... + tolower_string( trim_string( key ) ); + tolower_string( trim_string( subkey ) ); + + // some fields want capitals... none care about external spaces + trim_string( field ); + + // Keep unlowercased field around + std::string orig_field = field; + + if (key != "name" && key != "crawl_dir" + && key != "race" && key != "class" && key != "ban_pickup" + && key != "stop_travel" && key != "sound" + && key != "drop_filter" && key != "lua_file") + { + tolower_string( field ); + } + + // everything not a valid line is treated as a comment + if (key == "autopickup") + { + for (size_t i = 0; i < field.length(); i++) { - const int orig_col = str_to_colour( subkey ); - const int result_col = str_to_colour( field ); + char type = field[i]; + + // Make the amulet symbol equiv to ring -- bwross + switch (type) + { + case '"': + // also represents jewellery + type = '='; + break; - if (orig_col != -1 && result_col != -1) - Options.colour[orig_col] = result_col; + case '|': + // also represents staves + type = '\\'; + break; + + case ':': + // also represents books + type = '+'; + break; + + case 'x': + // also corpses + type = 'X'; + break; + } + + int j; + for (j = 0; j < obj_syms_len && type != obj_syms[j]; j++) + ; + + if (j < obj_syms_len) + Options.autopickups |= (1L << j); else { - fprintf( stderr, "Bad colour -- %s=%d or %s=%d\n", - subkey.c_str(), orig_col, field.c_str(), result_col ); + fprintf( stderr, "Bad object type '%c' for autopickup.\n", + type ); } } - else if (key == "channel") + } + else if (key == "name") + { + // field is already cleaned up from trim_string() + strncpy(you.your_name, field.c_str(), kNameLen); + you.your_name[ kNameLen - 1 ] = '\0'; + } + else if (key == "verbose_dump") + { + // gives verbose info in char dumps + Options.verbose_dump = read_bool( field, Options.verbose_dump ); + } + else if (key == "detailed_stat_dump") + { + Options.detailed_stat_dump = + read_bool( field, Options.detailed_stat_dump ); + } + else if (key == "clean_map") + { + // removes monsters/clouds from map + Options.clean_map = read_bool( field, Options.clean_map ); + } + else if (key == "colour_map" || key == "color_map") + { + // colour-codes play-screen map + Options.colour_map = read_bool( field, Options.colour_map ); + } + else if (key == "easy_confirm") + { + // allows both 'Y'/'N' and 'y'/'n' on yesno() prompts + if (field == "none") + Options.easy_confirm = CONFIRM_NONE_EASY; + else if (field == "safe") + Options.easy_confirm = CONFIRM_SAFE_EASY; + else if (field == "all") + Options.easy_confirm = CONFIRM_ALL_EASY; + } + else if (key == "easy_quit_item_lists") + { + // allow aborting of item lists with space + Options.easy_quit_item_prompts = read_bool( field, + Options.easy_quit_item_prompts ); + } + else if (key == "easy_open") + { + // automatic door opening with movement + Options.easy_open = read_bool( field, Options.easy_open ); + } + else if (key == "easy_armour" || key == "easy_armour") + { + // automatic removal of armour when dropping + Options.easy_armour = read_bool( field, Options.easy_armour ); + } + else if (key == "easy_butcher") + { + // automatic knife switching + Options.easy_butcher = read_bool( field, Options.easy_butcher ); + } + else if (key == "lua_file" && runscript) + { +#ifdef CLUA_BINDINGS + clua.execfile(field.c_str()); + if (clua.error.length()) + fprintf(stderr, "Lua error: %s\n", + clua.error.c_str()); +#endif + } + else if (key == "colour" || key == "color") + { + const int orig_col = str_to_colour( subkey ); + const int result_col = str_to_colour( field ); + + if (orig_col != -1 && result_col != -1) + Options.colour[orig_col] = result_col; + else { - const int chnl = str_to_channel( subkey ); - const int col = str_to_channel_colour( field ); - - if (chnl != -1 && col != -1) - Options.channels[chnl] = col; - else if (chnl == -1) - fprintf( stderr, "Bad channel -- %s\n", subkey.c_str() ); - else if (col == -1) - fprintf( stderr, "Bad colour -- %s\n", field.c_str() ); + fprintf( stderr, "Bad colour -- %s=%d or %s=%d\n", + subkey.c_str(), orig_col, field.c_str(), result_col ); } - else if (key == "background") - { - // change background colour - // Experimental! This may look really bad! - const int col = str_to_colour( field ); + } + else if (key == "channel") + { + const int chnl = str_to_channel( subkey ); + const int col = str_to_channel_colour( field ); + + if (chnl != -1 && col != -1) + Options.channels[chnl] = col; + else if (chnl == -1) + fprintf( stderr, "Bad channel -- %s\n", subkey.c_str() ); + else if (col == -1) + fprintf( stderr, "Bad colour -- %s\n", field.c_str() ); + } + else if (key == "background") + { + // change background colour + // Experimental! This may look really bad! + const int col = str_to_colour( field ); + if (col != -1) + Options.background = col; + else + fprintf( stderr, "Bad colour -- %s\n", field.c_str() ); + + } + else if (key == "detected_item_colour") + { + const int col = str_to_colour( field ); + if (col != -1) + Options.detected_item_colour = col; + else + fprintf( stderr, "Bad detected_item_colour -- %s\n", + field.c_str()); + } + else if (key == "detected_monster_colour") + { + const int col = str_to_colour( field ); + if (col != -1) + Options.detected_monster_colour = col; + else + fprintf( stderr, "Bad detected_monster_colour -- %s\n", + field.c_str()); + } + else if (key == "remembered_monster_colour") + { + if (field == "real") + Options.remembered_monster_colour = 0xFFFFU; + else if (field == "auto") + Options.remembered_monster_colour = 0; + else { + const int col = str_to_colour( field ); if (col != -1) - Options.background = col; + Options.remembered_monster_colour = col; else - fprintf( stderr, "Bad colour -- %s\n", field.c_str() ); - + fprintf( stderr, "Bad remembered_monster_colour -- %s\n", + field.c_str()); } -#ifdef USE_COLOUR_OPTS - else if (key == "friend_brand") + } + else if (key == "friend_brand") + { + // Use curses attributes to mark friend + // Some may look bad on some terminals. + // As a suggestion, try "rxvt -rv -fn 10x20" under Un*xes + Options.friend_brand = curses_attribute(field); + } + else if (key == "stab_brand") + { + Options.stab_brand = curses_attribute(field); + } + else if (key == "may_stab_brand") + { + Options.may_stab_brand = curses_attribute(field); + } + else if (key == "no_dark_brand") + { + // This is useful for terms where dark grey does + // not have standout modes (since it's black on black). + // This option will use light-grey instead in these cases. + Options.no_dark_brand = read_bool( field, Options.no_dark_brand ); + } + else if (key == "heap_brand") + { + // See friend_brand option upstairs. no_dark_brand applies + // here as well. + Options.heap_brand = curses_attribute(field); + } + else if (key == "show_uncursed") + { + // label known uncursed items as "uncursed" + Options.show_uncursed = read_bool( field, Options.show_uncursed ); + } + else if (key == "always_greet") + { + // show greeting when reloading game + Options.always_greet = read_bool( field, Options.always_greet ); + } + else if (key == "weapon") + { + // choose this weapon for classes that get choice + Options.weapon = str_to_weapon( field ); + } + else if (key == "chaos_knight") + { + // choose god for Chaos Knights + if (field == "xom") + Options.chaos_knight = GOD_XOM; + else if (field == "makhleb") + Options.chaos_knight = GOD_MAKHLEB; + else if (field == "random") + Options.chaos_knight = GOD_RANDOM; + } + else if (key == "death_knight") + { + if (field == "necromancy") + Options.death_knight = DK_NECROMANCY; + else if (field == "yredelemnul") + Options.death_knight = DK_YREDELEMNUL; + else if (field == "random") + Options.death_knight = DK_RANDOM; + } + else if (key == "priest") + { + // choose this weapon for classes that get choice + if (field == "zin") + Options.priest = GOD_ZIN; + else if (field == "yredelemnul") + Options.priest = GOD_YREDELEMNUL; + else if (field == "random") + Options.priest = GOD_RANDOM; + } + else if (key == "fire_items_start") + { + if (isalpha( field[0] )) + Options.fire_items_start = letter_to_index( field[0] ); + else { - // Use curses attributes to mark friend - // Some may look bad on some terminals. - // As a suggestion, try "rxvt -rv -fn 10x20" under Un*xes - if (field == "standout") // probably reverses - Options.friend_brand = CHATTR_STANDOUT; - else if (field == "bold") // probably brightens fg - Options.friend_brand = CHATTR_BOLD; - else if (field == "blink") // probably brightens bg - Options.friend_brand = CHATTR_BLINK; - else if (field == "underline") - Options.friend_brand = CHATTR_UNDERLINE; - else if (field == "reverse") - Options.friend_brand = CHATTR_REVERSE; - else if (field == "dim") - Options.friend_brand = CHATTR_DIM; - else - fprintf( stderr, "Bad colour -- %s\n", field.c_str() ); + fprintf( stderr, "Bad fire item start index -- %s\n", + field.c_str() ); } - else if (key == "no_dark_brand") + } + else if (key == "assign_item_slot") + { + if (field == "forward") + Options.assign_item_slot = SS_FORWARD; + else if (field == "backward") + Options.assign_item_slot = SS_BACKWARD; + } + else if (key == "fire_order") + { + str_to_fire_order( field, Options.fire_order ); + } + else if (key == "random_pick") + { + // randomly generate character + Options.random_pick = read_bool( field, Options.random_pick ); + } + else if (key == "remember_name") + { + Options.remember_name = read_bool( field, Options.remember_name ); + } + else if (key == "hp_warning") + { + Options.hp_warning = atoi( field.c_str() ); + if (Options.hp_warning < 0 || Options.hp_warning > 100) { - // This is useful for terms where dark grey does - // not have standout modes (since it's black on black). - // This option will use light-grey instead in these cases. - Options.no_dark_brand = read_bool( field, Options.no_dark_brand ); + Options.hp_warning = 0; + fprintf( stderr, "Bad HP warning percentage -- %s\n", + field.c_str() ); } -#endif - else if (key == "show_uncursed") + } + else if (key == "hp_attention") + { + Options.hp_attention = atoi( field.c_str() ); + if (Options.hp_attention < 0 || Options.hp_attention > 100) { - // label known uncursed items as "uncursed" - Options.show_uncursed = read_bool( field, Options.show_uncursed ); + Options.hp_attention = 0; + fprintf( stderr, "Bad HP attention percentage -- %s\n", + field.c_str() ); } - else if (key == "always_greet") + } + else if (key == "crawl_dir") + { + // We shouldn't bother to allocate this a second time + // if the user puts two crawl_dir lines in the init file. + if (!SysEnv.crawl_dir) + SysEnv.crawl_dir = (char *) calloc(kPathLen, sizeof(char)); + + if (SysEnv.crawl_dir) { - // show greeting when reloading game - Options.always_greet = read_bool( field, Options.always_greet ); + strncpy(SysEnv.crawl_dir, field.c_str(), kNameLen - 1); + SysEnv.crawl_dir[ kNameLen - 1 ] = '\0'; } - else if (key == "weapon") + } + else if (key == "race") + { + Options.race = str_to_race( field ); + + if (Options.race == '\0') + fprintf( stderr, "Unknown race choice: %s\n", field.c_str() ); + } + else if (key == "class") + { + Options.cls = str_to_class( field ); + + if (Options.cls == '\0') + fprintf( stderr, "Unknown class choice: %s\n", field.c_str() ); + } + else if (key == "auto_list") + { + Options.auto_list = read_bool( field, Options.auto_list ); + } + else if (key == "delay_message_clear") + { + Options.delay_message_clear = read_bool( field, Options.delay_message_clear ); + } + else if (key == "terse_hand") + { + Options.terse_hand = read_bool( field, Options.terse_hand ); + } + else if (key == "flush") + { + if (subkey == "failure") { - // choose this weapon for classes that get choice - Options.weapon = str_to_weapon( field ); + Options.flush_input[FLUSH_ON_FAILURE] + = read_bool(field, Options.flush_input[FLUSH_ON_FAILURE]); } - else if (key == "chaos_knight") + else if (subkey == "command") { - // choose god for Chaos Knights - if (field == "xom") - Options.chaos_knight = GOD_XOM; - else if (field == "makhleb") - Options.chaos_knight = GOD_MAKHLEB; - else if (field == "random") - Options.chaos_knight = GOD_RANDOM; + Options.flush_input[FLUSH_BEFORE_COMMAND] + = read_bool(field, Options.flush_input[FLUSH_BEFORE_COMMAND]); } - else if (key == "death_knight") + else if (subkey == "message") { - if (field == "necromancy") - Options.death_knight = DK_NECROMANCY; - else if (field == "yredelemnul") - Options.death_knight = DK_YREDELEMNUL; - else if (field == "random") - Options.death_knight = DK_RANDOM; + Options.flush_input[FLUSH_ON_MESSAGE] + = read_bool(field, Options.flush_input[FLUSH_ON_MESSAGE]); } - else if (key == "priest") + else if (subkey == "lua") { - // choose this weapon for classes that get choice - if (field == "zin") - Options.priest = GOD_ZIN; - else if (field == "yredelemnul") - Options.priest = GOD_YREDELEMNUL; - else if (field == "random") - Options.priest = GOD_RANDOM; + Options.flush_input[FLUSH_LUA] + = read_bool(field, Options.flush_input[FLUSH_LUA]); } - else if (key == "fire_items_start") - { - if (isalpha( field[0] )) - Options.fire_items_start = letter_to_index( field[0] ); - else - { - fprintf( stderr, "Bad fire item start index -- %s\n", - field.c_str() ); + } + else if (key == "lowercase_invocations") + { + Options.lowercase_invocations + = read_bool(field, Options.lowercase_invocations); + } + else if (key == "wiz_mode") + { + // wiz_mode is recognized as a legal key in all compiles -- bwr +#ifdef WIZARD + if (field == "never") + Options.wiz_mode = WIZ_NEVER; + else if (field == "no") + Options.wiz_mode = WIZ_NO; + else if (field == "yes") + Options.wiz_mode = WIZ_YES; + else + fprintf(stderr, "Unknown wiz_mode option: %s\n", field.c_str()); +#endif + } + else if (key == "ban_pickup") + { + append_vector(Options.banned_objects, split_string(",", field)); + } + else if (key == "pickup_thrown") + { + Options.pickup_thrown = read_bool(field, Options.pickup_thrown); + } + else if (key == "pickup_dropped") + { + Options.pickup_dropped = read_bool(field, Options.pickup_dropped); + } + else if (key == "show_waypoints") + { + Options.show_waypoints = read_bool(field, Options.show_waypoints); + } + else if (key == "travel_delay") + { + // Read travel delay in milliseconds. + Options.travel_delay = atoi( field.c_str() ); + if (Options.travel_delay < -1) + Options.travel_delay = -1; + if (Options.travel_delay > 2000) + Options.travel_delay = 2000; + } + else if (key == "level_map_cursor_step") + { + Options.level_map_cursor_step = atoi( field.c_str() ); + if (Options.level_map_cursor_step < 1) + Options.level_map_cursor_step = 1; + if (Options.level_map_cursor_step > 50) + Options.level_map_cursor_step = 50; + } + else if (key == "macro_meta_entry") + { + Options.macro_meta_entry = read_bool(field, Options.macro_meta_entry); + } + else if (key == "travel_stair_cost") + { + Options.travel_stair_cost = atoi( field.c_str() ); + if (Options.travel_stair_cost < 1) + Options.travel_stair_cost = 1; + else if (Options.travel_stair_cost > 1000) + Options.travel_stair_cost = 1000; + } + else if (key == "travel_exclude_radius2") + { + Options.travel_exclude_radius2 = atoi( field.c_str() ); + if (Options.travel_exclude_radius2 < 0) + Options.travel_exclude_radius2 = 0; + else if (Options.travel_exclude_radius2 > 400) + Options.travel_exclude_radius2 = 400; + } + else if (key == "stop_travel") + { + std::vector fragments = split_string(",", field); + for (int i = 0, count = fragments.size(); i < count; ++i) { + if (fragments[i].length() == 0) + continue; + + std::string::size_type pos = fragments[i].find(":"); + if (pos && pos != std::string::npos) { + std::string prefix = fragments[i].substr(0, pos); + int channel = str_to_channel( prefix ); + if (channel != -1 || prefix == "any") { + std::string s = fragments[i].substr( pos + 1 ); + trim_string( s ); + Options.stop_travel.push_back( + message_filter( channel, s ) ); + continue; + } } + + Options.stop_travel.push_back( + message_filter( fragments[i] ) ); } - else if (key == "fire_order") - { - str_to_fire_order( field, Options.fire_order ); - } - else if (key == "random_pick") - { - // randomly generate character - Options.random_pick = read_bool( field, Options.random_pick ); - } - else if (key == "hp_warning") + } + else if (key == "drop_filter") + { + append_vector(Options.drop_filter, split_string(",", field)); + } + else if (key == "travel_avoid_terrain") + { + std::vector seg = split_string(",", field); + for (int i = 0, count = seg.size(); i < count; ++i) + prevent_travel_to( seg[i] ); + } + else if (key == "travel_colour") + { + Options.travel_colour = read_bool(field, Options.travel_colour); + } + else if (key == "item_colour") + { + Options.item_colour = read_bool(field, Options.item_colour); + } + else if (key == "easy_exit_menu") + { + Options.easy_exit_menu = read_bool(field, Options.easy_exit_menu); + } + else if (key == "dos_use_background_intensity") + { + Options.dos_use_background_intensity = + read_bool(field, Options.dos_use_background_intensity); + } + else if (key == "explore_stop") + { + Options.explore_stop = ES_NONE; + std::vector stops = split_string(",", field); + for (int i = 0, count = stops.size(); i < count; ++i) { - Options.hp_warning = atoi( field.c_str() ); - if (Options.hp_warning < 0 || Options.hp_warning > 100) - { - Options.hp_warning = 0; - fprintf( stderr, "Bad HP warning percentage -- %s\n", - field.c_str() ); - } + const std::string &c = stops[i]; + if (c == "item" || c == "items") + Options.explore_stop |= ES_ITEM; + else if (c == "shop" || c == "shops") + Options.explore_stop |= ES_SHOP; + else if (c == "stair" || c == "stairs") + Options.explore_stop |= ES_STAIR; + else if (c == "altar" || c == "altars") + Options.explore_stop |= ES_ALTAR; } - else if (key == "hp_attention") - { - Options.hp_attention = atoi( field.c_str() ); - if (Options.hp_attention < 0 || Options.hp_attention > 100) - { - Options.hp_attention = 0; - fprintf( stderr, "Bad HP attention percentage -- %s\n", - field.c_str() ); + } +#ifdef STASH_TRACKING + else if (key == "stash_tracking") + { + Options.stash_tracking = + field == "explicit"? STM_EXPLICIT : + field == "dropped" ? STM_DROPPED : + field == "all" ? STM_ALL : + STM_NONE; + } + else if (key == "stash_filter") + { + std::vector seg = split_string(",", field); + for (int i = 0, count = seg.size(); i < count; ++i) + Stash::filter( seg[i] ); + } +#endif + else if (key == "sound") + { + std::vector seg = split_string(",", field); + for (int i = 0, count = seg.size(); i < count; ++i) { + const std::string &sub = seg[i]; + std::string::size_type cpos = sub.find(":", 0); + if (cpos != std::string::npos) { + sound_mapping mapping; + mapping.pattern = sub.substr(0, cpos); + mapping.soundfile = sub.substr(cpos + 1); + Options.sound_mappings.push_back(mapping); } } - else if (key == "crawl_dir") - { - // We shouldn't bother to allocate this a second time - // if the user puts two crawl_dir lines in the init file. - if (!SysEnv.crawl_dir) - SysEnv.crawl_dir = (char *) calloc(kPathLen, sizeof(char)); - - if (SysEnv.crawl_dir) - { - strncpy(SysEnv.crawl_dir, field.c_str(), kNameLen - 1); - SysEnv.crawl_dir[ kNameLen - 1 ] = '\0'; + } + else if (key == "menu_colour" || key == "menu_color") + { + std::vector seg = split_string(",", field); + for (int i = 0, count = seg.size(); i < count; ++i) { + const std::string &sub = seg[i]; + std::string::size_type cpos = sub.find(":", 0); + if (cpos != std::string::npos) { + colour_mapping mapping; + mapping.pattern = sub.substr(cpos + 1); + mapping.colour = str_to_colour(sub.substr(0, cpos)); + if (mapping.colour != -1) + Options.menu_colour_mappings.push_back(mapping); } } - else if (key == "race") - { - Options.race = str_to_race( field ); - - if (Options.race == '\0') - fprintf( stderr, "Unknown race choice: %s\n", field.c_str() ); - } - else if (key == "class") - { - Options.cls = str_to_class( field ); - - if (Options.cls == '\0') - fprintf( stderr, "Unknown class choice: %s\n", field.c_str() ); - } - else if (key == "auto_list") - { - Options.auto_list = read_bool( field, Options.auto_list ); - } - else if (key == "delay_message_clear") - { - Options.delay_message_clear = read_bool( field, Options.delay_message_clear ); - } - else if (key == "terse_hand") - { - Options.terse_hand = read_bool( field, Options.terse_hand ); - } - else if (key == "flush") + } + else if (key == "dump_kill_places") + { + Options.dump_kill_places = + field == "none"? KDO_NO_PLACES : + field == "all" ? KDO_ALL_PLACES : + KDO_ONE_PLACE; + } + else if (key == "kill_map") + { + std::vector seg = split_string(",", field); + for (int i = 0, count = seg.size(); i < count; ++i) { - if (subkey == "failure") - { - Options.flush_input[FLUSH_ON_FAILURE] - = read_bool(field, Options.flush_input[FLUSH_ON_FAILURE]); - } - else if (subkey == "command") - { - Options.flush_input[FLUSH_BEFORE_COMMAND] - = read_bool(field, Options.flush_input[FLUSH_BEFORE_COMMAND]); - } - else if (subkey == "message") - { - Options.flush_input[FLUSH_ON_MESSAGE] - = read_bool(field, Options.flush_input[FLUSH_ON_MESSAGE]); + const std::string &s = seg[i]; + std::string::size_type cpos = s.find(":", 0); + if (cpos != std::string::npos) { + std::string from = s.substr(0, cpos); + std::string to = s.substr(cpos + 1); + do_kill_map(from, to); } } - else if (key == "lowercase_invocations") + } + else if (key == "dump_message_count") + { + // Capping is implicit + Options.dump_message_count = atoi( field.c_str() ); + } + else if (key == "dump_item_origins") + { + Options.dump_item_origins = IODS_PRICE; + std::vector choices = split_string(",", field); + for (int i = 0, count = choices.size(); i < count; ++i) { - Options.lowercase_invocations - = read_bool(field, Options.lowercase_invocations); + const std::string &ch = choices[i]; + if (ch == "artifacts") + Options.dump_item_origins |= IODS_ARTIFACTS; + else if (ch == "ego_arm" || ch == "ego armour" + || ch == "ego_armour") + Options.dump_item_origins |= IODS_EGO_ARMOUR; + else if (ch == "ego_weap" || ch == "ego weapon" + || ch == "ego_weapon" || ch == "ego weapons" + || ch == "ego_weapons") + Options.dump_item_origins |= IODS_EGO_WEAPON; + else if (ch == "jewellery" || ch == "jewelry") + Options.dump_item_origins |= IODS_JEWELLERY; + else if (ch == "runes") + Options.dump_item_origins |= IODS_RUNES; + else if (ch == "rods") + Options.dump_item_origins |= IODS_RODS; + else if (ch == "staves") + Options.dump_item_origins |= IODS_STAVES; + else if (ch == "books") + Options.dump_item_origins |= IODS_BOOKS; + else if (ch == "all" || ch == "everything") + Options.dump_item_origins = IODS_EVERYTHING; } - else if (key == "wiz_mode") + } + else if (key == "dump_item_origin_price") + { + Options.dump_item_origin_price = atoi( field.c_str() ); + if (Options.dump_item_origin_price < -1) + Options.dump_item_origin_price = -1; + } + else if (key == "target_zero_exp") + { + Options.target_zero_exp = read_bool(field, Options.target_zero_exp); + } + else if (key == "target_wrap") + { + Options.target_wrap = read_bool(field, Options.target_wrap); + } + else if (key == "target_oos") + { + Options.target_oos = read_bool(field, Options.target_oos); + } + else if (key == "target_los_first") + { + Options.target_los_first = read_bool(field, Options.target_los_first); + } + else if (key == "drop_mode") + { + if (field.find("multi") != std::string::npos) + Options.drop_mode = DM_MULTI; + else + Options.drop_mode = DM_SINGLE; + } + // Catch-all else, copies option into map + else + { +#ifdef CLUA_BINDINGS + if (!clua.callbooleanfn(false, "c_process_lua_option", "ss", + key.c_str(), orig_field.c_str())) +#endif { - // wiz_mode is recognized as a legal key in all compiles -- bwr -#ifdef WIZARD - if (field == "never") - Options.wiz_mode = WIZ_NEVER; - else if (field == "no") - Options.wiz_mode = WIZ_NO; - else if (field == "yes") - Options.wiz_mode = WIZ_YES; - else - fprintf(stderr, "Unknown wiz_mode option: %s\n", field.c_str()); +#ifdef CLUA_BINDINGS + if (clua.error.length()) + mpr(clua.error.c_str()); #endif + Options.named_options[key] = orig_field; } } - - fclose(f); -} // end read_init_file() +} void get_system_environment(void) { -- cgit v1.2.3-54-g00ecf