-------------------------------------------------------------------------------- 7d9e569 | gammafunk | 2020-01-23 20:53:26 -0600 Fix a vault NSUBST (riverfiend) The Zot definition for the 2 glyphs was missing a comma, which made it place unwanted features and messed up the loot placement there. Also reformat a couple other NSUBST in this vault to have a consistent style. -------------------------------------------------------------------------------- 0e000e8 | Alan Malloy | 2020-01-23 11:19:39 -0800 Fix a custom meatsprint monster's spell list (p0a) -------------------------------------------------------------------------------- 80bd347 | gammafunk | 2020-01-19 02:23:42 -0600 Add an aliveness check for LRDing a monster Don't let LRD attempt to fragment using a dead monster as the source. This probably could not arise in practice, as currently nothing can trigger an LRD on a monster that has already died. Still, if the monster at the target is dead, we should ensure that any appropriate terrain at the location is used as the LRD source instead. Also ensure that no god conducts are applied for LRD happening at a dead monster's location. -------------------------------------------------------------------------------- c46a48d | gammafunk | 2020-01-19 02:23:10 -0600 Remove a redundant application of god conducts Airstrike applied god conducts twice, once in cast_airstrike() and once in _player_hurt_monster(); let the latter handle any conducts. -------------------------------------------------------------------------------- 1567df3 | gammafunk | 2020-01-19 02:22:10 -0600 Refactor a player spell damage function It's easier to understand if we let monster::hurt() do death cleanup and only do cleanup in _player_hurt_monster() for the exceptional case where no damage was done. Also document our requirement that a monster be alive if we're handling god conducts in this function. -------------------------------------------------------------------------------- 1657e52 | gammafunk | 2020-01-19 01:20:16 -0600 Restore cloud/conduct changes and fix a crash The application of conducts for cloud placement in d5a9e69a didn't include a check that the target monster is alive. Effects like immolation can place a cloud when a monster dies, triggering an assert. Add an aliveness check before applying any conducts. A cloud can't harm a monster if it's already dead (in the HP sense), after all. This restores commits d5a9e69a through 7650d0de. -------------------------------------------------------------------------------- 1cc7eeb | Alan Malloy | 2020-01-17 11:10:42 -0800 Revert cloud/conduct changes They were causing crashes with inner fire This reverts commits d5a9e69a through 7650d0de. -------------------------------------------------------------------------------- 7650d0d | gammafunk | 2020-01-16 23:21:27 -0600 Add attack prompts for Ring of Flames and Tornado With da09f83f, these spells respects god conducts when placing clouds that harm allies or attack from a sanctuary. Ring of Flames had no attack warning at all, and Tornado had one that warned about harming allies, but made no mention of penance. This commit gives both spells attack warnings that includes any relevant mention of penance. -------------------------------------------------------------------------------- 9db6740 | gammafunk | 2020-01-16 23:21:16 -0600 Remove an unnecessary scope -------------------------------------------------------------------------------- 4be4e3a | gammafunk | 2020-01-16 23:16:00 -0600 Document some cloud functions -------------------------------------------------------------------------------- d5a9e69 | gammafunk | 2020-01-16 23:16:00 -0600 Apply god conducts when placing clouds Currently most damaging cloud spells don't apply god conducts for attacking allies (Okawaru and the good gods) or attacking while in Zin's sanctuary. The UI does warn the player about penance in some cases (Freezing Cloud, Poisonous Vapours) but not all (Ring of Flames, Tornado), and in nearly all cases the conduct is not actually applied after any attack. This commit puts conduct tracking in the place_cloud() function, which is used by all spells to place clouds. This properly considers whether the target is actually affected by a damaging cloud. Ice beasts are immune to freezing clouds, for example, so placing one on an ice beast gives no warning and causes no penance. The existing conduct warning and application code already correctly ignores conjured or "object" monsters made by player conjuration spells. -------------------------------------------------------------------------------- da09f83 | gammafunk | 2020-01-16 23:15:47 -0600 Refactor conducts for Zin's sanctuary Before this commit, any code that applied god conducts had to make its own additional checks for sanctuary violations and potentially call remove_sanctuary(). This commit moves this handling into set_attack_conduct() and the god_conduct_trigger class so that separate sanctuary checks aren't necessary. Technical note about Toxic Radiance and #999: A comment noted that the god conduct had to be applied before any toxic radiance damage in order to properly apply conducts for monsters killed the turn the spell is cast, but this was not true as of the current code. A unique_ptr in the trigger holds a monster object that has the properties of the original monster copied by value before any damage is made; any victim data necessary to apply the conduct is hence still available. -------------------------------------------------------------------------------- 719d992 | Emily | 2020-01-17 03:42:34 +0000 Remove the per-weapon-type vorpal brand adjectives These mostly served to confuse players and hide the relation between the vorpal brands. -------------------------------------------------------------------------------- 3b4b6a4 | Alan Malloy | 2020-01-13 10:59:40 -0800 Bah, humbug! Christmas is over (Goratrix) Revert "Changing 'slaying song' to 'sleighing song'" This reverts commit 5f8687bca5ed173a039bdfd0014589c418b5cf6d. -------------------------------------------------------------------------------- 1430e7d | gammafunk | 2020-01-13 10:28:01 -0600 Improve the cone of clouds targeter Previously this targeter didn't indicate when a square would be unaffected by the wand due to presence of an existing cloud or due to Zin's Sanctuary. Now only squares that would actually receive a cloud are highlighted. Ideally this targeter would prevent accepting a target when no squares would be affected, but this will take a bit of rewriting to do properly. This wand probably should not use the shotgun targeter at all, since it doesn't actually use the concept of multiple beams firing like the wand of scattershot does. -------------------------------------------------------------------------------- cdfab47 | gammafunk | 2020-01-13 10:28:01 -0600 Disallow targeting a cloud spell to a sanctuary Zin sanctuaries prevent clouds from placing at all, but currently the game lets you waste a turn casting e.g. Freezing Cloud even when you target a sanctuary square that would create no clouds at all. Although we could let the targeter choose a sanctuary square if it would create at least one cloud out of the sanctuary, it's more consistent with the spell's current behaviour to disallow this. Freezing cloud refuses to target a square with an existing cloud regardless of whether empty squares are adjacent to it, for example. This commit prevents the player from targeting sanctuary squares and gives a message to that effect in the targeter. -------------------------------------------------------------------------------- 53dbb63 | Seve Monahan | 2020-01-12 16:08:06 -0600 Don't create random 0 byte files when running catch2-tests -------------------------------------------------------------------------------- 96e9fc7 | Seve Monahan | 2020-01-12 15:09:27 -0600 Checkwhite -------------------------------------------------------------------------------- e97b98a | Seve Monahan | 2020-01-12 13:57:44 -0600 Remove some support rough black scales mutation. This mutation was removed around four years ago, I am OK with somebody trying to use a save from that long ago losing some AC for their trouble. -------------------------------------------------------------------------------- 508b930 | Seve Monahan | 2020-01-12 13:52:44 -0600 Refactor player::base_ac some -------------------------------------------------------------------------------- 4db4e4f | Seve Monahan | 2020-01-12 13:51:30 -0600 Create a test fixture which creates a mock player you. Ignore the odd discussion of refactoring base_ac in the comments, it's coming in the next commit. -------------------------------------------------------------------------------- e02885a | Edgar A. Bering IV | 2020-01-12 10:35:05 -0700 Tone down the new swamp ending Specifically, remove spectral and simulacrum Learnean variants and ghouls. Reduce monster density at high-rolls and reduce monster variance. -------------------------------------------------------------------------------- c1b5a34 | Alan Malloy | 2020-01-09 13:24:14 -0800 Don't crash when failing to acquire an item At least one way this could happen is when trying to create a manual while all your skills are at 27. -------------------------------------------------------------------------------- 49d089a | Edgar A. Bering IV | 2020-01-08 11:01:57 -0700 Re-enter acquirement selection after a HUP a0cd47f incorrectly included the code that made this change. This commit is to point that fact out for posterity. [skip-ci] -------------------------------------------------------------------------------- a0cd47f | Edgar A. Bering IV | 2020-01-08 11:00:11 -0700 Display appropriate capitals for easy_confirm = none In shopping and acquirement confirmation prompts, which use yesno and so respect easy_confirm but write their own prompts, the easy_confirm = none user was not reminded to use capitals. -------------------------------------------------------------------------------- 35c6a73 | Edgar A. Bering IV | 2020-01-08 10:04:20 -0700 Re-enter Stack Five ordering after a HUP -------------------------------------------------------------------------------- d3051d0 | Edgar A. Bering IV | 2020-01-08 09:31:37 -0700 Display drawn cards immediately when re-entering Stack Five When returning to the uncancelable Stack Five after a HUP the previously drawn cards were not immediately displayed, only after another draw. -------------------------------------------------------------------------------- cf1075a | gammafunk | 2020-01-07 22:00:50 -0600 Remove an unused Lab timer effect Labs no longer exist. Set up removal upon update to next major version tag. -------------------------------------------------------------------------------- 1920f1a | gammafunk | 2020-01-07 16:23:03 -0600 Remove an unused private field (geekosaur) -------------------------------------------------------------------------------- fa5a36f | Edgar A. Bering IV | 2020-01-07 14:49:55 -0700 Allow monsters to cast Leda's while flying and remove dead code Currently only player ghosts have Leda's; this is more about removing an otherwise unused function. -------------------------------------------------------------------------------- 9cef9eb | Kate | 2020-01-07 21:26:40 +0000 Allow Leda's to persist while flying When cast by the player - being stuck in hostile Leda's will still prevent flight. -------------------------------------------------------------------------------- 3fbb973 | Kate | 2020-01-07 20:59:45 +0000 Rename a function for clarity Since it's not just used for silence. -------------------------------------------------------------------------------- 97f579c | Kate | 2020-01-07 20:36:16 +0000 Make a local function static -------------------------------------------------------------------------------- 28aa74e | Edgar A. Bering IV | 2020-01-07 12:29:09 -0700 Have Confusing Touch check MR instead of HD As a Hex this spell should be checking the magic resistance mechanic. Dazzling Flash keeps its HD check with its dual school nature. This also increases the power cap to be more in line with being a level 3 spell. -------------------------------------------------------------------------------- 61946d8 | Edgar A. Bering IV | 2020-01-07 12:29:09 -0700 Raise Confusing Touch to level 3, Remove Confuse Confusing Touch was absurdly powerful at Level 1; Confuse also is quite strong at Level 3. Of the two ways of applying confusion, confusing touch is the more interesting one, so that effect stays at level 3 (replacing Confuse in all relevant books). Corona replaces confusing touch in the book of Cantrips. -------------------------------------------------------------------------------- c98b7b2 | Edgar A. Bering IV | 2020-01-07 12:29:09 -0700 Return Dispel Undead to level 4 Unlike Agony, which deals damage scaling with the target's HP, Dispel Undead is a normal dice roll. With its melee range restriction, Level 5 is no longer appropriate. -------------------------------------------------------------------------------- 67d9bde | Edgar A. Bering IV | 2020-01-07 12:29:09 -0700 Remove the range-dependence from Dazzling Flash The range dependence made the spell harder to reason about for little payoff, and the spell is too weak with it. -------------------------------------------------------------------------------- bb9abfc | Edgar A. Bering IV | 2020-01-07 09:51:31 -0700 Buff Leda's Liquefication Make the caster immune to the maluses imposed by liquefied ground. This goes all the way back to the introduction of the spell in 2010, and the justification given then was simulationist. Hexes are intended to support other combat styles, but the attack fumbling and slow movement penalties meant that Leda's made little sense for any archetype and as a result the spell was little-used. The shrinking radius and re-cast delay imposed by the radius 0 period should provide sufficient buffer against aggressive kiting strategies with the spell; if this proves incorrect the movement penalty can be restored (without the fumble penalty). -------------------------------------------------------------------------------- 41a7e55 | gammafunk | 2020-01-06 22:22:31 -0600 Fix felid acquirement (alexjurkiewicz) We were assuming there would be 3 classes that aren't food or gold to draw from, but felids now only have two of those. -------------------------------------------------------------------------------- 3ac56c6 | Edgar A. Bering IV | 2020-01-06 20:24:16 -0700 Add the join god screen revisions to webtiles fd4a3aefb759 implemented these UI changes but did not include the changes in webtiles. -------------------------------------------------------------------------------- 90aa2f6 | gammafunk | 2020-01-06 20:29:52 -0600 Remove the miscellaneous acquirement category This category gifts evocable items, most of which are consumable. These gifts are harder to balance relative to equipment and spells, since each type of consumable accumulates without limit for each type. Gold acquirement already covers "consumable acquirement" through shops, which are limited by dungeon generation (nerf Gozag imo). Although players should have acquired misc often due to how reliably the category gives a useful item, it remained relatively unpopular, making it an easy target for removal. -------------------------------------------------------------------------------- 148af02 | gammafunk | 2020-01-06 20:29:52 -0600 Rework the scroll of acquirement Scrolls of acquirement are spoilery items. It benefits the player know internal game logic in order to make a decision on which choice is the most likely to give a desirable acquirement. This logic isn't something we'd like to display in-game. While some acquirement logic could be simplified to reduce the amount of spoilers, it's probably not feasible to fully do this as long as acquirement uses the player character's data to affect item generation. This commit mostly removes acquirement spoilers by having the scroll present a set of fully generated items as choices instead of asking for a choice of item categories. Reading an acquirement scroll opens a popup menu presenting 5 generated items: * It always generates food and gold acquirement item. * For the remaining three items, it chooses three categories without replacement from the six available. * Each randomly chosen category has an equal chance of being chosen. * The menu has a toggle between selection and inspection, to allow showing the detailed view of generated items. * Because of the toggle, it confirms any selection in selection mode. * The menu is uncancellable to prevent problems with unrand item generation. More detailed wiki writeup https://github.com/crawl/crawl/wiki/Acquirement-Reform Technical notes: The old acquirement() function that handled both interactive and non-interactive requirement is gone, with non-interactive instances having been moved to use acquirement_create_item() in a previous commit. The new acquirement_menu() function uses an AcquireMenu class to build a menu based on a modified shop menu. The scroll generates the items and stores them in a player prop. These remain and repopulate the menu until the player actually selects an item, so it works properly across HUPs. -------------------------------------------------------------------------------- 4094881 | gammafunk | 2020-01-06 20:29:52 -0600 Refactor some calls to acquirement Since the acquirement scroll interface will be rewritten in a subsequent commit, we don't want to use the same function for interactive and non-interactive acquirement. Have various instances of god acquirement gifts call acquirement_create_item() directly, as this function does all the callers need with a simple interface. -------------------------------------------------------------------------------- bb2a68f | gammafunk | 2020-01-06 20:29:52 -0600 Fully use a function parameter -------------------------------------------------------------------------------- f734a50 | Byrel Mitchell | 2020-01-06 19:21:49 -0700 Enchant Wyrmbane for Maggie/Margery Since, in young form, she's killed a dragon; and in older form killed at least two. [ Committer's note: reworded commit message, set force_item. Closes #1255 ] -------------------------------------------------------------------------------- 9ac4296 | Seve Monahan | 2020-01-06 19:18:55 -0600 Add a comment to branch-data.h -------------------------------------------------------------------------------- 91ddc7e | Seve Monahan | 2020-01-06 19:18:41 -0600 Refactor some code related to disabled (swap) branches. Creates a new file (ng-init-branches.cc) and a couple new test files. Some of the new tests are characterization tests which should probably be removed when somebody wants to actually change the behavior, but I'm leaving them in for now. -------------------------------------------------------------------------------- fd4a3ae | Edgar A. Bering IV | 2020-01-06 17:47:21 -0700 Refactor and streamline the join god screen (12160) First, this commit refactors the code to remove some gotos. Next, this enables one-key joining from the pray-at-altar screen by pressing J or Enter. (There is still a [Y]es/[N]o prompt for abandoning.) There's some concern that this behavior might lead to inadvertent conversion when using the G_ feature. However, G_ does not initiate prayer, the player must press > before seeing this screen. -------------------------------------------------------------------------------- d2ca0b7 | Edgar A. Bering IV | 2020-01-06 13:55:13 -0700 Allow casting BVC with shift+dir (12164) Now that BVC is bolt-like. -------------------------------------------------------------------------------- 5f064af | Edgar A. Bering IV | 2020-01-06 13:09:53 -0700 Respect quiet for flight checks (12171) -------------------------------------------------------------------------------- 9cab249 | Edgar A. Bering IV | 2020-01-06 11:58:23 -0700 Fix a crash in monster collisions (12156) -------------------------------------------------------------------------------- 04aae9b | Edgar A. Bering IV | 2020-01-06 11:24:32 -0700 Add attack strength punctuation to unrand effects -------------------------------------------------------------------------------- 1537728 | Edgar A. Bering IV | 2020-01-06 11:14:45 -0700 Add attack strength punctuation for staff damage -------------------------------------------------------------------------------- 45ab754 | Edgar A. Bering IV | 2020-01-06 11:05:49 -0700 Refactor staff damage application (12149) This ensures staff damage messaging occurs, fixing a bug. It also deduplicates code for actually inflicting staff special damage, and despaghetties the printing of the message. -------------------------------------------------------------------------------- a0877df | Seve Monahan | 2020-01-06 10:00:57 -0600 Give Maggie and Margery a 1% chance of carrying Wyrmbane This is another cute flavour nod to Margery being a dragonslayer. -------------------------------------------------------------------------------- 6c1ce5f | Seve Monahan | 2020-01-06 10:00:56 -0600 Tweak Maggie description to explain her dragon armour -------------------------------------------------------------------------------- 28ae719 | Seve Monahan | 2020-01-06 10:00:56 -0600 Adjust the armour Maggie and Margery spawn with. (hellmonk) Maggie now has a steam/acid/swamp dragon armour (which should be interesting in the games she spawns) while Margery has a shadow/storm/fire dragon armour (to distinguish her from Maggie). It might be worth reducing Maggie's weight some if this ends up warping the amount of dragon armour available to players. -------------------------------------------------------------------------------- 0b69049 | Seve Monahan | 2020-01-06 10:00:56 -0600 Adjust Maggie's range (hellmonk) -------------------------------------------------------------------------------- c4e65ce | Seve Monahan | 2020-01-06 10:00:56 -0600 Change Margery's weights This is intended to make Margery spawn approximately the same percentage of games as she did before Maggie was added. -------------------------------------------------------------------------------- 56651bb | Seve Monahan | 2020-01-06 10:00:55 -0600 New unique: "Maggie" This a test at a new story-telling technique for dcss: having multiple uniques which represent the same character. See here for the proposal: https://crawl.develz.org/tavern/viewtopic.php?f=8&t=26482 Flavorfully, this unique is a younger version of Margery. Mechanically, this unique is meant to be an early introduction to the Mesmerise spell. Maggie and Margery will not appear in the same game. The Maggie tile is just a Jessica palette swap. Hopefully it will be replaced with a superior tile later. The Maggie tile's palette is based on normal Margery. -------------------------------------------------------------------------------- 516bc45 | Aidan Holm | 2020-01-05 22:24:48 +0800 Fix crash on startup with map-generated messages This is a variation of the previously-fixed crash; turns out startup messages can be generated even earlier than I previously anticipated. -------------------------------------------------------------------------------- 7600c65 | Kate | 2020-01-04 15:31:03 +0000 Remove an unused parameter (geekosaur) -------------------------------------------------------------------------------- e76b031 | Edgar A. Bering IV | 2020-01-03 15:58:57 -0600 Don't trigger ball lightning and foxfire on firewood (pblur, 12154) -------------------------------------------------------------------------------- bb0aff5 | Edgar A. Bering IV | 2020-01-03 15:58:57 -0600 Prevent allies from swapping with foxfire (12153) -------------------------------------------------------------------------------- 90ccd6a | Nikolai Lavsky | 2020-01-03 15:26:12 -0600 Fix an information leak about Mara and rakshasa clones The player could use a scroll of immolation to find the real Mara, because the scroll doesn't affect summons. The Inner Flame spell has a similar problem. Also, when the original is behind a clone or another monster, the spell's targeter will happily inform the player that "You can't see any susceptible monsters within range!" This commit fixes that by making Mara and rakshasa clones inner-flameable. As a side effect, all other illusions - illusions created via a card, evocable, or monster spells - become inner-flameable too. -------------------------------------------------------------------------------- 519431e | Edgar A. Bering IV | 2020-01-03 11:41:38 -0600 Fedhas protects plants from Ignite Poison (12161) -------------------------------------------------------------------------------- 05e59b5 | Edgar A. Bering IV | 2020-01-03 11:15:56 -0600 Reveal floor traps when magic mapping (12167) The cause of 12167 is magic mapping stores extra info about the terrain type allowing it do distinguish tc_forbidden and tc_dangerous; alone this is not a bug, but it becomes a bug because traps share glyphs with floor, causing an information leak. There are three possible solutions: 1. Add a special case in _get_travel_colour() to not report that magic mapped trap cells are dangerous. 2. Add a new magic mapping feature/glyph pair for unidentified trap and report that. 3. Reveal floor traps when magic mapping. This commit takes soultion number 3; since traps are revealed it makes sense to treat them like other features (more like statues and doors than shops/altars). Approach 2, adding a feature DNGN_UNKNOWN_TRAP seems like it will also require a new trap type and some complications; the simplicity of approach 3 is why I favored it. -------------------------------------------------------------------------------- 9f54f11 | Kate | 2020-01-03 16:44:28 +0000 Fix spacing [skip ci] -------------------------------------------------------------------------------- 9e2f79d | Kate | 2020-01-03 16:44:28 +0000 Don't make Trog's Hand increase passive hunger rate It caused hunger while active in the same way that the regeneration spell did, but as an activated ability it makes more sense for the hunger to be an up-front cost (as with berserk), so just slightly increase its food cost instead. -------------------------------------------------------------------------------- 7e26dd5 | Emily | 2020-01-03 16:44:20 +0000 Remove the Regeneration spell This spell is one of the few that offers a pure buff without any meaningful downside at a relatively low level, and that is so universally useful as to be worth learning on any character that can cast it. It also duplicates a god ability (Trog's Hand). In light of these factors, it has been chosen as a sacrifice to the God of Removal. Agony takes its place in the Book of Necromancy (making the book single-school), while the Book of Battle receives Ozocubu's Armour as a replacement defensive buff. -------------------------------------------------------------------------------- 7c9d860 | Kate | 2020-01-02 18:41:53 +0000 Add a cast message for harpoon shot (#11454) -------------------------------------------------------------------------------- 1045be4 | Kate | 2020-01-02 18:20:30 +0000 Add descriptions for ranged Agony/Dispel Undead (#12148) -------------------------------------------------------------------------------- 148cd44 | Kate | 2020-01-02 16:00:55 +0000 Fix inner flame messages displaying out of LOS (#12168) -------------------------------------------------------------------------------- ed6d547 | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Improve gcovr arguments Don't try and re-use gcov data between runs, the way gcov files automatically get merged could lead to some very confusing results. This approach is slow, but more reliable. Also ignore a bunch of machine-generated source files which otherwise generate errors. -------------------------------------------------------------------------------- 386efcf | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Don't clean gcno files with make clean-coverage These coverage-related files are generating during debug compilation, so treat them like .o files and only delete with `make clean`. -------------------------------------------------------------------------------- 340c395 | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Improve coverage documentation -------------------------------------------------------------------------------- ca889fb | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Use gcovr preferentially over genhtml -------------------------------------------------------------------------------- 10fadfe | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Improve catch2 test compilation Don't relink the binary if it's not strictly necessary. -------------------------------------------------------------------------------- f682754 | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Remove trailing whitespace -------------------------------------------------------------------------------- 81cf26a | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Add code coverage tracking Supports both GCC and LLVM toolchains. Bluffer's guide: 1. make catch2-tests 2. util/coverage More explanation has been added to testing.md (which reworks testing.txt) and `util/coverage --help`. -------------------------------------------------------------------------------- 140ab78 | Kate | 2019-12-30 15:33:25 +0000 Fix Trog being unable to gift artefacts (#12159) But restrict them to the same brand set as non-artefacts. Also prevent gifting the staff of Olgreb (since other unrand enhancer staves are disallowed), and unrand weapons of pain such as Morg. Other unrands can currently still be gifted regardless of brand. -------------------------------------------------------------------------------- a29699c | Aidan Holm | 2019-12-30 22:55:27 +0800 Prevent entering excluded area from stair exclusion -------------------------------------------------------------------------------- 2677940 | Aidan Holm | 2019-12-30 22:46:00 +0800 Update tiles every turn, not every refresh (12144) The main change here is the conditional increment of you.frame_no, but there's also an additional `mon_id` parameter to tileids_monster_base, which is only used as an additional input to randomize the tile; it should be something that identifies the monster across frames, but not necessarily across turns; a coord_def is fine. The purpose of this is to vary the chosen tile if there are multiple monsters of the same type on the screen. -------------------------------------------------------------------------------- 44e4e85 | Aidan Holm | 2019-12-30 21:44:42 +0800 Fix crash on load if level had exclusions d626285191 introduced a crash for saves with exclusions on the current level; messages were processed before the message window was given a size, due to do_layout exiting early. The root issue is that the message window requires the window size to be ready when printing with mpr(). This adds unnecessary coupling between messaging and with screen rendering. The message code should just store messages into a ring buffer, and the message window should display that ring buffer. -------------------------------------------------------------------------------- d85ed34 | Aidan Holm | 2019-12-30 20:51:47 +0800 Fix excluded stairs not being cycled through (12166) This happened because excluded stairs do not exclude their tile, but instead prevent traversal, so travel_point_distance was not set to PD_EXCLUDED. -------------------------------------------------------------------------------- 6f074c8 | Aidan Holm | 2019-12-29 15:59:25 +0800 Fix draconians always being mottled at xl 7 -------------------------------------------------------------------------------- a1faa16 | Seve Monahan | 2019-12-28 23:47:37 -0600 Suppress a compiler warning (libw32c.cc) -------------------------------------------------------------------------------- b37b713 | advil | 2019-12-27 18:52:22 -0500 Revert "Remove Yak player species" This reverts commit e4dd1522aaec2eab40eb9aec1633f407cf286207. -------------------------------------------------------------------------------- e4dd152 | Aidan Holm | 2019-12-27 20:26:08 +0800 Remove Yak player species Hopefully all of the crashes are out, but in any case not having this unsightly fallback species data should make unsound code easier to find (aka much crashier). -------------------------------------------------------------------------------- d626285 | Aidan Holm | 2019-12-27 20:26:08 +0800 Don't do_layout if player isn't loaded The local tiles UI (at least) accesses the player species during layout. This commit simply stops all layout until the player species is loaded, so layout will happen on the main menu after the player loads and saves a game. Layout will also happen in the arena, since the arena sets the player species to human. -------------------------------------------------------------------------------- bc038bb | Aidan Holm | 2019-12-27 20:26:08 +0800 Remove unnecessary make_hungry() call As far as I can see, this call does absolutely nothing. It makes no change to the hunger state and doesn't trigger a message, nor does it initialize a "previous hunger state" variable. Removing because it references the player (you_foodless()) during startup. -------------------------------------------------------------------------------- 168f80a | Aidan Holm | 2019-12-27 20:26:08 +0800 Avoid checking player species during startup mons_genus() will check the player species if given a player illusion, to see if the player is a draconian. Since we only care about statues, we can just look at the monster data genus directly. -------------------------------------------------------------------------------- 0fa9f10 | Aidan Holm | 2019-12-27 20:26:08 +0800 Skip checking threat level for MILEV_NAME As best as I can tell, this MILEV thing is an optimization, where parts of the monster_info will not be filled out if not required. Monster names are calculated during game initialization, and at this point the player struct (you) is invalid; currently this points to the Yak entry, but we're trying to remove that. In general, this is kind of weird. I think it'd be preferable if the monster class did name calculation (since I don't see how that can possibly vary depending on player knowledge), with monster_info deferring to monster. There's some similar things like color() with MILEV_NAME that should also really be moved. -------------------------------------------------------------------------------- 3eb5a02 | Aidan Holm | 2019-12-27 20:26:08 +0800 Split Clua::init_lua() This commit allows Clua instances to not load most of the stuff that clua and dlua load. This commit also inlines load_cmacro() and load_chooks(), since these functions were not descriptive of what the code actually did. -------------------------------------------------------------------------------- 14707fc | Aidan Holm | 2019-12-27 20:25:48 +0800 Refactor species JSON dumping This commit changes the output data slightly; the base draconian entry is moved after the derived types' entries, due to the underlying enum ordering. -------------------------------------------------------------------------------- 41b2ec9 | Aidan Holm | 2019-12-27 20:24:37 +0800 Factor out NUM_SPECIES, NUM_JOBS This commit removes coupling with the underlying enums by using the playable/all species/job functions instead. -------------------------------------------------------------------------------- 5dae2b7 | Aidan Holm | 2019-12-27 20:24:37 +0800 Add job_is_removed() -------------------------------------------------------------------------------- e160d0f | Aidan Holm | 2019-12-27 20:24:37 +0800 Add all_species() There is no corresponding all_jobs() function, since it would return the same results as playable_jobs(); that is, all jobs are playable. -------------------------------------------------------------------------------- ab48cecf | Aidan Holm | 2019-12-27 20:24:37 +0800 Refactor out is_good_combination() This helper function just wasn't really doing much. The new code also uses playable_species() directly instead of iterating over the underlying enum, which is much better for encapsulation. Todo: CC_UNRESTRICTED should probably be called CC_RECOMMENDED. -------------------------------------------------------------------------------- e792f88 | Aidan Holm | 2019-12-27 20:24:37 +0800 Add species_type_valid(), job_type_valid() Fairly straightforward; the idea here is to encapsulate the process of checking species_type/job_type validity. We lose reporting of the exact invalid value in tags.cc, but it's not as if that's terribly useful information in the first place. -------------------------------------------------------------------------------- b09b68f | Aidan Holm | 2019-12-27 20:24:37 +0800 Refactor _resolve_species() and _resolve_job() This code is still pretty wonky, but hopefully this change makes it somewhat more readable. -------------------------------------------------------------------------------- 235a6da | Aidan Holm | 2019-12-27 20:24:37 +0800 Fix CLua::execfile() showing the wrong error message Previously it would always show the error message for a hard-coded global CLua instance, not the current instance. -------------------------------------------------------------------------------- 00b82ea | Aidan Holm | 2019-12-27 20:24:37 +0800 Replace CL_RESETSTACK_RETURN with lua_stack_cleaner lua_stack_cleaner is a much better idiom for doing this; less typing, less reasoning about macro substitution, and much harder to get wrong. -------------------------------------------------------------------------------- 03d1ba0 | Aidan Holm | 2019-12-27 20:23:33 +0800 Fix space not showing god join prompt on webtiles (Yermak) -------------------------------------------------------------------------------- 3677130 | gammafunk | 2019-12-26 21:29:51 -0600 An Abyss-themed transporter ghost vault The ghost of a poor adventurer who got banished and managed to escape from the abyss, only to die to some horrors they brought through the gate. Monsters are a variety of abyss spawns that include abyss-only natives as well as monsters that also spawn in connected branches. The nastiest spawns are equivalent to an 8 spawn, but scale up in placement slowly and are appropriate 8-level difficulty for the branch of vault placement. As the source of the ghost's banishment, the vault places a monster wielding a distortion weapon, or in the case of Spider, a Zot trap or two. There is a guaranteed loot item with translocations or Lugonu theme, and the monster and loot counts scale up with placement depth. Places in all ghost-viable branches save Vaults, until we can fix transporter placement in that branch. -------------------------------------------------------------------------------- b629ede | gammafunk | 2019-12-26 21:25:12 -0600 Generalize some ghost vault monster weapon lua Use lua tables of monster weapons and weights instead of a series of conditionals. Make a function that can be used by any ghost vault wanting to set up weapons using these weapon sets. -------------------------------------------------------------------------------- 60aa035 | Kate | 2019-12-26 23:30:21 +0000 Make friendly foxfire dissipate when swapped into by the player Instead of giving frequent warning prompts. -------------------------------------------------------------------------------- 207b656 | Kate | 2019-12-26 23:30:21 +0000 Fix messaging inconsistencies when reflecting projectiles For consistency with beam reflection messages, and to use the pronouns of the monster doing the reflecting, rather than the pronouns of the projectile. -------------------------------------------------------------------------------- 446fb84 | Kate | 2019-12-26 23:30:21 +0000 Fix some crawlcode -------------------------------------------------------------------------------- 5f8687b | Brendan Hickey | 2019-12-24 20:15:22 -0500 Changing 'slaying song' to 'sleighing song' -------------------------------------------------------------------------------- d28d56f | Seve Monahan | 2019-12-23 23:43:50 -0600 Mention catch2 macro problems in platform.h comment -------------------------------------------------------------------------------- 1d56166 | Alex Jurkiewicz | 2019-12-23 23:07:37 -0600 Fix macOS OS detection with catch2 Catch2 erroneously defines TARGET_CPU_ARM on macOS, which causes platform.h to mis-detect the target OS as Nintendo DS. Fix this by changing the order of OS detection. There are a couple of alternate approaches for this fix: * Fix Catch2 so that TARGET_CPU_ARM (and possibly other TARGET_CPU_* defines) is not erroneously defined on macOS * Remove Nintendo DS support from the project -------------------------------------------------------------------------------- e4868ce | Seve Monahan | 2019-12-23 11:17:13 -0600 Revert "Test whether travis-ci can detect failing catch2 tests" Test was successful, travis-ci reported the error. This reverts commit 9aa3435fcc3cbed86b065d4cce91ea0505110db5. -------------------------------------------------------------------------------- 9aa3435 | Seve Monahan | 2019-12-23 00:24:57 -0600 Test whether travis-ci can detect failing catch2 tests -------------------------------------------------------------------------------- 5769b18 | Seve Monahan | 2019-12-22 23:17:05 -0600 Add automatic catch2 tests to travis-ci builds -------------------------------------------------------------------------------- a901c2c | Seve Monahan | 2019-12-22 22:45:04 -0600 Integrate catch2 testing framework into crawl. In order to compile and run the catch2 tests, use the "make catch2-tests" command. If you want to see an example test file, look at catch2-tests/test_english.cc. It should be possible to test any leaf functions in crawl just by copying that file and making minor changes. Future work: For some reason whenever I try to change the names of the test files from using underscores to using dashes, I get a "No such file or directory" error for pty.h (util/fake_pty.c:5:12, which #includes ). Note I am using the current way of compiling on Windows suggested in INSTALL.txt. It would be good to fix whatever is causing this so the test files can use dashes to separate words like most crawl files. Travis ci should be configured to verify the catch2 tests are working at the same time it compiles. This should be pretty easy - it just needs to run the "make catch2-tests" command and verify that command exits without an error. It would be good to eventually create a way of faking some globals to enable easier testing - player you is a big offender. -------------------------------------------------------------------------------- 60f0ac2 | Seve Monahan | 2019-12-22 11:20:55 -0600 New function in includes.sh: checkcc -------------------------------------------------------------------------------- e4380fb | Aidan Holm | 2019-12-22 19:30:39 +0800 Also clear main menu name on space (#12157) -------------------------------------------------------------------------------- eac7954 | Byrel Mitchell | 2019-12-20 18:28:28 -0700 Change player tile to use multiple levels of poison Follows the same breakpoints as the color of the 'Pois' status indicator. -------------------------------------------------------------------------------- ae7c9bc | Umer Shaikh | 2019-12-20 19:57:39 -0500 Fix dancing weapon headsup messages (hittemvvvhard) Commit 7046ed1b expanded the conditions under which headsup messages happen and how much information they give, but broke the special case of dancing weapons. The result was that when multiple enemies came into view the game tried to warn the player about an interesting dancing weapon with the unhelpful message 'There is .' This commit fixes that. -------------------------------------------------------------------------------- 3faca94 | Seve Monahan | 2019-12-20 01:44:35 -0600 Remove a few more redundant #includes Does contain some massaging to reduce the net number of includes, such as accessing the same program constructs with different #includes -------------------------------------------------------------------------------- 0164aa5 | Seve Monahan | 2019-12-19 23:12:24 -0600 Remove redundant #includes from player-reacts.cc Split off from previous commit due to a slight bit of complexity: player-reacts.cc needed access to artefact.h, which was being included transitively through melee-attack.h (melee-attack.h #includes attack.h, which in turn #includes artefact.h). So we now #include artefact.h instead of melee-attack.h in player-reacts.cc. -------------------------------------------------------------------------------- e0ea79d | Seve Monahan | 2019-12-19 23:12:15 -0600 Remove more redundant #includes -------------------------------------------------------------------------------- 1f6dc26 | Seve Monahan | 2019-12-19 23:11:08 -0600 Add a new function to util/includes.sh The new function, checkafter, allows you to effectively "restart" a cancelled or frozen run of the checkall function. -------------------------------------------------------------------------------- 9f75867 | Seve Monahan | 2019-12-19 12:16:27 -0600 Remove unused variable (libw32c.cc) -------------------------------------------------------------------------------- 8baffb9 | Seve Monahan | 2019-12-19 10:55:59 -0600 Move some #includes from artefact.cc -> art-func.h (Fixed version) These #includes were used only in art-func.h and therefore should be included from art-func.h Found with util/includes.sh This commit has an identical diff to commit ba943c654d. ba943c654d was reverted out of caution when the build started failing, but the fault was in a different commit pushed at the same time. -------------------------------------------------------------------------------- 6aab8bd | Seve Monahan | 2019-12-19 10:52:40 -0600 Remove a bunch of redundant #includes (Fixed version) These were found with util/includes.sh. I didn't finish checking all headers for redundant inclusion due to the huge amount of time it takes util/includes.sh to run, so expect another similar commit in the near future. If you're planning to use util/includes.sh to find the remaining redundant includes: the next header I was about to check for unnecessary inclusion was initfile.h. I finished checking all header files which appear before initfile.h in alphabetical order. This is a revised version of b2f3ebf68f2 which has been tested against the tiles builds. -------------------------------------------------------------------------------- ced51cc | Seve Monahan | 2019-12-19 00:55:43 -0600 Revert commits which broke the tile builds Accidentally broken in ba943c6 or b2f3ebf. Attempted to revert both, but messed up again and just polluted the history. -------------------------------------------------------------------------------- 6bd3a3e | Seve Monahan | 2019-12-19 00:42:40 -0600 Revert "Revert "Remove a bunch of redundant #includes"" This reverts commit 18b4d129d3da0dd7cf5b1d3f398c359d72baef40. Somehow slipped my mind to check the tiles builds. Reverting both my most recent commits after travis-ci revealed the failure. -------------------------------------------------------------------------------- 18b4d12 | Seve Monahan | 2019-12-19 00:42:25 -0600 Revert "Remove a bunch of redundant #includes" This reverts commit b2f3ebf68f21b493f31f90f8d5e94d820562c764. -------------------------------------------------------------------------------- ba943c6 | Seve Monahan | 2019-12-19 00:12:08 -0600 Move some #includes from artefact.cc -> art-func.h These #includes were used only in art-func.h and therefore should be included from art-func.h Found with util/includes.sh -------------------------------------------------------------------------------- b2f3ebf | Seve Monahan | 2019-12-19 00:11:34 -0600 Remove a bunch of redundant #includes These were found with util/includes.sh. I didn't finish checking all headers for redundant inclusion due to the huge amount of time it takes util/includes.sh to run, so expect another similar commit in the near future. If you're planning to use util/includes.sh to find the remaining redundant includes: the next header I was about to check for unnecessary inclusion was initfile.h. I finished checking all header files which appear before initfile.h in alphabetical order. -------------------------------------------------------------------------------- ea9b1ad | advil | 2019-12-15 15:12:20 -0500 Fix ally warning prompt for irradiate This prompt should trigger for monsters that are not protected by fedhas, rather than players that are not protected by fedhas. -------------------------------------------------------------------------------- e69d3d4 | advil | 2019-12-15 14:45:59 -0500 Focus arena text input widget automatically -------------------------------------------------------------------------------- aa31f04 | advil | 2019-12-14 17:33:00 -0500 Make fedhas_protects less likely to crash if player is in the mix This function was routinely called with *act->as_monster(), which is a fairly bad paradigm since player::as_monster() returns nullptr, and so a segfault was guaranteed of a protecting monster check is missed. As long as this is so, it is better for this function to take a monster pointer instead of reference. -------------------------------------------------------------------------------- 84510d0 | advil | 2019-12-14 17:09:31 -0500 Fix a missing ! -------------------------------------------------------------------------------- 4a1327e | Alan Malloy | 2019-12-12 18:38:33 -0800 Solidify grunt_spider_rune_circles There was a crack in the stone wall surrounding it -------------------------------------------------------------------------------- 406d636 | advil | 2019-12-12 17:26:08 -0500 Various improvements to seed selection This started just as an attempt to get the seed input dialog to be focused on game start, but that led to various other issues: * [enter] only begins the game when seed selection or the begin game button are selected. * ctrl-v now works for pasting. * the [enter] button is disabled when there is no valid seed (rather than acting like esc in that case) * full pregen button is reenabled offline, there is still demand. * hotkeys -, p, and d now work when the seed input box is focused. * hotkeys -, p, d now cause the seed input box to become focused. * a bug (I think) where hotkeys always preempt other events, even if their handler returns false, is fixed. (I could be misunderstanding the intent here, as this looked semi-purposeful -- but this doesn't seem like the behavior that would be intended.) * other formatting / wording tweaks. Main remaining issues that I know of: * clicking enter while - or d buttons are selected (via tab) in webtiles still starts the game if it can; in local tiles it does nothing. This seems to be because clicking on a button in webtiles doesn't change the focus. * in all platforms, hitting [esc] while anything is focused defocuses it. This is most weird in the seed input box, on tiles/webtiles, where players won't have been as likely to navigate the ui with keys, and so will be expecting [esc] to cancel. * webtiles could use some visual tweaking * if you hit esc from the species menus after seed selection, it returns to the main menu instead of seed selection. * It's posible this ui should give some clearer indication that entering 0 will actually start a different game type than anything else. -------------------------------------------------------------------------------- b773885 | advil | 2019-12-12 17:18:27 -0500 Fix (?) a race condition with ui state syncing When starting up the game and opening the seed selection dialog, the game fills in a seed and attempts to sync that to the js client. If the js client doesn't receive and process that message fast enough, it will send a sync message to the game with a blank text field; in my local setup these actually cross paths and things end up in an inconsistent state: the game thinks the field is empty, but there is still a number showing on the client side. (If the player does more things in the UI that number will be resynced, so it is only on immediately pressing enter that there is buggy behavior.) This fix is very brute-force, and I'm not sure it'll really get all the cases. I'm generally worried that this syncing mechanism can have race-cases like this beyond just the game start, and also it seems like the possibility of messages crossing paths might need to be dealt with more consistently. -------------------------------------------------------------------------------- 56a5b49 | advil | 2019-12-11 14:40:21 -0500 Don't crash when checking if fedhas protects player from igniting act->as_monster() returns nullptr for the player, so some check like this needs to happen. Not immediately sure if clouds under the player should return 0 or a negative value, this goes with negative. -------------------------------------------------------------------------------- 8ac0393 | Byrel Mitchell | 2019-12-11 10:43:14 -0800 Add new swamp ending vault with Fedhas and Yred theming. Includes an undead lerny (which should generally be weaker than a living lerny; the only one that does more damage is simulacrum which is 8 speed and low MR). Equal chance of the rune being in each lobe. Yred lobe has 2 vampire knights, assorted yred gifts and some undead hydrae/drakes. Fedhas lobe has several thorn hunters/shambling mangroves, 2 spriggan druids, and a handful of oklobs. The antechamber is watery, and populated by a bunch of swamp drakes/dragons and an undead Lerny. -------------------------------------------------------------------------------- cba6f66 | gammafunk | 2019-12-10 23:20:11 -0600 A swamp worm tunnel vault (mikee) Prepare to get slurped! Swamp worms line a narrow corridor of Zot traps with briar patches on either side. The worms are contained by lava and try to collide the player with lava, the briar patches, or the Zot traps, depending on the player's position and whether they are flying. Either flying over the lava or destroying the briar patches offer paths to the loot. Loot consists of good jewellery and aux armour along with some star items. Number of worms and loot items scale with depth, which is D:12-$ and Swamp. Original notion suggested by mikee, but you can definitely blame me for everything about this vault. -------------------------------------------------------------------------------- 26646b4 | gammafunk | 2019-12-10 23:18:42 -0600 Clean up some DES syntax for a vault Use the predefined aux armour list in dungeon.lua instead of making our own list, use better syntax for NSUBST, and clean up statement alignment. -------------------------------------------------------------------------------- e7e91ba | Kate | 2019-12-10 22:20:39 +0000 Allow staff of Olgreb to grant poison immunity to monsters And improve its descriptions. -------------------------------------------------------------------------------- 8a0eb6d | Alex Jurkiewicz | 2019-12-10 15:19:01 -0500 Ignore VS Code editor config -------------------------------------------------------------------------------- 8d3aca7 | Alex Jurkiewicz | 2019-12-10 15:18:45 -0500 Update my mailmap entries -------------------------------------------------------------------------------- fa4545f | advil | 2019-12-09 23:21:01 -0500 Fix message replay at main menu This is sort of a quick fix. e48d713e changed the behavior of split_string so that it parsed '' into a single segment '', where before it would turn '' into an empty segments list. The old behavior implicitly prevented the log replay from filling the buffer with many empty lines. This commit fixes the issue by restoring the old behavior just for log replays, and doesn't address the question of why these empty log messages are there in the first place. -------------------------------------------------------------------------------- 53730b6 | Kate | 2019-12-09 22:04:43 +0000 Account for variable range in Dazzling Flash range checks (sdynet) The range check always considered it to be cast with power -1 so would falsely claim that no enemies were in range when the flash reached radius 3. -------------------------------------------------------------------------------- 06d2327 | gammafunk | 2019-12-09 04:35:21 -0600 Update the changelog Through 0.25-a0-277-g7046ed1b37. -------------------------------------------------------------------------------- 7046ed1 | Umer Shaikh | 2019-12-08 17:24:18 -0500 Make headsup function less strict about warnings (11875) When multiple monsters come into view at the same time, the game warned you if a monster was using a dangerous weapon but ignored other equipment, even if that equipment was interesting enough that it would be flagged if the monster were alone. This commit liberalizes what the game is willing to note. It also changes the function to check equipment through the monster info instead of directly, on the grounds that warnings should be based on revealed information only. As a side-effect this liberalization also fixes a small bug with alerts for dual-wielding monsters. This commit increases message spam, which is unfortunate. But warnings about what items monsters have are relatively important messages, especially since many players use force_mores to warn about dangerous monsters. [ Committer's note: Squashed and rebased. Reworded one commit message since the change had been implemented in trunk but the commit contained helpful comment clarifications. Closes #1215 ] -------------------------------------------------------------------------------- cebdc9c | Umer Shaikh | 2019-12-08 17:23:19 -0500 Adjust warnings about monster gear on coming into view Update conditions for including information about monster gear in the "comes into view" message in several ways: - monster gear is all identified, so no need to check that - now warn for all artefacts as well as for branded equipment (an orc warrior with Maxwell's Patent Armour is often at least as interesting as an orc with branded plate, but its armour wasn't noted) - the old rules were not warning for wands in the alt weapon slot (I'm not clear on whether this can even happen?) if they were not offensive wands. The rules for warning about wands shouldn't depend on what slot the wand is in. Also one often wants to be warned or force-mored for monsters with wands of digging, despite their being non-offensive. That leaves wands of random effects as the only non-offensive wand; rather than special casing the single wand type, we warn for all wand types. [ Committer's note: Monsters may learn to use random effects in the future, this is good future proofing. ] -------------------------------------------------------------------------------- 3be3026 | Umer Shaikh | 2019-12-08 17:22:18 -0500 Clarify comments in is_offensive_wand -------------------------------------------------------------------------------- 84948a9 | Umer Shaikh | 2019-12-08 17:21:05 -0500 Expose missiles in monster inventory to x and ^x The function get_monster_equipment_desc already tried to get a description including what is quivered, but this part of the inventory wasn't copied from the monster to its corresponding monster info. This commit makes that copying happen. This allows players to rely less on animations to tell which monsters are doing what. -------------------------------------------------------------------------------- 5ba6e9a | Edgar A. Bering IV | 2019-12-08 13:35:00 -0500 Prevent an information leak with Mara Illusions (11946) -------------------------------------------------------------------------------- 87e124a | Edgar A. Bering IV | 2019-12-08 13:14:58 -0500 Correct Flay status light colour (12147) The cause was an unintentional fallthrough. -------------------------------------------------------------------------------- 0af21f4 | Edgar A. Bering IV | 2019-12-08 12:28:54 -0500 Clarify Heal Other description (12128) -------------------------------------------------------------------------------- a1f8d6e | Edgar A. Bering IV | 2019-12-08 12:20:05 -0500 Fix summoner highligting for console in webtiles builds -------------------------------------------------------------------------------- ec1133e | Alex Jurkiewicz | 2019-12-08 10:54:51 -0500 Let the player renounce religion while silenced Divine abilities are blocked by silence, but renouncing your religion isn't really a divine ability. -------------------------------------------------------------------------------- d25cbf0 | James Buck | 2019-12-08 10:53:54 -0500 Fix initial god ability slot assignment in local tiles Ability slots need to be claimed before setting initial piety. This is because if a player's starting piety is at least 1*, the local tiles version will trigger a redraw of the ability tab, a side effect of which is to fix any available but unassigned abilities using the default logic (starting at f) rather than the god ability rules (a-e + X). -------------------------------------------------------------------------------- c224260 | marksg07 | 2019-12-08 10:41:50 -0500 Refactor common functionality between look_around functions [ Committer's note: Squashed and rebased. Closes #1109 ] -------------------------------------------------------------------------------- 5fe89d5 | Gabriel Marks | 2019-12-08 10:41:20 -0500 Add crawl.get_target This clua function opens the targeting dialog in the same way it is opened when you press x to examine. The user is allowed to move the cursor around (same as examine). If the user makes a selection and presses enter, this function returns the player-relative coordinates of the selection. Note that the target is valid even if it is past the bounds of the map, so there is no leak of world borders. If the user cancels the selection, this function returns nil. -------------------------------------------------------------------------------- 7af84ae | Edgar A. Bering IV | 2019-12-06 22:12:15 -0500 Keep allies out of Conjure Flame embers (advil) Allies smothering a player's conjured flame is frustrating and doesn't lead to interesting gameplay. Allies are smart enough to not step in traps; they can also not put out player conjured flames. This is implemented as a change to monster behavior; if a player casts Conjure Flame then swaps with an ally the fire will still be put out when the ally is moved into the embers cloud. -------------------------------------------------------------------------------- 17cbeb8 | Edgar A. Bering IV | 2019-12-06 17:13:52 -0600 Scale Conjure Flame embers by current player speed Using BASELINE_DELAY + 1 auts for the duration of the Embers cloud initially created by conjure flame meant that a slowed player could not use the spell at all. The movement requirement already puts slow players at a disadvantage when using Conjure Flame, there is no need to prevent them from using the spell outright. This commit sets the cloud's lifespan to player_speed() + 1 to allow slow players to use the spell; it also prevents hasted players from taking an action in the embers cloud before moving out of it. -------------------------------------------------------------------------------- 9d16a9d | Edgar A. Bering IV | 2019-12-06 16:11:33 -0600 Remove some debugging lines (amalloy) -------------------------------------------------------------------------------- aca421d | Edgar A. Bering IV | 2019-12-06 15:50:46 -0600 Fix a crash in apply_toxic_bog -------------------------------------------------------------------------------- 6783385 | advil | 2019-12-06 09:18:31 -0500 Add frontmatter to issue template [skip ci] -------------------------------------------------------------------------------- 9a32677 | advil | 2019-12-06 09:13:26 -0500 Relocate issue template to modern location -------------------------------------------------------------------------------- 7a49f6c | advil | 2019-12-06 09:11:03 -0500 Tweak issue template slightly [skip ci] -------------------------------------------------------------------------------- 6d7e32a | Alex Jurkiewicz | 2019-12-05 01:09:09 -0600 Adjust Trog weapon gifting (ebering) Only gift melee weapons with a restricted set of brands (plain, vorpal, flaming, antimagic). This is to differentiate Trog gifts from Okawaru's further, and in line Trog's theme of crude anger, fire, and hatred of magic. Gifting only melee weapons also makes Trog slightly simpler, which is a bonus for new players. This also slightly modifies the minimum enchantment of gifts from Trog and Okawaru. Previously the minimum was 0 or 1 (random per-item), now it is always 0. [ Committer's note: Significantly revised the approach in the change to acquirement. The acquirement system did not previously distinguish ranged and melee weapons, doing so required a rather deep dive. Closes #1208 ] -------------------------------------------------------------------------------- 105ea27 | kitchen-ace | 2019-12-05 01:09:09 -0600 Fix edge cases for destroying Summon Forest's trees Tornado and forest fires were not checking whether a tree was created by Summon Forest. -------------------------------------------------------------------------------- c5e4228 | sdynet | 2019-12-05 01:09:09 -0600 Ely's Divine Protection always protects at ***** At present, the always protection of this power begins at 131 piety. This figure is slightly different from when the player's faith becomes ***** (120). This subtle difference is confusing for a player who doesn't read a spoiler because nothing in-game alerts the player to the moment when the odds of protection are 100%, though the guarantee is described in the ^ screen. This confusion can be resolved by aligning the point at which the protection probability is 100% to the moment at which the number of stars changes. As a result players will be able to clearly see when this sentence means without a spoiler: Especially pious individuals may be certain of this help. [ Committer's note: revised the commit message. Closes #1212 ] -------------------------------------------------------------------------------- 32a057a | sdynet | 2019-12-05 01:09:09 -0600 Make the Elemental Staff an enhancer for all elemental schools The melee gimmick and resists alone did not make the elemental staff a particularly attractive unrand, most staff users would strongly prefer an enhancer. This enhancer counts for each school separately, so gives two enhancers to the handful of multi-element spells. [ Committer's note: revised description and commit message. Closes #1211 ] -------------------------------------------------------------------------------- b31bfc5 | kitchen-ace | 2019-12-05 01:09:09 -0600 Make fire spells better at burning trees Fireball could previously burn trees with all squares of its explosion, not just the centre, but this was inadvertently changed in be81960. This commit restores that behaviour. Also make the new spell Starburst burn trees properly. It also allows the spells Fire Storm and Ignition to burn trees, because it seemed strange to me that the most powerful fire spells did nothing on trees. This allows a player to easily clear out large amounts of trees at once, but by the time a player can cast these spells, this is not usually all that relevant. [ Committer's note: corrected Ignition Fedhas logic. Closes #1189 ] -------------------------------------------------------------------------------- 6f1b5d9 | James Buck | 2019-12-04 12:40:28 -0600 Add missing SUBST to gammafunk_ghost_icy Fixes an ugly green tile when placed in Lair. -------------------------------------------------------------------------------- c8cd6a5 | advil | 2019-12-04 10:50:20 -0500 Fixup recently placed ghosts correctly d0e028f13a handled fixup for placement of new ghosts, but any ghosts placed between TAG_MINOR_POSITIONAL_MAGIC and TAG_MINOR_GHOST_MAGIC didn't get updated, because the spells are copied from the ghost_demon list into the monster list on placement. Resolves #1222 fully (I hope). -------------------------------------------------------------------------------- 572059c | Edgar A. Bering IV | 2019-12-04 00:33:15 -0500 Prevent Foxfire from using stairs -------------------------------------------------------------------------------- 53a6a0d | Edgar A. Bering IV | 2019-12-04 00:06:36 -0500 Update credits -------------------------------------------------------------------------------- 542a224 | Edgar A. Bering IV | 2019-12-03 22:49:40 -0500 Fixup Sting and the description (advil, kitchen_ace) The effect of Sting on resistant monsters that got merged was not the exact intended behaviour in the experimental branch; the changes got lost in a rebase shuffle. Sting does Poison Arrow flavored damage, but with a reduced number of poison stacks; specifically adding 1 stack to a monster, or 0.5 if the monster is resistant (implemented with div_rand_round). -------------------------------------------------------------------------------- 18654cf | advil | 2019-12-03 11:45:29 -0500 stringer -> stinger (ebering) -------------------------------------------------------------------------------- 3ee35ab | advil | 2019-12-03 11:43:09 -0500 Clarify Sting description (12145 / kitchen_ace) The flavor is actually still the same as poison arrow, but the description implied that it would poison even immune things. -------------------------------------------------------------------------------- 58704a1 | advil | 2019-12-02 14:36:03 -0500 Fix some shadow warnings for older compilers Happened quite a bit on rebuilds. -------------------------------------------------------------------------------- d0e028f | Edgar Bering | 2019-12-02 14:04:46 -0500 Correctly fixup ghost spells -------------------------------------------------------------------------------- 618c0ec | advil | 2019-12-02 12:51:14 -0500 Mark dazzling flash as unusable for saved ghosts This spell is set with spflag::no_ghost, so all that is needed is to keep ghosts that saved with dazzling spray from using it. -------------------------------------------------------------------------------- ce69c89 | advil | 2019-12-02 11:02:53 -0500 Improve beforeunload future compatibility I noticed while trying to figure out how to detect the back button during gameplay that this code could be a bit more general. I don't think this will change behavior on any particular browsers right now, because the return value is the method that is supported by the most browsers, but this approach is deprecated. The only non-deprecated method for doing this is event.preventDefault, so I added this, as well as another deprecated approach. (Of course, the one you're supposed to use *isn't* supported by most browsers.) See https://developer.mozilla.org/en-US/docs/Web/API/Window/beforeunload_event for the full compatibility table. -------------------------------------------------------------------------------- 28950d1 | advil | 2019-12-02 10:42:55 -0500 Handle HUPs better in lua interpreter Previously, this code ran in a tight loop if a hup was received, because the input function always returned immediately. This led to stuck high-cpu processes and crashes when a webtiles client disconnected, or when an ssh connection was lost, while the lua interpreter was running. This commit should simply break the loop on this case. It's possible it would be even safer to not do a repl loop at all on empty input for online games... -------------------------------------------------------------------------------- 5bc340a | Edgar A. Bering IV | 2019-12-02 07:48:24 -0500 Replace Flame Tongue with Foxfire in the FE description -------------------------------------------------------------------------------- 216da55 | Edgar A. Bering IV | 2019-12-02 07:48:05 -0500 Remove a vestigal line -------------------------------------------------------------------------------- e017589 | Edgar A. Bering IV | 2019-12-02 07:47:33 -0500 Actually use the foxfire monster tile -------------------------------------------------------------------------------- 716fc43 | Edgar A. Bering IV | 2019-12-02 07:41:48 -0500 Actually use the new foxfire tile -------------------------------------------------------------------------------- 0889b22 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Monster save compatibility for positional magic This commit uses the same TAG_MINOR as the previous commit. -------------------------------------------------------------------------------- 688896f | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Player save compatibility for positional magic -------------------------------------------------------------------------------- 592f7d0 | gammafunk | 2019-12-02 00:54:18 -0500 Positional magic ⛰️ 💀: Rework BVC targeting This commit brings Borgnjor's Vile Clutch targeting in line with most other earth magic spells, making it use a directed beam instead of a smite-targeted 3x3 square. The BVC beam always penetrates and never misses, to affect up to 6 squares. This is a nerf to a spell that was already sitting at a good power level. However another aim of the 0.25 magic changes is to reduce the overall strength of the Necromancy school given how many strong spells it has. BVC is routinely overrated and not actually in the overpowered set, so we don't want to make the spell bad just because of perception. The reasons given for rating BVC so highly include synergy with allies, lowering monster evasion, damage per cast, smite targeting, and being in such a strong school. Allies are vastly stronger than BVC and capable of clearing entire floors quite on their own, and the spell doesn't improve accuracy enough versus a majority of monsters to warrant spend a turn using BVC instead of a better Earth magic damage spell. Its damage per cast is good, but at reasonable spellpower levels and in the most important use cases, it's a lot better to spend MP each turn on a spell that kills monsters sooner. Removing the smite targeting combined with changes to other spells that reduce the power of the Necromancy school will help with player perception without making the spell too weak. I do also want to take a look at the spell's damage per turn with the highest spellpower levels. Part of the perception problem the spell has comes from constriction having a lot of small effects that are hard for the player to evaluate. If Necromancy settles on a kind of "melee support" role in 0.25, it might be good to simplify the spell's effects somewhat toward this aim. -------------------------------------------------------------------------------- d51b216 | gammafunk | 2019-12-02 00:54:18 -0500 Simplify and document some beam logic conditions -------------------------------------------------------------------------------- 165abee | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 💀: Revise Corpse Rot (CanOfWorms) Unlike the other attack spells, where position was not relevant enough, Corpse Rot was too positional: it relied on the combined relative position of (player, monster, immovable floor object). This revision changes Corpse Rot to place clouds in a ring around the caster, with the number of clouds equal to the number of corpses rotted. The cloud duration is reduced This should keep in a less-constrained way the relative-to-corpse positioning, while making the player's position relative to terrain and monsters more relevant. -------------------------------------------------------------------------------- 3b7ae84 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 💀: Reduce the range of Agony and Dispel Undead Reduce player Agony and Dispel Undead to range 1. Necromancy is a very strong school, with a lot of spells in it. Direct damage spells that are ranged and can't miss (Agony checks MR but with a large power boost) are very strong. Reducing these spells to range 1 is a way to add positional considerations to the spells, makes them thematically fit with Vampiric Draining, and nerfs them to boot. Necro needs the nerf. -------------------------------------------------------------------------------- 0ea3b1b | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 💀: Remove Bolt of Draining as a player spell The "bolt spell but black", one of many removed in this overhaul. Necromancy has plenty of direct-damage spells, this one will not be missed. -------------------------------------------------------------------------------- c910bab | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic tiles: Noxious Bog icon (CanOfWorms) -------------------------------------------------------------------------------- 949bf58 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic tiles: Toxic bog feature -------------------------------------------------------------------------------- e4a03fb | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🐍: New spell: Eringya's Noxious Bog New spell Eringya's Noxious Bog, L6 Posion/Transmutation. Gives a player the "Bog" status for 4 + random2( power / 10 ) turns. While this status is active, as the player leaves behind a trail of temporary "toxic bog" cells. Each toxic bog cell remains that way for 10 + random2avg( power/ 20, 2) turns. Ignite poison places flame clouds over bog cells, but at present does not remove them. The spell replaces Leda's Liquefication in the Fen Folio (though perhaps a different spell could be removed from the Fen Folio instead) and is added to the Book of Alchemy. -------------------------------------------------------------------------------- f462223 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🐍: New dungeon feature type toxic bog Create a new dungeon feature type, toxic bog, which does Poison Arrow flavor damage to creatures in it and imposes shallow water penalties. -------------------------------------------------------------------------------- b3f3dca | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🐍: Adjust Venom Mage start With Poison Magic being revised to emphasize transmutations and alchemy, and Venom Bolt removed, this moves VM's starting Conjurations skill to Transmutations and adds Ignite Poison to the Young Poisoner's Handbook. This is especially relevant since Sting has become Poison/Transmutations. The manual and background descriptions are terse enough to not require a change, but it might be nice for flavor reasons to add some reference to alchemy. -------------------------------------------------------------------------------- 3cb921f | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🐍: Revise Sting In the overarching design writing for this overhaul I wrote that some space for single-target ranged spells must remain. Sting is one of those. However, LOS range poison damage that sometimes poisons is dangerously close to darts. Further, Sting is immediately outshone by Poison Vapours. This commit changes Sting to be a range 3 Poison/Transmutation spell, with the same beam flavour as Poison Arrow (still Sting damage and to-hit). Since Poison Arrow is removed as a player spell, this beam-type re-use doesn't steal from Poisons L6 niche. -------------------------------------------------------------------------------- b75774f | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🐍: Poison removals Remove Venom Bolt and Poison Arrow, as single target conjurations that do not fit in with this magic overhaul. -------------------------------------------------------------------------------- 4a65e1f | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: Revise Spellforged Servitor Servitor now takes the highest-level servitor spell available for player users. The spell description indicates the spell the servitor will use. This behavior could already be accomplished by a player by removing most of their damaging spells and was a good idea. However the process of modifying one's spell list introduced a variety of tedious incentives in its interaction with amnesia. Now that servitor takes only one spell, the spell list is adjusted for players (for monsters, since the monster servitor takes every spell this has no effect). The servitor prioritizes ranged targeted damage spells of level 4 and higher, followed by clouds, followed by low level and short range spells. [Thanks to hellmonk for suggesting the servitor description display the spell to use and that the spell list be revised.] -------------------------------------------------------------------------------- 60c6236 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: New Iskenderun's Mystic Blast Re-introduce IMB as a player spell that detonates on the player with range 2. The spell attempts to hit each non-conjured monster within this range with MMISSILE flavor damage, and then knocks the target back. The damage is currently half that of old IMB: 2 dice with a max damage of 6 + pow / 6. This change also flattens the knockback curve of Force Lance for monsters. For both spells the knockback distance starts at 2 and scales with power. -------------------------------------------------------------------------------- 9ec2bd9 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: Rename and revise Dazzling Spray Rename Dazzling Spray to Dazzling Flash. The effect is now a radius 2-3 flash, centered on the player, that has a power dependent chance of dazzling living monsters. The chance decreases with distance. The spell is silent. [Thanks to cwz testers for feedback on this spell.] -------------------------------------------------------------------------------- 1d4a33e | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: Remove Force Lance as a player spell Continuing with the magic overhaul, Force Lance is made a monster only spell. The new Iskenderun's Mystic Blast will take the knockback effect, to be added in a subsequent commit. -------------------------------------------------------------------------------- c6818cb | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: Remove Dazzling Spray as a zap type In preparation for a new version of dazzling spray. The spell was already unusable by monsters but some old code for supporting dazzle ghosts was still around. That gets removed. -------------------------------------------------------------------------------- 45c4a97 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: Remove IMB as a zap type and from monster spells A subsequent commit will introduce a new version of Iskenderun's Mystic Blast as a player spell. IMB gets lost amidst the sea of similar direct damage conjurations; as a monster spell the explosions did not add much. It is replaced by force lance in various monster books that used IMB, or just removed from monsters. -------------------------------------------------------------------------------- 4305f63 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: Simplify Searing Ray (minmay) Searing ray is a rather complicated spell because of beam aliasing, and yet Cj is a hints mode background. This changes searing ray to always fire at max range at the player's selected target (even if the target moves), or in the player's selected direction. If the target dies the ray continues firing at the target's last position. If there was no monster, the spell proceedes like old searing ray (but fires for the full distance). In addition to the targeting change, the three beams are given the same damage and to-hit, chosen so the damage distribution matches that of old Searing Ray, and are all penetrating. -------------------------------------------------------------------------------- bd1a5c2 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ❄️: Adjust Ice Elementalist start Now that the book of Frost contains a single conjuration, starting IE with some conjurations skill does not make sense. This commit concentrates their skill in ice magic, leaving the player to chose how to branch out through the remainder of the book. -------------------------------------------------------------------------------- c46f9d6 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ❄️: Buff Refrigeration Not strictly a positional change; Ozocubu's Refrigeration was the second lowest-damage level 6 damage spell (doing only slightly more than a freezing cloud), and comes with significant draw-backs (self damage and loss of potions). This commit adds a damage die to the spell, making it do 4d(5 + power / 10) up from 3d(5 + power / 10) and removes the self damage. The spell retains its -Potion effect. This is still on the weaker side of level 6 spells in terms of raw damage, but it hits full LOS, is single-school, and is quiet. -------------------------------------------------------------------------------- 2846b0a | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic tiles: Hailstorm icon (ontoclasm) -------------------------------------------------------------------------------- 0364848 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ❄️: New Ice spell: Hailstorm Hailstorm is a Level 4 Conjuration/Ice spell. It replaces Throw Icicle in the IE starting book. When cast it fires a ring of inner radius 2 and outer radius 3 of BEAM_ICE (like throw icicle) flavoured beams. Icy monsters are immune, so this spell gets along with ice beasts and simulacra but not other minions. Having it skip allies all together is something to consider. Currently, Veh does not add a fourth ring, that would almost double the number of affected squares. The damage is that of throw icicle but the accuracy is higher. [Thanks to cwz testers and Bacchus for early feedback on this spell.] -------------------------------------------------------------------------------- 290c60e | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ❄️: Ice removals Remove Throw Frost, Throw Icicle, and Bolt of Cold. These targeted, "damage but blue" spells did little to distinguish the school from others (despite their slightly different ranges) or from ranged weapons. The current result is that the IE book is a bit thin. New ice spells will be added in subsequent commits. -------------------------------------------------------------------------------- daefaf0 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic tiles: Foxfire monster, icon, and trails (ontoclasm) -------------------------------------------------------------------------------- 48bd468 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🔥: New spell Foxfire Foxfire is a L1 Conjurations/Fire spell that replaces Flame Tongue. Foxfire conjures two foxfires adjacent to the caster which seek the nearest target and burn the target, or dissapate if they fail to reach the target after making 8 moves. Monsters and the player can swap with foxfire, but doing so triggers the foxfire attack. Each foxfire burn does slightly more than half the damage of Flame Tongue, but does not miss. This makes the spell better than FT when fighting in the open (discounting the delay), but much worse in corridors. Foxfires have see invisible; with their high move speed this allows them to attack first, dissipating and allowing the monster to then move towards the player. [Thanks to hellmonk, tealizard, Doesnt, EN0N, and cwz testers for feedback in development of this spell.] -------------------------------------------------------------------------------- e44d55d | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🔥: Modify inner flame Inner flame is a very positional spell; unfortunately it's somewhat impractical to use, explosions come only when the monster dies. To open up new possibilities, this commit adds an on-damage effect to the enchantment. Inner Flamed monsters have a chance of creating a short-lived flame cloud on their own cell when they take damage. -------------------------------------------------------------------------------- 0d78dbb | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic tiles: Starburst icon (ontoclasm) -------------------------------------------------------------------------------- e3d4451 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🔥: New Fire spell: Starburst Starburst provides a L6 damage spell fitting into a similar place as the old Bolt of Fire spell. Where Bolt of Fire was targeted, Starburst is un-targeted. Instead, Starburst fires eight range 5 (six under Vehumet) bolts of fire in the principal directions. [Thanks for early feedback from cwz players in the design of this spell.] -------------------------------------------------------------------------------- 7758758 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🔥: Nerf conjure flame (minmay, tealizard) Smite targeted, renewable flame clouds are extremely strong. This changes Conjure flame to create the cloud on the player. The player initially creates a cloud of smoldering embers. These ignite the turn after if nothing is in the cell. Conjure flame is still very strong and permits many of its old uses. This increases the time cost of those uses and prevents degenerate things like refereshing a blocking flame indefinitely. It also did not work well as a monster spell; the only monsters that still cast it were player ghosts, so it's been removed from them and is now player only. -------------------------------------------------------------------------------- f302f3d | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🔥: Fire removals Remove Throw Flame and Bolt of Fire as player spells. They live on on monsters and in wands. Both of these are "damage but red" single target spells, on the chopping block in this magic overhaul. -------------------------------------------------------------------------------- 1b0f4d3 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🌪: Airstrike The air school is already quite positional: targeted spells require bolt bouncing to use with maximum effectiveness, the remaining spells require different positional considerations to use well. Airstrike is smite-targeted, which makes it more interesting than most single-target spells. However, it is just ``smite but air''. This commit scales airstrike damage with the number of adjacent empty cells to the target. Specifically, when there are more than three empty cells adjacent to the target, each empty cell contributes a linear amount to the affine base damage and reduces the variance by addinng another roll to average the damage over. At 100 spellpower this results in the following damage statistics, depending on the number of empty adjacent spells. | | 0-3 | 4 | 5 | 6 | 7 | 8 | | --- | ---- | ---- | ---- | ---- | ---- | --- | | avg | 15.5 | 16.3 | 17.2 | 18.1 | 19.1 | 20 | | std | 4.61 | 3.27 | 2.68 | 2.32 | 2.08 | 1.9 | [ TODO: Refactor mons-cast airstrike damage to be in the same place as player damage. Take another swipe at the spell description. ] -------------------------------------------------------------------------------- abb5cbb | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Use targeter_radius hitfuncs for friendly fire checks This replaces the helper function _irradiate_is_safe -------------------------------------------------------------------------------- 8bd92b5 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Generalize and rename targeter_los Rename it to the more accurately descriptive targeter_radius, and include a constructor parameter for specifying a range minimum to exclude an inner radius. -------------------------------------------------------------------------------- 0bb11ae | Edgar A. Bering IV | 2019-12-02 00:43:05 -0500 Don't crash in the ignite poison cloud tracer Only check Fedhas protection from clouds for players; monster Fedhas worshippers clouds will hurt plants. Only relevant for player ghosts. -------------------------------------------------------------------------------- 5ba9614 | gammafunk | 2019-11-30 22:57:29 -0600 Remove an outdated comment -------------------------------------------------------------------------------- 8d00908 | gammafunk | 2019-11-30 22:57:29 -0600 Fix monster ranged attack logic for some wands Monsters learned how to use wands of clouds, iceblast, and scattershot in 0.24, but the logic to determine whether monsters have ranged attacks was not updated. This logic is used for player sensing nearby danger and some aspects of monster movement; monsters were able to use these wands before this commit. -------------------------------------------------------------------------------- 17f9c9c | Aidan Holm | 2019-12-01 10:35:28 +0800 Fix chat keeping focus trapped after hiding (#12140) When spectating with chat activated, the player quitting/dying/exiting caused the chat input to be hidden, which did not deactivate the focus trap. This fix uses a MutationObserver, which does require IE10; AFAIK, the previously supported minimum was IE9, but we shall see if anyone complains first.. -------------------------------------------------------------------------------- c6a9f38 | Aidan Holm | 2019-12-01 10:35:28 +0800 Fix minimized chat not being expandable via click Caused by over-eager click event filtering; turns out the minimized chat window is a totally separate element (#chat_hidden). -------------------------------------------------------------------------------- b8371ea | Aidan Holm | 2019-12-01 10:35:28 +0800 Fix webtiles chat stuck focus issue When clicking the chat input, document.activeElement has already been updated by the time the focusin event is received, so the focus trap stores the chat input as the previously focused element; when it is deactivated, it will then refocus the chat input. The focus-trap docs refer to a setReturnFocus option, but this doesn't seem to work as intended. Disabling return focus fixes this for now. Unfortunately this means that entering and exiting chat from a UI with focusable elements (e.g. seed selection) will lose the currently focused element, until a workaround is implemented. -------------------------------------------------------------------------------- 61c9e09 | Brendan Hickey | 2019-11-30 20:45:15 -0500 Rewrite Barachi +LOS fakemut description. Before: "Shadows flee at your approach. (+LOS)" After: "You can be seen from farther away. (+LOS)" The issue is that 'Shadows' are always monsters. Unless we want to cause Shadows to run from Barachi let's use text with less potential to mislead the player. The rewrite is based on the species description. I think the players in general understand reciprocal LOS, so this formulation (rather than saying "You can see things farther away.") will be convey that their LOS radius is bigger and Tomb is going to be harder. -------------------------------------------------------------------------------- ece1257 | gammafunk | 2019-11-29 21:04:25 -0600 Remove unused Fedhas corpse rotting code This is no longer used, since the god no longer gains piety through rotting corpses. -------------------------------------------------------------------------------- 0f3e877 | gammafunk | 2019-11-29 21:04:16 -0600 Fix outdated food logic when worshiping Fedhas These were relevant when the god accepted rations as a cost for some abilities, but this is no longer the case. Don't always have a food acquirement option when worshiping Fedhas. Also don't consider food always useful and always an interesting autoexplore target under Fedhas. -------------------------------------------------------------------------------- b5a0cb1 | gammafunk | 2019-11-29 20:53:10 -0600 Remove an outdated acquirement rule under Fedhas The acquirement code prevented acquiring weapons with the reaping brand under Fedhas, specifically the Sword of Zonguldrok. The god no longer has a no-corpse-necromancy conduct, so remove acquirement restriction. -------------------------------------------------------------------------------- a656ec4 | gammafunk | 2019-11-29 19:52:38 -0600 Update the Fedhas flavor of a Lugonu vault (minmay) Give a randbook with Recall as the "useless" insult item for Fedhas worshipers, since nearly all allies Fedhas grants are stationary ones that can't be recalled. The exception would be wandering mushrooms granted from Fedhas' Overgrowth ability, but who could take a mushroom seriously anyways? -------------------------------------------------------------------------------- 27fffb8 | Aidan Holm | 2019-11-29 13:57:10 +0800 Don't show monster threat levels by default It'd be nice to show these on the monster lists only, but that's technically challenging, and on webtiles the monster list already displays the threat level. -------------------------------------------------------------------------------- f71692c | Aidan Holm | 2019-11-28 20:32:06 +0800 Add documentation for tile_show_threat_levels -------------------------------------------------------------------------------- c5e1d6b | Byrel Mitchell | 2019-11-28 20:32:06 +0800 Add webtiles support for threat level indicators -------------------------------------------------------------------------------- 61c6e96 | Psymania | 2019-11-28 20:32:06 +0800 Add monster threat level indicators Webtiles and console both have a monster list at the bottom-right of the screen which lists all monsters in view color-coded by rough threat level. Many players have expressed a desire for something similar in offline tiles, to provide always-visible indicators of the threat levels of all enemies in view. This commit adds translucent colored backgrounds -- dark grey, light grey, yellow, and red -- to indicate trivial, easy, tough, and nasty monsters respectively. Additionally, these indicators are configurable with a new option in the options file, "tile_show_threat_levels". Each type of indicator can be independently enabled or disabled by including or omitting it in the option file line. For example, the following... "tile_show_threat_levels = tough nasty" ...will show only yellow (tough) and red (nasty) threat indicators. I have experimented with various styles of indicators, as shown in the following thread: https://crawl.develz.org/tavern/viewtopic.php?f=8&t=26439 I am open to changing back to a different style, or even making multiple styles available and letting the player choose which style to use, if any. This style is the best in my opinion, as it is very noticeable while being subtle enough not to interfere with any other monster or monster-associated graphics. I have playtested this feature through a 6-rune run with no problems, technical nor cosmetic. -------------------------------------------------------------------------------- 280d70d | Nikolai Lavsky | 2019-11-28 20:31:26 +0800 Remove an inventory hotkey for corpses and skeletons Although the player cannot pickup carrion anymore, the pickup menu still displays a hotkey for it. The hotkey already does nothing because corpses and skeletons are stationary objects (62bc8482). -------------------------------------------------------------------------------- 6cfeca7 | advil | 2019-11-26 18:44:59 -0500 Remove some obsolete batform code (alexjurkiewicz) This is a relic from the times when you ended a transformation by setting its duration to 2, something that hasn't been in play since 0970d1a616d41. For reasons unclear to me at this remove (something to do with food maybe) the exact threshold for ending batform was increased to 5 from 2 in 19d229916a4423. -------------------------------------------------------------------------------- cd15a05 | advil | 2019-11-26 15:16:56 -0500 Update the github issue template Mostly just wanted to provide instructions on how to upload a save file directly to github, but I ended up revamping the whole thing. [skip ci] -------------------------------------------------------------------------------- d5e5576 | advil | 2019-11-26 12:29:39 -0500 Clarify "master archer" code This shouldn't change any behavior for monsters that actually place. This cleans up some ranged code to be more consistent with the (apparent) intent of the flags, and renames a flag to be more consistent with what it does (since what was called `M_DONT_MELEE` has no impact on melee outside of monsters with missile-based ranged attacks, and also doesn't actually prevent melee -- you would do this by giving the monster no melee attacks I think). I'm not 100% sure why MONS_STATUE (which doesn't place) was M_ARCHER | M_DONT_MELEE, but I have kept its status. This may be for things like the statue in minmay_dual_archer_statues? -------------------------------------------------------------------------------- 090528c | Byrel Mitchell | 2019-11-26 22:10:22 +0800 Added webtiles support for Possessable icon (Yred enslave soul status) -------------------------------------------------------------------------------- e569287 | Byrel Mitchell | 2019-11-26 22:00:32 +0800 Show monster poison level as a debuff icon Currently has 3 tiles for 1, 2 or 3, 4 stacks of poison. -------------------------------------------------------------------------------- dbf363a | Aidan Holm | 2019-11-26 20:28:26 +0800 Fix "Found item" messages not being coloued correctly (gammafunk) This was caused by mpr() not supporting formatted_strings, which were being silently converted to plain std::strings, discarding all colour information. -------------------------------------------------------------------------------- 4c60e79 | gammafunk | 2019-11-26 01:49:09 -0600 Don't trap monsters in Zig pillars (AliasTheSpectator) The Ziggurat pillar vault ziggurat_pillar_centre_drop places monsters behind fully opaque walls, providing a teleport trap to release them. This no longer works with LOS requirements for trap triggering, so make the vault always have transparent rock or stone windows. I've also modified the vault substitutions so that the windows will always be diggable when the rest of the vault is. -------------------------------------------------------------------------------- c9f82b1 | gammafunk | 2019-11-25 17:32:57 -0600 Allow Divine Exegesis without a memorized spell (12129) The check for the ability to cast spells includes one for having at least one spell memorized. Don't require this condition for Exegesis, as this ability casts directly from the spell library. -------------------------------------------------------------------------------- d145f35 | gammafunk | 2019-11-25 15:32:46 -0600 Fix spell colors for Divine Exegesis No longer show spells listed by Divine Exegesis as dark grey if they couldn't be memorized due to spell level restrictions, since the ability doesn't care about spell levels. -------------------------------------------------------------------------------- 379fad0 | Edgar A. Bering IV | 2019-11-25 14:41:19 -0500 Extend Fedhas protection to collisions (12082) There is no messaging or indication to the player that Fedhas doesn't protect plants from player-induced collision damage. For consistency's sake the best solution here is to extend the protection. -------------------------------------------------------------------------------- 3835771 | Edgar A. Bering IV | 2019-11-25 13:43:22 -0500 Checkwhite -------------------------------------------------------------------------------- bad95dd | Edgar A. Bering IV | 2019-11-25 13:42:13 -0500 Convert summon damage dismissal into a fineff (12082) The solution in 0.25-a0-106-g3db639d13e led to crashes; use contexts of behavior_event do not expect that the behavior event might kill the monster. Converting the dismissal to a fineff prevents these problems. -------------------------------------------------------------------------------- 1a393a3 | Aidan Holm | 2019-11-26 01:37:41 +0800 Tidy up tilesdl.cc a bit -------------------------------------------------------------------------------- 4f669b7 | Aidan Holm | 2019-11-26 01:37:41 +0800 Simplify some local tiles code -------------------------------------------------------------------------------- 9513415 | advil | 2019-11-25 10:19:51 -0500 Detect an empty des cache This is designed to preempt cryptic error messages that can happen if you run tests directly without previously building the des cache; it's maybe a bit of an overly clever method to do so but also very easy to write. Resolves #1121 -------------------------------------------------------------------------------- 0adb1ba | Aidan Holm | 2019-11-25 22:49:33 +0800 Add webtiles dev option note to readme [skip ci] -------------------------------------------------------------------------------- 5296520 | Aidan Holm | 2019-11-25 22:39:54 +0800 Show sprint help for sprint menu help button (GH #1203) This handler is only called for the tutorial and sprint menus, and the tutorial lacks a help button, hence the assertion. '6' is the hotkey for the sprint section. Blegh. -------------------------------------------------------------------------------- f1674c6 | Aidan Holm | 2019-11-25 21:21:33 +0800 Fix webtiles chat not responding to mouseclicks (12136) Predictably, the focus-trap library was responsible here, along with some over-eager trapping of events. Thankfully the focus-trap has a very useful allowOutsideClick hook which does exactly what we want; pass through click events to attached handlers under certain conditions. Separately, we also need to not capture all events if the focus is outside the popup; this allows exiting the chat window with the escape key when a popup is open. Regrettably, the focus-trap library does not provide onPause/onUnpause hooks to facilitate this, but we can make do. -------------------------------------------------------------------------------- 836c352 | gammafunk | 2019-11-24 14:42:35 -0600 Declare a global function This was apparently omitted in the artefact code perfomance improvements made in ca9b7906. -------------------------------------------------------------------------------- 16436c4 | advil | 2019-11-22 17:21:55 -0500 Don't crash when right clicking in local tiles I don't understand the circumstances under which this event is getting sent, but just ignoring it seems to work. Resolves #1210 -------------------------------------------------------------------------------- 8b14890 | advil | 2019-11-22 16:49:57 -0500 Don't crash if tornado dismisses a friendly summon -------------------------------------------------------------------------------- b55e97d | Istvan Marko | 2019-11-22 00:07:37 -0500 Use yaml.safe_load instead of load PyYAML'S yaml.load is insecure and it is deprecated in 5.1. Some distributions even disable it, making it difficult to build DCSS on them. Use the recommended safe_load instead. -------------------------------------------------------------------------------- 00f8f0c | Edgar A. Bering IV | 2019-11-21 12:18:32 -0500 Fix a typo in the previous commit -------------------------------------------------------------------------------- f5240d9 | Edgar A. Bering IV | 2019-11-21 12:14:00 -0500 Add Boris to the Orb Run Give Boris a chance to come back on the Orb run if he spawned in the game. Boris has the same chance as a named lord whose rune you've taken. While Boris isn't the most threatening Orb run spawn, he definitely poses a threat and having him spawn is great flavour. -------------------------------------------------------------------------------- b7fd73d | Aidan Holm | 2019-11-21 08:38:11 +0800 Fix mouse click not working in skill menu (12133) The event handler was being called with a CK_MOUSE_CLICK dummy key sent from UISkillMenu::on_event(), delivered directly to the skill menu via Widget::on_event(). This meant that the event did not bubble, and would not be caught by a handler attached to the skill menu parent. -------------------------------------------------------------------------------- d1d2e81 | advil | 2019-11-20 12:08:20 -0500 Simplify some holiness checks for monster swapping One of these checks changes behavior. Requiring the same holiness for swapping around intelligence in general seems really spoilery and weird. If this doesn't work out (e.g. there's too much swapping as a result, or some noticeable effect on balance) I'm open to reverting or modifying this. However, I think if something like this needs to be in place, then we should first try a more obvious rule, e.g. nothing can swap past undead. (Which I think is the main use case anyways.) The demonic change is just an optimization and shouldn't affect behavior. (Full holiness checks are costly if done a lot, because they check damage types -- but this is irrelevant for the demonic check.) -------------------------------------------------------------------------------- 282e4f8 | advil | 2019-11-20 11:30:19 -0500 A few more monster movement optimizations These eliminate/reduce a few more hotspots. The bounds check in _handle_movement shouldn't lead to any behavior change, since if the player is out of bounds they can never see any other cell; but it cuts a biggish case to do the check preemptively, as opposed to inside various loops. -------------------------------------------------------------------------------- 59b9092 | Aidan Holm | 2019-11-20 14:33:21 +0800 Fix various small alignment issues Switchers with scrollers inside them generally need to have align_x set to stretch, so that the scrollbar will be flush against the right-hand side of the screen on local tiles. -------------------------------------------------------------------------------- 260bac9 | Aidan Holm | 2019-11-20 14:32:07 +0800 Use consistent desc/quote switch text This code is pretty heavily duplicated from describe_monsters(). For reasons unknown, show_description() does not show quotes at all on webtiles... -------------------------------------------------------------------------------- 0c4bda3 | Aidan Holm | 2019-11-20 12:12:11 +0800 Fix input_dialog key binds on webtiles (kitchen_ace) -------------------------------------------------------------------------------- 11d28fe | Aidan Holm | 2019-11-20 10:58:05 +0800 Grammar fixup -------------------------------------------------------------------------------- 7faa4ce | Aidan Holm | 2019-11-20 10:48:32 +0800 Use textbox widget for msgwin_get_line() popup -------------------------------------------------------------------------------- 0541610 | Aidan Holm | 2019-11-20 10:48:32 +0800 Fix hotkey binding encoding on webtiles client On the crawl server, all key events are encoded as integers; HTML/JS does not provide a way to map a keydown event to an ascii keycode (while crawl does a whole lot of rather strange mapping, the keys we care about and wish to bind as hotkeys are almost all within a-zA-Z0-9). This makes complete sense because a key and a character are separate things, but it does mean some extra conversion is required. This commit adds ui.utf8_from_key_value() and ui.key_value_from_utf8(); these convert a key value name string, such as "D" or "Enter" to/from an integer that the crawl server recognizes. -------------------------------------------------------------------------------- b6c28e0 | Aidan Holm | 2019-11-20 10:48:32 +0800 Remove unneeded focus -------------------------------------------------------------------------------- ce263d2 | Aidan Holm | 2019-11-20 10:48:32 +0800 Add textbox paste from clipboard function -------------------------------------------------------------------------------- f2554d8 | Aidan Holm | 2019-11-20 10:48:32 +0800 Fix focus traps breaking webtiles chat Focus traps on the top-level popup prevent the chat box from being focused. To fix this, when showing the chat, we enter a new focus trap, and leave it when returning to the game. This is complicated by the fact that the chat JS is effectively non-modifiable (not in game_data), so we attach to the focusin event. You can tab around within the chat popup; the focus-trap class prevents nested traps when doing so. -------------------------------------------------------------------------------- afe43dc | Aidan Holm | 2019-11-20 10:48:32 +0800 Improve focus rendering for webtiles watchers On watching clients, don't use focus traps, and disable all focusable input elements. Since we can no longer rely on the input focus, we add a style-focused class to take its place on watching clients. This produces a much better experience when spectating. -------------------------------------------------------------------------------- 1c8e11a | Aidan Holm | 2019-11-20 10:48:32 +0800 Remove unnecessary set_focused_widget() calls -------------------------------------------------------------------------------- f460fa4 | Aidan Holm | 2019-11-20 10:48:32 +0800 Remove unused headers -------------------------------------------------------------------------------- 40106ef | Aidan Holm | 2019-11-20 10:48:32 +0800 Make webtiles seed selection dialog scrollable -------------------------------------------------------------------------------- 1855e6e | Aidan Holm | 2019-11-20 10:48:32 +0800 Small refactor of event handlers -------------------------------------------------------------------------------- cd84247 | Aidan Holm | 2019-11-20 10:48:32 +0800 Extract MenuButton focus-on-hover behaviour Previously, buttons would take input focus when hovered. Now, this only happens for buttons within OuterMenus, and it is the OuterMenu which adds the event handlers for this. This makes MenuButtons much nicer to use outside of OuterMenus, and they will probably be moved into ui.cc Since they can be hovered without being focused, some additional rendering code is needed. -------------------------------------------------------------------------------- da5b7fe | Aidan Holm | 2019-11-20 10:48:32 +0800 Use textbox for arena UI -------------------------------------------------------------------------------- 0ead14a | Aidan Holm | 2019-11-20 10:48:32 +0800 Refactor menu button activation handling This adds an ActivateEvent and a corresponding on_activate_event() helper. Activate events are emitted when a button (and, in the future, other widgets?) is activated by clicking, pressing its hotkey, or pressing space/enter while it has input focus. Activate events bubble, so you can add a handler to the button itself, or to a higher-level container containing many buttons within it. -------------------------------------------------------------------------------- b87a47e | Aidan Holm | 2019-11-20 10:48:32 +0800 Refactor event delivery This commit attempts to make event delivery more centralized, by moving most calls to widget->on_event() to a single function responsible for event delivery up and down the widget layout. This should make event propagation easier to understand. -------------------------------------------------------------------------------- 2c8c973 | Aidan Holm | 2019-11-20 10:48:32 +0800 Add ui-specific event class Mostly necessitated by the need to add an event target member. Different event types are now implemented as subclasses. Unfortunately this means downcasting via static_cast<> in some cases, although the new on_foo_event() handlers remove that need by passing a derived event. I'm not too sure about the Event::Type::Foo verbosity... otherwise, it's mostly a net improvement. In C++20 you can do `using enum Event::Type;` which might help, when we get C++20. -------------------------------------------------------------------------------- 65a9246 | Aidan Holm | 2019-11-20 10:48:32 +0800 Add event handler helper functions This commit hides the ugly event handler slots mechanism, adding clearly named event handler helpers that, in the case of on_keydown_event, removes the need to check the event type. -------------------------------------------------------------------------------- 52f71b6 | Aidan Holm | 2019-11-20 10:48:32 +0800 Sync all widget state on layout push Initial widget state is often set before pushing the new layout, causing sync messages that are discarded by the webtiles client (since the corresponding layout HTML has not been created). In order for these widgets to have the correct state on webtiles clients, the state must be resent on push. -------------------------------------------------------------------------------- 78f1d66 | Aidan Holm | 2019-11-20 10:48:32 +0800 Add focus sync Mostly straightforward. One caveat is that widgets require a sync-id to have their focus state synced correctly, even if they have no other data that can be synced. A console warning will be issued if you tab to such an element, so manual testing during development should catch any missing ids. -------------------------------------------------------------------------------- 69b4fc0 | Aidan Holm | 2019-11-20 10:48:32 +0800 Protect against network races with popup generation IDs This commit adds a simple mechanism intended to ensure that widget sync messages are always delivered to the correct widget. Widget layouts / popups have a generation id, which is an increasing integer that never repeats. Sync messages include the current client/server generation ID, which is used to discard invalid messages on the other end. Sync messages for widgets / elements not on the top layout / popup are discarded. One reason for discarding these is that 1) on the server, while getting the generation ID of the top layout is easy, getting the generation ID of an arbitrary layer would require more API changes; and 2) it's unlikely for these to be generated on the webtiles client. While it's quite easy to change the state of any widget given a pointer on the server, discarding these messages should not cause any issues, as the entire set of syncable widgets are resynced on layout push/pop. An example of how a sync message could be sent to the wrong widget without a mechanism like this in place: 1) Client changes widget state, e.g. textbox contents 2) Simultaneously, server pops layout 3) Server receives widget state from client for previous layout -------------------------------------------------------------------------------- 465f1a9 | Aidan Holm | 2019-11-20 10:48:32 +0800 Add generic webtiles UI state syncing This commit adds an improved widget state synchronization system. Widgets now have a sync_id property. If set to a non-empty string, widgets' state will be synchronized automatically in both directions, which should allow phasing out the clunky ui_state_change() sync mechanism. Note: the currently focused widget is not yet synchronized. -------------------------------------------------------------------------------- 0499068 | Aidan Holm | 2019-11-20 10:48:32 +0800 Improve seed generation UI This commit improves the seed generation UI, using the new text entry and checkbox widgets, as well as the new focus system. UI state is not yet synchronized between webtiles and server. This commit also adds a HTML implementation; previously, the CRT emulation system was being used. -------------------------------------------------------------------------------- 74bebdf | Aidan Holm | 2019-11-20 10:48:32 +0800 Add widget focus cycling This implements a more versatile input focus layer for local tiles and console. Widgets can now be focusable or not, depending on derived type. On UI hierarchy change, a DFS is performed of all widgets and all focusable widgets are collected into an array, which is then used for cycling between focusable elements. This commit adjusts keyboard event delivery. The keyboard event (key up or down) is delivered first to the focused widget, which has a chance to handle the event and stop propagation. Next, tab, shift+tab, and esc are handled; if one of these keys is pressed, propagation stops. Otherwise, propagation continues upwards. Input focus on webtiles is decoupled from input focus on the server. The current plan is that the webtiles implementation for a given UI layout will have corresponding focusable HTML elements, and that UI state, including focus, will be synchronized in both directions. -------------------------------------------------------------------------------- b7d4c03 | Aidan Holm | 2019-11-20 10:48:32 +0800 Make shift-tab work on unix console -------------------------------------------------------------------------------- c9420b3 | Aidan Holm | 2019-11-20 10:48:31 +0800 Move controller event handlers to popup widgets -------------------------------------------------------------------------------- 37c931e | Aidan Holm | 2019-11-20 10:48:31 +0800 Add widget internal child tracking It's not uncommon for non-container widgets to have internal children as an implementation detail, invisible to the code using the non-container widget. This new API requires such internal children to be explicitly marked as such, allowing the UI system to enumerate them. for_each_internal_child() iterates over internal children, and the somewhat verbose for_each_child_including_internal() iterates first over internal widgets, and then over all children. These new APIs are added because widget users will not expect to see internal non-child widgets they did not add when iterating over a widget. -------------------------------------------------------------------------------- 383bcb0 | Aidan Holm | 2019-11-20 10:48:31 +0800 Improve Widget::for_each_child() helper Previously, it only worked on containers, so if you only had a Widget* you had to use a dynamic_pointer_cast and an if statement: ugly. Now regular non-container widgets just do nothing by default. It's also been given a clearer name. -------------------------------------------------------------------------------- c74a01a | Aidan Holm | 2019-11-20 10:48:31 +0800 Remove Layout::add_event_filter() API -------------------------------------------------------------------------------- 74dbbd1 | Aidan Holm | 2019-11-20 10:48:31 +0800 Use new hotkey API -------------------------------------------------------------------------------- 50eff3a | Aidan Holm | 2019-11-20 10:48:31 +0800 Add hotkey event handling support The purpose of this hotkey handling API is to be more explicit about the purpose of individual event handlers, replacing the add_event_filter() API. Hotkey handlers are only called for keydown events, before all other handlers get a chance to run. Note: hotkey handlers get called for *all* keydown events, due to the large number of handlers that have switch statements. -------------------------------------------------------------------------------- 5d773dd | Aidan Holm | 2019-11-20 10:48:31 +0800 Add text entry widget This commit adds a rudimentary textbox widget. It is single-line only, and does not support text selection or, indeed, most of the niceties of regular OS/toolkit-provided textboxes. That can come later. This widget has an inner LineReader class, which is a gutted version of the line_reader class, permitting independent modification. line_reader, meanwhile, will hopefully eventually be removed as more and more UI layouts are widgified. -------------------------------------------------------------------------------- ab78da2 | Aidan Holm | 2019-11-20 10:48:31 +0800 Add checkbox widget This adds a rudimentary checkbox widget. Currently, hovered checkboxes and checkboxes with input focus are visually indistinguishable. -------------------------------------------------------------------------------- fe7bffb | Aidan Holm | 2019-11-20 10:48:31 +0800 Add improved console cursor positioning API Widgets may wish to show the console cursor at a particular position, e.g. a focused text entry widget should indicate the current cursor position. However, the cursor position is also changed while rendering widgets in general, and widgets have no control over the order in which they are rendered, by design. This API allows a widget to explicitly request, for one render cycle, that the on-screen cursor be positioned in a given position. The UI framework will then move the cursor to that position after rendering, just before the screen is updated. -------------------------------------------------------------------------------- 66650a8 | Aidan Holm | 2019-11-20 10:48:31 +0800 Rename MouseEvent -> wm_mouse_event Partially for consistency with the other wm_event types, but also because I want to use MouseEvent as a derived type of a new ui-layer specific Event class, without having to worry about changing all the cruft left over in tilereg-* -------------------------------------------------------------------------------- f485fd5 | Aidan Holm | 2019-11-20 10:48:31 +0800 Refactor widget hover path handling This commit moves the hover path inside the UIRoot struct, which avoids the undefined destruction order of statically-allocated instances. I'm not sure that this was ever an issue in practice, but UB is UB, and in any case the code is cleaner now. This also fixes an issue when setting a widget's parent did not update the hover path. Now, the hover path is truncated if the widget has no parent, and recalculated afresh (delivering mousein/out events) if it is part of the top layout. Finally, this commit renames prev_hover_path to hover_path, which makes much of the code using it easier to read. -------------------------------------------------------------------------------- 87cb31b | Aidan Holm | 2019-11-20 10:48:31 +0800 Extract UI debug drawing code This is purely a method extraction and shouldn't have any functionality changes. -------------------------------------------------------------------------------- 8dd6822 | Aidan Holm | 2019-11-20 10:48:31 +0800 Make box alignment members protected This is necessary since changing box alignment should force a recalculation of the box's size. This was never an issue because noone was changing box alignments after showing the box, but it's better to have proper encapsulation. -------------------------------------------------------------------------------- eeaa2dc | Aidan Holm | 2019-11-20 10:48:31 +0800 Clean up ui.cc and ui.h -------------------------------------------------------------------------------- 166592d | advil | 2019-11-19 21:47:49 -0500 Various refactoring to make expensive calls less likely This is all in code paths that are involved in monster movement, so code that is called very frequently. Calls that check enchantments in particular seem to be disproportionately bad. -------------------------------------------------------------------------------- a07cd79 | advil | 2019-11-19 21:47:49 -0500 Disable some debugging code even in FULLDEBUG This might be useful if this cache ever stops working, but right now it's just slowing down FULLDEBUG builds for no good reason. -------------------------------------------------------------------------------- b95ba5e | Aidan Holm | 2019-11-20 10:46:33 +0800 Unbrace [skip ci] -------------------------------------------------------------------------------- 53d2a09 | advil | 2019-11-19 20:31:48 -0500 Remove clinging This is a long-time spoilery corner of dcss monster behavior, and has been under consideration for removal for years (more or less since player clinging went). Clinging monsters had weird/unique pathfinding behavior with a bunch of hidden special cases that weren't ever well-communicated (or communicatable) to the player, for example a +4 search radius for players out of los. The special cases were also kind of error-prone, as in the 0.23 bug with clinging monsters behind glass walls. This commit removes clinging without replacement. If this is somehow a nerf to spiders, I would just make them able to unconditionally cross water. (But I sort of doubt it'll make a difference.) -------------------------------------------------------------------------------- 514c71c | advil | 2019-11-19 20:31:48 -0500 Fix a wizmode / test crash on randbooks -------------------------------------------------------------------------------- 94313f7 | advil | 2019-11-19 20:31:48 -0500 Refactor habitability checks around monster flight The airborne() call is quite heavy, given how many varied things it must check. This commit refactors habitability checks to only ever check airborne() if all other tests have failed, and if the terrain is actually one that would be saved by flight. -------------------------------------------------------------------------------- ca9b790 | advil | 2019-11-19 20:31:48 -0500 Clean up some heavy-handed artefact code Any time you checked an artefact property, the old code made an entire copy of the CrawlHashTables for both the artefact props and its known state. Because artefact properties are checked frequently when monsters are carrying them (mostly in case they have flight), this could lead to heavy world_reacts on some levels, e.g. Vaults 5. This was particularly noticeable with step from time on a debug build. -------------------------------------------------------------------------------- e29c8f2 | Aidan Holm | 2019-11-18 22:08:36 +0800 Check makefile deps in parallel When running make, the dependency files are first checked to see whether they are stale, which can take several seconds. This commit parallelizes that by forking for each dependency (currently around 350 in total). There are no race conditions because the output is merged linewise and there are no ordering constraints on the generated dependencies. This takes a NOP rebuild from ~3.6 seconds down to ~1.2 seconds on my machine. -------------------------------------------------------------------------------- e9c0e85 | advil | 2019-11-17 19:09:22 -0500 Improve some webtiles logging messages in order to make cross-checking things a bit easier. (Added IP to login messages, and name to start/stop watching messages.) -------------------------------------------------------------------------------- da8bd6c | AdamPG | 2019-11-16 17:01:40 -0500 Make the Warlock's Mirror's reflection chance scale as intended Commentary about the omnireflection property granted by the Warlock's Mirror (see line 3099 of beam.cc) indicates that it is intended to reflect 50% of ench-type effects at 20 displayed SH; however, the the actual chance is 33% due to a mathematical error. This commit changes the chance to the intended 50% at 20 SH. -------------------------------------------------------------------------------- 8addd88 | Edgar A. Bering IV | 2019-11-16 15:12:44 -0500 Clarify and correct Vampire status info (12121, 12035) Also, Closes #1202. -------------------------------------------------------------------------------- 3db639d | Edgar A. Bering IV | 2019-11-16 13:44:35 -0500 Dismiss most summons on attitude change (12082) For the most part, creating hostile summons is a bad thing for a player; however, there are some exceptions that led to degenerate behavior. Guardian Golem which has no attack and any of the stationary summons (SLS and Fedhas' summons) could be made hostile in order to block monsters indefinitely. This commit changes the behavior in the following way: - True summons are dismissed on attack. The exception is demons from Summon Greater Demon, which turn hostile. - "Summons" that are M_CONJURED (fulminant prisms, ball lightning, fire fire vortices, other spell proxies) take damage but retain ATT_FRIENDLY - Fake summons (snakes, undead, malign gateway tentatcle) become hostile on hit. This will need to be re-evaluated if stationary or attackless undead get added. -------------------------------------------------------------------------------- 2289b3b | Aidan Holm | 2019-11-15 16:27:11 +0800 Fix run_layout() clearing default focus By default, the child widget of the popup widget is focused; run_layout's initial_focus parameter broke this default. -------------------------------------------------------------------------------- e48d713 | Aidan Holm | 2019-11-15 16:00:17 +0800 Fix string_wrap removing trailing empty segments This was causing a trailing newline in text widgets to not be rendered properly on console. -------------------------------------------------------------------------------- 264caf7 | Aidan Holm | 2019-11-15 16:00:16 +0800 Set initially focused widget from run_layout() -------------------------------------------------------------------------------- bfa96ce | Aidan Holm | 2019-11-14 22:10:58 +0800 Add support for formatted_string + string -------------------------------------------------------------------------------- e1e9d96 | Aidan Holm | 2019-11-14 20:59:31 +0800 Add support for formatted_string += string -------------------------------------------------------------------------------- 33052ce | advil | 2019-11-13 11:56:26 -0500 Remove old flavor messaging from fedhas_altar_decomposition (12106) This vault seems ok without it, at least if one is fine with trapped monsters. Could just be removed entirely, perhaps? -------------------------------------------------------------------------------- fcdb843 | gammafunk | 2019-11-13 00:19:17 -0600 Correctly cap duration for Fedhas summons The enchantment degree for the abjuration enchant is supposed to range from 1 to 6, but the checks on this for monster placement code aren't applied when non-spells set up the monster data. Code implementing non-spell abilities that create summons must itself enforce the degree cap, otherwise it can create permanent allies. This commit adds this degree cap to the Fedhas abilities. It took invocations of over 15 to achieve abjuration degrees above 6. Hence it wasn't 'free' to get permanent allies before this commit, but we want the allies to be temporary ones all the same. This change means that duration is maxed out at 15 invocations to 190 turns on-average, however the abilities continue to scale with past 15 invocations through increases to the allies' HD. -------------------------------------------------------------------------------- 0cf78c2 | Alex Jurkiewicz | 2019-11-12 09:23:21 -0500 Add !cancellation to Zig loot table (EugeneJudo) "Do cancellation potions not spawn in zigs? They're very useful for surviving -wiz on pan floors when things get out of hand (brilliance doesn't help, or at least it still leaves things unreliable to cast.) My supply is running low, while it's pretty rare that I ever use them." [Committer's note: Closes #1100] -------------------------------------------------------------------------------- 19cdb01 | Alex Jurkiewicz | 2019-11-11 23:32:41 -0500 Rework some chaos brand effects * Common effects added: might, agility * Cloning can sometimes make neutral/friendly copies of monsters * Miscasts entirely removed. Too unpredictable for a weapon brand, and steps on Spellbinder's toes. -------------------------------------------------------------------------------- 4073cf8 | Alex Jurkiewicz | 2019-11-10 19:59:50 -0500 Run GDB from /usr/local/bin on OSX [Committer's note: Closes #987] -------------------------------------------------------------------------------- 3c6720d | Alex Jurkiewicz | 2019-11-10 19:27:16 -0500 Run gdb at lower priority Will help manage load for online servers -------------------------------------------------------------------------------- 9e23508 | Umer Shaikh | 2019-11-10 17:13:59 -0500 Make the game check the floor when emergency eating Currently if the player is about to starve to death, they will automatically eat from their inventory if they have food available. Since the player can now eat directly from the floor, this commit extends that check to seeing if there is anything available to eat on the floor. This is an edge case and not likely to matter often, but it's good to have consistent and unsurprising behaviour. I take it the intention of commit 2474f45a (which added forced eating when starving) was just about eating rather than starving, if it's possible, and that nothing special about the location of the food in inventory was intended; if that's right, this commit updates behaviour to be in line with that intention. As a player I wouldn't expect location of the food to matter, only that the game is kindly not letting me starve from inattention to my hunger state; if that's the general player expectation, then this commit also makes the behaviour less surprising. -------------------------------------------------------------------------------- 1bb4612 | Edgar A. Bering IV | 2019-11-10 15:11:05 -0500 Revert "Add a trunk reminder for the 0.24 tournament" This reverts commit 9dd530fc128f9e15ccd22fabec984bd9d586efbc. -------------------------------------------------------------------------------- 20dcb12 | Edgar A. Bering IV | 2019-11-10 14:16:00 -0500 Remove edge cases from Fedhas protection This commit extends Fedhas protection to piercing attacks done by all allies. Fedhas summons also worship Fedhas, so can shoot through plants. Other summons do not, but will shoot through briars because they "can be shot through". The result is players killing their own briars with a lightning spire or similar. The narrowest fix is to have Fedhas only protect briars from non-Fedhas allies, but the result of that approach is a thicket of special cases. This commit also extends Fedhas protection to ballistomycete spores (which had previously been excepted for reasons involving the old spore network system) and snaplasher vines (the remaining exception, which wasn't described anywhere). -------------------------------------------------------------------------------- 23bb404 | Aidan Holm | 2019-11-10 23:45:40 +0800 Fix overenthusiastic nullptr find-replace -------------------------------------------------------------------------------- 0e808ab | Aidan Holm | 2019-11-10 20:09:08 +0800 Fix backspace-clears-name behaviour Previous commit did not stop treating backspace as 'clear' if any other key was pressed. Backspace will now keep clearing until you press a key that changes the name input (or backspace). -------------------------------------------------------------------------------- 355392f | Aidan Holm | 2019-11-10 19:57:04 +0800 Partially restore backspace-clears-name behaviour (advil, 12119) Fully restoring the old behaviour is non-trivial, but this change should make clearing the initial name easy, which is the primary use-case. Backspace will now clear if it's the first key pressed, and delete one character at a time otherwise. -------------------------------------------------------------------------------- 1777079 | Aidan Holm | 2019-11-10 19:46:53 +0800 Fix redraw issue when game ends (Goratrix, 12124) Fully redrawing the screen is only necessary when running, since a more() may be issued while running and the map should be updated to show the correct location. Otherwise, fully redrawing currently causes redraw issues and crashes if more() forces a redraw during monster moves; use the old draw code in this case for now. -------------------------------------------------------------------------------- a3d287b | advil | 2019-11-09 12:51:50 -0500 Don't crash if there aren't enough spells for an acquired randbook This can happen, for example, if sif grants a mummy a pure transmutations randbook, and rolls a size of 8 -- there aren't enough spells in the school currently that a mummy can cast. -------------------------------------------------------------------------------- a6f17ae | advil | 2019-11-08 16:24:36 -0500 Don't update travel cache on excursion to unvisited levels (odiv) An excursion to unvisited levels can happen, since 0.23, for pregenerated levels when creating abyss terrain. The level excursion was putting an entry into the travel cache, leading to the level visited values in ctrl-o potentially being wrong. -------------------------------------------------------------------------------- 7617fd2 | advil | 2019-11-07 14:50:15 -0500 Improve behavior of `remember_name = false` There were several cases where this option wasn't working as expected. Two main ones: * If a name was present in the sticky prefs, but this option was false, the saved name would still be loaded. * It was ignored on restart after a game end. This commit also lets `*` work to pick a random name at the main menu, not just at the name prompt. It's a bit of a hidden feature for now, not sure how best to document it to users. -------------------------------------------------------------------------------- 11f2770 | Aidan Holm | 2019-11-07 10:04:34 +0800 Link with the LLVM linker if available On my system, linking with lld is around 9 times faster than GNU gold, with link times of around 0.5 seconds. -------------------------------------------------------------------------------- fb64b48 | Aidan Holm | 2019-11-07 10:04:34 +0800 Add const -------------------------------------------------------------------------------- a3fec9a | Aidan Holm | 2019-11-07 10:04:34 +0800 Remove broken back-compat keybindings for hints menu This broke a while ago, once event delivery was changed to bubble up instead of down. No-one's complained, so let's quickly removed it; easy enough to add it in later, but currently it's in the way of further refactorings. -------------------------------------------------------------------------------- e945405 | Aidan Holm | 2019-11-07 10:04:34 +0800 Remove weird shift-X binding -------------------------------------------------------------------------------- 9b55229 | advil | 2019-11-06 14:18:47 -0500 Don't crash on a few cases of invalid skill names in lua Handling of bad skill names is extremely mixed in l-you; a few other cases do actual error checking, but most just return fighting on errors, which seems maybe non-ideal. There are two dlua cases that will still crash on bad skill names that I didn't bother to fix. -------------------------------------------------------------------------------- 1d1f32e | Aidan Holm | 2019-11-06 10:05:54 +0800 Fix more compiler warnings This adds most of -Wextra, except for a few exceptions. -------------------------------------------------------------------------------- 5069e0c | Aidan Holm | 2019-11-06 10:04:39 +0800 Fix enum + non-enum mixing in ?: expressions -------------------------------------------------------------------------------- 0d431de | Aidan Holm | 2019-11-06 10:04:39 +0800 Remove hacky function pointer casts -------------------------------------------------------------------------------- 2bcd1f6 | Aidan Holm | 2019-11-06 10:04:39 +0800 Remove/mark unused parameters This commit transitively removes unused parameter from all over crawl. If the unused parameters look like they're part of an interface, I've left them as is, but commented out the parameter name. In general, if I'm less confident that a parameter is intentionally ignored, i've marked it with UNUSED(). One pain point is that crawl has a lot of conditional compilation, and variables are sometimes only used by one ifdef branch. I've still used UNUSED in these cases, but it's less than ideal. -------------------------------------------------------------------------------- 359a7de | Aidan Holm | 2019-11-06 10:04:39 +0800 Add UNUSED(...) macro This allows use with parameter packs, and also allows specifying multiple arguments, e.g: UNUSED(arg1, arg2); -------------------------------------------------------------------------------- d92d1f5 | Edgar A. Bering IV | 2019-11-05 20:00:37 -0500 Check appropriate tracers in monster wand usage (ManMan) Scattershot and Cloud cone were incorrectly using a fake_beam tracer to determine when to be used as wand spells, instead of the relevant tracer functions from mon-cast.cc -------------------------------------------------------------------------------- 9796ba8 | Aidan Holm | 2019-11-05 00:30:59 +0800 Fix incomplete draws while running (advil) The UI layer calls viewwindow() via redraw_screen() to ensure that the base layout (view, hud, and messages) is fully rendered before rendering any popups (if there are any). viewwindow() does not render the main view if the player is currently running, however, so if autoexplore is paused during a prompt (e.g. the inventory full during pickup prompt or rune pickup force-more), the view is not fully rendered on either tiles or console. This commit fixes this issue by only skipping rendering while running if the current mouse_control mode is MOUSE_MODE_NORMAL. Prompts via more() and yesno() change the mouse mode, forcing full rendering. This commit also fixes the turn counter not being updated while running, and partially fixes the more prompt while running. Currently, at least on local tiles, resizing the window causes the --more-- line to disappear, due to the way the message code is structured. -------------------------------------------------------------------------------- 6cdc7bc | theJollySin | 2019-11-04 20:37:15 +0800 Remove haste potion from FoWn start (12115) -------------------------------------------------------------------------------- e910a4a | Edgar A. Bering IV | 2019-11-02 12:29:51 -0400 Don't feel safe near exploding monsters Change i_feel_safe to alert the player instead of waiting near friendly fulminant prisms, ball lightning, or ballistomyete spores. Currently this is slightly overzealous and will refuse to wait in sight of a fulminant prism regardless of distance, but this minor edge case is preferable to players waiting after a fight with Fedhas or CBL and dying after pressing 5. -------------------------------------------------------------------------------- f553b7a | Aidan Holm | 2019-11-02 22:00:48 +0800 Fix menu filtering from crashing (damerell, 12120) cursorto() moves the on-screen cursor to the correct position, given the cursor offset in the input text. However, resumable_line_reader never renders to the screen directly, so it's safe to NOP this function entirely. The crash itself seems to have something to do with the line reader start position, but I'm less interested in fixing this hacky mess because a replacement (textentry widget) is almost finished. -------------------------------------------------------------------------------- 7ce66cc | Aidan Holm | 2019-11-02 21:59:27 +0800 Remove unnecessary capitalization [skip ci] -------------------------------------------------------------------------------- e58f8a5 | gammafunk | 2019-11-01 23:53:32 -0500 Rework a worm vault (again) This commit reworks worms_lemuel to place more reasonable numbers of monsters in the earliest depths and to scale monsters and loot up with depth. For example, in D:7-10 it places only two on-average and 3 at maximum. The moths of wrath and/or torpor snails are also scaled more reasonably, only beginning to appear in Lair. Previously the vault used absolute depth for monster placement, but now it looks at branch and branch level. The vault's layout is slightly changed to accommodate the potential max number of spawns. I've also made the vault place within-branch monsters in Swamp/Spider, since placing swamp worms in Spider is not too interesting. Now it uses demonic crawlers in Spider and only torpor snails as the "assistant" monster there, since crawlers can't be berserked by moth of wrath. -------------------------------------------------------------------------------- 7dccc1b | Aidan Holm | 2019-11-01 12:41:30 +0800 Fix description UIs not scrolling via keyboard Keyboard events now have to be explicitly passed to scroller widgets, as they cannot (currently) be focused. A better implementation is in the works. -------------------------------------------------------------------------------- fe83247 | Aidan Holm | 2019-11-01 11:22:00 +0800 Prevent pinned monsters from using trample (Yermak, 12062) -------------------------------------------------------------------------------- 7ed4e61 | Aidan Holm | 2019-11-01 10:52:09 +0800 Fix some screens wider than minimum width (12008) The spell info and memorise menus were slightly wider than the minimum width. When viewing a description from one of these menus on a console screen with minimum width (79 chars), the UI layout engine takes the width of the lower layout into account, and makes the description view wider than the viewport. Any text outside the viewport is then truncated, leading to seemingly incorrect wordwrapping. Menu minimum widths are primarily determined by the width of the title string. Trimming off empty spaces at the end is enough to fix the issue. -------------------------------------------------------------------------------- fbcdf99 | Aidan Holm | 2019-11-01 10:52:09 +0800 Fix menu title/more margin size It's generally assumed that titles and entries of the same number of characters will have the same width. This was not the case because menu entry text has a right-padding of 10px. This commit adds a right-margin of 10px to both the title and the more, which fixes ellipsizing of menu entries when the window width is reduced. -------------------------------------------------------------------------------- befff83 | Aidan Holm | 2019-11-01 02:29:11 +0800 Fix win32 console branded colours Console crawl has a concept of 'branding' colours, which involves setting one of several high bits each corresponding to a given brand. This brand is then looked up in the options, allowing customization of e.g. how summons are displayed. On win32 console, branded colours were converted into actual colour pairs (fg and bg) much earlier than on unix console, (inside the real_colour() function), with the background colour being stored in bits 0xF0. This worked fine because win32 textcolour() actually updated both foreground and background colours simultaneously, until db4295c90eb, which corrected this API inconsistency, inadvertently breaking branded colours. This commit moves win32 console branding into libw32c.cc, and applies branding in the same way it is applied for unix console, fixing this issue. I'm not sure why the win32 branding was also enabled for all local tiles builds, since tiles never draws anything via the console... -------------------------------------------------------------------------------- 88673ef | advil | 2019-10-28 21:04:26 -0400 Remove an accidental swastika (Snack, minmay) Unfortunately it's not a good idea to cherry-pick this to 0.24 during the tournament (or maybe during 0.24) as this change will potentially affect any seed that uses minmay_the_grid. -------------------------------------------------------------------------------- 63109bb | advil | 2019-10-28 15:51:31 -0400 Fix some odd permastore update conditions (aidanh) This fixes weird behavior in two cases: (i) it keeps the permastore from being updated when ghosts are used during level load but the level is vetoed, and (ii) it keeps the permastore from being updated unintentionally using wizmode commands. -------------------------------------------------------------------------------- 7a5f90e | Aidan Holm | 2019-10-28 20:04:46 +0800 Revert "Add rudimentary win32 console colour adjustment" (advil) Win32 colour adjustment was added so that the new menu implementation was legible on windows console, but the legibility issue was fixed at 6844edd79dc0, which added explicit menu colouring. Meanwhile, colour adjustment is breaking the foreground text colour on the species/job menu on Windows. I'm not sure why unix is not affected. This reverts commit 40b4c6130089b08bb32c9d453dad5093658186d3. -------------------------------------------------------------------------------- f342c8b | advil | 2019-10-27 11:33:48 -0400 Several updates to the debian release guide, convert to md This introduces a bunch of extra detail and modifies some of the recommendations based on our experience packaging debs over the last few releases. Main changes: * explicit discussion of how to check dependencies of the built debs, hopefully avoiding ubuntu incompatibilities. * recommend always fully specifying OS/DIST/ARCH for creating and updating cows; this would head off some mistakes I've made at least. * convert doc to md, some cosmetic overhauls -------------------------------------------------------------------------------- 9dd530f | gammafunk | 2019-10-25 15:21:12 -0500 Add a trunk reminder for the 0.24 tournament -------------------------------------------------------------------------------- a0c9b72 | advil | 2019-10-25 10:04:50 -0400 Fix comma (Goratrix) -------------------------------------------------------------------------------- 68f8618 | advil | 2019-10-24 20:16:21 -0400 Add some missing credits I found some names (apparently) not in here while writing the release post. Also, apparently CXC was missing from here?? -------------------------------------------------------------------------------- 0753fd1 | advil | 2019-10-24 14:28:07 -0400 Update debian changelog for release (cherry picked from commit a7d21def0a8b0b39c6825b643a3b51f371b73583) -------------------------------------------------------------------------------- 45a4e74 | advil | 2019-10-24 14:27:59 -0400 Finalize changelog for 0.24 release (cherry picked from commit 54606e7572d31cb9608e76dcbdf8097f60c0c247) -------------------------------------------------------------------------------- 72b0ba0 | advil | 2019-10-24 10:59:31 -0400 Fix a gcc warning -------------------------------------------------------------------------------- 9c56bcb | advil | 2019-10-24 09:13:43 -0400 Add vaults to stable version morgues We'll see if players think this is too spammy or too obscure, but for 0.24.0 at least this will be helpful for testing any seed issues that come up. -------------------------------------------------------------------------------- c466198 | advil | 2019-10-23 20:42:08 -0400 Fix mummy death curses from ally kills (12104) This has been broken for a while; it was a mid/mindex confusion. I've also refactored the call so that it will better handle the case where your summon does before the fineff fires. -------------------------------------------------------------------------------- f0389da | gammafunk | 2019-10-23 14:53:17 -0500 Rework a wizard vault The vault cheibrodos_wizard_tower placed on-average 3 8-tier monsters at Lair depth, which is fairly nasty. This commit reworks the monster and loot placement to better scale with depth, starting with 1.25 monsters at D:7-9. The monster set now includes a possible deep elf annihilator in Dungeon, but only at depths where those are possible 8 spawns, and with a small chance. The monster count in Elf has been increased as well. The vault range is now increased to include D:13-D:$. The loot now has some thematic aux armor, randbooks, and staves mixed in, and the loot scales in count with depth. -------------------------------------------------------------------------------- 75acf023 | advil | 2019-10-23 12:42:40 -0400 Changelog tweaks -------------------------------------------------------------------------------- 6843c08 | kitchen-ace | 2019-10-24 00:31:13 +0800 Warn when exploding portal projectiles would hit you 853fe2e fixed this for harming allies, but not yourself. -------------------------------------------------------------------------------- 2ac9325 | Edgar Bering | 2019-10-23 12:13:51 -0400 Correct a changelog entry (pblur) -------------------------------------------------------------------------------- 6afad29 | theJollySin | 2019-10-23 16:57:03 +0800 Fixed typo in wands mutation (12103) -------------------------------------------------------------------------------- 47823c4 | Aidan Holm | 2019-10-23 16:23:21 +0800 Fix loading screen click activating main menu This fix drops mouseup events if the UI layout has been changed since the corresponding (well, previous) mousedown event. This fixes a bug where the loading screen would transition to the main menu on mousedown, and the mouseup event would then activate the button underneath the cursor. I'm not sure this is the best way to fix this. Some alternatives: - have the loading screen transition on mouseup - have the loading screen "swallow" the mouseup event explicitly via some new API - have menu buttons only activate on mouseup if they also received a corresponding mousedown -------------------------------------------------------------------------------- 29a1220 | gammafunk | 2019-10-23 00:29:05 -0500 Some updated invocations tiles from CanOfWorms Updated tiles for Sif Muna's Divine Exegesis and Fedhas' Wall of Briars, Overgrow, and Grow Oklob abilities. -------------------------------------------------------------------------------- 3121d2d | gammafunk | 2019-10-22 23:31:56 -0500 More updates to the 0.24 changelog -------------------------------------------------------------------------------- 6c54e25 | advil | 2019-10-21 11:17:42 -0400 Add seed as a logfile/score entry This is necessary if scoring (or perhaps sequell) is to do anything interesting with seeded games. This commit adds the seed for all game types, since even for normal games the seed is revealed on game end. Milestones do not have this field for any game type. -------------------------------------------------------------------------------- 6cf4ce5 | Aidan Holm | 2019-10-21 01:50:38 +0800 Fix formatted_scroller more text alignment A better fix would be to use the just-removed align_self, but I'd rather not revert that removal, and adding a better implementation would be too disruptive at this point (feature freeze). -------------------------------------------------------------------------------- 883716c | theJollySin | 2019-10-20 22:33:37 +0800 Adjust barehanded attack prompt wording (11907) -------------------------------------------------------------------------------- 710a5d0 | theJollySin | 2019-10-20 22:33:37 +0800 Fix Sceptre of Torment inconsistency (12093) -------------------------------------------------------------------------------- 099c3e1 | kitchen-ace | 2019-10-20 14:24:51 +0800 Draw shields on deep elf knights -------------------------------------------------------------------------------- 8155909 | kitchen-ace | 2019-10-20 14:24:05 +0800 Prevent torment from killing spriggan riders Torment shouldn't be able to kill spriggan riders or their mounts. -------------------------------------------------------------------------------- 303dd5b | Aidan Holm | 2019-10-19 16:55:46 +0800 Fix text bug (Goratrix) The Enter key does not close the popup. -------------------------------------------------------------------------------- 747a2b3 | Aidan Holm | 2019-10-18 05:51:48 +0800 Add icon to the high scores screen (advil) This also fixes the high score description text being centered in console. -------------------------------------------------------------------------------- 1393849 | Aidan Holm | 2019-10-18 04:09:29 +0800 Specify max menu width relative to font size (Siegurt, 12097) -------------------------------------------------------------------------------- 3d4e485 | Aidan Holm | 2019-10-18 03:46:46 +0800 Fix tile_menu_icons = false on local tiles ability menu -------------------------------------------------------------------------------- 14bc496 | Aidan Holm | 2019-10-18 02:45:30 +0800 Show whether spells are in library in book description -------------------------------------------------------------------------------- f7f5d9a | Aidan Holm | 2019-10-18 01:14:01 +0800 Remove stray pixels from spell tiles -------------------------------------------------------------------------------- 99cdaf7 | Aidan Holm | 2019-10-18 01:14:01 +0800 Add tiles for a few monster spells 63 to go... as measured by `grep -B7 GENERIC spl-data.h | grep ' SPELL'` -------------------------------------------------------------------------------- a86127e | Aidan Holm | 2019-10-17 23:38:36 +0800 Tidy dc-spells.txt Sorts monster spells. The note for future removal referred to an entry for 'Rearrange the Pieces' that is already gone. -------------------------------------------------------------------------------- 65d077c | Aidan Holm | 2019-10-17 19:39:22 +0800 Disallow focusing widgets not in top layout (advil, 12098) On webtiles, focus events for the species menu buttons were being received after the attributes scroller had opened. On the server side, a callback would then focus the button, even though the menu had already been opened. This fix prevents widgets not in the top layer from being focused. -------------------------------------------------------------------------------- 6ac5fb9 | Aidan Holm | 2019-10-17 19:29:42 +0800 Add ui::Widget::is_ancestor_of() -------------------------------------------------------------------------------- c393037 | Aidan Holm | 2019-10-17 18:46:37 +0800 Update the changelog -------------------------------------------------------------------------------- f18fdeb | Umer Shaikh | 2019-10-17 00:00:59 -0400 Show flay damage in status light It is tactically useful to know how much damage is due to flay. For example, it matters in deciding whether to quaff cancellation or who to attack. This information is already revealed to the player, but not in a convenient way. At the moment the careful player must pay attention to what the sources of damage are as the fight proceeds in order to know this; and, if this is neglected, it is difficult to recover the information from the message log later in the fight. This commit reveals that information more straightforwardly by adding it to the flay status light. I show a number instead of a more coarse-grained indicator. Note that otherwise the conscientious player will still want to keep track manually of damage since they can get better information that way. The damage is displayed as a negative number for consistency with the similar corrosion status light. -------------------------------------------------------------------------------- 72dcfe0 | advil | 2019-10-16 09:55:41 -0400 Revert "Remove support for multi-key macro binds" + associated commits It turns out that multi-key macros were used for keybinds for multi-character sequences sent by some terminals corresponding to special keys. For example, under the VT100 standard, \{27}Ov is sent by numpad 6. Another example: on OS X, option+arrow keys send multi-character escape sequences as well (maybe even outside of terminal). This sequence of commits broke such old macro files, and even worse, tended to break ESC, since nearly all of these sequences are ESC sequences. We'll need to rethink how to simplify this. Some of these simplifications might be independent of the current revert project and could be restored... This reverts commit 049a78546b28e77ec9647cdfd40840a8451f18ad. (Note: also a partial revert of d158fba7, 0b1efcb, 0e779d2) This reverts commit 678ee33c32bb4efb2fda34a8b44ce857352add0c. This reverts commit 5a8975c3e2236cd5aa0d3cf1738ccfdd360a4ab3. This reverts commit 3ea5ddb52caf3a66e4f92f90f056132a344c65e3. -------------------------------------------------------------------------------- dc1bd94 | advil | 2019-10-15 21:38:37 -0400 Fix Ru sacrifice delay with faith (12096 / @Wise Wolf) Specific problem and solution found by @Wise Wolf on discord yesterday. -------------------------------------------------------------------------------- c5ee894 | Edgar A. Bering IV | 2019-10-15 21:10:06 -0400 Further update the changelog Add in descriptions of the Vampire and Throwing changes -------------------------------------------------------------------------------- a5a8db4 | gammafunk | 2019-10-15 15:36:15 -0500 Update the changelog A quick pass that likely contains errors. I've left out Vampire and Throwing changes so that those can be written up by others. -------------------------------------------------------------------------------- 8315797 | advil | 2019-10-15 16:14:35 -0400 Fix a js error in go_lobby Not sure what the conditions are that trigger this, but probably at least game_exit::abort. -------------------------------------------------------------------------------- 74baf03 | advil | 2019-10-15 16:14:35 -0400 Add a webtiles seed selection popup At first glance, this may appear to be a feature, but it is in fact a bug: the bug is that paste doesn't work for crt-emulated input. Implementing this as an actual textbox is the only way I've found to get this to work in webtiles. This doesn't materially change the implementation of the seed selection ui for console/local tiles; it is just as bad as ever. -------------------------------------------------------------------------------- f4602a8 | Aidan Holm | 2019-10-15 23:14:54 +0800 Factor out Region::contains_point() This commit also fixes a few off-by-one bugs in widget hit testing. -------------------------------------------------------------------------------- b94451d | Aidan Holm | 2019-10-15 23:14:54 +0800 Don't allow showing messages on arena team choice UI It's always empty. -------------------------------------------------------------------------------- 2533fd6 | Aidan Holm | 2019-10-15 23:14:54 +0800 Fix segfault when delivering mousebutton events The previous code used a reverse iterator that could be invalidated by the hover path changing during event handling, causing a segmentation fault. It may be better to first copy the hover path and then iterate over that; this would matter if an event handler changed something in the hover path. But the semantics of event emission aren't strongly defined at this point; better to wait for a use-case and revisit this then. -------------------------------------------------------------------------------- c27d5b8 | Aidan Holm | 2019-10-15 23:14:54 +0800 Fix some event forwarding bugs Previously, the UI framework would propagate events from the topmost root widget down to child widgets. The framework has since been changed to propagate events up from a focused widget, inadvertently breaking these event handlers' custom event propagation. -------------------------------------------------------------------------------- bc5b4a9 | Aidan Holm | 2019-10-15 23:14:54 +0800 Add ui::Switcher::current_widget() -------------------------------------------------------------------------------- 8ab17b4 | Aidan Holm | 2019-10-15 23:14:54 +0800 Fix off-by-one error -------------------------------------------------------------------------------- 1381ef2 | Edgar Bering | 2019-10-15 07:47:17 -0400 Update CREDITS -------------------------------------------------------------------------------- b8d28a4 | theJollySin | 2019-10-15 07:37:24 -0400 Misleading text when renouncing religion (8887) -------------------------------------------------------------------------------- 2fe12d4 | advil | 2019-10-14 16:25:26 -0400 Fix the build on non-webtiles (aidanh) -------------------------------------------------------------------------------- a8c9d54 | advil | 2019-10-14 16:09:42 -0400 Fix seed selection on webtiles Eventually this needs to be rewritten to use a browser text input box. -------------------------------------------------------------------------------- b6de7aa | mwvdev | 2019-10-14 14:15:16 -0400 Fix manual typos -------------------------------------------------------------------------------- 771548f | kitchen-ace | 2019-10-15 01:00:46 +0800 Don't stop travel for changes from (un)melding If you are auto-travelling, and you lose stats from armour melding or unmelding, don't stop auto-travel for that reason alone. This is really only relevant for merfolk with artefact boots, but the fix should apply to the general case. -------------------------------------------------------------------------------- 653463b | Nikolai Lavsky | 2019-10-15 00:45:52 +0800 Add details to the newgame dolls This commit adds hair, claws, and horns to player dolls on the species selection menu. These extra bits are selected according to the default values from `tilep_race_default()` and `fill_doll_equipment()`. -------------------------------------------------------------------------------- 8ac2ca0 | Nikolai Lavsky | 2019-10-15 00:45:52 +0800 Refactor the processing of species/job tiles This commit fixes a couple of enum names, removes unnecessary file extensions, and replaces repeating file paths with `%sdir`. -------------------------------------------------------------------------------- 8166f01 | Aidan Holm | 2019-10-15 00:45:52 +0800 rltiles: Allow referencing generated images by enum Wherever image filenames are used, you can now also refer to an already-generated tile by its enum name. The first such matching tile is chosen; there is no support (yet?) for selecting a variation. The motivation for this feature is to reduce duplication and ensure that changes between tiles are synchronized. -------------------------------------------------------------------------------- e7af4de | Aidan Holm | 2019-10-14 23:26:55 +0800 Fix abyss-gen level excursion milestones (kitchen_ace, 12078) Abyss generation can include parts of other levels, through a level excursion. When including part of a level that the player had never visited, a milestone was erroneously added. -------------------------------------------------------------------------------- 6559c6c | kitchen-ace | 2019-10-13 14:59:21 -0400 Show that bloodless vampires' bite can heal It's not obvious that vampires can heal themselves when they bite something, and that this works only when they're bloodless. Add some messages to the abilities screens. -------------------------------------------------------------------------------- 14d03b1 | kitchen-ace | 2019-10-13 14:58:48 -0400 Fix showing regen amulets as useless for Vampires Vampires now heal when bloodless as long as no monsters are in LOS. -------------------------------------------------------------------------------- ac51ba0 | gammafunk | 2019-10-12 20:40:28 -0500 Update ballistomycete descriptions (kitchen-ace) Updates the descriptions for ballistomycete and ballistomycete spores to remove an outdated reference to ballistomycetes growing and to describe the effect of the spore's explosion. Also add a description for the Sporulate ability using the same language. Closes #1183. [skip ci] -------------------------------------------------------------------------------- 0f74319 | advil | 2019-10-11 12:18:19 -0400 Don't crash with equip_unequip I think this case just got missed in b57a41d. -------------------------------------------------------------------------------- a050431 | Umer Shaikh | 2019-10-10 18:28:50 -0400 Allow putting on jewellery from the floor This commit extends previous functionality to work with puton_ring (which also handles amulets). Amount of time to perform the action is the same as putting on jewellery from the inventory. [ Closes #1136 ] -------------------------------------------------------------------------------- b57a41d | Umer Shaikh | 2019-10-10 18:23:04 -0400 Allow wielding and wearing from the floor This commit changes wield_weapon and wear_armour to use use_an_item so the player can wield and wear from the floor. It also changes use_an_item so * and - options are allowed to, respectively, view and choose from all items and (if selecting weapons) swap to bare hands. This means * is now available for quaffing and reading as well. The wield weapon menu can now be brought up even if there are no weapons around---indeed, even if there is nothing at all around. The first is because you can wield non-weapons with *. The second is because you always have your bare hands, and I am anticipating a menu where basic stats for weapons are displayed alongside the options (a long-standing feature request). This commit implements * to show all items. This preserves the current ability to wield non-weapons and fulfills a TODO marked in the existing use_an_item code, so that * can be used for reading scrolls and quaffing as well. However, my own feeling is that this is not a usefull bit of UI complexity from the player's side. You cannot quaff non-potions, read non-scrolls, or wear non-wearables anyway. And as far as I know the only practical use for wielding non-weapons is breadswinging, a niche speedrunning tactic. I suggest cutting this and cutting the ability to wield non-weapons. This commit makes wielding or wearing from the floor take the same amount of time as wielding or wearing from your inventory. I think this is the least surprising UI and is consistent with the current behaviour for quaffing and reading from the floor (10 aut). I anticipate this means speedrunners and the hyper-optimal will want to sometimes pick items up by wielding them from the floor (e.g., wielding arrows to pick them up). [ Committer's note: Wielding arrows from the floor to pick them up then switching back to the previously wielded item costs 15 aut and 2 turns. Just picking up the arrows costs 10. Whether turns or aut are used for scoring, just picking up arrows is faster. ] -------------------------------------------------------------------------------- b7a8766 | Byrel Mitchell | 2019-10-10 18:06:47 -0400 Fixed bug in OTR variance reduction commit This makes it impossible to gain extra OTR duration by breadswinging during the final turn of duration. [Closes #1177] -------------------------------------------------------------------------------- 71cb82d | Aidan Holm | 2019-10-11 02:44:24 +0800 Fix crash when repeating menu evocations (gammafunk) When repeating the previous command via the ` key, the UI is not fully laid out. The current implementation depends on having the menu more text default to not being visible for the UI to layout correctly. On local tiles this isn't an issue, since scrollers render their own scrollbars, but on console the scroll position is rendered to the more, and the layout error was causing a division by zero in the position calculation. -------------------------------------------------------------------------------- ddf7d93 | Byrel Mitchell | 2019-10-10 14:29:33 -0400 Adjust OTR to be more turn length invariant. Changed direct damage to use turn length in auts (instead of 10s of auts) for direct damage, and to scale odds of adding a poison stack linearly between 1 and 20 aut turn lengths (instead of 50% odds regardless of turn length.) This has the same results as previous calculation at 10 aut turns, but eliminates the incentive to 'quick-blade-swing' to add poison stacks rapidly. -------------------------------------------------------------------------------- 36a6468 | Aidan Holm | 2019-10-11 01:41:06 +0800 Don't scale when rendering lines (Goratrix, 12085) This bug was caused by line buffer rendering correctness depending on the GL scale being the same when buffer packing and when rendering, which was only required due to the way the local tiles minimap worked. The local tiles minimap has been changed to render the boundary box with no scaling, fixing this weird quirk. -------------------------------------------------------------------------------- 5730307 | Nikolai Lavsky | 2019-10-10 13:36:11 -0400 Indicate damage done by Ignite Poison This commit brings Ignite Poison in line with other damaging spells that use exclamation marks to show the amount of damage done. It is a followup for PR #952 and commits 4a3ee908 and 1f260a4b. -------------------------------------------------------------------------------- 410b6b9 | Aidan Holm | 2019-10-11 00:53:02 +0800 Revert "Remove UI_CRT and other UI gunk" Reverted due to https://crawl.develz.org/mantis/view.php?id=12090 This reverts commit ad5c9ccc1d3bb7aae20c7d970926c877ea0f62fe. -------------------------------------------------------------------------------- bc6939d | Aidan Holm | 2019-10-11 00:02:05 +0800 Fix minimap stretching on local tiles -------------------------------------------------------------------------------- fe114aa | Aidan Holm | 2019-10-10 22:45:34 +0800 Remove ui_ prefix from namespaced functions -------------------------------------------------------------------------------- ad5c9cc | Aidan Holm | 2019-10-10 22:45:34 +0800 Remove UI_CRT and other UI gunk tiles_crt_popup() shouldn't be necessary, since these UIs don't use any cgotoxy/cprintf calls themselves. I'm not exactly sure of the purpose of the set_ui_state() calls here, but they shouldn't be required either for those UIs to work correctly. In general, we're trying to remove tiles_crt_popup() entirely, as it was an temporary hack used to wrap old-style UIs. As of this commit, the last remaining such UI is the skill menu UI. -------------------------------------------------------------------------------- 6733c44 | Aidan Holm | 2019-10-10 22:45:34 +0800 Make text widget members private We also add size request invalidation, just in case someone is doing something interesting... -------------------------------------------------------------------------------- 6c541cf | Aidan Holm | 2019-10-10 22:45:34 +0800 Remove ui::Widget align_self property This only did anything inside a box widget, and was confusingly named (does it refer to main- or cross-axis alignment?). It seems to be unnecessary, although relying on the parent stretch property is probably slightly brittle. IIRC Flutter allows the parent to store a small amount of data on child widgets; perhaps adding a Box::set_child_cross_alignment() that utilizes this method will work well. -------------------------------------------------------------------------------- 83d332e | Aidan Holm | 2019-10-10 22:45:34 +0800 Make ui::Box member private -------------------------------------------------------------------------------- c303d00 | Aidan Holm | 2019-10-10 22:44:26 +0800 Improve Box widget alignment property names "main" means alignment along the main axis, while "cross" means alignment along the cross axis. E.g. for a horizontal box, the main axis is horizontal and the cross axis is vertical. -------------------------------------------------------------------------------- d9e12f6 | Aidan Holm | 2019-10-10 22:42:55 +0800 Make RestartAllocation private to ui.cc -------------------------------------------------------------------------------- 1ec443c | Aidan Holm | 2019-10-10 22:42:55 +0800 Remove ui::vec utility array -------------------------------------------------------------------------------- cb68440 | Aidan Holm | 2019-10-10 22:42:55 +0800 Remove use of ui::i2 -------------------------------------------------------------------------------- 9d7ac8f | Aidan Holm | 2019-10-10 22:42:55 +0800 Clean up headers -------------------------------------------------------------------------------- 87254cb | Aidan Holm | 2019-10-10 22:42:55 +0800 Add ui::Region helper class -------------------------------------------------------------------------------- aeaa904 | Aidan Holm | 2019-10-10 22:42:55 +0800 Add ui::Margin helper class This makes margin member accesses clearer, by allowing/forcing the use of symbolic names (top/left/etc) rather than array indices. Also adds several Margin() constructors, based on CSS notation; parameters are now forwarded by the set_margin_for_* helpers. Those helpers also now invalidate their size request, so updating margins live should also work. -------------------------------------------------------------------------------- 5029d81 | Aidan Holm | 2019-10-10 22:42:55 +0800 Add ui::Size helper class -------------------------------------------------------------------------------- 2df86a5 | Aidan Holm | 2019-10-10 22:42:55 +0800 Add widget visibility Non-visible widgets don't get rendered or allocated and have a size request of zero. -------------------------------------------------------------------------------- 35933f4 | advil | 2019-10-09 10:58:42 -0400 Don't let overgrow target out of bounds This directly provides bounds information, but that is the same as the dig and passwall targeters. The alternative (to avoid a crash) would be letting the targeter work, but the spell fail, which seems worse. -------------------------------------------------------------------------------- 2b66604 | gammafunk | 2019-10-09 01:31:40 -0500 Fix use of Slimify on derived undead (CanOfWorms) The monster polymorph code had a special consideration (i.e. a hack) for derived undead that have the shapeshifter enchantment. This hack involved having the polymorph target check look at the monster type of the original type the undead monster derived from instead of the current type. A byproduct of this hack was that derived undead that got Slimified wouldn't polymorph into a death ooze yet would be converted to a neutral monster. Derived undead with the shapeshifter enchant shouldn't exist since undead are not normally able to polymorph. Hence this commit removes the hack to allow Slimify to work properly. Any derived undead that attempts to shift simply generate the "...looks momentarily different" message. -------------------------------------------------------------------------------- 06d714f | Edgar A. Bering IV | 2019-10-08 22:53:13 -0400 Add new airstrike formula to monster (minmay) -------------------------------------------------------------------------------- aa6b62e | Edgar A. Bering IV | 2019-10-08 22:27:54 -0400 Add attack strength punctuation to waterstrike and airstrike These (and everything else in mon-cast.cc that does damage in mon-cast.cc instead of via beam.cc) were missed when attack strength punctuation was added to spells. -------------------------------------------------------------------------------- 4d0d9f2 | Edgar A. Bering IV | 2019-10-08 22:25:17 -0400 Give monsters the player airstrike damage formula Commit a0cb8612 simplified airstrike damage for players; monster airstrike damage was previously a hack that gave a simplified damage formula and also reduced variance to work around the old formula's long tail. The new airstrike damage formula does not have the high-variance long tail and is appropriate for monsters to use. -------------------------------------------------------------------------------- 601f8f6 | kitchen-ace | 2019-10-08 20:52:30 +0800 Use felid blade hands tile with mons:natasha If the player has tile_player_tile = mons:natasha, show the felid version of blade hands. It's still not perfect (and doesn't match with many of the other felid tiles) but looks much better than the human blade hands tile. -------------------------------------------------------------------------------- e536774 | Aidan Holm | 2019-10-08 15:25:49 +0800 Fix grow oklob tile colour space reduction Unfortunately the previous iteration of the grow oklob ability tile had been saved with an unintentionally reduced colour set, due to the PNG being in indexed mode. -------------------------------------------------------------------------------- 92173c3 | Aidan Holm | 2019-10-08 15:24:53 +0800 Add tile for sprint monster spell -------------------------------------------------------------------------------- 048a31f | John Stilley | 2019-10-07 18:15:48 -0700 Put an oklob in the tile for Fedhas's oklob ability (#1173) -------------------------------------------------------------------------------- 3fb7a4b | John Stilley | 2019-10-07 18:12:56 -0700 Improving redundant working on flight dangers (#1174) -------------------------------------------------------------------------------- 36f0aeb | theJollySin | 2019-10-07 16:23:12 +0800 Remove ill-fitting confusion text (1583) This visual doesn't work for monsters with 0 or 1 eyes [skip ci] -------------------------------------------------------------------------------- 74da537 | S. Mark | 2019-10-06 17:51:03 -0400 Update mailmap. [skip ci] -------------------------------------------------------------------------------- 30414c0 | S. Mark | 2019-10-06 17:49:23 -0400 Fix typo. -------------------------------------------------------------------------------- 8ac5403 | advil | 2019-10-06 17:37:31 -0400 Add an explicit bounds check to crawl_view_buffer () This is what was crashing in #1166 / mantis 12069, but because it was triggered by an invalid memory access, whether there was a crash was very system/build-specific. This makes a similar out of bounds error explicit in the future. -------------------------------------------------------------------------------- b0425b2 | advil | 2019-10-06 17:37:31 -0400 Remove an ifdef related to seed selection This never really worked right anyways, and gave errors on CPO -------------------------------------------------------------------------------- f26d611 | Aidan Holm | 2019-10-07 05:05:29 +0800 Fix dungeon feature quotes not visible (Vaamat, 12032) -------------------------------------------------------------------------------- 3be9bf8 | Aidan Holm | 2019-10-07 03:52:55 +0800 Add keybind to clear player name (kitchen_ace, 12084) Using backspace to clear is not the best choice because a) it's kind of weird for backspace to delete everything, and b) difficult to determine when to delete everything and when to delete just one letter. -------------------------------------------------------------------------------- bb1ff42 | Aidan Holm | 2019-10-07 03:37:01 +0800 Fix invalid read causing map-view crash (jackofblades, 12069) -------------------------------------------------------------------------------- 643f6c6 | Aidan Holm | 2019-10-07 02:24:03 +0800 Fix main menus not handling app quit (Goratrix, 12080) -------------------------------------------------------------------------------- ad1f87b | Aidan Holm | 2019-10-07 02:15:58 +0800 Fix empty high scores menu (Goratrix, 12080) The reported bug was caused by there being no focused UI widget, so the escape key was never handled. I really need to revisit that whole focus system... I also added in a placeholder text label for when there are no highscores, explicitly stating the fact. -------------------------------------------------------------------------------- 368c164 | Umer Shaikh | 2019-10-03 15:47:11 -0400 Clean up a function Change the function is_habitable_feat to an equivalent formulation which is simpler and idiomatic. -------------------------------------------------------------------------------- dea222d | Aidan Holm | 2019-10-04 00:31:51 +0800 Refactor and improve UI widget iterators This removes the honestly quite hacky container iterator implementation which deferred at runtime to a heap-allocated implementation class. Instead, each container type gets their own iterator. If you have a base class pointer and you want to iterate over it, the new foreach() helper function does that. It's a little ugly, but much better than before, especially since iterating over a derived type is the common case. -------------------------------------------------------------------------------- 98f1965 | Aidan Holm | 2019-10-03 22:45:37 +0800 Don't include debug drawing in release builds -------------------------------------------------------------------------------- fb0ce18 | Aidan Holm | 2019-10-03 19:53:41 +0800 Add widget margin debug drawing -------------------------------------------------------------------------------- 0be37ba | Aidan Holm | 2019-10-03 19:53:25 +0800 Fix off-by-one error in mouse hover handling -------------------------------------------------------------------------------- f64bd74 | Aidan Holm | 2019-10-03 19:29:35 +0800 Simplify code -------------------------------------------------------------------------------- f1eb651 | Aidan Holm | 2019-10-03 19:26:33 +0800 Fix startup menu spacing issues This fixes a bug where there was no margin between the header text and the name entry row. This also replaces some conditional minimum heights with proper margins. -------------------------------------------------------------------------------- ca426f5 | gammafunk | 2019-10-02 15:27:12 -0500 Update descriptions for Fedhas (Snack ⑨) Update descriptions for the god and the general description of its powers, and update the descriptions for all ability to mention the affects of Invocations training. [skip ci] -------------------------------------------------------------------------------- f4813fd | gammafunk | 2019-10-02 14:56:40 -0500 Update the descriptions for Sif Muna (Goratrix) The god and god power descriptions were still based on the previous iteration of Sif. [skip ci] -------------------------------------------------------------------------------- 74cc3ae | Nikolai Lavsky | 2019-10-01 22:44:20 -0400 Fix display of detected gold on the minimap (11950) Currently, there are several Gold Sense-related bugs: * on webtiles, detected gold is not displayed on the minimap; * on local tiles, it disappears from the minimap after reloading the game and after reentering a floor; * on console, it's not possible to scroll the map in the X mode to see all detected piles of gold on a new level. This happens because now update_item_at() runs more than once for each pile of gold. Prior to 063869c, the gold detection code from files.cc:_count_gold(), which contains update_item_at(), run only once for each new level. After that commit and after 4488db6, the gold detection code, which is now in god-passive.cc:gozag_detect_level_gold(), runs twice when the player enters a new floor. First, it runs as a delayed action, then it runs for counting the generated gold (both calls come from files.cc:load_level()). When it's called the first time, gozag_detect_level_gold() sets the MAP_DETECTED_ITEM flag for each pile of gold, so they would appear on the minimap. When gozag_detect_level_gold() called after that, clear_item() removes this flag from the piles, and, since env.map_knowledge() already knows about those piles, gozag_detect_level_gold() won't set the flag again. The code path is god-passive.cc:gozag_detect_level_gold() -> show.cc:update_item_at() -> map-cell.h:set_item() -> map-cell.h:clear_item(). Unlike webtiles, local tiles update the minimap only after the first call, so detected gold appears on the minimap, but only until a current level is reloaded. This commit makes it safe to call gozag_detect_level_gold() multiple times: update_item_at() will be called only for undetected piles of gold. Also, force update of the minimap so piles of gold generated in new Abyss regions are displayed too. -------------------------------------------------------------------------------- bfa02ac | EC2 Default User | 2019-10-01 21:59:27 -0400 Fix wizdump loading when rotted or Gozag follower. Recognize "HP:" and "MP:" as mourge line starts. Recognize Gozag which doesn't have a piety meter, causing the God line to only have 8 fields. -------------------------------------------------------------------------------- bab67b8 | gammafunk | 2019-10-01 20:57:53 -0500 Remove an unused function for Dithmenos conducts Since Dith no longer cares about sources of fire, this function is unused. A similar function that tests for fiery monsters by monster class is still necessary for resistance checks. -------------------------------------------------------------------------------- a1bddc0 | gammafunk | 2019-10-01 20:57:53 -0500 Rework damage of ballistomycete spores Currently the spore damage is fixed at 3d15, which is pretty high when the 3* Grow Ballistomycete becomes available. This commit incorporates Invocations skill into the spore explosion damage and decreases the initial damage. The new explosion damage is 3d(5 + spore HD), with spore HD ranging from 1 at 0 Invocations to 28 at Invocations 27. Hence the max damage at 27 Invocations is 3d33, which is very similar to max spell-power Fireball. -------------------------------------------------------------------------------- 27a75b7 | gammafunk | 2019-10-01 20:57:53 -0500 Fedhas rework part 11: simplify conducts Fedhas used to care about corpse-violating spells or items, a minor conduct thematically connected to how piety was gained for this god. Now that Fedhas appreciates kills, this conduct doesn't make thematic sense. It was also too minor a conduct, so the two best options are removing it or expanding it to a more significant set of conducts thematically connected to the current god. One option is making Fedhas hate all of necromancy. This is similar to the removed no-fire-magic conduct for Dith, but it affects a much larger number of spells in a school that's one of the strongest. Unfortunately, the reasons for current Fedhas hating necromancy are a bit tough to justify. Something about necromancy disrupting the natural cycle of life and death in nature is a bit sketchy when so many other things could do this. Another option is to make Fedhas a good god, which introduces some gameplay changes as well as an even more pervasive set of conducts. Unfortunately, Fedhas is a god that's significantly stronger early on relative to how strong they are later in the game. Since being a good god would remove any wrath effects at all for most god swaps and even allow retaining piety for switches to the good gods that are stronger than Fedhas later on, this opens up a lot of no-brainer god switches. In the end, I wasn't satisfied with either option, so for now I'm simply removing Fedhas' conducts related to undead worhsipers and corpse violation without replacement. This means that ghouls, mummies, vampires and those unblessed with the mighty lich form can now worship Fedhas. I'm open to re-adding something like the no-necromancy/undead conduct or another interesting conduct if details can be properly hashed out. Fedhas also had a minor conduct related to letting a permanent ally die which I've also removed. Fedhas no longer makes permanent allies, so this conduct no longer makes sense. Fedhas still gives penance if you kill an actual plant or a summoned ally, of course. -------------------------------------------------------------------------------- dacd3b1 | gammafunk | 2019-10-01 20:57:44 -0500 Fedhas rework part 10: Grow Oklob ability A 5* ability to summon an oklob plant at a smite-targeted location within radius 2 for a cost of 6 piety. The HD of the oklob is increased by 1 for each level of Invocations skill, which increases its summon duration, its HP, the damage from its Spit Acid ability, as well as the frequency with which it uses Spit Acid. These aspects are all done in the same way as Fedhas' previous Evolution ability had Invocations influence oklobs. This is not an especially creative ability, but it's fun to play with strong stationary allies. At a cost of 6 piety, a player at 6* could make quite a few oklobs, so it's still possible to make a large group for a single fight on e.g. Zot:5. -------------------------------------------------------------------------------- 286ebac | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 9: Overgrow ability A 4* ability that transforms any (non-permarock) walls, trees, doors, or diggable solid features in a 3x3 smite-targeted area into plant allies at a cost of 12 piety. The created monster is a summon, but the wall is permanently destroyed. This commit implements a targeter UI that only shows cells as affected if they contain a wall that's a valid target for Overgrow. To be affected, a wall must be in LOS and not blocked by a feature that blocks translocations (e.g. clear walls). Open doors won't be affect if they contain a monster, and if it turns out there was an invisible monster in the open door, the ability will fail but still use piety. Currently the set of possible plant allies is weighted towards oklob saplings, wandering mushrooms, and burning bushes, with lower chances for ballistomycetes and oklob plants. The plant HD is increased by 1 with each level of Invocations, which for oklob saplings, burning bushes, and oklob plants will give more damage per use of their abilities, and oklob plants will get an increase in their "spit" rate. All monsters will get increased HP and summon duration with Invocations. -------------------------------------------------------------------------------- 8f1ea3d | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 8: remove Rain Part of what Rain does is allow creation of plants, but this is no longer relevant, since the other Fedhas ally creation abilities don't need plant intermediaries. The other prominent aspect of Rain is permanent creation of deep water, but this leads to a lot of luring. The new Wall of Briars ability provides some instantaneous limitation of monster movement, but in a way that doesn't make permanent terrain changes and hence less encourages luring. -------------------------------------------------------------------------------- 7ac76a7 | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 7: rework Reproduction This commit replaces Fedhas' Reproduction with Grow Ballistomycete, an ability that creates a summoned ballistomycete at any smite-targeted location within radius 2 at a cost of 5 piety. Ballistomycetes have been simplified in the previous commit and now use their Sporulate ability to create spores that try to reach their target in order to explode. The explosion radius has been reduced to 1, so this combined with more flexibility in positioning will make it easier for players to avoid the explosion. If explosion avoidance ends up still being too big an issue, we could have a Fedhas passively protect players from the explosion to some degree. Ballistomycetes get increased HD and duration with Invocations, gaining 1 HD per level of the skill. The only effect of this HD increase at present is more HP. We probably don't want to increase the usage rate of Sporulat like we do for Oklob Plant's spit acid, since rapidly creating too many spores will create...a lot of explosions. Fedhas wrath places spores around corpses using some of the same functions that were previously used for Reproduction. Hence these have been moved to god-wrath.cc. It would probably be best to simplify this wrath by creating durably summoned ballistomycetes instead, but I'm not doing that for now. -------------------------------------------------------------------------------- 7da3b9e | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 6: simplify ballistomycetes Ballistomycetes (ballistos) are complicated monsters that grow based on interactions with the spore monsters. Spores leave mold as they move, which can give rise to the production of new ballistos. This set of behaviors fell into the realm of "complexity for the sake of complexity". One had to wait a while for this "reproduction" to play out, only to get a few more ballisto spores. Now that we're putting stronger limits on ally usage through use of summons, it's a good time to simplify the way ballistos and their spores work. This commit removes the reproduction aspect of ballistos, removes mold itself, and simplifies ballistos down to one type of monster. Additionally, ballistos now have a Sporulate natural ability they occasionally use to create a single spore as a short-lived summon. The spore will seek after the ballisto's target and explode upon hit, still producing the damaging explosion that applies confusion to living targets. A subsequent commit will make a Fedhas active ability to let the player to create a ballisto summon, and this will replace Fedhas' Reproduction. -------------------------------------------------------------------------------- dd8df34 | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 5: remove Evolution As per the Fungal Bloom and Growth ability removals, we don't use plants as intermediaries for creating allies. New abilities to create some of these monsters as summons directly will be added in future commits. -------------------------------------------------------------------------------- 6ba74d5 | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 4: remove Growth Fedhas will use summons to create all allies instead of creating permanent ones using actual plant monsters as intermediaries. Hence Growth, also referred to as using the descriptor `RING_OF_PLANTS` in the source, is no longer necessary. -------------------------------------------------------------------------------- 1d64b78 | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 3: remove Sunlight Sunlight is a pretty tedious to use ability that strongly overlaps with TSO. Removing shallow and deep water when flight is extensively available is also not especially interesting. This adds a minor version tag to handle save compatibility, since we're removing a member of the global env that maps sunlight-affected squares. -------------------------------------------------------------------------------- 9563602 | gammafunk | 2019-10-01 20:47:14 -0500 Fedhas rework part 2: Wall of Briars ability A 2* ability that encircles the player with summoned briar patches. The player can fire through these plants, and the briars damage monsters that attack them. Monster AI is changed so that hostile monsters always try to attack briars that are friendly to the player. Only floor or shallow water tiles that have no monsters are viable summon locations. The briar patches' HP scale with Invocations by adding 1 HD with each level of this skill. -------------------------------------------------------------------------------- 0b10f19 | gammafunk | 2019-10-01 20:47:14 -0500 Fedhas rework part 1: piety gain Fedhas is a plant-themed god originally intended to support range combat. The god gives you plant allies that you can move and fire through allows you to create water to impede monster movement. Unfortunately the current design gives access to too many allies that are strong enough to carry the player through much of the game. These are either permanent or long-lived yet are stationary or have movement limitations, things that together encourage the player to lure monsters to specific locations. As a result, Fedhas has a tedious play-style, and this is reflected in the god's usage rate among players. This commit is the first in a set that rework the god but in a way that retains some of idea of supporting ranged combat. New Fedhas will use only summoned allies and will allow less unfettered use of allies in general. A github wiki page describing remaining and potential issues with the rework is available here: https://github.com/crawl/crawl/wiki/Fedhas-Rework Part 1 removes Fedhas' appreciation of corpse decay as well as the Fungal Bloom ability. I haven't touched the corpse violation, necromancy conducts, and species restrictions for now, although those all need addressing. -------------------------------------------------------------------------------- 3348362 | Richard Wardin | 2019-10-01 21:41:39 -0400 Fix being able to pick out barbs while incapacitated (12065) Carefully pulling out barbs now requires that you can move (not paralyzed or petrified), aren't confused, and aren't asleep. [Committer's note: Closes #1162. Tweaked berserk message.] -------------------------------------------------------------------------------- 42da65f | Edgar A. Bering IV | 2019-10-01 21:20:38 -0400 De-randomize Golden Eye confusion spellpower This random power is a legacy dating back to their creation. The commit log doesn't describe why Confusion Gaze should work this way instead of with a normal confuse spellpower and a normal MR check. Now that monster spell success chance is displayed, this randomization had the side effect of making the success chance display wrong. Confusion Gaze was the last monster spell with monster spellpower randomization; this commit cleans up some of the code, but there is a larger refactor possible that is left undone. Closes #1160 -------------------------------------------------------------------------------- f6d4cf8 | NormalPerson7 | 2019-10-01 20:48:38 -0400 Remove troves asking for scrolls of identify Beyond the early game, once almost all the potions and scrolls in the game are identified, scrolls of identify become a convenience tool more than anything else; it is simply easier and faster for the player to identify this unknown ring on the floor using a scroll than to find something to drop, pick the ring up, put it on, decide it's useless, drop it, and pick up the other thing. This especially applies when the player has 5+ spare identify scrolls in their inventory, which is fairly common around the time of Vaults and Depths. Troves asking for identify scrolls encourages players to employ the tedious second behaviour, and to some extent take risks with wear-identifying artefacts, in order to horde the scrolls and eventually enter the trove. Additionally, being reduced to 0 identify scrolls by a trove hardly makes a significant difference to the strength of a character - rather it simply means once again that the tedious wear-identification process is required. Note that the wear-identification of artefacts that is encouraged by this isn't particularly dangerous beyond the early game anyway. The only bad effects are *Drain and *Contam, where *Drain is unlikely to have a significant impact, and *Contam may cause 1 malmutate before wearing off that the player can probably eliminate by using a mutation potion. Hence, remove troves asking for scrolls of identify, because they encouraged tedious behaviour instead of meaningful decision making. -------------------------------------------------------------------------------- 8abc067 | theJollySin | 2019-10-01 20:36:48 -0400 Add more flavour to the Halloween welcome spam -------------------------------------------------------------------------------- 7e681d2 | theJollySin | 2019-10-01 20:36:48 -0400 Vary orb descriptors in the welcome text -------------------------------------------------------------------------------- ebba34e | theJollySin | 2019-10-01 20:36:48 -0400 Add more random uselessness messages [Committer's note: Closes #1161. Removed messages that suggested some in-game happening or portal vault. Random uselessness is for flavor, we don't want it to intentionally confuse. Squashed and re-organized the PR into this and the next two commits.] -------------------------------------------------------------------------------- 463e120 | theJollySin | 2019-10-01 20:36:48 -0400 Clean up Paradise Lost quote citations -------------------------------------------------------------------------------- 26e8666 | theJollySin | 2019-10-01 20:36:48 -0400 An assortment of item and location quotations [Committer's note: Closes #1153. Squashed and revised the PR.] -------------------------------------------------------------------------------- 6aba940 | srvanmeter87 | 2019-10-01 19:43:01 -0400 Rephrase MP-powered wands player alert (#984) [Committer's note: Closes #984, #1133, #1143] -------------------------------------------------------------------------------- 4e6fe30 | Aidan Holm | 2019-10-02 04:13:04 +0800 Fix sealed-off sensed monsters stopping travel (gammafunk) Sensed monsters were handled with a separate check that did not take into account whether they were reachable. The new way uses the list of monsters returned by get_nearby_monsters, which does test reachability. -------------------------------------------------------------------------------- 323ad4e | Aidan Holm | 2019-10-02 03:02:37 +0800 Fix clinging monsters breaking autoexplore (shalmezad, 11924) Clinging monsters in vaults could pathfind their way through the runed door, and were therefore marked as not safe, preventing autoexplore. This was caused by mons_traversable() sidestepping checks for runed cells and uninhabitable cells in mons_can_traverse() if the monster can cling. I've just hoisted them out here. In addition, cell_can_cling_to() only checks physical location, and so couldn't check whether a feature is passable by a given monster. Last but not least, the call to cell_is_clingable() previously passed the wrong parameter. -------------------------------------------------------------------------------- ca5e8cfc | Aidan Holm | 2019-10-01 16:41:10 +0800 Use quads for line drawing (advil) Line drawing with GL_LINES seems to be subject to a number of rendering bugs and limitations that vary by OS and driver. This commit renders all lines with a single quad. This removes support for arbitrary lines that are not horizontal or vertical, but we don't currently draw any such lines. -------------------------------------------------------------------------------- 940da44 | Aidan Holm | 2019-10-01 16:34:05 +0800 Tidy up some duplication and incorrect naming -------------------------------------------------------------------------------- 6844edd | Aidan Holm | 2019-10-01 16:34:05 +0800 Fix difficult-to-read main menu labels on console (advil) Menu labels previously relied on libunix.cc's adjustment of identical foreground and background colours, which didn't work properly with allow_extended_colours = true, since white and lightgrey are not identical. This commit manually adjusts all button label colours on focus change, both foreground and background. This fixes a bug on the weapon selection menu on console where the background did not extend under the listed aptitudes, due to them being in a separate text widget. It also cleans up the hacky code that was previously used to recolour the buttons. You can specify the foreground colour to use when focused; the default is black. This code assumes that all text widgets have a single colour, and will not correctly restore multi-coloured text on unfocus. -------------------------------------------------------------------------------- 3ed16d2 | Aidan Holm | 2019-10-01 16:34:05 +0800 Refactor curses colour and attr munging -------------------------------------------------------------------------------- 011b83a | NormalPerson7 | 2019-10-01 00:59:26 -0400 Let Trog and Okawaru gift regular boomerangs and javelins Previously, when tomahawks and javelins had no innate special properties and each had about 5 different brands, it made sense that Trog and Okawaru should always gift branded tomahawks and javelins. However, there are now only two different types of javelin: plain and silver; and three different types of boomerang: plain, silver and dispersal. This behaviour led to all such ammo gifts being silver javelins, or silver or dispersal boomerangs, which seems a little unbalanced. Additionally, new javelins are equivalent to branded penetration javelins previously, and likewise with boomerangs and tomahawks of returning, so this behaviour no longer makes sense. As such, Trog and Okawaru now gift regular boomerangs and javelins, with these having weight 120. This means the chance of a javelin gift giving silver javelins is reduced from 100% to 43%, and the chance of a boomerang gift being branded is reduced from 100% to 33%. This commit preserves Trog and Okawaru only gifting curare/datura/atropa-tipped darts and not poisoned darts, and also preserves the behaviour of ISPEC_GOOD_ITEM always producing branded missiles, so as to not affect dungeon generation in any way. [Closes #1131] -------------------------------------------------------------------------------- ac2e79e | Nikolai Lavsky | 2019-10-01 00:44:13 -0400 Add descriptions for awoken autumnal and dead trees Use the same description as for regular awoken trees. -------------------------------------------------------------------------------- f61156f | Nikolai Lavsky | 2019-10-01 00:44:13 -0400 Distinguish flammable and non-flammable trees Even though Summon Forest's trees cannot be burned since 0a4d0e94, their description still mentioned that mechanic. Fix this and add a way to distinguish summoned trees from regular ones in the x-mode. Also, update a comment: trees cannot be disintegrated since 85f13f00. -------------------------------------------------------------------------------- 0e0b679 | Edgar A. Bering IV | 2019-10-01 00:35:02 -0400 Tiles for the staff of Battle (CanOfWorms) -------------------------------------------------------------------------------- 2f2aade | olowin | 2019-10-01 00:35:02 -0400 The unrand staff of Battle A staff of conjuration with. It will automatically spawn a battlesphere when monsters are in sight and automatically dismisses the battlesphere on unwield. Trog hates it; using it to spawn a battlesphere is as bad as casting a spell in Trog's eyes. Unlike an evokable this is real magic. [Committer's note: Squashed and rebased; made the staff battlesphere have the same spellpower as the player's (to avoid weird re-casting incentives); removed +4 SH, it is one-handed on normal species. Closes #1040] -------------------------------------------------------------------------------- f1a930f | advil | 2019-09-30 15:38:58 -0400 Don't pull abyss terrain from the vestibule The issue is that if the player hasn't visited the vestibule, a level excursion there will trigger asserts regarding the up stairs, which haven't been set up yet. This could be made conditional on having visited the vestibule, but even for the abyss I'd rather avoid dependencies on level traversal order. -------------------------------------------------------------------------------- be6272a | gammafunk | 2019-09-30 14:26:34 -0500 Use no_tele_into in a Bazaar map (wizard44) The water (or lava) areas outside of the central area with shops needs `no_tele_into` in order to prevent teleports from stranding players who are amphibious or flying. -------------------------------------------------------------------------------- 3c9d5f2 | advil | 2019-09-30 12:59:04 -0400 Remove full_name logic from main menu These features were supposed to make typing the player name easier, but they're very hard to predict from standard text box behavior, and also buggy with names that are a partial match to another name. In addition, the behavior pre-0.24 that this logic is based on seems to have been fairly broken; at least I can't figure out the pattern from the UI in older versions for when `full_name` is set to true. Should replace this with some more of the standard text editing shortcuts, e.g. ctrl-u. -------------------------------------------------------------------------------- 261a0b2 | advil | 2019-09-30 12:32:32 -0400 Main menu improvements and streamlining * move info about rc file off main screen -- without linewrapping this doesn't work well on either console or tiles. * don't explain arrow keys and enter * use some of the reclaimed space to improve description of [tab], add description of [ctrl-p]. This latter is mainly just so players know where to find the rc file info. Eventually the canonical place to find the rc file should be an about screen, not the startup log. -------------------------------------------------------------------------------- 5fed591 | Aidan Holm | 2019-09-30 21:49:45 +0800 Reduce popup padding on small screens (alexjurkiewicz) -------------------------------------------------------------------------------- bbc45b0 | Aidan Holm | 2019-09-30 14:23:31 +0800 Fix newgame menu highlight width on remote console On TILEWEB=y console games, the text widget was not expanding to take the full width of the box it was contained in. When its background colour was changed, only the section of the menu button with letters changed colour. This isn't a problem in pure console builds because in that case the text widget is the direct child of the MenuButton widget and so takes its full size. -------------------------------------------------------------------------------- 2d00395 | Aidan Holm | 2019-09-30 14:23:31 +0800 Fix memorise menu entry letter colour Previously, the entry letter was always lightgrey; now it is darkgrey if the spell is not castable, etc. -------------------------------------------------------------------------------- 8282249 | Aidan Holm | 2019-09-30 14:23:30 +0800 Refactor memorise menu entry colour code -------------------------------------------------------------------------------- 5a4ac4e | Aidan Holm | 2019-09-30 13:10:21 +0800 Remove debug logging -------------------------------------------------------------------------------- 2d0fce6 | advil | 2019-09-29 19:48:04 -0400 Don't generate unknown weapons for weapon selection I'm not sure if this is causing the windows crash (which is happening somewhere in give_items_skills), but it is definitely an odd thing that this code is doing when used before weapon selection. -------------------------------------------------------------------------------- 0b739ee | advil | 2019-09-29 17:47:54 -0400 One more batch of debug code see 40886de7c. -------------------------------------------------------------------------------- 40886de | advil | 2019-09-29 17:09:38 -0400 More public bisection (The reason that I'm doing this bisection in trunk like this is that we are chasing a crash that only replicates on the windows tile builds done by CDO.) -------------------------------------------------------------------------------- bfea814 | advil | 2019-09-29 16:46:00 -0400 Apply some brute-force output debugging to the problem -------------------------------------------------------------------------------- f68d918 | advil | 2019-09-29 15:36:51 -0400 checkwhite [skip ci] -------------------------------------------------------------------------------- 964def8 | advil | 2019-09-29 15:36:00 -0400 Fix a compiler warning (shadowed variable) -------------------------------------------------------------------------------- 5bd470a | advil | 2019-09-29 14:21:12 -0400 Don't clear player name when selecting arena (12075) I agree that this behavior is unintuitive given the menu structure (especially when navigating with keyboard), even though arena doesn't use player name. -------------------------------------------------------------------------------- 2bac2fb | advil | 2019-09-29 14:21:12 -0400 Restore centering for the progress popup in console -------------------------------------------------------------------------------- aa951a3 | Aidan Holm | 2019-09-30 01:34:06 +0800 Fix hiscores not showing in webtiles (12077, Ge0ff) Console viewers will still get a view that adjusts to their screen size; webtiles viewers get a hardcoded size of eleven lines, which IIRC was the typical size before. -------------------------------------------------------------------------------- b641180 | advil | 2019-09-29 10:41:47 -0400 Fix a crash with full pregen This was introduced in 80d7c3d5c -------------------------------------------------------------------------------- cb3158e | Kyle Rawlins | 2019-09-29 10:08:39 -0400 just one more windows install instructions tweak This incorporates both solutions from #1134. Thanks to amcmullan and Goratrix for figuring this out; as of Feb or so, msys2 makes python 3 the default python version for everything. Resolves #1134 [skip ci] -------------------------------------------------------------------------------- 0f4390f | advil | 2019-09-29 09:53:45 -0400 Replace some symbolic links with copies In order to fix windows builds. -------------------------------------------------------------------------------- 6ba659e | Kyle Rawlins | 2019-09-29 09:36:27 -0400 Tweak windows install instructions again [skip ci] -------------------------------------------------------------------------------- d2de06d | Kyle Rawlins | 2019-09-29 09:20:59 -0400 tweak windows install instructions -------------------------------------------------------------------------------- aeb99fb | advil | 2019-09-28 18:41:54 -0400 Fix another webtiles console menu glitch These values were being interpreted as characters when rendering console, and are apparently unused for webtiles browser. So, just set them to 0. -------------------------------------------------------------------------------- 6234c29 | advil | 2019-09-28 18:27:05 -0400 Address an uninitialized variable This *might* be the windows crash, not sure. In any case, tileidx_t is uint64_t and so needs to be initialized to something. -------------------------------------------------------------------------------- 7b85b32 | advil | 2019-09-28 18:07:42 -0400 Slightly improve console MenuButton highlighting code This now handles another bug by generalizing slightly from 5a66b1aa3b36: the weapon selection menu wasn't highlighting correctly in local console because those buttons on console consist of a bin with two Texts. The new version finds the first Text child (if any) and does the highlighting on it, and because of this also does away with the #ifdefs. -------------------------------------------------------------------------------- 5a66b1a | advil | 2019-09-28 17:09:28 -0400 Fix(ish) for menu highlighting issues in webtiles console The problem was that webtiles console, because it can be showing complex menu items via a browser client, has a different menu structure than regular console, so the assumption that it contained a single Text child was incorrect. This fairly hacky solution also tries setting the background color of any label in position 1 in case the button is a container. There should probably be something more general here, perhaps highlighting every Text contained in the button widget (Which would get both of the currently-used cases as special cases), but I'll leave that for aidanh. -------------------------------------------------------------------------------- 60d090b | advil | 2019-09-28 13:10:22 -0400 Fix a shadowed variable warning in webtiles -------------------------------------------------------------------------------- 8e49684 | advil | 2019-09-28 12:13:11 -0400 Use MenuButton highlight color in local console This does not fix 12076; I think the dynamic_cast is not working at all for webtiles console. -------------------------------------------------------------------------------- d18775d | Aidan Holm | 2019-09-28 14:05:05 +0800 Reduce webtiles newgame menu height (12074, kitchen_ace) This attempts to fit the entire menu in without needing to scroll; it only takes effect on windows less than 780px high though. -------------------------------------------------------------------------------- 53c33f0 | Aidan Holm | 2019-09-28 14:04:42 +0800 Fix webtiles newgame menu background colour -------------------------------------------------------------------------------- bbc8897 | Aidan Holm | 2019-09-28 03:16:22 +0800 More dead code removal -------------------------------------------------------------------------------- 39a19ac | Aidan Holm | 2019-09-27 23:33:44 +0800 Remove unused smart cursor interface This also fixes a bug on win32 console where the mouse cursor was visible on the main menu. -------------------------------------------------------------------------------- 40b4c61 | Aidan Holm | 2019-09-27 23:33:44 +0800 Add rudimentary win32 console colour adjustment libunix.cc will adjust the foreground colour when both foreground and background are indistinguishable. This commit ports a much-reduced version of that functionality to win32 console, primarily so that the main menu will be readable. -------------------------------------------------------------------------------- db4295c | Aidan Holm | 2019-09-27 23:33:44 +0800 Fix broken win32 console text colouring API Crawl code assumes that the terminal text and background colours can be updated independently; the win32 console backend, however, was setting the background colour from the high bits of the provided text colour. This resulted in a textcolour() call followed by a textbackground() call to function normally, but the reverse would not. -------------------------------------------------------------------------------- 17bb100 | Aidan Holm | 2019-09-27 23:33:44 +0800 Refactor identical colourpair remapping code -------------------------------------------------------------------------------- 1fcc531 | Aidan Holm | 2019-09-27 23:33:44 +0800 Refactor MenuFreeform methods with find_if() -------------------------------------------------------------------------------- 3e190a4 | Aidan Holm | 2019-09-27 23:33:44 +0800 Remove unused menu code -------------------------------------------------------------------------------- cd35390 | Aidan Holm | 2019-09-27 23:33:44 +0800 Improve end-game hiscore list appearance -------------------------------------------------------------------------------- bb89a6c | Aidan Holm | 2019-09-27 23:33:44 +0800 Improve newgame name choice prompt -------------------------------------------------------------------------------- 5dd181b | Aidan Holm | 2019-09-27 23:33:44 +0800 Add alignment options to Switcher widget -------------------------------------------------------------------------------- 6919a33 | Aidan Holm | 2019-09-27 23:33:44 +0800 Add enable_shared_from_this to Widget -------------------------------------------------------------------------------- ba565db | Aidan Holm | 2019-09-27 23:33:44 +0800 Fix Switcher widget handling mouse events incorrectly -------------------------------------------------------------------------------- 94b374d | Aidan Holm | 2019-09-27 23:33:44 +0800 Add tile to game-over screen -------------------------------------------------------------------------------- a0fde06 | Aidan Holm | 2019-09-27 23:33:44 +0800 Add pgup/pgdn/home/end support to OuterMenu -------------------------------------------------------------------------------- 41769e3 | Aidan Holm | 2019-09-27 23:33:44 +0800 Add HTML newgame menus, more tiles -------------------------------------------------------------------------------- bbc46fc | Aidan Holm | 2019-09-27 23:33:44 +0800 Make send_doll() public -------------------------------------------------------------------------------- e13cadf | Aidan Holm | 2019-09-27 23:33:44 +0800 Add operator[] accessor for container widgets -------------------------------------------------------------------------------- 77bbe51 | Aidan Holm | 2019-09-27 23:33:44 +0800 Respect popup child widget's preferred size -------------------------------------------------------------------------------- 94e85a7 | Aidan Holm | 2019-09-27 23:33:44 +0800 Add species attributes to starting weapon menu (VeryAngryFelid) -------------------------------------------------------------------------------- efe2a7d | Aidan Holm | 2019-09-27 21:07:02 +0800 Let Box widgets stretch children on main axis -------------------------------------------------------------------------------- 23a3942 | Aidan Holm | 2019-09-27 21:07:02 +0800 Add species/job tiles (CanOfWorms) -------------------------------------------------------------------------------- b661a63 | Aidan Holm | 2019-09-27 21:07:02 +0800 Convert newgame menus to new UI framework -------------------------------------------------------------------------------- 9f778ef | Aidan Holm | 2019-09-27 21:07:02 +0800 Fix ui::Image widget using uninitialized data -------------------------------------------------------------------------------- ded90f5 | Aidan Holm | 2019-09-27 21:07:01 +0800 Convert hiscores menu to new UI framework -------------------------------------------------------------------------------- 20abbd2 | Aidan Holm | 2019-09-27 21:07:01 +0800 convert hints menu to new UI framework -------------------------------------------------------------------------------- 3169f25 | Aidan Holm | 2019-09-27 21:07:01 +0800 Convert startup menu to new UI framework -------------------------------------------------------------------------------- 87535ee | Aidan Holm | 2019-09-27 21:07:01 +0800 Add species/background newgame doll generator This adds a helper function to generate dolls for character combos. This is done in a rather ugly fashion by (partially) generating the new game character. A small segment of the character setup code in _setup_generic() that's relevant to initial equipment is duplicated, with some minor changes; this code modifies the global `you` variable, and fill_doll_equipment() is then called to generate the doll corresponding to the character in `you`. Regarding the modified character generation code, everything after give_items_skills() is removed, since that's what determines a player's starting equipment, and thus the doll appearance. An exception is the item colour randomization. Separately, _unfocus_stats() was not included, since I'm reasonably sure that this has no effect on initial item generation, and I didn't want to make it non-static. -------------------------------------------------------------------------------- 1274d92 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add PlayerDoll widget -------------------------------------------------------------------------------- 9970949 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add descriptions to outer menu buttons -------------------------------------------------------------------------------- 7134dd4 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add OuterMenu, MenuButton widgets -------------------------------------------------------------------------------- 72f1adc | Aidan Holm | 2019-09-27 21:07:01 +0800 Add debug drawing -------------------------------------------------------------------------------- f253313 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add per-layer focus -------------------------------------------------------------------------------- b86fa12 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add add_event_filter() -------------------------------------------------------------------------------- 0428708 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add UI widget input focus -------------------------------------------------------------------------------- 50bd2e0 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add text widget background colour (console-only) -------------------------------------------------------------------------------- 4d30056 | Aidan Holm | 2019-09-27 21:07:01 +0800 Remove black background from high scores tile This tile is still in need of work; apart from anything else, it fills its entire 32x32 region, which makes it visually inconsistent with the other main menu entry tiles. -------------------------------------------------------------------------------- 01783e0 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add UIGrid stretch_h, stretch_v -------------------------------------------------------------------------------- 2a43284 | Aidan Holm | 2019-09-27 21:07:01 +0800 Fix invalid read during program shutdown Invalid memory accesses were caused by the Slot destructor freeing slots, which freed shared_ptrs, which caused remove_by_target() to access handlers, which was already partially destroyed. -------------------------------------------------------------------------------- 406b842 | Aidan Holm | 2019-09-27 21:06:55 +0800 Add ui_render() -------------------------------------------------------------------------------- ff19f33 | Alex Jurkiewicz | 2019-09-27 15:36:43 +0800 Mark trove portals as single-use Fixes #1126. -------------------------------------------------------------------------------- 80d7c3d | advil | 2019-09-26 18:27:52 -0400 Fix ungenerated branches in wizmode + pregen (12071) These were falling through the cracks of _branch_pregenerates, but not generating as part of the generation order. This commit just moves you directly to them without any pregeneration (which needless to say will break the seed, but if you're doing this you probably don't care). -------------------------------------------------------------------------------- 3936067 | kitchen-ace | 2019-09-26 00:14:35 -0700 A meagre spelling correction for AUS english (#1157) -------------------------------------------------------------------------------- 46ecf6d | Aidan Holm | 2019-09-26 01:40:04 +0800 Remove unused function chop_tagged_string() -------------------------------------------------------------------------------- 4b16227 | Aidan Holm | 2019-09-26 01:40:02 +0800 More refactoring of formatted_string code -------------------------------------------------------------------------------- d158fba | Aidan Holm | 2019-09-25 23:57:46 +0800 Fix some compile warnings (geekosaur) Returning std::move() here is fine because the parameter is an rvalue reference, so RVO is not relevant, and a move() call is required to prevent a copy. -------------------------------------------------------------------------------- 0b1efcb | Aidan Holm | 2019-09-25 23:52:45 +0800 Revert "Fix some compile warnings (geekosaur)" This reverts commit 0e779d289c517aeb1bab0ed4e172b85274d776cf. -------------------------------------------------------------------------------- eb4d282 | Aidan Holm | 2019-09-25 23:49:37 +0800 Reduce unnecessary text widget allocations -------------------------------------------------------------------------------- 6ad1058 | Aidan Holm | 2019-09-25 23:49:37 +0800 Remove some formatted_string functions Spell range strings don't use colour codes any more. As for explore discoveries, it's simpler to parse the tagged string and then use the dedicated width() method. -------------------------------------------------------------------------------- 0627d6e | Aidan Holm | 2019-09-25 23:49:37 +0800 Remove unused and rename used fs_op members -------------------------------------------------------------------------------- 0e779d2 | Aidan Holm | 2019-09-25 23:43:23 +0800 Fix some compile warnings (geekosaur) Returning std::move() here is fine because the parameter is an rvalue reference, so RVO is not relevant, and a move() call is required to prevent a copy. -------------------------------------------------------------------------------- 049a785 | Aidan Holm | 2019-09-25 14:23:27 +0800 Simplify macro_buf_add_with_keymap We only ever add a single key at a time to the macro buffer; better to enforce that. This also asserts in remap_key() that the macro buffer is empty before remapping a key; this must be the case because ui::pump_events() first tries to get a key from the macro buf, and only remaps a new key if there is no macro key available. -------------------------------------------------------------------------------- 678ee33 | Aidan Holm | 2019-09-25 14:23:27 +0800 Refactor _getch_mul() -> _getch_single() While you could theoretically have multiple keys returned from _getch_mul, in practice I never managed to make it happen, and it's preferable for the code paths through the macro system to be as simple as possible. -------------------------------------------------------------------------------- 5a8975c | Aidan Holm | 2019-09-25 14:23:27 +0800 Simplify macro code This makes the difference between getchm and getch_with_command_macros slightly clearer. -------------------------------------------------------------------------------- 3ea5ddb | Aidan Holm | 2019-09-25 14:23:27 +0800 Remove support for multi-key macro binds Apparently it was previously possible, for some definitions of the word 'possible', to have multi-key macro binds; e.g. 'ab' -> foo. I couldn't actually get any of these to trigger, however, even when using xdotool to quickly deliver keypress events. This commit simplifies the complicated macro expansion code that resulted. Saved macros that have multi-key binds are silently truncated to the first character. This commit also slightly refactors filtering of empty macros. -------------------------------------------------------------------------------- e7cd8ce | Nikolai Lavsky | 2019-09-23 11:37:32 +0800 Fix a crash when cloning an almost dead monster (geekosaur) A copy created via rakshasa's Phantom Mirror has only 35% of the target's hp and max hp. If the original monster is almost dead (1-2 HP), its copy will have 0 hp, which crashes the game. Fix this by giving cloned monsters at least 1 hp. Also, it allows rakshasas to clone lurking horrors, who always spawn with only 1 hp. -------------------------------------------------------------------------------- b70a11d | Aidan Holm | 2019-09-20 22:30:25 +0800 Fix monster list position when re-running arena The call to expand_mlist() assumes that the monster list has its initial position and size; this is not the case if you run arena mode more than once without quitting the game in between. After this fix, the UI is still broken if you run arena then a regular game. I tried using an unwind_var, but that caused crashes, and a better fix is in the works anyway (using the widget toolkit). -------------------------------------------------------------------------------- cb9520c | Aidan Holm | 2019-09-20 22:30:24 +0800 Remove cprintf calls that do nothing -------------------------------------------------------------------------------- 7c97eb6 | Aidan Holm | 2019-09-20 22:30:24 +0800 Remove explicit cursor positioning -------------------------------------------------------------------------------- 79b4920 | Aidan Holm | 2019-09-20 22:30:24 +0800 Remove support for yesno outside the messge window -------------------------------------------------------------------------------- 2190dae | Aidan Holm | 2019-09-20 22:30:24 +0800 Remove unused player name error messages -------------------------------------------------------------------------------- 0d32015 | Aidan Holm | 2019-09-20 22:30:24 +0800 Remove useless textcolour calls -------------------------------------------------------------------------------- c6fd4e6 | Alex Jurkiewicz | 2019-09-20 20:44:35 +0800 Default show_more to false in debug builds Debug builds unsurprisingly spew large numbers of messages, so repeatedly showing a more prompt is very inconvenient. -------------------------------------------------------------------------------- 5ea6cb6 | Nikolai Lavsky | 2019-09-20 20:30:27 +0800 Fix HP of summons created via the Phantom Mirror spell Because of an incorrect formula added in a559921a, Mara and rakshasa clones had 200% hp of their original instead of 50%. Regular monsters copied via `cast_phantom_mirror()` had 286% hp and max hp instead of 35%. -------------------------------------------------------------------------------- 346d576 | advil | 2019-09-19 20:06:03 -0400 Fix some issues with singing sword revealed in arena (p0a) The `get_tension` check is not well-defined without a player, and also isn't used for monster attackers. Also, the singing sword was shouting at the player's location, not the attacker (which caused another crash in arena). -------------------------------------------------------------------------------- 0d56a85 | Aidan Holm | 2019-09-19 01:51:59 +0800 Don't prewrap level builder logs Pre-wrapping to a given screen-width should be avoided in general because the screen can be resized. In addition, the GOTO_CRT region size is not a well-defined concept on local tiles. -------------------------------------------------------------------------------- 290c21e | Aidan Holm | 2019-09-19 01:51:59 +0800 Replace line_reader use with cancellable_get_line -------------------------------------------------------------------------------- 5f7070a | Aidan Holm | 2019-09-19 01:51:59 +0800 Add per-text-widget fonts -------------------------------------------------------------------------------- f045310 | Aidan Holm | 2019-09-19 01:51:59 +0800 Remove probably-no-longer-needed kludge The handle_terminal_resize() call in startup.cc (added in e03bc23d4eded) seems to no longer be required, since the code to determine the HUD size based on species (added in the same commit) is no longer present, and thus the HUD should not need to be resized any more. This permits some minor simplification of handle_terminal_resize(). -------------------------------------------------------------------------------- d29bdeb | Aidan Holm | 2019-09-19 01:51:59 +0800 Fix layout error for empty ellipsizable text widget m_wrapped_lines being empty caused the size request calculation to yield a natural size (0 lines) smaller than the minimum size (1 line), causing assertion failures. -------------------------------------------------------------------------------- 3da5d4e | Aidan Holm | 2019-09-19 01:51:59 +0800 Allow querying current scissor without UI layout Widgets may query the current scissor region to reduce render calls, e.g. by not rendering children or other elements that are not visible. During a regular layout and render cycle, the UI framework pushes a scissor region of the entire screen, so this works fine. When doing ad-hoc rendering (while we transition to full use of the UI framework), this is not the case, which caused crashes. -------------------------------------------------------------------------------- e6ffb7a | Aidan Holm | 2019-09-19 01:51:59 +0800 Fix menu items being unnecessarily ellipsized The menu already ellipsizes menu items as needed based on screen size. -------------------------------------------------------------------------------- 3dea988 | Aidan Holm | 2019-09-19 01:51:59 +0800 Fix tooltips freezing local tiles window The previous implementation added a tooltip timer before blocking for the next SDL event, and removed it before returning. If resize or move events were received, however, the function would return early, and the timer would never be removed and would instead timeout periodically. Subsequent move events would add additional timers, leading to a flood of timeouts clogging up the event loop. This new implementation only ever adds a timer when the mouse is moved, and timers only fire once. remove_timer() is also changed to take an int& for convenience. -------------------------------------------------------------------------------- 94eeae6 | Aidan Holm | 2019-09-19 01:51:59 +0800 Add remaining tilesdl font getters -------------------------------------------------------------------------------- f19a5e4 | Aidan Holm | 2019-09-19 01:51:59 +0800 Tidy up tilesdl font members -------------------------------------------------------------------------------- 15dcb32 | Aidan Holm | 2019-09-18 21:25:34 +0800 Fix UI cutoffs not being cleared properly (vt, 12061) UI cutoffs prevent any any UI layers with index <= the cutoff index from being displayed. If there's no cutoff, the cutoff index should be -1; the old value of 0 was causing the lowest UI layer to not be unhidden. -------------------------------------------------------------------------------- b7544fd | Nikolai Lavsky | 2019-09-16 00:54:56 -0500 Upgrade Wyrmbane's tile according to its enchantment As a followup to 1cd5daa3, this commit adds code to upgrade Wyrmbane's tile as the lance grows more powerful. -------------------------------------------------------------------------------- e4662a2 | theJollySin | 2019-09-14 21:14:06 +0800 #1125 spellbooks are no longer 'r'ead -------------------------------------------------------------------------------- 92e081b | Umer Shaikh | 2019-09-14 21:12:59 +0800 Change gauntlet teleportation message (bugfix) On entering the gauntlet the current message misleadingly suggests no one can teleport, but the restriction is on the player only. -------------------------------------------------------------------------------- e2a249a | advil | 2019-09-12 22:25:45 -0400 Remove throttling notification It's crashing for ., not sure why. Remove for now. -------------------------------------------------------------------------------- 751f86b | Aidan Holm | 2019-09-13 01:40:25 +0800 Fix webtiles rendering using outdated map_knowledge (Artagas, 12064) -------------------------------------------------------------------------------- eaf2f25 | advil | 2019-09-11 20:06:02 -0400 Limit repeats via 0 somewhat for online play This implements two changes for DGAMELAUNCH builds: * it disallows using CMD_REST at all with 0. (If someone comes up with an actual use-case for this I can reconsider.) * After 100 repeats, it throttles repeats by sleeping for 0.5 seconds. This (at least on my local device) brings cpu use back to what normal play would be like. An alternative would be to disable this altogether, but I prefer the throttling approach as it keeps the features more similar between online and offline. -------------------------------------------------------------------------------- 1ff6aac | Aidan Holm | 2019-09-09 23:18:24 +0800 Fix bad comma -------------------------------------------------------------------------------- e11a5d9 | Aidan Holm | 2019-09-09 23:10:28 +0800 Fix headsup crashloop with >4 monster types (nikopol, 12059) Headsups needed access to the number of monsters of each type to determine the appropriate grammar, but used a map of pre-condensed monster types. -------------------------------------------------------------------------------- fb3efd0 | Aidan Holm | 2019-09-09 12:34:07 +0800 Add all autoexcludes simultaneously This fixes two bugs; autoexclude spam when encountering multiple monsters that require autoexcludes, and autoexplore not showing the correct region of the map before forcing a more prompt. Monsters now no longer force a more prompt if they awaken immediately. This commit also slightly improves maybe_remove_autoexclusion(): the ballistomycete case is already handled in _need_auto_exclude(). -------------------------------------------------------------------------------- 9501b9e | Aidan Holm | 2019-09-09 12:34:07 +0800 Factor out describe_monsters_condensed() helper function -------------------------------------------------------------------------------- de3ff83 | Aidan Holm | 2019-09-09 12:34:07 +0800 Remove unused headers -------------------------------------------------------------------------------- ff1bdec | Aidan Holm | 2019-09-09 12:34:07 +0800 Fix magic mapping water colour in sewer -------------------------------------------------------------------------------- a4a55eb | Aidan Holm | 2019-09-09 12:34:07 +0800 Fix border between mapped and unmapped water tiles The idea here is that wave borders against the edge of LOS should not be added if the adjacent out-of-LOS terrain type is unknown. This is relevant when using magic mapping, which does not reveal the depth of water, showing all water as shallow. This caused deep water on the edge of LOS to incorrectly have wave borders on that edge. -------------------------------------------------------------------------------- ef970ca | Aidan Holm | 2019-09-09 12:34:07 +0800 Always clear tile flavour when destroying walls (kitchen_ace, 12053) It's not clear to me why the tile flavour was only cleared if the terrain had been transformed; in any case, this function is only ever called from destroy_wall(), so this should be safe. -------------------------------------------------------------------------------- f216e90 | Aidan Holm | 2019-09-09 12:34:07 +0800 Fix rest_delay = -1 option -------------------------------------------------------------------------------- 4db8f80 | Aidan Holm | 2019-09-09 12:34:07 +0800 Simplify wave overlay packing code -------------------------------------------------------------------------------- 2324e3a | Aidan Holm | 2019-09-09 12:34:07 +0800 Cache map knowledge for later rendering Rendering cell overlays needs access to the state of adjacent cells, in order to properly render waves. Previous code was directly accessing the current simulation state in env.map_knowledge, which caused glitches when viewwindow was exiting early (due to run_dont_draw) and not copying the current tile fg/bg. In general, render code should never access the global game state. This commit copies the current env.map_knowledge for each cell into packed_cell; this structure notably includes cloud_info, item_info, and monster_info structs copied from their corresponding global instances (so they're safely accessible). There are still a few locations where global state is accessed, such as player_in_branch() calls. These are relatively benign, but they should be removed as well. -------------------------------------------------------------------------------- d8832a9 | Aidan Holm | 2019-09-09 12:34:07 +0800 Properly cache global state for later rendering Local tiles rendering code should use only the state stored in the view buffer passed to load_dungeon; in particular, it should *not* access env.* whenever a redraw is needed, since this state may have been updated. Tile flavours are unlikely to change, but you never know... -------------------------------------------------------------------------------- bdd1752 | Aidan Holm | 2019-09-09 12:33:37 +0800 Remove dead inscription hints code -------------------------------------------------------------------------------- 12c97a3 | Aidan Holm | 2019-09-09 12:33:37 +0800 Fix bad FAQ menu entry wrapping -------------------------------------------------------------------------------- b99ddf9 | Aidan Holm | 2019-09-09 12:33:37 +0800 Make menu colours more consistent -------------------------------------------------------------------------------- a2d5783 | Aidan Holm | 2019-09-09 12:33:37 +0800 Fix deck menu being easily closable -------------------------------------------------------------------------------- ac8ac2a | Aidan Holm | 2019-09-09 12:33:37 +0800 Fix extra newlines in local tiles tooltip -------------------------------------------------------------------------------- 65986e5 | Aidan Holm | 2019-09-09 12:33:37 +0800 More font rendering refactoring This commit splits render_string() into render_hover_string(), used for rendering labels over dungeon tiles, and render_tooltip(). -------------------------------------------------------------------------------- 56e724e | Aidan Holm | 2019-09-09 12:33:37 +0800 Improve local tiles tooltip appearance This commit removes the ability to specify a background colour with render_string(), and switches on the tooltip parameter instead. -------------------------------------------------------------------------------- e755950 | Aidan Holm | 2019-09-09 12:33:37 +0800 Fix trailing empty lines on help screens -------------------------------------------------------------------------------- 2f91b30 | Aidan Holm | 2019-09-09 12:33:37 +0800 Fix player being off-centre on local tiles -------------------------------------------------------------------------------- 9a1d66b | kitchen-ace | 2019-09-09 01:29:13 +0800 Don't show draconian head with full helms Only really relevant for wearing the mask of the dragon. -------------------------------------------------------------------------------- 4bb3bc1 | kitchen-ace | 2019-09-09 01:29:13 +0800 Give draconians their own horns tile -------------------------------------------------------------------------------- a6a8d0c | Alex Jurkiewicz | 2019-09-08 22:37:08 +0800 Document timed_effects / timed_effect_type link -------------------------------------------------------------------------------- 611b3b1 | wjchen | 2019-09-08 22:36:08 +0800 Ensure stash update on being shafted (minqmay) Currently, if a player discovers an altar and get shafted by a trap at the same time, the altar will appear in dungeon overview but not in stash tracker. This change ensures items, shops, and altars discovered at the moment the player gets shafted are correctly registered. -------------------------------------------------------------------------------- 8e11da7 | dplusplus | 2019-09-08 22:34:47 +0800 fix mutations/vamp-attrs toggle -------------------------------------------------------------------------------- aff5e89 | kitchen-ace | 2019-09-08 22:21:59 +0800 Show scarves on player in tiles (11977) Scarves weren't being shown at all unless the player chose one through the doll editor. And even then they were practically invisible, since they were drawn behind the body (like cloaks) instead of in front where I think they were meant to be. The green scarf tile looks quite strange to me, but that's a separate problem. -------------------------------------------------------------------------------- 8e0e932 | Kate | 2019-09-06 23:44:15 +0100 Update mailmap [skip ci] -------------------------------------------------------------------------------- 5c5dc1b | Kate | 2019-09-06 22:25:44 +0100 Update CREDITS.txt [skip ci] -------------------------------------------------------------------------------- 9d6b971 | Nikolai Lavsky | 2019-08-28 22:15:16 +0800 Add missing feature tiles to the stash search menu PR #1051 allowed searching for traps, but several trap tiles are absent from the stash search menu. As mentioned in 276b1762, the current method of picking feature tiles by the search result description has some limitations. It works correctly for features that have a separate dungeon_feature_type, for example, regular teleport traps or altars. But there are dungeon features that have the same dungeon_feature_type, but different description: * Net traps, pressure plates, and all other mechanical traps are all DNGN_TRAP_MECHANICAL. * Permanent teleport traps share DNGN_TRAP_TELEPORT type with regular teleport traps. * Doors can have different descriptions too: 2-3 adjacent runed doors become "large runed doors", 4+ doors become "huge runed gates." If there is no matching description, feat_by_desc() returns DNGN_UNSEEN, which is why the search menu doesn't show tiles for these dungeon features. This commit fixes that by handling tile picking for traps and runed doors separately. -------------------------------------------------------------------------------- 87330a4 | advil | 2019-08-27 13:38:39 -0400 Enable incremental pregen as a default for new games, track in save Finally flipping the switch. Reason for adding to the save: This turns out to make more sense if the option sets a flag in the save, rather than the option determining the behavior of the current crawl session. Something like this should probably have been in the beginning, but the option of using "classic" levelgen was added quite late in the process. All of this could be simplified from the user's perspective by making the existence of classic levelgen less obvious, or debug-only, and I may do this in a future commit. -------------------------------------------------------------------------------- 4d4af81 | Alan Malloy | 2019-08-25 12:40:14 -0700 Revert "Add attack-no-move bindings for Colemak" (#1140) This reverts commit c0fa6600bf77c549186ab8d4e74820f4ac84c170. -------------------------------------------------------------------------------- c0fa660 | runrin | 2019-08-21 16:15:06 -0700 Add attack-no-move bindings for Colemak -------------------------------------------------------------------------------- 6a6c3f8 | advil | 2019-08-20 15:26:51 -0400 Fix another misc compiler warning Also, unbrace. -------------------------------------------------------------------------------- 962dd19 | advil | 2019-08-20 15:23:09 -0400 Fix a gcc warning Noticed while rebuilding cbro -------------------------------------------------------------------------------- f1077d3 | advil | 2019-08-20 15:06:32 -0400 Don't update brentry for portal mimics Also, change the ASSERT to an mprf for now, in lieu of real save compat (which doesn't seem worth the effort). I will likely change this back at some point, because annoying as it is, this ASSERT has found a ton of bugs and edge cases. -------------------------------------------------------------------------------- dfe7613 | advil | 2019-08-20 14:46:18 -0400 Put seed in crashlogs This is risky in that it has some cheating potential, we may even want to disable this for tournaments or in general, but it's incredibly frustrating to not have this information in trunk crashes right now. -------------------------------------------------------------------------------- 91963d7 | advil | 2019-08-20 13:41:25 -0400 Remove a debugging check that is tripping for dith chars Will return once I figure out why this is triggering. -------------------------------------------------------------------------------- d66451a | advil | 2019-08-20 11:41:47 -0400 Handle portals differently in dungeon overview (12048) 44eecae1 changed how portals are handled in the branch structure, and in so doing caused a change in behavior where they got added to `stair_level` if entered (via enter_branch, which didn't used to get called on them), and therefore showed up in the overview and G menu even though after exiting the portal branch. The entry in that structure is just an empty set, which previously wasn't possible, and caused them to render in a confusing way in the overview. This commit embraces the bug and shows previously entered portals in the overview as e.g. `IceCv (visited)`. A portal you are currently in will show as `IceCv (1/1)`. The empty set case is also now handled for `G`. An empty entry to stair_level, previously not possible, now has the semantics of a branch that no longer has stairs; it is worth noting that I didn't implement any way for portal stair sources to actually appear in this structure, so this semantics as described is not fully implemented (in that a portal branch will still have no source stairs even while the player is in it or have seen but not traversed the portal entry). There are some complexities with fully implementing this part that made it not seem worthwhile, including handling seen portals vanishing while not in los, and the fact that multiple bazaar entries could in principle exist at once (I think). Any game played between 44eecae1 and now may have missing portal branches if they were entered with `<` instead of `>` -- not going to worry about this. -------------------------------------------------------------------------------- 7d3d5a4 | advil | 2019-08-19 19:50:43 -0400 Simplify pregen options and update documentation. -------------------------------------------------------------------------------- b1ee012 | advil | 2019-08-19 19:50:43 -0400 Further domino call refactoring If a level does not use dominoes, there is no need to pass a value at all to the domino parameter as far as I can tell. Random tile variants are selected via other means. -------------------------------------------------------------------------------- 58b1be0 | advil | 2019-08-19 19:50:43 -0400 Default disable incremental pregen for testing This is for the merge of the incremental_pregen branch: the branch includes a wide range of rng improvements etc that are independent of the generation method, so it will be simpler to test the branch online without incremental pregen being enabled by default. If players are interested, they can still enable it in their rc file (`incremental_pregen=true`). Later, I'll default this to true. -------------------------------------------------------------------------------- bd264f5 | advil | 2019-08-19 19:50:43 -0400 Separate unique vault tracking for abyss from everything else This commit doesn't affect vaults that place only in one or the other, but for vaults that place in both and are supposed to be unique (e.g. hangedman_summoners_spam, lemuel_flamethrower_hall), these vaults can now in principle independently place twice, once in the abyss and once outside. (The behavior of unseen vaults in the abyss isn't changed, so if they aren't seen in the abyss, they can keep re-placing there.) This is consistent with abyss's flavor as a shadowy mirror of the outside world. Something like this is necessary for seed stability, as long as regular levelgen can be interleaved with the abyss: maps that can place in both abyss and elsewhere and are unique in some way can interfere with incremental pregeneration if they place in the abyss and are seen there, and then would try to place in an as-yet-ungenerated level. There aren't a lot of vaults that this affects, but there are a few, mostly placing in depths and elf. Abyss should be the only branch that this problem applies to. Pan is handled differently, by forcing everything else to pregenerate, and zigs + bazaars have non-overlapping vault lists (plus zigs will force complete pregeneration as well). The implementation is therefore a bit ad hoc in terms of serializing, though I have generalized how unique vault lists are accessed. Semi-related debugging changes: This commit also affects how vaults are shown in morgues, and might be kind of spammy for abyss / pan (it shows every vault that ever places), so this part may need further tweaking. There's also a bit of useful debugging infrastructure. -------------------------------------------------------------------------------- b9928c7 | advil | 2019-08-19 19:50:43 -0400 Remove some mutation validation ASSERTs (11807) If the player gets a lot of xp, the temporary mutation xp value may well be negative and stay negative. A negative value means that the player will get more temp mutations removed the next time they got any xp. There are various alternatives (e.g. maxing this value at 1, running temp_mutation_wanes in a loop until it is non-negative), but I've convinced myself that the current behavior is more or less what's intended. -------------------------------------------------------------------------------- 93dbe2d | advil | 2019-08-19 19:50:43 -0400 Isolate trove portal generation from levelgen rng The toll is calculated while generating the trove, and the number of rng draws that make up this calculation depends on the player (skills, species, etc). So, isolate it as a subgenerator calculation so that it always makes the same number of draws from the main rng. -------------------------------------------------------------------------------- 452b1d9 | advil | 2019-08-19 19:50:43 -0400 Handle certain random attack specs differently Four monsters (chaos spawn, cherubs, eidolons, and ghost moths) have a random attack type or flavor that is randomized as part of `mons_attack_spec`. This led to two bugs. First, the monster description changed each time you look at it; this is cosmetic for chaos spawn/cherub as the damage wasn't affected, but for eidolons and ghost moths a newer player would not realize that the stat affected by AF_DRAIN_STAT is randomized per hit. Second, and more involved, this led to a seed bug, depending on the state of the area grid when the builder was called. When placing an item, the builder checks if the player can hear the position where the item is, in order to decide whether to make a splash noise. As part of this check, it looks to see if the position is silenced. This involves checking the area grid, and if the area grid is invalid, rebuilds it. Part of rebuilding the area grid involves running holiness checks on potentially every monster in the level. Running a holiness check involves checking attack flavors, to look for evil attacks etc. This would therefore then do some random calls, on the levelgen rng. The result: the rng state was different depending on whether the area grid is valid. (Probably every stage of this calculation could be simplified out of existence for the levelgen case, but no matter.) I *think* that the area grid should always be valid except on turn 0, so this mainly led to a difference between the seed explorer and actual games; because these monsters are not super common it wouldn't manifest until lair branches or depths usually. This commit fixes these bugs in two ways. First, it makes `mons_attack_spec` non-random unless that is explicitly called for, which it only should be when actually doing the attack. This leads to better descriptions of these four monsters. Second, as a sanity check it also isolates the area grid rng, in case there's other code that could be triggered by it that is random. There's also a bit of debugging code / builder spam adjustment in this commit. -------------------------------------------------------------------------------- 5121451 | advil | 2019-08-19 19:50:43 -0400 Don't pregenerate bazaars (for now at least) The problem is that multiple bazaars can generate, which I hadn't realized. It would be possible to pregenerate the first one without too much trouble, but this leads to some oddness with the current incremental pregen setup. Ideally, we would pregenerate all bazaars, but this would require some tricky changes to how portal vaults are currently handled. -------------------------------------------------------------------------------- ad2a101 | advil | 2019-08-19 19:50:43 -0400 Fix a sequence point issue in rng::subgenerator -------------------------------------------------------------------------------- aa2f355 | advil | 2019-08-19 19:50:43 -0400 Isolate shoals tide from levelgen rng The builder calls some tide code when finishing up a shoals level, roughly to initialize things. However, tide code is dependent on global state, for things like shoals tide direction, and it is also randomized, so it would have a different impact on the rng depending on this state. This means that for incremental pregen (or just regular games before incremental pregen) the outcome of later levelgen would be impacted by the global tide state when entering a level. This commit ensures that tide state only ever impacts the gameplay rng. -------------------------------------------------------------------------------- 215db2b | advil | 2019-08-19 19:50:43 -0400 Reset brentry for portals correctly in tests/wizmode Now that portal information is stored here, we need to deal with tests that clear uniq_map data, allowing portals to be generated multiple times. -------------------------------------------------------------------------------- da9c0b0 | advil | 2019-08-19 19:50:43 -0400 Update seed explorer for incremental pregeneration This mostly consists of handling portals correctly. Also, smaller changes: * Add Gehenna to the seed explorer. Somehow this was missing? * Change the seed explorer default depth to exclude hells; the hells are too spammy, and not what most use cases are interested in. -------------------------------------------------------------------------------- 44eecae | advil | 2019-08-19 19:50:43 -0400 Generate portal levels at the same time as their source Whenever a regular level has a portal, this will generate the portal levels immediately after the regular level's generation is triggered. This imposes a deterministic generation order on portal levels for incremental pregen, as well as a deterministic order between portals when there are multiple ones from the same level (which is missing from even full pregen before this commit). This commit also puts ziggurats in the generation order, though they are handled a bit differently; this is so everything else generates before they do, to try to minimize the impacts of item placement in zigs. -------------------------------------------------------------------------------- 66c84cb | advil | 2019-08-19 19:50:43 -0400 Add pan to level generation order This forces everything before pan to be generated before entering pan; since there is occasional overlap of vaults and uniques, entering pan can therefore interfere in any later levelgen. -------------------------------------------------------------------------------- 38a37b7 | advil | 2019-08-19 19:50:43 -0400 Isolate shop rolls from levelgen This will make it not a complete disaster to try to place specific unrands in shops, though I would still want to discourage this. I believe there is currently one shop that does this, minmay_shop_mayhem, which doesn't have a simple fix. (One option might be to let some lua post-place script cull shop items, rather than try to filter the list beforehand, but I think this would be pretty involved.) -------------------------------------------------------------------------------- 7e99aec | advil | 2019-08-19 19:50:43 -0400 Use fallback randarts for minmay_shop_chei This works fine, you get randart bardings/hats with ponder. -------------------------------------------------------------------------------- cbae52a | advil | 2019-08-19 19:50:43 -0400 Make ds, wn, and dswn starts more deterministic by seed This should make the rng for setting up each of these start categories fully determined by the game seed, and independent from each other (as well as all other start choices). Before, these were somewhat accidentally dependent on seed, but dswn led to an interaction between the two (and potentially with any other randomness that might happen during character initialization, if there is any). Even if we decide that this is a bad idea at some point, these are still the right code changes to make these rolls independent of the rng as well -- would just need to initialize the subgenerator differently. Thanks to discord user Blue for pointing out the dswn interaction. -------------------------------------------------------------------------------- 82437c2 | advil | 2019-08-19 19:50:43 -0400 Update seed menu for incremental pregen Removes the toggle except on debug builds. It is still possible to enable full pregen in the rc file for offline games. -------------------------------------------------------------------------------- a46ea00 | advil | 2019-08-19 19:50:43 -0400 Remove almost all instances of you.unrands This technique for controlling unrand placement has a bad interaction with incremental pregen. Basically, any change to item placement in a vault description can impact rng state, and it's a bit hard to keep these effects limited. (Though possibly, uses of this technique that replace exactly one unrand with exactly one other thing might be more or less ok.) With full pregen, this is not an issue, because dungeon unrand selection is done before the player can do anything. With incremental pregen, because unrands can be generated by acquirement, any such generation can the effect levels that are in the future. Crawl already did some automatic fallback placement for unrands that were not wrapped in you.unrands checks: if unrand placement fails, it placed an unrand with the same base type and subtype. However, in various cases vault designers wanted something more specific. To solve this problem, this commit makes the following changes: 1. Item generation all happens on a sub-generator, so all single items make exactly the same number of draws from the level's rng (4). This means that fallback placement as described above doesn't affect the rng over and above regular unrand placement. 2. The vast majority of uses of you.unrands in vault design just tweaked what would happen without a lua check slightly, by adding a brand or changing the subtype. I've enhanced the syntax of art-data.txt to allow explicit specification of fallback type and subtype (e.g. so things like Glaive of the Guard can place as a bardiche), as well as allowing specification of a brand for the fallback. Before, item generation didn't try to mimic the unrand's brand, but now it does. Nearly everything that was previously done with you.unrands in lua can now be done with the new syntax in art-data.txt, in a more generalized way. Most of the time I took the fallback details from specific vaults. In a few cases, the logic that this replaces was complicated enough that I didn't try to reproduce it exactly, but I really don't think that most of these extra complicated cases added much. So, here's an example of what should happen. Suppose the old item spec looked like this: ``` : if you.unrands("frostbite") then KITEM: 2 = executioner's axe ego:freezing randart ident:type / \ battleaxe ego:freezing randart ident:type / \ broad axe ego:freezing randart ident:type : else KITEM: 2 = frostbite / \ battleaxe ego:freezing randart ident:type / \ broad axe ego:freezing randart ident:type : end ``` This has been replaced by the following, which now accomplishes exactly the same thing: KITEM: 2 = frostbite / \ battleaxe ego:freezing randart ident:type / \ broad axe ego:freezing randart ident:type If frostbite has already generated, and the vault rolls the first item in this list, then it will generate a fallback randart of the same type and subtype (exec axe). In fact this would have already happened with this item spec before this commit. Because frostbite specifies a brand (SPWPN_FREEZING), the randart will pick this up as well (this part is new). Because all this is partitioned off from the levelgen rng, nothing else about a level should change beyond the substitution of an unrand with a similar randart. There's still some details not in this commit; in particular there're a few shops that still use you.unrands that I'll address in a separate commit. -------------------------------------------------------------------------------- 9ece634 | advil | 2019-08-19 19:50:43 -0400 Improve the rng subgenerator API This makes it easier to spin up a temporary rng based on current rng state (or not). Subgenerators are designed for one-off calculations where it is desirable to keep the main rng state fairly stable. A couple pieces of code already use this technique, and they are now a lot better, both converted to use unbiased bounded random calls (though the domino code is complicated enough that I didn't want to convert it over fully). This commit changes make_name to be use randomness better relative to its 32 bit seed parameter; I'm not sure if it will be qualitatively noticeable but the old behavior is recoverable if necessary. -------------------------------------------------------------------------------- bc88668 | advil | 2019-08-19 19:50:43 -0400 Update the bounded random implementation This moves to an implementation of unbiased bounded random number generation based on a recent algorithm by Daniel Lemire with an implementation by Melissa O'Neill. This change has two advantages: (i) the big one, this is off-the-shelf code written by an rng expert, implementing an algorithm designed by someone who specializes in this kind of optimization. Ours was *probably* fine, but didn't exactly match any standard way of doing this that I was able to find. (ii) It gets a 10% speedup for typical range values compared to our old implementation, because it avoids using /,% where possible. This is probably not a big deal in the scale of things that are slow in crawlcode, but we do call the rng a *lot*, mostly with range values that this function is optimized for. See: http://www.pcg-random.org/posts/bounded-rands.html https://lemire.me/blog/2016/06/27/a-fast-alternative-to-the-modulo-reduction/ https://arxiv.org/abs/1805.10941 This also updates the API for this call, moving it the implementation into the pcg class, as well as updates some comments in pcg.cc to be more detailed and correct. -------------------------------------------------------------------------------- 8fead6f | advil | 2019-08-19 19:50:43 -0400 Change PCG initialization to something more standard Perhaps because of the age of our PCG implementation (it comes from before the official implementations were well-developed/documented), our initialization process was fairly ad-hoc, which is not usually a good idea in RNG design. This commit converts the initialization behavior to match what the official implementations do, for example: https://github.com/imneme/pcg-c-basic/blob/master/pcg_basic.c Possibly it would be best even to just use the official c++ PCG implementation, but this commit doesn't go that far. Needless to say, this change affects all seeds. -------------------------------------------------------------------------------- 159d84b | advil | 2019-08-19 19:50:43 -0400 Cosmetic refactoring of the rng interface Move the more internal parts into their own namespace, and rename some functions accordingly. This still leaves the external interface (random2 etc) outside the `rng` namespace, because I'm not up for the consequent mass edit right now. -------------------------------------------------------------------------------- 62a95a1 | advil | 2019-08-19 19:50:43 -0400 Add an option to disable incremental pregen, use it for fireworks This option isn't a very direct solution to the immediate problem, but it's something players might want anyway. The immediate problem is that after the incremental pregen commit, wizmode `&~` is not safe to use in a long sendkeys sequence, because if it triggers pregen, the pregen progress window will absorb any following keystrokes until it is done. For fireworks, the script just goes to temple because it's a straightforward area clear of monsters that it's safe to use for testing, so disabling pregen makes sense. No other official scripts really use this. If it turns out that a more complete solution is needed for some reason, I could imagine either (i) letting wizmode `&~` trigger a fancier menu that has an option to toggle pregen, or (ii) adding some kind of bot mode that suppresses the progress popup. Most bots trigger on ready() though, so won't get tripped up by this popup as far as I can see. -------------------------------------------------------------------------------- 11bec38 | advil | 2019-08-19 19:50:43 -0400 Initial implementation for incremental pregeneration This accomplishes the main mechanics, but doesn't solve most of the hard seeding problems. After this commit, the dungeon always generates in a stable order for non-pregen games; if you skip levels relative to the defined order it will catch up. -------------------------------------------------------------------------------- 45f0056 | Aidan Holm | 2019-08-19 00:30:35 +0800 Speed up level traversal by 33% The Wang tile generator in domino.h is unfortunately pretty slow. It's also not necessary on levels outside the crypt, which don't use wang tiles, so defaulting to random tile indices in this case is a simple fix. Improves (not-into-crypt) level traversal speed by around a third. -------------------------------------------------------------------------------- 0c8b59c | Aidan Holm | 2019-08-19 00:26:00 +0800 Revert "Speed up level traversal by 33%" This reverts commit 070f72b007c478799c7b6210fd4ce8416dc5f516. -------------------------------------------------------------------------------- 070f72b | Aidan Holm | 2019-08-18 23:12:10 +0800 Speed up level traversal by 33% The Wang tile generator in domino.h is unfortunately pretty slow. It's also not necessary on levels outside the crypt, which don't use wang tiles, so defaulting to random tile indices in this case is a simple fix. Improves (not-into-crypt) level traversal speed by around a third. -------------------------------------------------------------------------------- 61eb7a8 | Aidan Holm | 2019-08-18 23:07:43 +0800 Fix newline at end of message log -------------------------------------------------------------------------------- d1b266b | Aidan Holm | 2019-08-17 21:50:59 +0800 Fix excess padding on webtiles book spell list -------------------------------------------------------------------------------- 8077b2f | wjchen | 2019-08-17 21:22:26 +0800 Allow traveling and annotating current level from ^O G, _, $, and ! in dungeon overview are made shortcuts to G, G_, Ctrl+F "shop", and level annotation respectively allowing selection of target for travel and annotating current level from dungeon overview. -------------------------------------------------------------------------------- f04b0cd | wjchen | 2019-08-17 21:22:26 +0800 Allow using G_ to select altar for travel Pressing _ in G now lists discovered altars, user can then select the altar for travel by entering the initial of a god (except for TSO, which is replaced by 1). Once a god is selected, travelling to the nearest altar is started. Help file is also modified to reflect this change. -------------------------------------------------------------------------------- b950e11 | wjchen | 2019-08-17 21:22:26 +0800 Add _god_from_initial() to travel.cc _god_from_initial(const char god_initial) returns a god_type enum when the initial of a god (i.e., god_initial, case-insensitive) is given. (except for TSO, which is replaced by '1'). If the given letter does not match any god's initial, GOD_NO_GOD will be returned instead. For example: _god_from_initial('a') or _god_from_initial('A') will return GOD_ASHENZARI. This function is later used for allowing players to select an altar for travel by the initial of a god. -------------------------------------------------------------------------------- 4167bdc | wjchen | 2019-08-17 21:22:26 +0800 Allow predefined keyword for search_stashes() Modify StashTracker::search_stashes() to accept an optional predefined keyword. It now directly return search results without asking what to search for when the keyword is specified. -------------------------------------------------------------------------------- fe73009 | Aidan Holm | 2019-08-17 20:29:10 +0800 Check bounds for Grid widget row/col growths It's very easy to cause memory corruption if you unconditionally set the growth amount for a column / row, but conditionally add widgets to that column / row. -------------------------------------------------------------------------------- 6aae15e | Aidan Holm | 2019-08-16 17:36:42 +0800 Fix mouse cursor on unselectable items -------------------------------------------------------------------------------- 3b46b88 | Aidan Holm | 2019-08-16 17:32:04 +0800 Prevent widget parent clobbering (12046) If a widget's parent was recreated and reassigned to a shared pointer variable, it was possible for the old instance's destructor to clear the child's parent pointer after the new instance had initialized it: auto parent = make_shared(child); // child->m_parent == parent.get(); parent = make_shared(child); // child->m_parent == parent.nullptr When the second line runs, the first Parent instance is destructed after the second instance is constructed, clobbering the child's m_parent. -------------------------------------------------------------------------------- 2d01d4a | advil | 2019-08-11 11:28:14 -0400 Fix some non-working code in `your_talents` I'm still not sure under what natural circumstances this code can get triggered, but it seems to be happening in this megazig character: http://crawl.akrasiac.org/rawdata/malcoda/crash-malcoda-20190811-143529.txt This bit of code for doing backup hotkey assignment for abilities has apparently never worked, but it also is hard to get to, so no one has noticed before. -------------------------------------------------------------------------------- dd4cf15 | Nikolai Lavsky | 2019-08-10 13:01:29 -0400 Fix red draconian Tiamat tile (12043) In mon-data.h, the colour of red draconians is LIGHTRED, not RED, since 54374eb4. Because tilepick.cc:tileidx_monster_base() had no matching colour for red draconian Tiamat, it returned a tile with offset 0, the black draconian Tiamat tile, instead. -------------------------------------------------------------------------------- bb0d440 | gammafunk | 2019-08-08 21:46:59 -0500 Update Sif Muna's altar (CanOfWorms) This adds new animated altar tiles courtesy of CanOfWorms. The tile concept is a sort of shimmering orb of magic atop a deep blue pedestal inscribed in powerful LORE. The description is updated accordingly, and Sif's altar now has ETC_SHIMMERING_BLUE as its color instead of simply blue. -------------------------------------------------------------------------------- 42aaa33 | gammafunk | 2019-08-08 20:48:00 -0500 Remove an unused description -------------------------------------------------------------------------------- 939521a | Seve Monahan | 2019-08-08 19:10:12 -0400 Add rmcneive to CREDITS.txt -------------------------------------------------------------------------------- c9afb8a | Seve Monahan | 2019-08-08 19:05:20 -0400 Merge branch 'rmcneive-Vaamat_quotes_1' Some of these quotes are not currently visible in game due to mantis bug 12032 -------------------------------------------------------------------------------- 18ba70b | advil | 2019-08-06 07:37:22 -0400 Don't let dgn_move_entities_at move statues onto clouds This resulted in a crash in world_reacts; it could be reliably replicated by running lugonu corrupt near the vault statue_in_the_mist_lemuel. -------------------------------------------------------------------------------- 0b98641 | Seve Monahan | 2019-08-06 00:43:41 -0400 Remove extraneous Nikoli Lavsky credit -------------------------------------------------------------------------------- 98e85ec | Seve Monahan | 2019-08-04 11:18:03 -0400 Add Nikolai Lavsky to CREDITS.txt -------------------------------------------------------------------------------- c3251c5 | reaverb-Crawl | 2019-08-04 11:09:40 -0400 Merge pull request #1124 from nlavsky/zigfig-warning Warn the player about leaving a ziggurat figurine behind (u/Quatzecoatl) -------------------------------------------------------------------------------- cb87913 | Nikolai Lavsky | 2019-08-01 14:17:47 +0300 Warn the player about leaving a ziggurat figurine behind (u/Quatzecoatl) Ziggurat figurines are usually buried below other loot and could be easy to miss. This commit adds a confirmation prompt when exiting Zig:27 without the figurine. This change was suggested here: https://www.reddit.com/r/dcss/comments/al6bxh/ -------------------------------------------------------------------------------- 9231cdc | Seve Monahan | 2019-07-31 00:18:52 -0400 Don't mention Invocations skill in Drain Life spell description (#11947) -------------------------------------------------------------------------------- f43b32f | Seve Monahan | 2019-07-29 23:22:00 -0400 Ensure Zigsprint never fails to place guaranteed items (#12033) -------------------------------------------------------------------------------- e2f623c | Seve Monahan | 2019-07-29 23:00:39 -0400 Have fsim test magical staffs with different Staves skill values (#12034) It would probably better to give the fsim user control over which skill(s) to vary, but if somebody needs that functionality it should be relatively simple to implement. -------------------------------------------------------------------------------- 04f7f4e | Seve Monahan | 2019-07-29 20:16:11 -0400 Use "spell power" over "magical power" in !brill description (Yermak) "Magical power" is often used to refer to magic points, such as in the ring of magical power. There should probably be more consistent names for magical points and spell power, which should ideally both avoid using the word "power". -------------------------------------------------------------------------------- bf7f94f | rmcneive | 2019-07-27 11:05:17 -0400 Update quotes.txt -------------------------------------------------------------------------------- 122614b | Aidan Holm | 2019-07-27 17:21:15 +0800 Fix typo (runrin) -------------------------------------------------------------------------------- 8fd06ad | Seve Monahan | 2019-07-22 22:53:24 -0400 Rename a column of crash dumps from "can_train" to "can_currently_train" Split this off from 7ac07d978e2f31 so that this commit can be easily reverted. Reverting this commit would be useful if some outside system is fragile to the crash format changing. It might be better to split the skills table header into two lines for readability's sake. This would allow each column header to wrap once. -------------------------------------------------------------------------------- 7ac07d9 | Seve Monahan | 2019-07-22 22:49:23 -0400 Rename you.can_train to you.can_currently_train Logic errors such as the one fixed by 284f782df56 are much less likely to occur with this more precise name. Lua functions are unchanged to conserve compatibility with old scripts. Crash dumps will be changed in the next commit. -------------------------------------------------------------------------------- 9d8d8d5 | Seve Monahan | 2019-07-22 17:25:49 -0400 Ensure the Faerie Dragon scales are always id-ed (Mantis 12031) Now if you managed to kill the Enchantress before seeing her, the Faerie Dragon scales will be identified. This also ensures that if the Faerie Dragon scales are placed in a vault, they will be identified. -------------------------------------------------------------------------------- d52e2fb | Seve Monahan | 2019-07-21 18:35:10 -0400 Revert "Another try at "Don't crash if redrawing a prompt triggers a flash"" This reverts commit 9de272bb65679e0acb2c0d648a7bf934a2dbe1e2. This commit appears to cause crashes similar to a379d5e2002d17 Example: https://crawl.xtahua.com/crawl/morgue/hittemvvvvvvvhard/crash-hittemvvvvvvvhard- 20190721-214938.txt It's possible this is coincidence, if so this commit can be reverted. -------------------------------------------------------------------------------- 9de272b | advil | 2019-07-20 19:01:55 -0400 Another try at "Don't crash if redrawing a prompt triggers a flash" Not exactly a revert of be7f5e2e8dd2d2250346b0928555b9967f520fba. This tries under fewer circumstances to restore cursor position after a flash, doing it only while printing to the message window; it is apparently possible for a flash to be called in situations where the cursor position is incoherent with the region. However, things should be coherent within _mpr. This also disables flashing entirely in the arena, as the arena reliably instantiates one of these cases, and I couldn't figure out why. -------------------------------------------------------------------------------- be7f5e2 | advil | 2019-07-20 15:17:44 -0400 Revert "Don't crash if redrawing a prompt triggers a flash" This reverts commit a379d5e2002d1753cc2fdd47a06dc70336d03bd7. -------------------------------------------------------------------------------- a379d5e | advil | 2019-07-20 14:10:22 -0400 Don't crash if redrawing a prompt triggers a flash This is probably a webtiles-specific bug: if a prompt triggered a flash (on just webtiles builds, I think), and there were monsters in view, then the redraw involved in the flash would lose the cursor position and leave the region in the mlist. This is a kind of minimalistic fix in that it only addresses flash calls specifically -- viewwindow on relevant builds (as well as update_monster_pane) can change the region as a side effect, leaving it in the monster list. However, I'm not yet certain whether it would have other consequences to adjust this more generally. But probably a more general fix is needed, and all the occasional cursor out of bounds issues we see with GOTO_MLIST do result from this side effect of viewwindow. -------------------------------------------------------------------------------- 284f782 | Seve Monahan | 2019-07-19 22:50:02 -0400 Show XL to reach relevant skill level on more items (Mantis #12018) Before, if you could not *currently* train a particular skill, you would not see the "At X% training you would reach Y in about Z XLs" line. For example, if you did not have any short blades in your inventory but were looking at a rapier in a shop, the line would be missing. This fixes the description code to only exclude the line if a skill is *permanently* untrainable. -------------------------------------------------------------------------------- 2b48af3 | advil | 2019-07-19 09:08:24 -0400 Fix a potential cursor rendering issue in glyph mode What was happening here was if w or h were non-integer, then the scale value ended up slightly different than the cell sizes. In glyph mode, this was happening to the width parameter depending on font details (applying at least to firefox/mac on default settings). When rendering the mouse cursor, this scale value is used, so it would be a bit larger horizontally than a single cell, by 1-2 pixels. On firefox this meant that the cursor didn't get cleanly cleared when it moved, leaving vertical lines when moving the mouse cursor across the dungeon view. In testing, I have seen no consequences of using a scale based on the floored versions of w and h, even though in principle this might mean that the width of glyphs is slightly larger than the cell size is expecting. -------------------------------------------------------------------------------- 71c5d99 | advil | 2019-07-19 09:08:24 -0400 Handle hidpi screens in webtiles glyph mode This was not factoring in the device pixel ratio correctly, and so ended up too small on hidpi screens. This commit also adds support for crawl-internal zooming (via rc options, or {} in X) of the dungeon. Browser zoom affecting glyph mode is a different story, I'm not sure how possible this is going to be. -------------------------------------------------------------------------------- 9253d74 | Alex Jurkiewicz | 2019-07-19 16:45:50 +0800 Compress title PNGs a little bit better Using: advpng -z4 -i 1000 Then: zopflipng --iterations=1000 --filters=01234mepb --lossy_transparent -------------------------------------------------------------------------------- a1643a6 | Seve Monahan | 2019-07-18 22:52:16 -0400 Ensure artefact jewellery is always auto-picked-up (Mantis #12029) This was caused by commit 32ec7cac8f0e. 32ec7cac8f0e did not correctly handle artefact jewellery when it changed some jewellery autopickup from using simple autopickup exclusions to a lua function which checks the player's inventory. -------------------------------------------------------------------------------- af07aaf | Alex Jurkiewicz | 2019-07-18 18:47:22 -0700 Add guidelines for no_tele_into usage (#1118) Discourage overuse and explicitly reject the idea all runed door / transporter vaults require it. -------------------------------------------------------------------------------- 3e8b2426 | Seve Monahan | 2019-07-17 21:04:30 -0400 Clarify Beastly Appendage Octopode mutation conflict. (Mantis #12028) This makes it explicit in the description for Beastly Appendage it is ineffective for Octopodes which already have levels of the tentacle spike mutation. -------------------------------------------------------------------------------- 958ff8e | Seve Monahan | 2019-07-17 17:33:07 -0400 Make Qazlal's noise conduct more clear (Mantis #12025) Specifically, clarify that Qazlal followers generate noise even if there are no clouds around them. -------------------------------------------------------------------------------- bda620f | Seve Monahan | 2019-07-17 17:32:47 -0400 Fix misspelling in describe.cc comment -------------------------------------------------------------------------------- cfb02b9 | nlavsky | 2019-07-15 12:46:23 -0700 Update scroll of brand weapon description (#1114) As blowguns are no more. -------------------------------------------------------------------------------- b815cdf | Aidan Holm | 2019-07-15 15:19:12 +0800 Fix spurious key events when adjusting map zoom -------------------------------------------------------------------------------- e6e1909 | Aidan Holm | 2019-07-15 15:15:54 +0800 Fix visual jump when toggling floor / inv items For unselectable items, the hotkey is a space character, which produced an extra (presumably unintentional) indentation. I tried indenting to align the item titles, but this looked even more out of place, so flush left it is. -------------------------------------------------------------------------------- c560d0b | Alex Jurkiewicz | 2019-07-15 13:26:20 +0800 Mark two unrand vaults no_tele_into As both are protected by runed doors / transporters, it shouldn't be possible to teleport randomly inside. -------------------------------------------------------------------------------- 46574c2 | Seve Monahan | 2019-07-14 01:06:22 -0400 Add escape hatch to mumra_spider_spiderweb (Mantis #12013) It was possible for the inner area of this vault to generate cut off from the rest of the level (by deep water). -------------------------------------------------------------------------------- 1074bba | Seve Monahan | 2019-07-13 22:42:20 -0400 Ensure Bat Form warns about Stat Zero (Mantis #12006) I have changed the bat form drain formula to drain 2 from each stat. The old formula was very high variance (For example, there was a 1 in 70,000 chance of causing any particular stat to drop by 7). This made it difficult to communicate to the player the chance of causing stat zero, which I think is important. The old formula drained an average of 4.5 points, while the new formula drains 6 points. I do not believe this is a significant change. -------------------------------------------------------------------------------- e00f04a | Seve Monahan | 2019-07-12 23:56:26 -0400 Extract new helper function "_player_is_gnoll()" in skills.cc -------------------------------------------------------------------------------- 5a03d68 | Seve Monahan | 2019-07-12 21:33:12 -0400 Ensure train targets turn off once reached with !experience (#11993) This bug was caused by commit ece4408. I have tested the bug fixed by ece4408 (#11943) to ensure this commit did not cause a regression. -------------------------------------------------------------------------------- be733cd | marksg07 | 2019-07-12 13:43:31 -0700 Revert "Allow running clua from map viewing mode (#1103)" (#1107) This reverts commit 1c7b743a30f0ffe3337a8d576059ebbbcae2e84a. -------------------------------------------------------------------------------- d30f2f1 | olowin | 2019-07-12 12:03:45 -0400 Remove blood from Gozag shop description Now that vampires are hungerless. -------------------------------------------------------------------------------- 17ce2c7 | Seve Monahan | 2019-07-12 00:37:23 -0400 Correct alphabetization in Makefile.obj -------------------------------------------------------------------------------- 7e4ddcd | advil | 2019-07-11 17:25:51 -0400 Fix a pronoun (12011) Ideally this should reflect player choice, but given that we aren't using the `it` form at all any more, this is at least more consistent. -------------------------------------------------------------------------------- df4b510 | advil | 2019-07-11 16:57:06 -0400 Trigger fineffs after blurrily reading a scroll (12016) Otherwise, they need to wait until the next turn. Two cases that I have tested: torment vs TRJ, and torment vs shock serpents. This is not a very general fix, and in principle might need to be generalized to any delay that queues a fineff. -------------------------------------------------------------------------------- 29c01f8 | advil | 2019-07-11 15:40:11 -0400 Fix arena logging (10060) For some time, arena logging has been writing the entire message history on each turn. This commit redoes arena logging using the message_tee paradigm instead of trying to read from the log history directly; doing it this way better handles continuous updates and the possibility of the message log filling up. -------------------------------------------------------------------------------- 534e725 | marksg07 | 2019-07-11 10:44:49 -0700 Check for known map bounds in the clua travel library (#1102) The set_exclude, del_exclude, and set_waypoint functions all previously ignored the bounds normally set on your cursor in map mode, i.e. you can only move your cursors to points within the bounding box of the screen. This being ignored meant both that clua could do something that couldn't be done manually, and that your absolute coordinates could be leaked by careful use of the above functions. This fix will prevent both from happening. -------------------------------------------------------------------------------- 1c7b743 | marksg07 | 2019-07-10 17:33:25 -0700 Allow running clua from map viewing mode (#1103) This is made possible by adding user function recognition to key inputs while viewing map. A clua function can be run by adding a levelmap key map from a given key to ===functionName. When the clua function finishes, we will still be in map mode unless the function took us out of it. Additionally add clua functions for asking about map mode: crawl.in_map_mode, crawl.cursor_pos, and crawl.cursor_level cursor_pos and cursor_level return nil outside of map mode. cursor_pos also returns nil if the level of the cursor is not the same as the level of the player, because giving the relative position to the player in that case would leak information about the level map. -------------------------------------------------------------------------------- 33f6f7b | advil | 2019-07-10 18:11:47 -0400 Arena error improvements * keep arena from causing a full game exit if you mistype a monster. (In fact, just restart arena, at least if it was run from the main menu.) * Print multiple rounds messaging into a popup, it wasn't showing at all in interactive arena before. There's still a bunch of improvements that could be made to arena messaging, it doesn't say anything for 1-round fights, and is generally kind of lacking in local tiles (because of the lack of monster list). -------------------------------------------------------------------------------- 57318f2 | Alex Jurkiewicz | 2019-07-08 21:46:12 -0700 Unify two loot lines (#1101) Based on absolutely nothing, I think the average stack size of mutation potions is a touch over 1, adjust the new weight accordingly. -------------------------------------------------------------------------------- ed88169 | Alan Malloy | 2019-07-08 15:43:25 -0700 Add gmarks to CREDITS and mailmap after e77e6fb -------------------------------------------------------------------------------- e77e6fb | marksg07 | 2019-07-08 15:35:48 -0700 Add clua function to set waypoint (#1098) -------------------------------------------------------------------------------- 962a3ee | Nikolai Lavsky | 2019-07-08 15:27:22 -0400 Remove dump_book_spells option Obsolete since the introduction of the spell library. -------------------------------------------------------------------------------- 98ea13e | Alex Jurkiewicz | 2019-07-08 15:26:04 -0400 Simplify logic -------------------------------------------------------------------------------- e98fbd9 | advil | 2019-07-08 14:47:54 -0400 Adjust desolation fog machines It turns out that the desolation fog machines achieved their effect by running 200 times per turn (by being set with delay 0). After my previous commit causing delay to be max'd at 1, the amount of fog produced by these machines with the same settings is approximately halved. This commit tweaks the fog machines to try to get something more like the originally intended effect. They may need further tweaking from anyone who has a better sense how desolation fog should "feel". It's possible that the portal fog should be toned down more, as well. Needless to say, with a delay of 5 (2x per turn) these machines are a lot easier on the cpu than they used to be. This probably makes something like #948 not needed. -------------------------------------------------------------------------------- a9b13e7 | advil | 2019-07-08 14:47:54 -0400 Handle delay 0 values correctly in lm_trig.lua I think this code was infected by a classic lua gotcha: 0 does not evaluate to false, so the "or 1" here did not ever apply (since at least one of delay and delay_min/mix were guaranteed to not be nil). So if you set up a turn triggerer with delay 0, in `DgnTriggerer:turn` the countdown counter never got incremented and the loop there only exited because of the countdown_limit check. This means it ran 200 times, where the intended max appears to have been 10 for a single turn. (The 200 limit looks like it's something to do with apocalypserobin issues in the distant past, but I haven't figured out exactly under what conditions it was intended to apply.) Consequently, each fog machine in desolation ran 200 times per turn. This does a great job at getting lots of fog, but is really slow. From reading the logs it looks like no one realized this is how it was operating. I'll address desolation fog machines in a separate commit (since with this commit they will run only 10x a turn, and this turns out to mean putting out about half the fog.) Running 10x a turn is still heavy in the scale of things but in my testing it's negligible compared to the old 200x cap, so these changes may effectively fix the server cpu issues for salt even without further tweaking delay (which my next commit will also do). -------------------------------------------------------------------------------- 7da6c14 | Alex Jurkiewicz | 2019-07-08 09:44:34 -0400 align braces -------------------------------------------------------------------------------- 9a978d2 | Kyle Rawlins | 2019-07-05 12:22:18 -0400 Travis modernization (#1095) * Travis modernization * Enable ccache: travis can now save caches between builds (for every cell in the build matrix even!) so in the best case this massively speeds things up. Required some footwork for clang. * Move all apt stuff into .travis.yml, using a more complex build matrix and yaml references to cut down on repitition. This isn't quite as clean as the perl code it replaces, but doing this directly allows travis the option to do whatever caches / retries / etc it wants for apt. * Don't mess with compiler versions; xenial has modern enough compilers for c++11. * Switch the build matrix to use include rather than exclude, and prune it down so that clang isn't fully crossed with every env option. The choice of which builds to do with clang is a bit arbitrary and could be further tweaked if anyone has preferences. * Don't build non-needed contribs on BUILD_ALL for webtiles; this is covered by regular tiles builds and simplifies the dependencies. -------------------------------------------------------------------------------- e3eab05 | advil | 2019-07-05 10:29:53 -0400 Fix join_strings args (amalloy) -------------------------------------------------------------------------------- 132cf69 | Stephen | 2019-07-05 09:48:27 -0400 Fedora build deps rename SDL* to SDL2* (#1076) The SDL build dependencies on Fedora are provided by the SDL2-devel and SDL2_image-devel packages. The current, non-"2", versions will cause the build to fail. [committer's note: copied PR message into commit] -------------------------------------------------------------------------------- f6c7d2a | Alex Jurkiewicz | 2019-07-05 09:44:36 -0400 Old Vampire cleanup (#1096) [committer's note: these braces are left over from b5eab8406da.] -------------------------------------------------------------------------------- 5b41c6f | gammafunk | 2019-07-04 16:44:40 -0500 Fix Death's Door HP at time of cast (Wise Wolf) Certain spells such as Death's Door, Tornado, and Dragon's Call do calculations of spell-power each turn for the purposes of spell effects. In the case of Death's Door, HP sanity checking code would immediately set hp to a value that didn't consider any spell-power bonuses that might be no longer active. This meant that HP would be lowered when using Sif's Divine Exegesis (due to loss of the Invocations bonus) or when swapping off e.g. a staff of death. This commit records the spell-power-derived HP at the time of casting and uses this for all subsequent turns of the current Death's Door duration. Changing the HP on subsequent turns is a result of the technical issue of implementing the sanity check for Death's Door and not part of the spell's intended design. This is a more general issue of how to handle spell-power for any spell with effects over multiple turns. Most duration-based spells, all summon spells, all conjurations that create a summon-like conjuration, and all cloud spells don't reconsider spell-power with every turn, which is inconsistent with how we do for Dragon's Call, Tornado, Borg's Vile Clutch, Searing Ray, and Olgreb's Toxic Radiance. If discouraging swaps is so important, we should not limit that restriction to a narrow subset of spells mainly for technical reasons. Clarity is the most important reason; most players probably don't expect that the former list of spells become worse over subsequent turns if they swap off enhancers. If we agree that encouraging swaps is bad, we should likely make *all* spells that have effects over time reconsider spell-power on each turn. -------------------------------------------------------------------------------- 47c397e | advil | 2019-07-04 11:26:09 -0400 Travis: Update mingw package names for xenial -------------------------------------------------------------------------------- 7d61508 | advil | 2019-07-04 09:52:29 -0400 Another travis dep... -------------------------------------------------------------------------------- 7b9cff8 | advil | 2019-07-04 08:54:58 -0400 More travis dependency updates, this time for BUILD_ALL -------------------------------------------------------------------------------- 3302cd4 | advil | 2019-07-03 22:52:46 -0400 Try xenial (travis) This apparently could happen any day now anyways. -------------------------------------------------------------------------------- c1e67f2 | advil | 2019-07-03 22:13:21 -0400 More travis tweaking for local tiles -------------------------------------------------------------------------------- 4a4e935 | advil | 2019-07-03 21:55:50 -0400 Remove old 3rd party sdl build from travis -------------------------------------------------------------------------------- 378ef55 | advil | 2019-07-03 18:06:12 -0400 Add local tiles zoom to key reference -------------------------------------------------------------------------------- a9e2c0f | advil | 2019-07-03 17:36:04 -0400 Let X be zoomed differently from main map, default to 60% In console, the `X` view is really useful in terms of getting a quick overview of the level map. However, it's always struck me as a bit useless / vestigial on tiles, because the amount of map displayed wasn't much different from what `x` displays, just with a different set of keys and behavior. The situation is slightly better on webtiles, where at least the message pane is hidden, but on local tiles it literally was not different. This commit allows the `X` view to be zoomed differently from the main map, and defaults it to 60% zoom (as opposed to default 100% zoom). You can also now change the zoom in game using {,}. On local tiles, ctrl-'-' and ctrl-'=' also work (as with the main view). To return this behavior to its previous state, set the (new) rc option `tile_map_scale` to 1.0. There are a few awkward issues remaining. In webtiles, some status messages printed using `mpr` are no longer visible in `X` mode, though prompts will work (see 65f37df). I'm not yet sure what the best solution for these is. Also, unlike local tiles, webtiles lets you zoom beyond what will actually display, because I couldn't figure out a simple way of getting this information back from the client (though there are certainly complex ways of doing this). -------------------------------------------------------------------------------- f8f69c1 | advil | 2019-07-03 11:32:00 -0400 Start local tiles on the current display Previously, it just started on display 0 regardless of where the focus was, which is pretty annoying if you have a laptop+monitor setup. This uses mouse location to find the current display, and opens the window there. (N.b. this may differ from OS-specific means of finding the "current" display, for example, Cocoa uses keyboard focus, not mouse focus. But SDL doesn't seem to provide an interface to any of these checks.) This is tested and works on os x, but it would be useful to know before a release if this works on windows/linux... -------------------------------------------------------------------------------- 4402b9e | advil | 2019-07-03 10:26:26 -0400 Improve zooming behavior (mainly for local tiles) This commit makes two changes: it adds an option that lets you zoom the dungeon view via a multiplier, rather than a number of pixels, and it lets this zoom be adjusted in-game via CMD_ZOOM_IN and CMD_ZOOM_OUT (previously only available for the small screen ui). The first change is just because using pixel values is not the most intuitive thing for most players (I've noticed), and is basically cosmetic if you already know how to change the tile size. In local tiles, these commands are bound to ctrl-'-' and ctrl-'='. I was unable to find a good binding for these commands in webtiles, so they are unbound (though they should work), but that's probably ok because browser zoom already works ok in accomplishing a similar thing. The zoom level is reset to its rc value on start and currently not saved. -------------------------------------------------------------------------------- 6b2be6b | advil | 2019-07-02 10:44:07 -0400 Don't let `X.` show completely inaccessible travel targets This fixes some aspects of 11771, though not the main issue reported there (which is more of a UI issue than a bug per se). This commit, for example, will prevent an off-level travel target from being shown in abyss, because off-level travel doesn't work at all there. -------------------------------------------------------------------------------- 3510def | Seve Monahan | 2019-07-01 19:36:37 -0400 Fix a text bug. (#11665) This fixes a text bug which occurred when a feared monster was hit by an explosion from a wild magic card. -------------------------------------------------------------------------------- e24419a | advil | 2019-06-30 15:56:59 -0400 Use int32_t for a size check for string marshalling -------------------------------------------------------------------------------- 720adc7 | advil | 2019-06-30 15:25:05 -0400 Save builder logs in save file for debug builds This specifically requires DEBUG_DIAGNOSTICS, since it only makes sense to enable if `dprf` is going to work. What this does is just store any logging that happens during levelgen into a hashtable in you.props. For a fully pregenerated build, this can increase the size of a save file by about 300k, so it may be non-trivial, but it's only going to be enabled in dev settings I think. If that bugs anyone it would certainly be possible to make it more conditional. This change is because scrutinizing these logs is stop 1 of fixing any seed divergence, and this commit will make it a lot easier to get at them, as well as deal with cases where the build logs are bigger than the default log line limit. -------------------------------------------------------------------------------- 36f2fa8 | advil | 2019-06-30 15:22:07 -0400 Let store classes save strings >32k This is a bit of a hacky way to do this, in order to avoid any save compat issues; it adds a save-only type, SV_STR_LONG that is normalized to SV_STR once the store is loaded. -------------------------------------------------------------------------------- 225fefd | Alex Jurkiewicz | 2019-06-27 10:41:36 -0700 Mark some runed door vaults as no_tele_into (#1092) Replace an empty square in one with $ to simplify the KPROP logic. -------------------------------------------------------------------------------- fcb5e6d | advil | 2019-06-25 21:04:25 -0400 More specific documentation about des stability and tags [skip ci] -------------------------------------------------------------------------------- aec7895 | gammafunk | 2019-06-25 19:48:37 -0500 Clean up a condition -------------------------------------------------------------------------------- 09db799 | gammafunk | 2019-06-25 19:48:37 -0500 Sif Rework Part 5: Remove miscast protection As a passive, the protection was hard for players to reason about, since they had to know both a chance of successful protection based on their piety as well as the kind of miscast effect they might face should the protection fail. 100% protection was granted at 6*, but even then there tended to be a quite narrow set of relevant spells where the player might have some appreciable chance of successfully casting the spell. Repeatedly casting a high fail rate spell until successful is also tedious in terms of UI. The new Divine Exegesis active is basically an active ability version of miscast protection and provides access to more spells. Hence Sif no longer needs the passive. -------------------------------------------------------------------------------- e12f10f | gammafunk | 2019-06-25 19:48:37 -0500 Sif Rework Part 4: Add a Divine Exegesis ability Sif currently has one active that uses piety, Channel Energy, an ability that becomes more about convenience than power as the game progresses since players get access to a large MP pool. This commit adds a powerful new active to help Sif be relevant at the middle and late portions of the game and to help cement her role as the more active magical god counterpart to the more passive Vehumet. The Divine Exegesis ability allows casting any spell in the player's library with 100% success and with a spell power bonus of 1.5 x Invocations skill in addition to any spell-power coming from Int, Spellcasting, and any training in the spell schools of the spell. Thus players can cast a spell that normally has a 100% fail rate due to no or little training in the relevant skills. Divine Exegesis is granted at 4* and has a high piety cost of 12, meaning several uses of the ability is likely to bring a player under 4*. The ability will be useful to a wide variety of spell using characters, granting limited access to high level spells that normally remain totally inaccessible behind high skill requirements. -------------------------------------------------------------------------------- 0c6bcda | gammafunk | 2019-06-25 19:48:09 -0500 Sif Rework Part 3: Remove Divine Energy As discussed in 3db0654b, Sif doesn't need two MP restoration abilities, and Channel Energy, which is now granted at 1*, is the better design. -------------------------------------------------------------------------------- 3db0654 | gammafunk | 2019-06-25 19:36:34 -0500 Sif Rework Part 2: Grant some abilities earlier Sif currently has two MP restoration abilities, Divine Energy granted at 1* and Channel Energy granted at 3*. Sif doesn't need two MP restoration abilities, and Channel Energy works better in practice than Divine Energy in terms of UI and in terms of effectiveness throughout the game. Hence we'll remove Divine Energy in a subsequent commit and move Channel Energy to 1*. Its piety cost remains the same. This commit also moves Forget Spell to 3* piety, since we'll be adding a new ability at 4*. -------------------------------------------------------------------------------- 26b8ecb | gammafunk | 2019-06-25 19:27:57 -0500 Sif Rework Part 1: Piety on kills Sif Muna has some major design issues that weren't resolved the last time she was changed in version 0.19. This commit is the first in a series to change Sif's piety gain, her MP-related abilities, and to add a new high piety cost spell casting active ability. Sif's biggest issue is piety gain. She receives some piety from kills but also piety from training schools related to casting spells. The latter system has never worked well in practice. Players starting with spells want to train spell skills in order to get spells castable but generally want to switch to defensive skills or other suitably lower-cost skills afterwards. Sif currently tries to encourage training spell skills past this point to get gifts, but players trying to survive ignore this incentive for some time. The decision of whether to train spell schools for gifts is thus not an interesting one, since the answer is generally just to wait for them to happen naturally. This commit gives Sif normal piety on kills. We lose a distinct piety gain system, but her skill training system never worked well in either the full or partial versions. -------------------------------------------------------------------------------- 263dff2 | advil | 2019-06-25 17:29:32 -0400 Tweak the beast_lair_carwin fix For vaults that call the `large` monster function unconditionally, let the tags in the des cache be adjusted. This will keep the behavior of randomization more like before the first fix. -------------------------------------------------------------------------------- 1dd0858 | advil | 2019-06-25 10:28:55 -0400 More des cache stability fixes Aiming for completely reproducible des caches, at least relative to a particular system. -------------------------------------------------------------------------------- c0fab78 | advil | 2019-06-25 10:03:50 -0400 Fix a des cache random tag issue See f57072b2d696. I suspect this has been responsible for a whole bunch of issues where beast_lair_carwin maps have been showing up. -------------------------------------------------------------------------------- 8f2d45b | advil | 2019-06-25 09:54:37 -0400 Sort tags_string() again This is a regression from 80c1907ebbf6. -------------------------------------------------------------------------------- e8da920 | advil | 2019-06-24 14:10:52 -0400 Fix lua sorting in f98416c20 ...and demonstrate basic programming competence. (Though partial blame goes to lua scoping.) -------------------------------------------------------------------------------- 87df720 | Alex Jurkiewicz | 2019-06-22 22:58:16 +0100 Don't ignore torment damage for Jiyva jelly spawns (#1088) And also Xom butterfly spawns. This exception dates back to when Jiyva was first introduced (in 0.6.0-a0-258-g6d7627cb65). It's an exception which isn't mentioned anywhere to the player and probably unnecessary in terms of balance for both gods. -------------------------------------------------------------------------------- d5110b0 | dplusplus | 2019-06-21 10:11:32 -0400 Add stop for Merfolk fake-mutation description -------------------------------------------------------------------------------- f09efd6 | Alex Jurkiewicz | 2019-06-21 10:11:03 -0400 Guard against out of bounds array access -------------------------------------------------------------------------------- 80245de | advil | 2019-06-20 12:20:11 -0400 Better handling for single-char case swaps This restores any locale-specific casing behavior for non-ascii characters that might have been removed by bf76ec3. -------------------------------------------------------------------------------- bf76ec3 | advil | 2019-06-20 11:39:39 -0400 Don't let locale-specific casing affect ascii characters If a locale changes the upper/lower case correspondents of an ascii character, this would break many things. For example, as in #846, in Turkish (tr_TR.utf8), the lowercase version of I is a dotless i (ı). Since these case functions are used for all sorts of internal purposes (e.g. producing filenames from capitalized tile names), crawl would fail to even start. Though this issue only illustrated the first error, this is the tip of the iceberg and nearly every use of lowercasing was broken in this locale. I think, ideally, we'd be using two different case swapping functions: one for internal data (which is always ASCII) and one for UI-facing strings (which may be in arbitrary UTF-8 encodings). However, when I tried to adjust the API along these lines to fix Turkish, it turned out that there is not a clean distinction in crawlcode between these two uses and even stuff like the name functions which might be expected to be UI-facing are used for internal purposes as well. Based on my attempts, if this does come up for what little localization we have, it would be better/safer to let the ASCII behavior be the default for ascii characters and add in localized casing piecemeal. This commit also adjusts various hotkeys, and I'm not sure what impact this will have (it might be going too far); it could cause problems to e.g. users on a Turkish keyboard. -------------------------------------------------------------------------------- 27f0392 | advil | 2019-06-18 11:18:45 -0400 Fix some obscure sequence points that can be builder-triggered Noticed while auditing code, I don't know if this affects any actual seeds. -------------------------------------------------------------------------------- f98416c | advil | 2019-06-18 11:18:45 -0400 Don't use locale-sensitive string comparison for table.sort This is leading to seed divergence on different systems depending on locale, most immediately because some locales collate capital letters with their lowercase versions, and some don't. Lua uses locale-sensitive string comparisons unless you override it at build time, and it's not practical to set the locale in a way that avoids this (or at least I haven't managed). Capitalization isn't the only issue that could come up here, either, and it isn't appropriate for internal data to be affected by locale in this way (wtf lua), so this commit just exports c++ string comparison and uses that instead, which should use lexicographic byte ordering. -------------------------------------------------------------------------------- 6dd8730 | Chris Campbell | 2019-06-17 03:12:29 +0100 Update CREDITS.txt -------------------------------------------------------------------------------- ec079b9 | Chris Campbell | 2019-06-17 03:12:29 +0100 Change some uniques to use they/them pronouns Nessos, Xtahua, Fannar, Robin, Dissolution and Saint Roka now use "they", as do the demon/pan lords that previously used "it". Some random Gozag shopkeepers and the wizlab Cloud Mage/Hellbinder also use "they" instead of "it". -------------------------------------------------------------------------------- f4a770e | Chris Campbell | 2019-06-17 03:12:29 +0100 Add handling for non-ancestor monsters with they/them pronouns -------------------------------------------------------------------------------- dba641b | Chris Campbell | 2019-06-17 03:12:29 +0100 Refactor Hepliaklqana ancester gender choice -------------------------------------------------------------------------------- 1ba1822 | Quinten Konyn | 2019-06-17 03:12:29 +0100 Add singular they pronouns for Hepliaklqana ancestors Updates Hepliaklqana ancestors to use "they" instead of "it" when selecting "neither" as their gender - implements handling for they/them pronouns and correctly conjugates applicable messages. [Squashed PR, added spacing fixes and rewrote commit message, closes #1080 - MarvinPA] -------------------------------------------------------------------------------- d57e52f | ufshaikh | 2019-06-14 19:50:42 +0100 Remove possible placement of blowgun from vault (#1087) Should fix a bug where this vault places an item marked as removed. -------------------------------------------------------------------------------- be6fa4f | advil | 2019-06-13 16:36:15 -0400 Faster starts_with implementation The previous implementation was really inefficient; this change is minor in the scale of things (about 1% of a pregen run, or 200-300ms total) but it's also a very easy fix. -------------------------------------------------------------------------------- 90a0943 | advil | 2019-06-13 16:36:14 -0400 Cache the top three vault tags as bools These tags account for >50% of the `has_tag` calls, which over the course of a full pregeneration run really adds up -- this is nearly 5000000 calls for `has_tag`. This change shaves about 0.5s off a full (non-optimized) pregen run. This commit also adds some (disabled) profiling stuff for tags. For reference here's the call count for the top 7 tags, everything lower than this is <1%: 208774 ( 2%): vaults_empty 208774 ( 2%): vaults_room 439758 ( 5%): layout 550983 ( 6%): place_unique 1150916 (14%): overwritable 1243580 (15%): extra 2554449 (31%): minivault Total: 8144269 -------------------------------------------------------------------------------- 80c1907 | advil | 2019-06-13 11:40:59 -0400 Use unordered_set for tags, instead of set f1fd2d0243764f converted the tags API and internal representation from pure strings (that got split every access) into sets, to deal with order issues that were leading to seed divergence. However, it turns out that `has_tag` is called many, many more times than a sorted tag list is ever needed, and since `set` usually uses something like a binary tree internally, the costs of a search were substantially outweighing any gains from storing the tags in a sorted form. This commit converts to using unordered_set for better lookup time, which cuts about 50% of the time spent checking for tags. On a fulldebug build, this shaves at least 1s off a typical total pregen time. There is probably more to be gained as even with this change, the `count` call in has_tag is *still* about 1s total over a full pregen run. I've also slightly clarified some function names in this API. The cost of `get_tags` is negligable, about 1ms total. -------------------------------------------------------------------------------- 69c6a51 | advil | 2019-06-13 09:45:21 -0400 Fix signed/unsigned comparison (gammafunk) -------------------------------------------------------------------------------- 4608c8f | gammafunk | 2019-06-12 21:46:21 -0500 Use an existing item list for a vault Use the existing lists we have for aux armour in the dgn lua lib, since manually specifying these in vaults is error-prone. -------------------------------------------------------------------------------- 83a80d7 | gammafunk | 2019-06-12 21:45:19 -0500 Fix missing item result delimiters in some vaults -------------------------------------------------------------------------------- 19b5fbe | advil | 2019-06-12 19:09:11 -0400 Remove a redundant call Or at least I think it's redundant; it's called by load_level already, and I didn't spot any ill effects from removing it. -------------------------------------------------------------------------------- cdd7612 | advil | 2019-06-12 18:27:12 -0400 Disable pattern matching against levelgen output On a debug build, this was the heaviest single code path after luaV_execute itself, and this output consists entirely of debug output that should be hidden anyways. If someone had a use case for leaving these enabled I can try to come up with other solutions, but right now I'm not seeing anything crucial. -------------------------------------------------------------------------------- d84787c | advil | 2019-06-12 17:52:37 -0400 Simplify has_tag somewhat The vast majority of calls to this involved just a single tag. This gets called a *lot* during levelgen, so it was slowing down a full pregen run noticeably (as much as 10%). Even this change makes a big difference, though it is still not extremely optimized. `has_tag` itself is still not very fast because of the use of `set`. -------------------------------------------------------------------------------- 8bd77c7 | advil | 2019-06-12 17:51:18 -0400 Remove debug code -------------------------------------------------------------------------------- 6870c0f | advil | 2019-06-12 14:08:02 -0400 Rewrite overflow vault selection code The old version brute-force searched through every 2-3 god combination among the gods selected for overflow vaults, with a somewhat indirect and complicated stopping criteria (with a goto, even) and a call to `find_maps_for_tag` for every combination it reached before the stopping condition. This is a huge search space and even with the stopping criteria it would still consider hundreds to thousands of combinations. On the other hand there are less than 20 vaults *total* that this code could even find. This rewrite flips things, and searches through the temple_overflow_n vaults themselves for compatible vaults rather than the space of god combinations. It's *much* faster. I expect this will change some seeds, since the order of rolls before was determined by bitvector order, and this will be determined by vault list order; also, where there are multiple vaults with the same god tags the weight calculation is different in this implementation. However, in my testing the results have been basically the same for most seeds. This code probably is biased towards 2-altar vaults over 3-altar vaults as is. -------------------------------------------------------------------------------- 9eff389 | advil | 2019-06-11 16:52:08 -0400 Optimize find_maps_for_tag somewhat This gets about 10x speedup on overflow temple selection (on a non-optimized build). It's still not great (since the overflow selection code is pretty insane, could be as many as 300 calls to find_maps_for_tag in my testing), but now according to my profiling the bottleneck isn't the use of set, but rather the construction of an iterator for each has_tag. It's worth noting that 99% of the calls to map_def::has_tag in the codebase have a single tag, and don't need this complexity. However, for typical uses I didn't see any obvious gain from optimizing them. -------------------------------------------------------------------------------- 6863ae8 | Chris Campbell | 2019-06-11 19:31:13 +0100 Don't allow Vehumet to extend lightning rod range (#12007) -------------------------------------------------------------------------------- 24607be | dplusplus | 2019-06-10 19:45:48 -0400 Fix hint for item description Commit 2b1cce4 introduced negated logic. [Closes #1082] -------------------------------------------------------------------------------- f7c4f17 | NormalPerson7 | 2019-06-10 19:41:34 -0400 Fix incorrect information in Aura of Brilliance description -------------------------------------------------------------------------------- 9fa23b7 | Ashley Raine | 2019-06-10 19:39:23 -0400 Removed barehanded attack prompt while in treeform -------------------------------------------------------------------------------- 1cce26a | Aidan Holm | 2019-06-09 15:27:51 +0800 Fix dispersal trap not appearing in help/search The lookup-help system searches by feature name, and the stash tracker menu builder adds feature tiles by matching against the feature name. This misspelling caused dispersal traps to be absent from the lookup-help system, and a black tile to be shown instead of the correct tile in stash search. Other menus, such as the ctrl-x menu, weren't affected. -------------------------------------------------------------------------------- 56ce517 | Edgar Bering | 2019-06-07 20:14:29 -0400 Update default runrest stops for tweaked shaft messaging (vt) -------------------------------------------------------------------------------- 6d73c25 | advil | 2019-06-06 16:47:30 -0400 parens -------------------------------------------------------------------------------- 39a2186 | Edgar Bering | 2019-06-06 15:55:20 -0400 Make the lajatang of Order's silver consistent This is a buff to Order, giving it the same max(vorpal, silver) as silver throwables. Order is rare, it's nice for its brand to not be so niche in its targets. -------------------------------------------------------------------------------- 536fa38 | Edgar Bering | 2019-06-06 15:51:58 -0400 Nerf silver throwables Increasing the base damage by 30%, with throwing damage scaling, and combined with penetration and silver bonus damage made silver throwables overpowered (as feared in the initial commit). This commit tones them down; silver throwables now get max(vorpal bonus, silver bonus) bonus damage after the standard base damage, making them more consistent with other brands. -------------------------------------------------------------------------------- e138f7e | Edgar A. Bering IV | 2019-06-05 19:12:10 -0400 Update CREDITS -------------------------------------------------------------------------------- 4df2b12 | advil | 2019-06-05 14:48:18 -0400 Fix the build -------------------------------------------------------------------------------- b853c62 | advil | 2019-06-05 12:23:21 -0400 Seed explorer: more flexible depth args (ebering) This doesn't accept a full depth spec, but does accept level or branch names in short form. There's also now a parameter `-show` that allows only showing some levels (you provide a list), though of course it still has to generate everything before the shown levels. For example: util/fake_pty ./crawl -script seed_explorer.lua -seed random -count 10 -show Temple -cats features -------------------------------------------------------------------------------- da47cbf | Ashley Raine | 2019-06-05 08:33:30 -0400 Add missing loading images to webtiles. -------------------------------------------------------------------------------- cc1054c | Chris Campbell | 2019-06-04 22:48:38 +0100 Checkwhite -------------------------------------------------------------------------------- 86e7e05 | Chris Campbell | 2019-06-04 21:16:19 +0100 Update easy_eat_chunks documentation (#12004) -------------------------------------------------------------------------------- 1d664f1 | Chris Campbell | 2019-06-04 21:16:19 +0100 Mention noise in wand of iceblast description (#11902) -------------------------------------------------------------------------------- 6016cb4 | Chris Campbell | 2019-06-04 21:16:19 +0100 Remove a misleading god message (#11220) Barachi being told "x welcomes you back!" when converting to a good god for the first time was supposed to be a reference to the species having originally been servants of the good gods, but is mostly more confusing than flavourful. -------------------------------------------------------------------------------- d14802f | Chris Campbell | 2019-06-04 21:16:19 +0100 Cap Shroud of Golubria power at 50 (#12000) Since it's only a level 2 spell and power just affects its duration rather than effectiveness. -------------------------------------------------------------------------------- f268315 | advil | 2019-06-04 16:05:03 -0400 Clean up some outdated comments and a few other misc fixes. -------------------------------------------------------------------------------- 581a069 | advil | 2019-06-04 15:27:39 -0400 Don't let monster digging allow out-of-los casting (11945, 11969) Since 5b187de83c, monsters that cast dig do so on a movement action (the burrowing mechanism), not usually as a regular spell. In fact, I couldn't get a monster to ever cast dig normally. Therefore, no monsters ever need to cast dig out-of-los via the normal spell code, and they definitely don't need to be able to cast arbitrary spells out-of-los if they have dig. I *think* that this is a pretty old bug, and only used to trigger under fairly rare conditions; a cacodemon still couldn't cast energy beam through a wall (though it would try). However, it would work through fog as reported in 11945. What changed recently is that LRD no longer destroys walls but is still area targeted, so that in some configurations a caster could attack out of los: > # > @#2 > # A LRD caster (e.g. a cacodemon) in this position could succesfully cast LRD on the wall in the lower left, damaging the player, instead of moving. In my testing a direct LRD cast, e.g. at the wall between the player, would still cast but have no effect or messaging, so even this case would still involve some monster wasted turns. Before the LRD change I think the caster could cast LRD succesfully on this square, destroying it in the process, so the setup conditions for the bug were much less common. Hence the recent reports of this bug. -------------------------------------------------------------------------------- 4219c68 | advil | 2019-06-04 14:39:11 -0400 Don't place needle traps for TRAP_RANDOM (11991 / Yermak) Possibly the result of an over-eager search & replace. -------------------------------------------------------------------------------- 86696ef | advil | 2019-06-04 12:52:56 -0400 Add a bit more about how to run the seed explorer in comments -------------------------------------------------------------------------------- 0a26ff3 | advil | 2019-06-04 10:40:10 -0400 Add shop items to seed explorer This commit also changes &y and &Y to fully (un)identify items in shops; before they only dealt with items that are identified by type. -------------------------------------------------------------------------------- 4edc0ab | Edgar A. Bering IV | 2019-06-04 09:02:12 -0400 Revise Exsanguinate's description (Yermak) -------------------------------------------------------------------------------- 73b976d | Edgar A. Bering IV | 2019-06-03 22:22:31 -0400 New Vampire ability icons (CanOfWorms) [Closes #1043] -------------------------------------------------------------------------------- 2bae87b | Edgar A. Bering IV | 2019-06-03 22:22:18 -0400 Update the manual for Vampires Remove references to blood bottling and blood consumption. -------------------------------------------------------------------------------- 301a641 | Edgar A. Bering IV | 2019-06-03 22:22:18 -0400 Increase costs for Vampire abilities Bat Form is really strong, in part because of its spamability and low MP cost. To rein it in, this commit adds a random stat drain of 2+binomial(5, 1/2) to the form. The choice of stat drain over skill drain is largely borne of a desire to avoid more uses of Drain. A secondary reason for the choice is that mutating the undead causes stat damage, so this is a flavourful choice. To make the choice of Vampire form strategic, instead of costly in tactical situations but otherwise trivial, revivification gives one level of temporary frail. This dovetails nicely with bloodless being frail---the frailty of undeath lingers. Exsanguination keeps its delay cost, but doesn't gain any other costs. The cost is paid only to reverse the process. -------------------------------------------------------------------------------- 7fb0062 | Edgar A. Bering IV | 2019-06-03 22:22:18 -0400 Give bloodless vampires the ability to regenerate, and frail Having Bloodless vampires not regenerate at all created either a tedium headache for the player or a technical headache automating the switch. After some testing and discussion it's clear that a better approach will be to inhibit regen for bloodless vampires when monsters are in LOS, coupled with some strategic costs for switching form. Bloodless is significantly stronger than Alive, outside of a few niches it is almost always advantageous to be bloodless. To balance out the two states, this commit makes bloodless Vampires frail, adding a -20% HP that stacks with mutations. A Vampire now must trade between a weaker form with lower regen but undead resists and bat form access, and a stronger form with fast regen and alive transmutations. The choice of frail over other possible downsides for bloodless was informed by a desire to not further overlap Vp with other undead. -------------------------------------------------------------------------------- 8336dd5 | Edgar A. Bering IV | 2019-06-03 22:22:18 -0400 Boolean vampire undead state Part 3 of a vampire revision. Add a new player variable to track whether a vampire is alive or bloodless. Use this in place of the non-functional hunger checks. Vampires now transition between Alive and Bloodless via abilities, Exsanguinate and Revivify. These are interruptable delays of length 5, with no MP cost, to make them tactically difficult to use. The abilities are implemented separately so that Exsanguinate can splatter some blood; it might also be desirable to allow Revivify to be done without a delay if a corpse is available. Changing blood state ends the active transformation. There is a check for exsanguinate and revivify to prevent their use in places where the resulting untransform would be lethal to the player. There are several places where undead holiness is checked because this is provided for all actors, but for players the effect takes into account vampire undead state; Vampires are always MH_EVIL. -------------------------------------------------------------------------------- 3edcaf6 | Edgar A. Bering IV | 2019-06-03 22:22:18 -0400 Remove potions of blood These are no longer needed, as vampires do not drink blood in bottles anymore. -------------------------------------------------------------------------------- b5eab84 | Edgar A. Bering IV | 2019-06-03 22:22:18 -0400 Remove blood bottling and blood drinking Part 2 of a vampire revision. This commit makes vampires foodless (but not drinkless) which has the appropriate effect on Gozag. Blood bottling and blood specific code are removed, as is the nutrition gain from melee attacks. This decouples vampires from the food system. [Committer's note: includes a fixup from gammafunk] -------------------------------------------------------------------------------- 54394cd | Edgar A. Bering IV | 2019-06-03 22:22:18 -0400 Reduce vampires to two blood states Part 1 of a vampire revision. Vampire's mix of "togglable undead" with "food micromanagement" left a fun concept in an obnoxious place. The presence/absence of blood allowed the player to (tediously) remain in the hunger state of their choice almost all of the time. Since the extremes of the spectrum provided the most impact on playstyle, players tended to focus on one or the other. This commit simplifies vampires to the two extreme states: Alive and Bloodless. The next commits will decouple vampire state from the food clock, replacing state change with a delay, and removing blood drinking and blood potions. -------------------------------------------------------------------------------- 65887bb | advil | 2019-06-03 22:12:35 -0400 More seed explorer command line options * add some shortcuts for looking at multiple seeds * let categories be specified from the command line * a few special subcases for items and monsters For example, to look at all artefacts on the ground or held by monsters in seed 1, you can now do: util/fake_pty ./crawl -script seed_explorer.lua -seed 1 -cats monsters items -mon-items -artefacts (caveat, shops are still not implemented) -------------------------------------------------------------------------------- b57f36d | advil | 2019-06-03 15:12:46 -0400 Actually commit the new seed explorer script... Partial repeat of the commit message from d7d9f274c4ec: Pretty basic right now, but you can run it with e.g.: util/fake_pty ./crawl -script seed_explorer.lua -seed 1 Supports multiple seeds, which can be random, and lets you pick the depth. In the future I will add more customization to what exactly is shown. -------------------------------------------------------------------------------- d7d9f27 | advil | 2019-06-03 15:08:39 -0400 Add a script interface to the seed explorer Pretty basic right now, but you can run it with e.g.: util/fake_pty ./crawl -script seed_explorer.lua -seed 1 Supports multiple seeds, which can be random, and lets you pick the depth. In the future I will add more customization to what exactly is shown. This commit also fixes a bug where scripts got doubled command line arguments, and changes script behavior so that crawl only outputs what the script does. (Also a few small cosmetic things.) -------------------------------------------------------------------------------- 6ad002b | advil | 2019-06-03 13:34:30 -0400 Refactor the vault catalog test to use seed explorer code The comparison part is still specialized (and maybe could be generalized too) but otherwise the code for building the vault catalog is essentially the same as seed explorer code. -------------------------------------------------------------------------------- 8afd68e | advil | 2019-06-03 13:34:30 -0400 Refactor the seed explorer to do only one dungeon pass instead of iterating through the dungeon for each category. This turns out to only get a negligable speedup (about 2s for a pass through the entire generation depth) but the code is still probably cleaner this way. -------------------------------------------------------------------------------- 4b32467 | advil | 2019-06-03 13:34:30 -0400 Refactor the seed explorer code into a module in dat/dlua Some minor cosmetic changes to the output while doing this, as well as some code cleanup, but the behavior shouldn't be majorly changed. -------------------------------------------------------------------------------- 2b49f6d | Edgar Bering | 2019-06-03 13:26:07 -0400 Fix another arena crash Closely related to the crash fixed in 39439d866, check for arena state before dispatching a behavior event. -------------------------------------------------------------------------------- 8e86157 | Edgar Bering | 2019-06-03 11:49:24 -0400 Don't target chain spell arcs through actors (12003) In the target selection loop in cast_chain_spell, no check was made to ensure that the arc from source to target was not obstructed by an actor. As a result, the special-cased treatment of the caster was ignored occasionally. By tracing the ray for each potential target and checking for obstructions this problem is avoided. -------------------------------------------------------------------------------- 637bb38 | advil | 2019-06-02 18:48:05 -0400 Add dungeon features to the seed explorer -------------------------------------------------------------------------------- 7ade4d1 | Edgar Bering | 2019-06-02 16:36:15 -0400 Add a penance prompt for potion quaffing (12001) Prompt when a player attempts to quaff a known god-hated potion. -------------------------------------------------------------------------------- c0b1d33 | Edgar Bering | 2019-06-02 16:13:52 -0400 Add more teleport traps to grunt_tough_drop (11997) Now that teleport traps don't trigger out of LOS, this vault was not working properly. By adding teleport traps that give monsters room to move in the two hallways, a player passing through the hall will still cause the monsters to step on a permanent teleport trap. -------------------------------------------------------------------------------- 94936e5 | Chris Campbell | 2019-05-31 19:10:01 +0100 Fix ?amnesia reversed logic (#11998) -------------------------------------------------------------------------------- ee2287c | Chris Campbell | 2019-05-30 20:45:54 +0100 Update WJC powers description (#11994) -------------------------------------------------------------------------------- c54ef59 | Chris Campbell | 2019-05-30 20:45:54 +0100 Remove an obsolete Donald line (#11994) -------------------------------------------------------------------------------- 4de66ed | advil | 2019-05-30 09:00:24 -0400 Properly reset tags on vaults rooms The initial tag change here was persisting on vault definitions until the next time crawl restarted, leading to seed instability in some cases. In the seed this came up in, serial_ice_m placed in D and mirrored horizontally. This vault is tagged with vaults_empty, and on vaults 4 was getting the no_hmirror tag (among others) even though it didn't ultimately place, and this was sticking around to any future games in the same crawl session that tried to place serial_ice_m, leading to the seed diverging after that point. (The more obvious divergence from the failure to hmirror in this seed came much later in _prepare_water, because the deep water positions in the map were affected by whether this vault mirrored or not.) -------------------------------------------------------------------------------- 3ea9d24 | advil | 2019-05-30 08:57:35 -0400 Fix some missed random call sequencing resolve_range is just a wrapper on a random call, and so these calls need sequence points to be stable across compilers. (See cdddf7c89e9) -------------------------------------------------------------------------------- 39439d8 | Edgar A. Bering IV | 2019-05-29 22:00:19 -0400 Fix an arena crash behavior_event only makes sense in non-arena mode, but was being called whenever an eldritch tentacle timed out -------------------------------------------------------------------------------- 9fa3ae0 | NormalPerson7 | 2019-05-29 21:37:44 -0400 Mention draining gaze's healing effect Draining gaze heals ghost moths and eyes of draining for the amount of MP drained by the gaze. This commit adds a note to this effect to the draining gaze spell description. Note: orange crystal statues also cast this spell, but they don't get healed from it because they cannot regenerate HP. -------------------------------------------------------------------------------- 4cc88bc | NormalPerson7 | 2019-05-29 21:37:19 -0400 Update vine stalker description (11979) -------------------------------------------------------------------------------- 78e9d4e | Alan Malloy | 2019-05-29 10:24:37 -0700 Make Tomb stop printing warnings when in debug mode It was placing 3 exit stairs on purpose and relying on the dungeon builder to trim them down to 1 branch exit. Instead, it now places just one. -------------------------------------------------------------------------------- 78adf78 | Alan Malloy | 2019-05-29 09:57:10 -0700 Remove unused variables in random_picker::probability_at -------------------------------------------------------------------------------- 0e0cebd | advil | 2019-05-27 19:18:38 -0400 Have fake_pty respond better to SIGINT and SIGTERM ...by killing the subprocess. The point of this is to allow ctrl-c at the command line to work. This is pretty hacky but it's better than nothing. If someone has any idea why SIGHUP won't work, let me know. -------------------------------------------------------------------------------- 1748d93 | advil | 2019-05-27 18:48:55 -0400 Support random seeds only in seed explorer (alexjurkiewicz) -------------------------------------------------------------------------------- c1c896e | advil | 2019-05-27 13:24:17 -0400 Seed explorer improvements * Estimate OODness based on probability of generation at the relevant depth. There's also currently disabled code for indicating builder OOD rolls, which I found to be less useful. The supporting lua calls are available for player use in moninfo objects. * Highlight "non-native" monsters, basically things placed by a vault that don't usually show up in the branch. * Handle dancing weapons better. -------------------------------------------------------------------------------- a4d96b6 | Brendan Hickey | 2019-05-26 12:35:04 -0400 Checkwhite fix -------------------------------------------------------------------------------- b5a06e8 | Brendan Hickey | 2019-05-26 10:42:38 -0400 Fixup vampiric brand messages to remove hunger references. -------------------------------------------------------------------------------- c4ac1b2 | Brendan Hickey | 2019-05-26 10:37:12 -0400 Don't prompt when unwielding vampiric weapons. -------------------------------------------------------------------------------- 0f23e7d | Brendan Hickey | 2019-05-26 08:55:53 -0400 Remove vampiric brand hunger cost. About ten years ago the vampiric brand increased your hunger clock. This led to tedious weapon swapping. We replaced it with an onwield hunger cost to relieve this obnoxious chore while maintaining a thematically appropriate cost for using a powerful brand. With crawl moving away from hunger as a forward progress clock there isn't a good reason to leave this in place. -------------------------------------------------------------------------------- 5716139 | advil | 2019-05-25 16:18:03 -0400 Some cosmetic fixes for the seed explorer -------------------------------------------------------------------------------- 0dde086 | advil | 2019-05-25 15:37:32 -0400 Add a basic lua seed explorer This prints out information about vaults, monsters, and items so far; it is packaged as a test that prints these for the first 5 seeds (replacing a less interesting test), but is fairly configurable if you're willing to edit the lua. To run it directly, you'll need to use util/fake_pty (which may need to be built), e.g.: util/fake_pty ./crawl -test seed_explorer.lua This also introduces a few lua support things that were missing that might be of general interest, especially monster inventory (which is easy now that all monster items are id'd). -------------------------------------------------------------------------------- bc69b92 | NormalPerson7 | 2019-05-25 20:23:40 +0100 Don't allow players to stop monster monstrous menagerie with OTR (11990) (#1073) The code for monsters casting monstrous menagerie uses the same code path as for players, which means an extra check that the caster is the player is required before asking the player whether they want to cancel the spell. -------------------------------------------------------------------------------- 53aee78 | Edgar A. Bering IV | 2019-05-24 14:13:09 -0400 Remove vestigal references to needles (11986) -------------------------------------------------------------------------------- 793c10c | advil | 2019-05-24 11:30:38 -0400 Better messaging when hep ancestor gets lost in abyss (11973) Addresses something mentioned in 11973: On abyss teleport (and some other cases that I don't fully understand; this happens sometimes but not often on abyss area shifts as well) the ancestor gets banished for a short period of time, but there was no messaging for this. In other cases the ancestor gets put into transit and there's also no messaging for this case; the only difference was that for the former recall isn't available. This commit ensures messaging if the banish case happens, and no messaging otherwise. This does the messaging at a relatively low-level point, so it could be that there will be cases of double messaging (but I have not found them in my testing). N.b. I'm not actually sure it makes gameplay sense to banish the ancestor on abyss teleport or even sure if this is intentional, so it might be worth trying to put the ancestor in transit for that case too. But it does fit with the randomness flavor of the abyss, I guess. But even with that change this lower-level code might still be triggered in complicated circumstances, and the ancestor really shouldn't ever be banished without messaging. -------------------------------------------------------------------------------- 0de8e75 | advil | 2019-05-24 11:22:44 -0400 Test a theory about hep abyss crashes This is a conceivable way for hep ancestor items to get copied to the grid, if somehow the ancestor becomes invalid before this call but cleanup of the ancestor hasn't happened yet (since held_by_monster will return false if the monster that was holding the item isn't valid). If it trips, this ASSERT will give a more direct line on what the setup conditions for this situation might be, which I still don't understand. -------------------------------------------------------------------------------- be4061d | advil | 2019-05-23 17:17:56 -0400 Fix another abyss gozag gold detection case -------------------------------------------------------------------------------- 4488db6 | advil | 2019-05-23 16:27:19 -0400 Clean up and improve gozag gold detection This consolidates a bunch of gozag code and removes an ASSERT that I think was over-eager, firing when update_item_at doesn't lead to a gold pile in the stash tracker. There had previously been two versions of this code, and only one had the check, but it doesn't seem so obvious to me that update_item_at should really be expected to make any arbitrary gold pile visible in the stash. This commit also makes gold detection work in the abyss beyond the initial levelgen. -------------------------------------------------------------------------------- ff863c2 | advil | 2019-05-23 10:39:30 -0400 Don't crash on gozag + gold in grunt_nemelex_the_gamble Unobtainable items don't appear in the stash tracker, and calls that try to add them to it silently fail. The only remaining "unobtainable" items are in grunt_nemelex_the_gamble; these are marked unobtainable so that if the player rolls the peril room they don't show up in the stash tracker. However, Gozag's gold detection code didn't take this flag into account, triggering an ASSERT on the expectation that any gold generated at all would be trackable. This isn't the most elegant solution, but it fixes the crash. I think what would be better is for (i) "unobtainable" to be removed, since it appears to have been deprecated for everything except this vault some time ago, and (ii) for this vault to do something like destroy the items if the player lands in the peril room. -------------------------------------------------------------------------------- 1cdb867 | cut1less | 2019-05-23 10:18:09 -0400 Don't fully describe unthrowable missiles -------------------------------------------------------------------------------- 4011b8c | cut1less | 2019-05-23 10:18:09 -0400 Simplify missile description cases Previously, descriptions for projectiles were based largely around whether they had a damage value associated with them, under the logic that "inherent missile damage => throwable missile". This made life easy in dealing with the old needles and with regular launcher missiles. However, it led to: * the sling bullet description having lots of throwing information (despite sling bullets not being throwable) and * the throwing net description lacking the fact that a net's delay is lowered with Throwing skill With the changes to throwing missiles, we can now just focus on throwable-ness to fix these issues and more. -------------------------------------------------------------------------------- 5b3daab | Edgar A. Bering IV | 2019-05-22 21:45:50 -0400 Don't place traps under vault placed items and monsters (11983) Randomly placed monsters and items do not place on traps, however the dungeon builder was placing random traps under vault placed items and monsters occasionally. This led to runes on dispersal traps as the worst outcome, but the asymmetry was occasionally noticed for other trap types too. Vaults that wish to have monsters or items start on a trapped grid will need to request this explicitly. -------------------------------------------------------------------------------- b8b2abe | Alan Malloy | 2019-05-22 17:10:14 -0700 Make it harder to accidentally waste ?amnesia (Jarrodb, #11985) -------------------------------------------------------------------------------- 4006481 | Alan Malloy | 2019-05-22 17:10:14 -0700 Simplify item weights -------------------------------------------------------------------------------- 1a3e1d3 | Alex Jurkiewicz | 2019-05-21 18:21:40 -0400 Remove vestigial duplicate wrath timer -------------------------------------------------------------------------------- e062c78 | Edgar A. Bering IV | 2019-05-21 16:31:06 -0400 Remove mentions to obsolete items from options_guide.txt -------------------------------------------------------------------------------- 4452427 | Chris Campbell | 2019-05-21 21:28:34 +0100 Allow holy wrath weapons to be cursed It was an almost invisible piece of flavour, since no external sources of cursing still exist other than initial generation, and it resulted in them being unable to be cursed under Ashenzari without any feedback as to why. -------------------------------------------------------------------------------- 13fca18 | NormalPerson7 | 2019-05-21 16:11:41 -0400 Fix a default note_messages -------------------------------------------------------------------------------- 48f6bce | NormalPerson7 | 2019-05-21 16:11:41 -0400 Fix a default force_more_message This was broken by the shaft message change in 52ca42d. -------------------------------------------------------------------------------- ad4687c | Edgar A. Bering IV | 2019-05-20 09:54:54 -0400 Replace a missing word -------------------------------------------------------------------------------- 52ca42d | Alex Jurkiewicz | 2019-05-19 22:59:41 -0400 Improve shaft messaging Always print the number of floors, so the message is consistent between falling one or multiple levels. -------------------------------------------------------------------------------- 6f6d0e6 | Doesnt | 2019-05-19 22:42:58 -0400 Fix Avatar Song displayed success rate -------------------------------------------------------------------------------- 442a7a2 | Joshua Gelbard | 2019-05-19 20:40:20 -0400 Add misc. evocables section to known items menu Steal the space on the '\' menu formerly taken up by known spellbooks and give it to misc. evocables (previously grouped under "Other"). Now that the spell library exists, a list of your already-recognized books is pretty useless. Individual switches for evocables like lamps of fire will make much better use of that space. "Unknown items mode" is untouched -- evocables still won't appear there, and unknown spellbooks will still get their own category. Issues: check_item_knowledge() has received patchwork additions over the years and is creaking with duplicated code. This commit doesn't help, but it doesn't make it that much worse -- there were already four seprately-treated vectors of item_def pointers; now there are five. (My first attempt at making this change started with a refactor, but the result wasn't enough of an improvement to justify the diff, so I've gone with the polar opposite and followed the existing pattern exactly.) [Closes #1025] -------------------------------------------------------------------------------- faf41a3 | Joshua Gelbard | 2019-05-19 20:23:57 -0400 Let players disable autopickup from the drop menu Add a new "drop-and-disable-autopickup" mode for the drop menu, toggled with '\'. Items selected in this mode are marked with a '*' instead of a '+' and have their autopickup disabled when the menu is exited. This turns "drop unwanted item; disable autopickup for unwanted item" from a two-menu operation into a one-menu operation and makes the most vital bit of the '\' menu available in a more convenient location. InvEntry and SelItem each get a new field to record whether they're selected "normally" or in this new special way, and InvMenu gets a field recording which selection mode it's in. InvMenu now overrides ::pre_process() and ::select_item_index() to handle the new mode. Also, assorted cleanup/bugfixes: * Fix '_' on the drop prompt not actually bringing up the help menu. * _invent_select can't return PROMPT_GOT_SPECIAL, so don't check for it. * Replace anonymous you.force_autopickup ints with an enum * Add helper functions for easier access to you.force_autopickup * Demystify magic -1 to OSEL_ANY in a few places * Remove unused define PROMPT_INAPPROPRIATE -------------------------------------------------------------------------------- 97e3104 | Joshua Gelbard | 2019-05-19 20:12:24 -0400 Fix '+' and '-' not being PGDN and PGUP as claimed Previously, menus using the default more prompt all claimed that '+' was pagedown and '-' was pageup, which was mostly false. This commit changes that to be mostly true and alters the prompt where it's not. On the drop, pickup, quiver, item knowledge, and wield menus, '-' has some other meaning, so those are the ones where '-' isn't listed as a usable pageup. '+' as pagedown should work everywhere. [Closes #1013] -------------------------------------------------------------------------------- fcedfb3 | Joshua Gelbard | 2019-05-19 19:37:41 -0400 Add a menu shortcut to select last unequipped item In equipment-related menus and prompts, make ';' (semicolon) an alias for the letter of the player's most recently unequipped item. The goal of this change is to reduce the amount of time the player spends scanning through menus to remember which item is where. Examples: * Wear-IDing a good cloak ('f') and dropping your old one: Wfd; * Wear-IDing a bad cloak ('f') and re-equipping the old: WfW;d; * Swapping to a utility ring ('g') for a certain enemy, then going back to your usual ring: Pg