diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-29 04:54:46 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-29 04:54:46 +0000 |
| commit | a44f0e10c356aa49b93f74e86e7b58dfcc3b74b7 (patch) | |
| tree | 119b82264c6d8becb23c59ae0a64e910bcbd7dde | |
| parent | e758c8dd2f6c4a9142c7b2fb1eae4bf45c006a8e (diff) | |
| download | crawl-ref-a44f0e10c356aa49b93f74e86e7b58dfcc3b74b7.tar.gz crawl-ref-a44f0e10c356aa49b93f74e86e7b58dfcc3b74b7.zip | |
[1849483] Wielded weapons are ignored when looking for missiles to fire, and fire_items_start defaults to 'a' again.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3140 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/docs/crawl_options.txt | 7 | ||||
| -rw-r--r-- | crawl-ref/init.txt | 6 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 5 | ||||
| -rw-r--r-- | crawl-ref/source/item_use.cc | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt index 1b5897f1d3..fd61ec740d 100644 --- a/crawl-ref/docs/crawl_options.txt +++ b/crawl-ref/docs/crawl_options.txt @@ -1084,11 +1084,12 @@ message_colour = <colour>:[<channel>:]<regex> 4-k Missiles. ----------------- -fire_items_start = c - Sets the first inventory item to consider. Default is c. +fire_items_start = a + Sets the first inventory item to consider when selecting + missiles to fire. The default is a. fire_order = launcher, return, -fire_order += javelin / dart / stone / rock / spear / net / handaxe +fire_order += javelin / dart / stone / rock / spear / net / handaxe / dagger Controls the order of items autoselected for firing. Items should be separated by commas and items that appear first get higher priority. You can use multiple fire_order lines - all diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt index 6a28243f52..43bec74bd1 100644 --- a/crawl-ref/init.txt +++ b/crawl-ref/init.txt @@ -213,9 +213,9 @@ message_colour = lightcyan:LOW MAGIC WARNING ##### 4-k Firing Commands ####################### # -# fire_items_start = c -# fire_order = launcher, return, dart / stone / javelin, -# fire_order += dagger, spear, handaxe, club +# fire_items_start = a +# fire_order = launcher, return +# fire_order += javelin / dart / stone / rock / spear / net / handaxe / dagger ##### 4-l Channels ############################## # diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index e6cd2746e1..c8b53c44af 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -706,11 +706,12 @@ void game_options::reset_options() flush_input[ FLUSH_ON_MESSAGE ] = false; flush_input[ FLUSH_LUA ] = true; - fire_items_start = 2; // start at slot 'c' + fire_items_start = 0; // start at slot 'a' // Clear fire_order and set up the defaults. set_fire_order("launcher, return, " - "javelin / dart / stone / rock / spear / net / handaxe", + "javelin / dart / stone / rock /" + " spear / net / handaxe / dagger", false); item_stack_summary_minimum = 5; diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 6f4f2d1bfc..5aeccf8cf1 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1281,7 +1281,7 @@ static bool fire_item_matches(const item_def &item, unsigned fire_type) static bool fire_item_okay(const item_def &item, unsigned flags) { return (fire_item_matches(item, flags) - && !(you.equip[EQ_WEAPON] == item.link && item_cursed(item))); + && you.equip[EQ_WEAPON] != item.link); } static int find_fire_item_matching(unsigned fire_type, int start, |