From af6c143561718ac7675acd8b5707a1d75644f577 Mon Sep 17 00:00:00 2001 From: dolorous Date: Thu, 10 Jul 2008 01:06:57 +0000 Subject: Apply trunk r6460 to 0.4. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6469 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/docs/034_changes.txt | 178 ++++++++++++++++++++--------------------- crawl-ref/docs/lualicense.txt | 68 ++++++++-------- 2 files changed, 123 insertions(+), 123 deletions(-) diff --git a/crawl-ref/docs/034_changes.txt b/crawl-ref/docs/034_changes.txt index a6c2521d34..e176cfcc79 100644 --- a/crawl-ref/docs/034_changes.txt +++ b/crawl-ref/docs/034_changes.txt @@ -1,89 +1,89 @@ -Information for players of versions 0.3.4 or earlier ----------------------------------------------------- - -There have been many changes to the interface in the new version. Among -them: - -* Swapped some command keys around: - G auto-travel (was Ctrl-G) - z cast spell (was Z) - Z zap wand (was z) - o auto-explore (was Ctrl-O) - Ctrl-O dungeon overview (was O) - O open door (was o) - C close door (was c) - c chop up (was D, dissect) - E show experience (was C) - v evoke (was E) - f, F fire/throw (was t) - t tell/yell (was !) - Ctrl-V Tiles settings (was Ctrl-Q) - Ctrl-Q quit (was Q) - -* Added some new commands: - ! annotate dungeon level - (If your annotation contains '!' you'll be prompted whenever - you attempt to enter the level.) - ( cycle the quiver to the next appropriate item - Q quiver an item for firing - ` repeat previous command - 0 repeat next command # of times - Ctrl-D define macros (synonym to '~') - Ctrl-G verbose list of monsters in sight - Ctrl-T change your allies' pickup behaviour - (only available to some characters) - - - There is a file called "key_changes.pdf" in the /docs directory that - lists all of these command changes on a printable reference sheet. - -* Removed the 'v' command (view item in inventory). Its functionality is - provided by pressing 'i' (showing the inventory) and the letter for the - item, at the same number of key presses. - -* The chop up (formerly dissect) interface is modified: there is no - prompt anymore for single corpses. In case of several corpses on the - square, you may use 'c' as a synonym for yes, and 'a' will answer yes - to this and all further corpses. In particular, all corpses in a square - can be sacrificed with 'pca'. - -* When targeting, the functions of '!' and '.' have been swapped. Thus - firing with '.' will now stop at the target, whereas '!' will shoot - further if the target was missed. Enter etc. still behave as in 0.3.4. - You can now target using the monster list; Cltr-L toggles this option. - You can quiver an item, meaning that you will preferably fire this - ammunition (and keep doing so even if you run out of it temporarily). - Quivering is done via 'Q' (quiver the currently fired item) or 'fi' - (choose an item for firing and quiver it) or also by using '(' which - cycles appropriate ammunition. 'F' lets you select an item to be thrown - without affecting the quiver. - -* The colours of many monsters have been changed. Most notably, there are - no darkgrey monsters anymore. In case darkgrey is actually better - visible than blue on your system, you can swap these colours using - colour: darkblue = darkgrey - in init.txt. - Apart from that, more dangerous monsters are now generally displayed in - lighter colours. - -We are content that all of these changes are genuine improvements. Should -your brain be hardwired to the old settings, you can effectively enforce -the 0.3.4 state by using the following options: - include = 034_monster_glyphs.txt - additional_macro_file = 034_command_keys.txt - always_confirm_butcher = true - -Note that the header of init.txt contains these lines. (It contains some -more options for using other old settings.) The options are commented out, -so you just need to remove the # in front in order to activate them. You -can choose to use only part of these options. In case you decide to use -the old keyset, be aware that D is also a synonym for 'yes' in the -butcher interface. - -If you choose to go with the new keyset or the new butcher interface and -you intend to use your old macros, you'll need to look through your -macro.txt file. - -There are a number of new options, some of them outsourced into various -files in the /settings folder, so if you intend to use your old init file, -you may still want to at least look through the new one. +Information for players of versions 0.3.4 or earlier +---------------------------------------------------- + +There have been many changes to the interface in the new version. Among +them: + +* Swapped some command keys around: + G auto-travel (was Ctrl-G) + z cast spell (was Z) + Z zap wand (was z) + o auto-explore (was Ctrl-O) + Ctrl-O dungeon overview (was O) + O open door (was o) + C close door (was c) + c chop up (was D, dissect) + E show experience (was C) + v evoke (was E) + f, F fire/throw (was t) + t tell/yell (was !) + Ctrl-V Tiles settings (was Ctrl-Q) + Ctrl-Q quit (was Q) + +* Added some new commands: + ! annotate dungeon level + (If your annotation contains '!' you'll be prompted whenever + you attempt to enter the level.) + ( cycle the quiver to the next appropriate item + Q quiver an item for firing + ` repeat previous command + 0 repeat next command # of times + Ctrl-D define macros (synonym to '~') + Ctrl-G verbose list of monsters in sight + Ctrl-T change your allies' pickup behaviour + (only available to some characters) + + + There is a file called "key_changes.pdf" in the /docs directory that + lists all of these command changes on a printable reference sheet. + +* Removed the 'v' command (view item in inventory). Its functionality is + provided by pressing 'i' (showing the inventory) and the letter for the + item, at the same number of key presses. + +* The chop up (formerly dissect) interface is modified: there is no + prompt anymore for single corpses. In case of several corpses on the + square, you may use 'c' as a synonym for yes, and 'a' will answer yes + to this and all further corpses. In particular, all corpses in a square + can be sacrificed with 'pca'. + +* When targeting, the functions of '!' and '.' have been swapped. Thus + firing with '.' will now stop at the target, whereas '!' will shoot + further if the target was missed. Enter etc. still behave as in 0.3.4. + You can now target using the monster list; Cltr-L toggles this option. + You can quiver an item, meaning that you will preferably fire this + ammunition (and keep doing so even if you run out of it temporarily). + Quivering is done via 'Q' (quiver the currently fired item) or 'fi' + (choose an item for firing and quiver it) or also by using '(' which + cycles appropriate ammunition. 'F' lets you select an item to be thrown + without affecting the quiver. + +* The colours of many monsters have been changed. Most notably, there are + no darkgrey monsters anymore. In case darkgrey is actually better + visible than blue on your system, you can swap these colours using + colour: darkblue = darkgrey + in init.txt. + Apart from that, more dangerous monsters are now generally displayed in + lighter colours. + +We are content that all of these changes are genuine improvements. Should +your brain be hardwired to the old settings, you can effectively enforce +the 0.3.4 state by using the following options: + include = 034_monster_glyphs.txt + additional_macro_file = 034_command_keys.txt + always_confirm_butcher = true + +Note that the header of init.txt contains these lines. (It contains some +more options for using other old settings.) The options are commented out, +so you just need to remove the # in front in order to activate them. You +can choose to use only part of these options. In case you decide to use +the old keyset, be aware that D is also a synonym for 'yes' in the +butcher interface. + +If you choose to go with the new keyset or the new butcher interface and +you intend to use your old macros, you'll need to look through your +macro.txt file. + +There are a number of new options, some of them outsourced into various +files in the /settings folder, so if you intend to use your old init file, +you may still want to at least look through the new one. diff --git a/crawl-ref/docs/lualicense.txt b/crawl-ref/docs/lualicense.txt index 274f501d8c..84d401b1e4 100644 --- a/crawl-ref/docs/lualicense.txt +++ b/crawl-ref/docs/lualicense.txt @@ -1,34 +1,34 @@ -Lua License ------------ - -Lua is licensed under the terms of the MIT license reproduced below. -This means that Lua is free software and can be used for both academic -and commercial purposes at absolutely no cost. - -For details and rationale, see http://www.lua.org/license.html . - -=============================================================================== - -Copyright (C) 1994-2006 Lua.org, PUC-Rio. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -=============================================================================== - -(end of COPYRIGHT) +Lua License +----------- + +Lua is licensed under the terms of the MIT license reproduced below. +This means that Lua is free software and can be used for both academic +and commercial purposes at absolutely no cost. + +For details and rationale, see http://www.lua.org/license.html . + +=============================================================================== + +Copyright (C) 1994-2006 Lua.org, PUC-Rio. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +=============================================================================== + +(end of COPYRIGHT) -- cgit v1.2.3-54-g00ecf