-------------------------------------------------------------------------------- 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