summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--crawl-ref/docs/changes.stone_soup21
-rw-r--r--crawl-ref/docs/keybind.txt15
-rw-r--r--crawl-ref/settings/034_command_keys.txt4
-rw-r--r--crawl-ref/source/dat/descript/monsters.txt8
-rw-r--r--crawl-ref/source/rltiles/dc-mon.txt4
-rw-r--r--crawl-ref/source/rltiles/dc-mon/unique/eustachio.pngbin0 -> 1002 bytes
-rw-r--r--crawl-ref/source/rltiles/dc-mon/unique/roxanne.pngbin0 -> 631 bytes
-rw-r--r--crawl-ref/source/tilepick.cc4
8 files changed, 34 insertions, 22 deletions
diff --git a/crawl-ref/docs/changes.stone_soup b/crawl-ref/docs/changes.stone_soup
index e9ed7417c2..16f8eacd37 100644
--- a/crawl-ref/docs/changes.stone_soup
+++ b/crawl-ref/docs/changes.stone_soup
@@ -8,7 +8,8 @@ Breaks saves compatibility.
0.5 Highlights
--------------
-* Several new uniques and other monsters.
+* New species and class: Deep Dwarf, Artificer.
+* Several cool new uniques and other monsters.
* Several great new portal vaults.
* Cooler labyrinths.
* Much more useful monster descriptions.
@@ -38,7 +39,7 @@ Monsters
* Polymorphed uniques retain their spells and speech.
* Reintroduce chance of orc wizards and priests in early orc bands.
* Most monsters of the same genus will now attempt to surround the player.
-* Implemented monster miscasts: caused by Zot traps or mummy curses.
+* Implemented monster miscasts caused by Zot traps or mummy curses.
* Make all allies (including zombies) avoid Zot traps known to the player.
* Ghosts don't get holy wrath branded attacks anymore.
* Monsters will now drink !healing to cure confusion etc.
@@ -49,11 +50,11 @@ Monsters
* Account for randart shields when scanning monsters' inventories for randarts.
* Fixed monsters getting stuck in deep water after entering it while confused.
* Monsters behind glass but with a path to the player interrupt rest/travel.
-* Monsters raised from the dead are now equipped with equipment from the pile.
+* Monsters raised from the dead are now equipped with their original equipment.
* Zombies/skeletons no longer drown, but will still avoid water.
* Fixed summoned monsters taking non-summoned items with them.
* Make abominations resist poison.
-* Better handling of amphibious monsters in the code.
+* Butchered corpses sometimes leave skeletons.
Interface
---------
@@ -69,7 +70,7 @@ Interface
* Added stat_colour option to highlight dangerously low stats.
* Pressing Esc at -More- automatically clears all queued -More- prompts.
* Greatly improved the monster view command ('V').
-* Add FAQ to help screen.
+* Add FAQ to help screen ('?Q').
* Purchases and donations are now noted.
* The database search now also prints armour base AC/EV and weapon plusses.
* Add spells and books to book/spell descriptions when searching the database.
@@ -80,8 +81,8 @@ Items
-----
* New scroll: ?vulnerability, applying to all creatures in LoS including you.
* Introduce randart spellbooks with random spell selections.
-* Book acquirements are now more random and may yield manuals.
-* Make missile enchantment decrease chance of item destruction.
+* Book acquirements are now much more random and may yield manuals.
+* Make missile enchantment decrease chance of destruction on impact.
* Freezing weapons can now slow cold-blooded monsters.
* The staff of channeling now trains Evocations.
* Item descriptions now mention enchantment/charging limits.
@@ -107,7 +108,7 @@ Characters
* Vampires can no longer heal via potions of blood or non-fresh corpses.
* Overhaul nutrition values and duration for Vampires feeding on corpses.
* Draining of the experience pool is now reduced by life protection.
-* Player and monster naga no longer flounder or lose stealth in shallow water.
+* Player and monster nagas no longer flounder or lose stealth in shallow water.
* Secondary unarmed attacks now wake sleeping monsters.
* Pure spellcasters don't start with a knife anymore.
* Tweak starting choice restrictions.
@@ -129,7 +130,7 @@ Gods
Tiles
-----
* Overhauled and improved tiles code, now using SDL.
-* Adding auto-sizing for font, map, and window sizes.
+* Added auto-sizing for font, map, and window sizes.
* Graphical menu improvements: some menus are now clickable and show icons.
* Mouse clicks on the map when unsafe now travel one square in that direction.
* Improved a number of tiles, and added some new ones. (Pandemonium lords!)
@@ -143,13 +144,11 @@ Miscellaneous
* Crashes now leave highly informative crash dumps.
* Poison Weapon is now a level 2 spell.
* Extension will now also extend temporary weapon brands.
-* Butchered corpses sometimes leave skeletons.
* Lua errors now report the line numbers of the actual code.
* Flying can now be cancelled.
* Petrify is now an Enchantment/Earth spell.
* Lee's Rapid Deconstruction deals great damage to petrified monsters.
* Rewrite and clean up of (among others) beam and trap code.
-* Increased Silence range from 6+0 to 6+1.
* Store code revision in save files for easier bug tracking.
* Many useful new wizard commands.
diff --git a/crawl-ref/docs/keybind.txt b/crawl-ref/docs/keybind.txt
index 080930478f..f8b3284f7d 100644
--- a/crawl-ref/docs/keybind.txt
+++ b/crawl-ref/docs/keybind.txt
@@ -1,5 +1,5 @@
-Here's a list of all commands, in the form they are parsed by the
-bindkey option, with their default key and a short explanation
+Here's a list of all commands, in the form they are parsed by the
+bindkey option, with their default key and a short explanation
(where necessary).
Movement
@@ -56,6 +56,7 @@ Z CMD_ZAP_WAND
= CMD_ADJUST_INVENTORY
{ CMD_INSCRIBE_ITEM
( CMD_CYCLE_QUIVER_FORWARD
+) CMD_CYCLE_QUIVER_BACKWARD
' CMD_WEAPON_SWAP
Dungeon interaction
@@ -66,6 +67,7 @@ s, . CMD_SEARCH, CMD_MOVE_NOWHERE (same command)
5 CMD_REST (rest/search 100 turns)
t CMD_SHOUT
x CMD_LOOK_AROUND
+V CMD_FULL_VIEW
z CMD_CAST_SPELL
C CMD_CLOSE_DOOR
^E CMD_FORGET_STASH
@@ -97,7 +99,7 @@ I CMD_DISPLAY_SPELLS
" CMD_LIST_JEWELLERY
[ CMD_LIST_ARMOUR
] CMD_LIST_EQUIPMENT
-) CMD_LIST_WEAPONS
+} CMD_LIST_WEAPONS
$ CMD_LIST_GOLD
\ CMD_DISPLAY_KNOWN_OBJECTS
# CMD_CHARACTER_DUMP
@@ -158,7 +160,7 @@ _ CMD_TARGET_FIND_ALTAR
^L CMD_TARGET_TOGGLE_MLIST (non-Tiles only)
p CMD_TARGET_PREV_TARGET
f, t CMD_TARGET_MAYBE_PREV_TARGET
-- CMD_TARGET_CYCLE_BACK},
+- CMD_TARGET_CYCLE_BACK,
+, = CMD_TARGET_CYCLE_FORWARD
/ CMD_TARGET_OBJ_CYCLE_BACK
*, ' CMD_TARGET_OBJ_CYCLE_FORWARD
@@ -217,3 +219,8 @@ s CMD_TARGET_WIZARD_MAKE_SHOUT
w CMD_TARGET_WIZARD_PATHFIND
F CMD_TARGET_WIZARD_MAKE_FRIENDLY
P CMD_TARGET_WIZARD_BLESS_MONSTER
+G CMD_TARGET_WIZARD_GAIN_LEVEL
+M CMD_TARGET_WIZARD_MISCAST
+S CMD_TARGET_WIZARD_MAKE_SUMMONED
+~ CMD_TARGET_WIZARD_POLYMORPH
+T CMD_MAP_WIZARD_TELEPORT
diff --git a/crawl-ref/settings/034_command_keys.txt b/crawl-ref/settings/034_command_keys.txt
index d80c7027f5..0f9d7b4793 100644
--- a/crawl-ref/settings/034_command_keys.txt
+++ b/crawl-ref/settings/034_command_keys.txt
@@ -1,4 +1,4 @@
-# This file keybinds for using 0.3.4 command keys instead of the
+# This file keybinds for using 0.3.4 command keys instead of the
# new set from 0.4.
# If you want to use it, add the following line to your init.txt:
@@ -7,6 +7,8 @@
# Note that the 'v'iew item command is not available anymore. You can
# get the same functionality by pressing the item slot while looking at
# you inventory.
+# For a full list of all game commands (CMD_xxx) and their default keys,
+# see docs/keybind.txt.
bindkey = [^I] CMD_ANNOTATE_LEVEL
bindkey = [^O] CMD_EXPLORE
diff --git a/crawl-ref/source/dat/descript/monsters.txt b/crawl-ref/source/dat/descript/monsters.txt
index dc4af60fa4..fbe80dec0e 100644
--- a/crawl-ref/source/dat/descript/monsters.txt
+++ b/crawl-ref/source/dat/descript/monsters.txt
@@ -250,7 +250,7 @@ A fair-haired mage, wandering and seemingly half-mad with grief and guilt.
%%%%
Roxanne
-A beautiful sapphire statue of a famous earth mage who disappeared after a catastrophic spell failure.
+A beautiful sapphire statue of a famous earth mage who disappeared after a catastrophic spell failure. It is clutching a book.
%%%%
Rupert
@@ -277,7 +277,7 @@ Sigmund
And the song, and the tinkling of harp-strings to the roof-tree winded up;
And Sigmund was dreamy with wine and the wearing of many a year;
- And the noise and the glee of the people as the sound of the wild woods were
+ And the noise and the glee of the people as the sound of the wild woods were
And the blossoming boughs of the Branstock were the wild trees waving about;
So he said: 'Well seen, my fosterling; let the lip then strain it out.'"
@@ -574,7 +574,7 @@ A huge grey slug with folds of wrinkled skin.
%%%%
elf
-One of the race of elves which inhabits this dreary cave.
+One of the race of elves which inhabits this dreary cave.
%%%%
ettin
@@ -719,7 +719,7 @@ A huge wrinkled brain, floating just off the floor. Every now and then it seems
%%%%
giant slug
-A huge and disgusting gastropod.
+A huge and disgusting gastropod.
%%%%
giant snail
diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 0b6e03a389..ca5bdda264 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -248,6 +248,9 @@ toenail_golem MONS_TOENAIL_GOLEM
wood_golem MONS_WOOD_GOLEM
## Statues (also '8')
+%sdir dc-mon/unique
+roxanne MONS_ROXANNE
+%sdir dc-mon
ice_statue ICE_STATUE
silver_statue SILVER_STATUE
orange_crystal_statue ORANGE_CRYSTAL_STATUE
@@ -265,6 +268,7 @@ donald MONS_DONALD
duane MONS_DUANE
edmund MONS_EDMUND
erica MONS_ERICA
+eustachio MONS_EUSTACHIO
frances MONS_FRANCES
francis MONS_FRANCIS
frederick MONS_FREDERICK
diff --git a/crawl-ref/source/rltiles/dc-mon/unique/eustachio.png b/crawl-ref/source/rltiles/dc-mon/unique/eustachio.png
new file mode 100644
index 0000000000..8f91aac995
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/unique/eustachio.png
Binary files differ
diff --git a/crawl-ref/source/rltiles/dc-mon/unique/roxanne.png b/crawl-ref/source/rltiles/dc-mon/unique/roxanne.png
new file mode 100644
index 0000000000..0c006ca206
--- /dev/null
+++ b/crawl-ref/source/rltiles/dc-mon/unique/roxanne.png
Binary files differ
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index b6d51aa45b..5375abb605 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -912,7 +912,7 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
case MONS_MURRAY:
return TILEP_MONS_MURRAY;
case MONS_ROXANNE:
- return TILEP_ICE_STATUE; // TODO enne
+ return TILEP_MONS_ROXANNE;
case MONS_SONJA:
return TILEP_MONS_KOBOLD; // TODO enne
case MONS_AZRAEL:
@@ -987,7 +987,7 @@ static int _tileidx_monster_base(const monsters *mon, bool detected)
case MONS_MARGERY:
return TILEP_MONS_MARGERY;
case MONS_EUSTACHIO:
- return TILEP_MONS_HUMAN; // TODO enne
+ return TILEP_MONS_EUSTACHIO;
// unique major demons ('&')
case MONS_MNOLEG:
generated by cgit v1.2.3-54-g00ecf (git 2.45.0) at 2024-05-19 12:24:50 +0000