-------------------------------------------------------------------------------- 20b394cb32 | Aidan Holm | 2020-06-01 23:45:23 +0800 Fix anti-reckless-fighting command Previously, this commit used crawl_state.prev_cmd to determine the previous command. This was incorrect; the deceptively-named prev_cmd is actually always set to the current command before process_command even runs. This commit adds a prev_cmd argument, which is set to the right value when called in main.cc. Unfortunately, process_command is also called from many other places for increasingly dubious reasons. I've added a default value of CMD_NO_CMD for that case, since it's clearly not appropriate to have all these functions accessing crawl_state.prev_cmd. If it actually does become important for these process_command calls to pass a correct value for prev_cmd, there should be a single wrapper function that takes one command_type and calls real_process_command with both current and previous commands, maintaining the state locally. -------------------------------------------------------------------------------- 4f279345d9 | advil | 2020-05-31 20:32:27 -0400 Restore note about pasting to local tiles seed selection This was lost in 04990682366a as part of improvements to the seed selection menu (since no button corresponds to [p] and pasting is more generally possible in local tiles text input). However, I think it's still useful for players to have a reminder that pasting is possible at this screen, and describe the way in which it may not behave as expected. -------------------------------------------------------------------------------- b98801ac91 | advil | 2020-05-31 19:28:41 -0400 Don't print "levelgen mode: deterministic" This is the default now and present in basically all morgues on all servers, no need to mark it explicitly. -------------------------------------------------------------------------------- fe7b5d5a6f | Aidan Holm | 2020-05-30 18:06:00 +0800 Remove strange FLYING flag compat code Removing this seems to work fine; tileidx_cloud() was only ever stored in env.tile_cloud and env.tile_bk_cloud, and all the places where that's used seem relatively non-suspicious. TILE_FLAG_FLYING was presumably added so that clouds were not displayed half-immersed in water (as a monster tile would be displayed), since apparently they used to be rendered on the same 'layer' (i.e. on tile_fg, rather than on tile_cloud). -------------------------------------------------------------------------------- ae4997d50b | Aidan Holm | 2020-05-30 18:05:59 +0800 Refactor feature extra tiles handling This commit groups data for feature descriptions together. Preivously, titles and descriptions were separated from tiles. This commit also fixes the display of the disjunction tile; it was never a cloud, so the previous code never worked properly. Unfortunately, since this code cannot access the packed_cell, we are limited to showing a fixed tile for disjunctions, not the tile that is present at the described map cell. -------------------------------------------------------------------------------- 682f2c3f2f | Aidan Holm | 2020-05-30 18:05:57 +0800 Make some tile picking code unconditional -------------------------------------------------------------------------------- 50178cf780 | Nicholas Feinberg | 2020-05-29 15:15:05 -0700 Fix some no_tele_into shops (minmay) It was still possible to blink into them and get soft-locked. Instead, add a helpful escape hatch! -------------------------------------------------------------------------------- 11e0b32562 | aaronegolden | 2020-05-29 14:39:16 +0100 Fix up some typos in the docs folder. (#1434) * Fix some typos in god_creation.txt. * Fix a typo in the quickstart guide. * Fix typo in monster_creation.txt. * Fix some typos in mutation_creation.txt. * Fix some typos in patch_guide.txt. * Fix a typo in tiles_creation.txt. * Fix a typo in translation.txt. Co-authored-by: Aaron Golden -------------------------------------------------------------------------------- 58eb27aeba | advil | 2020-05-29 08:50:07 -0400 Tweak dispreferred newgame colors on local tiles At darkgray, these read to newer players as unselectable, I think due to standard UI conventions (noticed this here: https://www.reddit.com/r/dcss/comments/gspvkg/i_made_a_review_of_dcss_let_me_kno w_what_you_think/). Adjust them to be only slightly darker than the preferred colors. This may now be too subtle? What might be better is to provide a key with these menus. -------------------------------------------------------------------------------- 9e0bf03589 | advil | 2020-05-28 17:48:56 -0400 Fix an unused param warning -------------------------------------------------------------------------------- ae26e8c9cb | advil | 2020-05-28 17:34:18 -0400 Temporary check to bridge a change in client.js client.js is served in a way where its browser cache isn't invalidated by changes, and so the lack of an updated version was causing many problems with this line. Kind of ugly, but having this around for a while is simpler than dealing with a lot of people having trouble with browser caches. (client.js should probably have some kind of versioning so that changing it doesn't go so poorly?) -------------------------------------------------------------------------------- c8e6c4a415 | advil | 2020-05-28 15:26:58 -0400 Fix a signed/unsigned warning -------------------------------------------------------------------------------- c29e872307 | Aidan Holm | 2020-05-29 00:10:28 +0800 Remove ability to memorize spells from their description With the introduction of the spell library, this was only ever possible by disabling autopickup and then examining a book you were standing on. -------------------------------------------------------------------------------- 56b8cd3df0 | gammafunk | 2020-05-28 02:15:38 -0500 Update the changelog -------------------------------------------------------------------------------- b080af96c6 | gammafunk | 2020-05-27 22:09:18 -0500 A tile for tin of tremorstones (CanOfWorms) -------------------------------------------------------------------------------- c929df5585 | gammafunk | 2020-05-27 01:13:21 -0500 Don't have allies avoid player line of fire In 340c9e81, monster AI was improved to avoid LOF between a monster's allies and their targets. This change had the player considered as an ally, hence summons in front of a player would try to move out of the path between the player and a hostile. This is convenient when the player wants to use a ranged attack, but doesn't work well in the more common case were allies are used for cover. This commit has the player not be considered a ranged ally by allied monsters, hence they won't avoid player LOF, but continues to allow that consideration for fellow allied monsters. There's probably no good way to predict when the player wants to make a ranged attack behind allies, so it's possible that a new 't' command is the best solution. A way to toggle this LOF-avoidance behaviour through other 't' commands might need some consideration, if something like this is implemented. -------------------------------------------------------------------------------- 1f0226971c | advil | 2020-05-26 20:24:16 -0400 Add an ugly exception for ui_state_sync -------------------------------------------------------------------------------- e22fd8933b | advil | 2020-05-26 14:34:52 -0400 Don't send ui_state_sync when not in game This fixes repeated logged warnings that were alarming to admins. This commit also tweaks some of the logic for what counts as "in game" for the javascript client, which looks to me like it was buggy. -------------------------------------------------------------------------------- 5c64649191 | advil | 2020-05-26 12:48:08 -0400 Fix a bytes/str issue in error message -------------------------------------------------------------------------------- 700258a8a8 | advil | 2020-05-26 12:37:36 -0400 Enhance an error message -------------------------------------------------------------------------------- 3ae7099c47 | advil | 2020-05-26 11:05:28 -0400 Fix accidental no-daemonize by default (johnstein) It turns out that store_true and store_false set a default. -------------------------------------------------------------------------------- 2a348b289f | Elliot Dronebarger | 2020-05-26 10:12:01 -0400 Fixed a typo in god-passive.cc Found a missing word, and added it back in. -------------------------------------------------------------------------------- f97e55dc39 | advil | 2020-05-25 16:53:42 -0400 Fix a randart name class (12270 / Flugkiller) -------------------------------------------------------------------------------- 5f92b90fa0 | gammafunk | 2020-05-24 21:09:21 -0500 Remove Lightli... ...'s lack of credit in CREDITS.txt. Thanks for your submissions! -------------------------------------------------------------------------------- 5d2c98bf94 | Edgar A. Bering IV | 2020-05-24 21:34:26 -0400 Update CREDITS.txt -------------------------------------------------------------------------------- 135ff06667 | Byrel Mitchell | 2020-05-24 17:26:24 -0400 Fixed terrain change duration not decrementing while off-floor This was most noticeable for Summon Forest, whose trees wouldn't tick down while off level. -------------------------------------------------------------------------------- e6218251f0 | Edgar A. Bering IV | 2020-05-24 16:54:55 -0400 Stimulate Xom on worship from a faded altar Closes #1413 Xom doesn't use normal piety, but thinks its hilarious when you end up worshipping from a faded altar. -------------------------------------------------------------------------------- 3fdfaa9094 | Nikolai Lavsky | 2020-05-24 16:29:06 -0400 Display Zz and ? status icons for allies Having this information on the main view is useful because confused allies can attack the player, and paralysed allies block movement. Also, since the player gets the top-tier stabbing bonus when attacking sleeping/paralysed/petrified allies, that should be indicated by the Zz's, TILE_FLAG_STAB, too. -------------------------------------------------------------------------------- 366e9434ed | RojjaCebolla | 2020-05-24 16:25:06 -0400 Add adjectives to the randart name generator [ Committer's note: split some cross-loaded history from this into other commits, tweaked and edited. Closes #1414 ] -------------------------------------------------------------------------------- 7b3c7a5917 | RojjaCebolla | 2020-05-24 16:24:25 -0400 Add verbs to some randart names Randarts can be "of the noun", let's expand that to "of the verbing noun". [ Committer's note: split out new nouns into a separate commit, removed a future goal from the commit message that isn't in line with the devteam's goals. ] -------------------------------------------------------------------------------- b168a4ef39 | Edgar A. Bering IV | 2020-05-24 16:24:25 -0400 New randart apperance adjectives (cebolla) -------------------------------------------------------------------------------- 4aaa7df55c | Edgar A. Bering IV | 2020-05-24 16:24:25 -0400 More randart nouns (cebolla) -------------------------------------------------------------------------------- 9c5a184348 | Edgar A. Bering IV | 2020-05-24 15:48:41 -0400 Typo fix (Goratrix) -------------------------------------------------------------------------------- 709782ff74 | Edgar A. Bering IV | 2020-05-24 15:23:01 -0400 Revise transmutation miscasts The polymorph effect was very flavorful, but even at minimal power a 150 aut badform was the result. Compared to other miscasts this was too intense. Reducing form duration would require a significant overhaul of player badform durations and power scaling because of how the existing codepath is set-up. Instead, since this is close to 0.25, this commit changes transmutations miscasts to increase player contamination: double existing contamination and then add the resulting miscast damage to the contamination score. Contam is still flavorful (since transmutations change the body and contamination is residual magic in the body and high contamination can cause mutation), though not as dramatic as polymorph. Possible idea for 0.26: add polymorph as a possible consequence of decontamination. -------------------------------------------------------------------------------- 750a858e70 | advil | 2020-05-24 15:08:17 -0400 Default `restart_after_save` to true What this means in practice is that saving returns to the main menu, a behavior that is much more typical for what people expect these days out of games. The option is retained for people who like the classic behavior. -------------------------------------------------------------------------------- c4d20be10f | advil | 2020-05-23 21:46:51 -0400 Comment an ASSERT (PleasingFungus) -------------------------------------------------------------------------------- 32a1ce3a9d | advil | 2020-05-23 19:55:58 -0400 Fix tiles I'm not sure why, but this assert triggers when starting up local tiles. -------------------------------------------------------------------------------- 448add79b7 | advil | 2020-05-23 15:56:04 -0400 Fix some unused function warnings for non-tiles builds -------------------------------------------------------------------------------- bc5e7ad058 | advil | 2020-05-23 15:52:45 -0400 Fix the tiles build -------------------------------------------------------------------------------- 9b8842f3ab | advil | 2020-05-23 15:22:44 -0400 Don't crash on too small terminal resize (6498) The new behavior is that a message is printed in the upper left telling the player their terminal is too small, and nothing else is drawn. This is pretty rough and ready, and there may still be glitches. In most of my testing a resize event also comes with an ESC (I'm not at all sure why) and this ends up exiting any exitable menus. You can still get glitches by resizing in menus that aren't exitable, e.g. the skill menu with no skills selected. But it's still probably better than crashing. This largely doesn't work on webtiles builds in terminal, for unclear reasons. However, that is not the main use case for this, and webtiles console is played wrapped in dgamelaunch anyways. In my testing this isn't a regression relative to current dgl behavior. (...which is a mess.) -------------------------------------------------------------------------------- d8d43ee9da | advil | 2020-05-23 14:44:04 -0400 Keep ui sizes in sync with terminal resizes (12260) Hopefully this is the right way to do it, but it stops a certain class of crashes in my testing: start the terminal with size n, shrink to some size =3 are supported now. -------------------------------------------------------------------------------- 8dcfb2fc82 | Alex Jurkiewicz | 2020-05-15 10:17:30 -0400 Convert README to markdown and update -------------------------------------------------------------------------------- ec0d3a76dc | Alex Jurkiewicz | 2020-05-15 10:17:30 -0400 Reduce log spam -------------------------------------------------------------------------------- fc79a73469 | Alex Jurkiewicz | 2020-05-15 10:17:30 -0400 Enhancements to webtiles game definitions Add support for: 1. Dynamic loading of games from games.d/*.yml files 2. Adding/modifying environment variables 3. -dir arg 4. Custom CWD -------------------------------------------------------------------------------- 38b645b55d | Edgar A. Bering IV | 2020-05-15 10:05:13 -0400 Document the auto_butcher_max_chunks default in options_guide.txt [skip ci] -------------------------------------------------------------------------------- dddbc3d8f2 | Edgar A. Bering IV | 2020-05-15 09:52:38 -0400 Restore the default auto_butcher_max_chunks = 10 But keep an exception for ghouls -------------------------------------------------------------------------------- 72af00c55a | gammafunk | 2020-05-15 06:37:27 -0500 Simplify targeter classes The shadow step targeter landing site method doesn't need to be a virtual method in the targeter base class. For uses in direction_chooser, we can do a static cast of this pointer to one of targeter_shadow_step, since we always know when our hit function was initialized with a targeter_shadow_step instance. -------------------------------------------------------------------------------- 858b6a6ff6 | advil | 2020-05-15 00:14:11 -0400 Add a placeholder fix for trap+corruption+nymphs What seems to be happening is that a trap gets temporarily removed by a nymph's flooding, then the terrain change marker gets moved by corruption without moving the corresponding env.trap entry, then the game crashes when restoring. This fix, which is not intended to be final, will instead print an error and place floor on the trap reversion. I think a real fix should either check and move the trap_def when the terrain change marker moves, or remove and recreate env.trap entries in sync with any terrain changes. The latter seems better, but I'm not sure why it wasn't implemented that way in the beginning, so there may be some issue I'm not anticipating. -------------------------------------------------------------------------------- ea6e5d949a | Aidan Holm | 2020-05-14 20:26:25 +0800 Move PrecisionMenu to its own file PrecisionMenu doesn't handle resizes well at all, and should be replaced with the new UI stuff. The only remaining user is the skills menu, but it's a complicated one... This commit just isolates it from menu.h, which is widely used (even if it's a complete mess as well...). -------------------------------------------------------------------------------- 1965fc2f32 | Aidan Holm | 2020-05-14 20:25:34 +0800 Remove ifdefs around menu tiles Less preprocessor gunk is always better, and efficiency is not really a concern (until proven otherwise). This change alone removes 1.6% of all ifdef lines! -------------------------------------------------------------------------------- dec1a2a129 | gammafunk | 2020-05-14 04:26:06 -0500 Fix log note generation for acquirement scrolls Generate log notes about finding items only if and when they are actually chosen. Previously artefacts and other notable items would falsely generate notes just by being a choice offered by the scroll. -------------------------------------------------------------------------------- 2ef1b3b3bb | gammafunk | 2020-05-14 04:23:39 -0500 Allow acquirement scrolls to be canceled We'd like to be able to back out of acquirement scrolls so that players can inspect inventory, stash, resists, etc. in order to make an informed decision. With the acquirement rework, these scrolls were uncancelable due to concerns about seed stability for any unrand items generated. If scrolls are cancelable, they must reuse the generated set of items, otherwise the player could reread the scroll to re-roll their results. If we do properly save items for a canceled scroll and any unrand artefacts are generated, we must "reserve" these unrands to prevent their generation on subsequent levels so as to avoid the scroll having to give the player a different item. My concern was that this unrand reservation would affect seed stability, but advil's recent improvements to unrand generation allows level generation to give fallback artefacts without affecting the seed results. Hence this commit allows the scroll to be canceled when read, including when it's first identified. Any unrands generated in the saved results are reserved to be out of item generation until a final selection is made. If an unrand isn't the final acquirement choice, it's properly unreserved and is allowed to generate in subsequent levels. I removed the keys for shopping list and identification items, since the player can just cancel the scroll and look at these menus normally. -------------------------------------------------------------------------------- 94ba3d2fff | gammafunk | 2020-05-14 04:21:06 -0500 Remove redundant comments and simplify The comment here is a redundant copy from the shop code. Also remove an unnecessary scope creation. -------------------------------------------------------------------------------- f4359a17dd | Edgar A. Bering IV | 2020-05-13 21:54:36 -0400 Mark !brill useless for Troglodytes Since they don't cast spells and can't use it usefully anymore. -------------------------------------------------------------------------------- 65f7fbe4a0 | Edgar A. Bering IV | 2020-05-13 21:02:49 -0400 Revert "Set auto_butcher_max_chunks default to 10" This reverts commit 9f5dfa981578c118dee96c7d59e09244e8ee7eb3. Setting defaults happens before species selection and this is a bad default for Ghouls, which makes this default a new player trap—especially considering ghouls are listed under simple. -------------------------------------------------------------------------------- 2607d5cfa1 | RojjaCebolla | 2020-05-13 15:24:28 -0400 Simplify ring plusses Put +6 on stat rings, +4 on the stronger rings, and curses are only -4, instead of somewhere between 2 to 6. Currently, 50% of rings are -2, 33% of rings are -3, and 17% of rings are -4 or more. The average cursed ring is -2.83. Making it -4 always will mildly increase the impact of wearing cursed items from the floor. -------------------------------------------------------------------------------- 0aa0c4bb02 | Edgar A. Bering IV | 2020-05-13 11:11:44 -0400 Add a TAG_MAJOR guard lost in rereflect -------------------------------------------------------------------------------- 2d2d24c1c4 | Edgar A. Bering IV | 2020-05-13 11:08:49 -0400 Add preservation and harm to shopping and debug (Implojin) -------------------------------------------------------------------------------- 112c7583a5 | Edgar A. Bering IV | 2020-05-13 07:54:34 -0700 Reflection artefact tweaks Correctly display the SH+5 for randart reflection amulets. Change the Brooch of Shielding to be an SH+8 guardian spirit amulet; it did not interact well with the new fixed plus reflection property, and having a guardian spirit + shielding amulet is more unique than a reflect amulet with 3 more SH -------------------------------------------------------------------------------- 0781489d4c | Nicholas Feinberg | 2020-05-13 07:54:25 -0700 Attune reflection amulets on HP Instead of a timed ramp up, attune them on HP like acrobat and regeneration for consistency's sake. -------------------------------------------------------------------------------- 9db49107ce | Nicholas Feinberg | 2020-05-13 07:54:01 -0700 Give piety for reflected Banishments -------------------------------------------------------------------------------- 76d6e0e762 | Nicholas Feinberg | 2020-05-13 07:54:01 -0700 Give piety for reflected poison -------------------------------------------------------------------------------- 1a06e6f6b7 | Nicholas Feinberg | 2020-05-13 07:54:01 -0700 Give piety for reflected missiles -------------------------------------------------------------------------------- 324b75660a | Nicholas Feinberg | 2020-05-13 07:53:46 -0700 Remove plusses from reflect amulets And don't autopickup "reflect. -------------------------------------------------------------------------------- 7b11d65f32 | Nicholas Feinberg | 2020-05-13 07:53:34 -0700 Revert "Remove amulets of reflection" This reverts commit ba0266bf1e409d5e43bea0c429847e88466dc8e7. This reverts commit 1529702659a5f61bd169c12671a9b1601423b43d. This reverts commit c3b2b15ad0812eb4e36560da048408bb64a9e613. -------------------------------------------------------------------------------- aaade9b9bd | Aidan Holm | 2020-05-13 20:40:30 +0800 Deduplicate weird monster type compatibility stuff -------------------------------------------------------------------------------- 97b10b9113 | Aidan Holm | 2020-05-13 20:40:28 +0800 Marshall all monster_type enums as uints This commit adds marshallMonType() for clarity. Everything else is fairly straight-forward. -------------------------------------------------------------------------------- d8ecb352c1 | Aidan Holm | 2020-05-13 20:40:27 +0800 Remove future code for marshalling monster types as shorts It's better to keep it as wide as possible, and rely on compression to reduce space usage. There's still inconsistency in how these are marshalled, but that's fixable with a minor tag bump. -------------------------------------------------------------------------------- 0139687f70 | Aidan Holm | 2020-05-13 20:40:25 +0800 Reorganize code This mostly separates the unmarshalling and the conditional genus stuff. -------------------------------------------------------------------------------- cb8d101f20 | gammafunk | 2020-05-13 01:41:21 -0500 Don't recolor statues next to damaging walls Granite statues near slimy and icy walls currently get recolored, but this doesn't make much sense, as the player can't move onto a statue. It also might mislead the player into thinking that standing next to these statues could damage them. Remove this recoloring, and also remove redundant tests for water and lava that's covered by earlier code. -------------------------------------------------------------------------------- 2efb326896 | advil | 2020-05-13 00:19:43 -0400 Revert "Disable travis notifications" This reverts commit 7f99b00658a4a79e6f92efb2b346077bf0ed5dbd. -------------------------------------------------------------------------------- 54a0b94bec | advil | 2020-05-13 00:18:50 -0400 Temporarily disable make test test pending further ... testing -------------------------------------------------------------------------------- 3431438f80 | advil | 2020-05-13 00:04:04 -0400 Run test in correct directory -------------------------------------------------------------------------------- e6544eeaff | advil | 2020-05-12 23:47:11 -0400 ... -------------------------------------------------------------------------------- 5e67357dd7 | advil | 2020-05-12 23:43:23 -0400 Try to make actions run `make test` no idea if this is the right syntax -------------------------------------------------------------------------------- cc65eb46a3 | Edgar A. Bering IV | 2020-05-12 22:42:46 -0400 Remove another too clever fallthrough in makeitem.cc This is to fix an immediate crash; refactoring this function should be high on the code cleanup todo. -------------------------------------------------------------------------------- 88e6ef3a42 | advil | 2020-05-12 21:02:56 -0400 Update makeitem.cc Stealth is the main issue that I see; there may be other things going on here though (I think this function has gotten a bit too clever with the fallthroughs...) -------------------------------------------------------------------------------- c3b2b15ad0 | Edgar A. Bering IV | 2020-05-12 19:42:04 -0400 And a few more -------------------------------------------------------------------------------- 1529702659 | Edgar A. Bering IV | 2020-05-12 19:40:31 -0400 Fix a leftover amulet of reflection -------------------------------------------------------------------------------- ac2cbc2f56 | Edgar A. Bering IV | 2020-05-12 18:55:35 -0400 Remove outdated amulet descriptions from translations These files could use further pruning for removed items. -------------------------------------------------------------------------------- 459fc583a1 | Edgar A. Bering IV | 2020-05-12 18:55:35 -0400 Remove amulets of Rage The remaining evocable active amulet, they no longer fit with the remainder of the amulet slot. Lacking a swap penalty, an amulet of rage can be swapped to by a character using a different amulet's effect when it's not needed if berserk can finish an encounter, since most current amulets swap penalties come on activation, not removal. Berserk is a powerful effect, unlimited berserk more powerful still, so I don't see a desparate need to move +Rage to a scarf. In doing so, +Berserk artefacts and Trog become a bit more special. -------------------------------------------------------------------------------- ba0266bf1e | Edgar A. Bering IV | 2020-05-12 18:55:35 -0400 Remove amulets of reflection A small plus to SH and the reflection property was a minor boost in most cases and easily outshone. Newer players enjoy the satisfaction of the reflection ego but to a point where it becomes a newbie trap: they'll take reflection over much stronger (though more subtle) amulets. They also suffer from a tedious-optimality: it's technically always good to carry one when possible while using an amulet of guardian spirit, and swap to it should your MP pool empty; or when using an amulet of rage. The previous amulet reform aimed to make the amulet slot one that the player commits to well in advance of a given fight, but the presence of a slew of older amulets hampered that goal. -------------------------------------------------------------------------------- ca3883d1df | Edgar A. Bering IV | 2020-05-12 18:55:35 -0400 Remove amulets of the gourmand With the food simplification over the years, lax food clock in general, and much stronger amulets its time to put this one to rest. -------------------------------------------------------------------------------- 8a86455914 | Edgar A. Bering IV | 2020-05-12 18:55:35 -0400 Allow Harm on randart armour Harm works as an armour property because armour swapping delay requires that a player commit to the harm effect tactically. Previously support for Harm as an artefact property was added, but set not to generate at the time and had *Drain as a corequisite. -------------------------------------------------------------------------------- 0691371e69 | Edgar A. Bering IV | 2020-05-12 18:55:35 -0400 Remove amulets of harm The previous commit added scarves of harm and explained why Harm wasn't working in the amulet slot. This removes amulets of harm as a follow-up. -------------------------------------------------------------------------------- 19c8d5534f | Edgar A. Bering IV | 2020-05-12 18:55:35 -0400 Add Harm to scarves This adds Harm as an armour ego, without the drain penalty on removal. The Drain penalty was to prevent swapping in urgent situations, but in practice players just ate the skill drain to get out of Harm when escaping. Putting it on an armour slot makes using Harm a much stronger commitment. -------------------------------------------------------------------------------- 6a14d1d4ee | Edgar A. Bering IV | 2020-05-12 18:55:35 -0400 Remove scarves of spirit shield Offering guardian spirit on a different slot in non-unrandart form offered such power combos as spirit+faith and spirit+acrobat at the price of making the scarf ego list overlap with the amulet ego list. With invisibility moved to scarf egos, there are enough scarf egos that this sort of padding isn't needed. -------------------------------------------------------------------------------- 8388af883b | Edgar A. Bering IV | 2020-05-12 18:55:35 -0400 Add preservation (rCorr) and stealth to cloaks The previous commit made the cloak ego list a bit thin. This commit adds preservation and stealth as possible cloak egos. "preservation" is reintroduced as an armour ego ego, but now it is just a name for rCorr (the player-facing name could change, but "cloak of resist corrosion" just doesn't have the same ring). -------------------------------------------------------------------------------- 97dead9f74 | Edgar A. Bering IV | 2020-05-12 18:55:35 -0400 Move invisibility from cloaks to scarves Evocable invisibility is extremely powerful, providing access to a level 6 spell without the associated spellcasting complications. It might still be op on a scarf, but on a scarf it doesn't provide AC as well! -------------------------------------------------------------------------------- f75c35ca80 | Edgar A. Bering IV | 2020-05-12 18:55:35 -0400 Remove scarves of cloud immunity Scarves of cloud immunity were a very niche effect, but the niche was occasionally useful in passing through particular vaults, which led to either stashing or an incentive to carry an otherwise unwanted item "just in case". This did not make for a good armour ego. -------------------------------------------------------------------------------- 6f112fb28d | Edgar A. Bering IV | 2020-05-12 15:25:58 -0400 Further tune down tremorstones Use a smaller step size for the stepdown, return ZAP_TREMORSTONE to being power independent so that damage scaling only comes from the number of stones thrown, and increase the XP recharge timer slightly. -------------------------------------------------------------------------------- 7f99b00658 | advil | 2020-05-12 14:42:37 -0400 Disable travis notifications I think at this point these are fully superseded by gh actions? -------------------------------------------------------------------------------- 61715709bc | Edgar A. Bering IV | 2020-05-12 13:52:33 -0400 Adjust the price of tremorstones They're permanent now, so the cost should reflect that. -------------------------------------------------------------------------------- b4f6ace0b6 | advil | 2020-05-12 13:02:55 -0400 Endless warnings -------------------------------------------------------------------------------- d75fab455a | advil | 2020-05-12 12:49:35 -0400 Fix more warnings for tag_upgrade=true -------------------------------------------------------------------------------- 05ec187f37 | advil | 2020-05-12 12:19:23 -0400 Fix a local tiles error + a few more warnings -------------------------------------------------------------------------------- 21ee38bd74 | advil | 2020-05-12 11:29:48 -0400 Fix some warnings on diverse compilers -------------------------------------------------------------------------------- a90a8e02b8 | advil | 2020-05-12 10:19:15 -0400 One more attempt to get UINT8_MAX from a header on cao/cbro... This reverts commit bfbf38f2cb72dd8d279634e992344898f6fd7b77. -------------------------------------------------------------------------------- f27dea0dad | Aidan Holm | 2020-05-12 21:17:52 +0800 Extract ScissorStack to its own class -------------------------------------------------------------------------------- 4c3fe21bcb | Aidan Holm | 2020-05-12 19:36:22 +0800 Move union/intersect methods to ui::Region class This commit also adds some tests. -------------------------------------------------------------------------------- e6b3a59081 | gammafunk | 2020-05-12 04:56:44 -0500 Update floor for features next to damaging walls (12233) When casting Frozen Ramparts, the floor tiles for features adjacent to icy walls were not updated. This is a problem for habitable features like fountains and open doors, since this indicates to the player that these tiles wouldn't harm a monster. This also applied to slimy walls, although it's less common for the player to see this. Update the packed cell code to properly modify floor tiles. Shallow and deep water are instances where updating floor tiles wouldn't help, since the water tile isn't transparent. We may need to make special "icy water" tile variants to handle this case. -------------------------------------------------------------------------------- 0c75a98c51 | gammafunk | 2020-05-12 04:56:43 -0500 Don't partly override cell cache with global data In d8832a91e, global state was more fully cached in the packed cells later used for Tiles rendering. This included the tile flavor data used to describe floor tiles of features. However the WebTiles code that handles tile flavor was not updated, and it was subsequently overriding the packed cell cache. -------------------------------------------------------------------------------- bfbf38f2cb | advil | 2020-05-12 00:25:02 -0400 Revert "Try 3b to fix compilation on CAO/CBRO" This reverts commit b6211d5327e150baf5cb89c5d09156141fa4ef52. -------------------------------------------------------------------------------- 2f40044526 | advil | 2020-05-12 00:23:27 -0400 Fix another c++11ism that is not working on CAO/CBRO -------------------------------------------------------------------------------- b6211d5327 | advil | 2020-05-12 00:14:20 -0400 Try 3b to fix compilation on CAO/CBRO This reverts commit 227e4c2ee8d22008d1552fa4821231495437bbef. (Try 4 worked, but is awful) -------------------------------------------------------------------------------- 227e4c2ee8 | advil | 2020-05-12 00:00:42 -0400 Fourth(!) try to fix the build on CAO/CBRO not an ideal solution... -------------------------------------------------------------------------------- a314768f3c | advil | 2020-05-11 23:56:55 -0400 Third try to fix the build on CAO/CBRO -------------------------------------------------------------------------------- 7cce4bb545 | advil | 2020-05-11 23:40:27 -0400 Second try to fix the build on CAO/CBRO -------------------------------------------------------------------------------- 5cf8ac06c5 | advil | 2020-05-11 23:35:05 -0400 Try to fix the build on CBRO/CAO -------------------------------------------------------------------------------- 8a05a4ca56 | Alex Jurkiewicz | 2020-05-11 21:07:37 -0400 Simplify 8c1d20324 -------------------------------------------------------------------------------- 8c1d203243 | advil | 2020-05-11 20:35:06 -0400 Make species group order stable across python versions This code would have worked in py3.6 (where dict creation order determines iteration order), but no guarantees in earlier versions. This may fix the species selection hotkey bug. -------------------------------------------------------------------------------- 4819203062 | Byrel Mitchell | 2020-05-11 17:00:58 -0400 Change the comment on max_miscast_damage to match the new miscast damage calculation. The actual math in this function was updated to calculate the max miscast damage properly, but the comment was incorrect. -------------------------------------------------------------------------------- ac5a30bc78 | advil | 2020-05-11 16:48:33 -0400 Allow clicking outside chat window to defocus focus-trap has a setting that is supposed to do this, but getting it to work ran up against what I think is a bug in focus-trap, where the returnFocusOnDeactivate setting isn't respected when the new target isn't clickable (https://github.com/davidtheclark/focus-trap/issues/103). The boolean expression here is a bit ugly, but I did it that way as a minimal change from the original logic. I have only a somewhat vague understanding overall of what is going on with focus in this library, so I hope that this doesn't have further side-effects. This library seems to be unmaintained now, I wonder if there are any alternatives to consider instead? Hopefully resolves #1243 -------------------------------------------------------------------------------- 3a3e078c59 | advil | 2020-05-11 12:58:32 -0400 Apply location effects *after* temp changing a feature ea32a606ab reordered things so that location effects were applied to monsters as a side effect before the temporary feature change took effect, i.e. using the about-to-be-replaced feature value. Aside from not applying any effects of the new feature type to a monster on the position, this caused weird things like a water nymph standing on a trap and temporarily flooding it to trigger that trap on the temporary terrain change. Some example crashes: http://crawl.berotato.org/crawl/morgue/ardl/crash-ardl-20191231-234514.txt http://crawl.akrasiac.org/rawdata/elzilcho/crash-elzilcho-20190927-225210.txt (The crash is when the terrain change reverts, and the shaft's trap info is gone.) This commit partially reverts ea32a606ab (sorry) but keeps the wall check in a more direct way. -------------------------------------------------------------------------------- 6ca9d89ac5 | advil | 2020-05-11 11:01:33 -0400 Fix a usk grand finale crash (12248) The flying chunks do damage, which can cause the original target to be dead by the time the monster_die call comes around. -------------------------------------------------------------------------------- 31286d223f | Aidan Holm | 2020-05-11 19:20:17 +0800 Fix unordered_map<> on Mac OS -------------------------------------------------------------------------------- 27f2bdb7b0 | Aidan Holm | 2020-05-11 18:41:57 +0800 Replace map<> with unordered_map<> If there's no ordering requirement, unordered_map is a better choice; it's more efficient (hash table instead of tree structure) and better documents the nature of the data. -------------------------------------------------------------------------------- ac5e0fa705 | Alex Jurkiewicz | 2020-05-11 01:55:09 -0400 Clean up notification logic After 4617b1041b and c6157ca552. -------------------------------------------------------------------------------- f0b061a3c0 | Alex Jurkiewicz | 2020-05-11 01:55:09 -0400 Remove BUILD_ALL CI config macOS and MingW builds already build submodules, so this job was redundant (and didn't work anyway). -------------------------------------------------------------------------------- 10a8c3caa8 | advil | 2020-05-10 21:41:15 -0400 Normalize @pronoun_possessive@ to @possessive@ to match do_mon_str_replacements -------------------------------------------------------------------------------- d106ae698d | advil | 2020-05-10 21:41:15 -0400 Fix spelling of @pronoun_possessive@ (u/bobloblawblogger) This was ... spelled wrong in every instance. -------------------------------------------------------------------------------- edaaef979a | Quipyowert2 | 2020-05-10 21:32:49 -0400 Fix signed/unsigned int format mismatch (%d vs %u) Fixes the following Cppcheck errors: [crawl-ref/source/rltiles/tool/tile_list_processor.cc:1006] (warning) %d in format string (no. 3) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint] [crawl-ref/source/rltiles/tool/tile_list_processor.cc:1166] (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint] [crawl-ref/source/rltiles/tool/tile_list_processor.cc:1180] (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint] [crawl-ref/source/rltiles/tool/tile_list_processor.cc:1201] (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint] [crawl-ref/source/rltiles/tool/tile_list_processor.cc:1260] (warning) %u in format string (no. 1) requires 'unsigned int' but the argument type is 'signed int'. [invalidPrintfArgType_uint] [crawl-ref/source/rltiles/tool/tile_list_processor.cc:1338] (warning) %d in format string (no. 1) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint] [crawl-ref/source/rltiles/tool/tile_list_processor.cc:1624] (warning) %d in format string (no. 2) requires 'int' but the argument type is 'unsigned int'. [invalidPrintfArgType_sint] -------------------------------------------------------------------------------- 47ef49afec | Edgar A. Bering IV | 2020-05-10 19:12:40 -0400 Further revise tremorstones Tone down the damage. Using the old scattershot formula directly for the number of explosions was way too good. Further, convert them to an xp evoker with three charges and an xp debt between that of the lightning rod and the one-charge evokers. -------------------------------------------------------------------------------- 6a45855626 | Edgar A. Bering IV | 2020-05-10 19:00:42 -0400 Extract XP Evoker properties to data This commit is not strictly necessary at present, but will ease the conversion of other evokers and wands to an XP-charge model in the future. -------------------------------------------------------------------------------- bcf8c60d55 | Edgar A. Bering IV | 2020-05-10 17:46:03 -0400 Find a lost unary minus (#1395) Closes #1395 -------------------------------------------------------------------------------- 3a27ba4f8a | advil | 2020-05-10 15:18:06 -0400 More lugonu corrupt flavor tweaks * add recoloring for stone walls, metal walls. Still subject to the "resistance" check for these types. Added a few more metal wall colors, which are relatively subtle. Use existing stone tiles. This won't work with some variants, e.g. the vaults stone tiles. * add recoloring for trees; don't add new tree colors, just use dead trees as a fallback. * chance to get flavor-only corruption for tiles within los that didn't get real corruption. * add a 20% chance for floor tiles to be magenta no matter what. This isn't abyss-themed per se but I chose it because it matches the color of the corruption flash. It remains possible that some of this will need to be toned down again? -------------------------------------------------------------------------------- 7e5784328a | advil | 2020-05-10 15:18:06 -0400 Remove an old debug dprf -------------------------------------------------------------------------------- 64580d555a | advil | 2020-05-10 15:18:06 -0400 Fix a local tiles crash with removed wands Would crash on monster tooltip with a wand that had a removed spell. -------------------------------------------------------------------------------- abcb65df2b | advil | 2020-05-10 15:18:06 -0400 Adjust lugonu corrupt flavor In 2f88dcd080dc11, lugonu corrupt was changed to be localized with 100%-30% chance to corrupt inside los. Perhaps accidentally (not sure), there was a flat 1% chance to corrupt any square outside LOS. This was very slightly flavorful. This commit makes two adjustments: (i) it adds a linear chance to corrupt tile flavor only outside the immediate radius, making it much easier to see across the level that corruption has happened, and (ii) it uses fixed point math to have smoother percentage values in general. It's possible that I've gone too far and the outside-los chance could use some toning down? -------------------------------------------------------------------------------- 211953ec74 | advil | 2020-05-10 15:18:06 -0400 Fix a theoretical terrain change crash I can't replicate this, but the previous implementation should be able to crash in the following way: if there are two terrain changes of the same type on a single position (something that is possible in principle), then reverting the terrain changes at that position would delete all markers associated with that position at once. Then, the iterator over markers will have a deleted marker in its future. Instead, save up all positions with markers to be reverted, and do them last by position, outside of the marker iteration. I *think* this might be able to happen in complicated circumstances involving water nymphs over stairways and lugonu corrupt. But, that is just a theory. -------------------------------------------------------------------------------- bd17af9716 | Aidan Holm | 2020-05-11 00:16:07 +0800 Add test for map view cursor clamping -------------------------------------------------------------------------------- 5a1f09014c | Aidan Holm | 2020-05-11 00:04:46 +0800 Fix ugly code Makes it easier to read. -------------------------------------------------------------------------------- baf2e0d10d | Aidan Holm | 2020-05-11 00:04:46 +0800 Remove duplication -------------------------------------------------------------------------------- 26bcaaf216 | Alex Jurkiewicz | 2020-05-10 22:29:06 +0800 Fix CI ccache caching Current runs are giving the following error during the "post cache compilation" step: Post job cleanup. /bin/tar -cz -f /home/runner/work/_temp/17c1f8fd-a821-43cb-a606-fc036b1b78dc/cache.tgz -C /home/runner/work/crawl/crawl/$HOME/.ccache . /bin/tar: /home/runner/work/crawl/crawl/$HOME/.ccache: Cannot open: No such file or directory /bin/tar: Error is not recoverable: exiting now [warning]Tar failed with error: The process '/bin/tar' failed with exit code 2 It seems like environment variables are not supported. However, examples in the actions/cache repo show use of `~`, so we can use that instead: https://github.com/actions/cache/blob/master/examples.md#python---pip -------------------------------------------------------------------------------- ca090100c3 | advil | 2020-05-09 22:10:13 -0400 Fix map view console cursor clamping Missing negation in ca36f614e. For various reasons, this issue only came up for extremely wide/tall maps in console, so was a hard bug to spot, but it was instantiated by sprint_mu. On this map, when fully explored (e.g. via `&{`) the effect was to let the cursor move off screen in map/`X` view. -------------------------------------------------------------------------------- 01c183ff00 | advil | 2020-05-09 21:09:59 -0400 Fix an iterator validity issue in sprint_mu (12192) When the door property called its veto check and removed the marker, that invalidated the iterator used in map_markers::property_at, leading to a crash. I think this code has been broken for ~ 6 years? (The previous version used a const iterator that I think would be resilient to this.) -------------------------------------------------------------------------------- 0adbbaad2a | advil | 2020-05-09 16:38:49 -0400 Fully sync player on webtiles load (12117) To determine what values to sync, all the `_update_blah` calls require that the initial values it is provided with are already in sync with the webtiles server (they only sync changes unless forced). However, the player_info class does not initialize most of its values, and the first instance of _send_player would typically be triggered on a redraw, which does not force sync. So when the on-load player_info value of some setting matched its initial value (which is undefined / up to the mercy of the compiler), that value would not get synced until it changed, or a spectator connected. This commit ensures that the first instance of _send_player is always a force sync, i.e. sends every value. There are other ways of fixing this but this one seemed like it would be reasonably safe. This was manifesting in a very specific way in 12117, where a quiver item on the `a` slot translated to a value 0, which in several build settings turns out to be what an uninitialized uint8 gets set to -- leading to the quiver value not getting synced in this one specific case. However, I wouldn't be surprised if there were other small effects. This issue might conceivably arise for other initial sync things; it makes me wonder why we call _send_everything for spectators but not ever for the player? -------------------------------------------------------------------------------- c08aec66eb | Edgar A. Bering IV | 2020-05-09 14:45:14 -0400 Unstack tremorstones and make them indestructible Is this another circle on the merry-go-round of "damaging purple evocable that also does self damage" a la tome of destruction and disc of storms? Time will tell. Tremorstones' effect is much simpler than the two mentioned items: randomized but possible to reason about without consulting a spoiler for the chart of switch statement cases. Now that tremorstones don't have a targeter and scale with evocations, its important to give the player an opportunity to get a feel for the self damage. The self-damage also tactically limits the effect without contributing to power spiral in the same way as a consumable. Because the effect scales with evocations, there is a strategic cost in getting greater benefit from tremorstones. For all of these reasons, making them consumable no longer fits. If the self-damage is not enough of a brake against spamming, XP-based charges can be added. (Indeed, moving all evocables to XP-charging would be a good idea to help with power-spiral, but it's too close to 0.25 to do that now.) -------------------------------------------------------------------------------- 4617b1041b | advil | 2020-05-09 08:44:48 -0400 Probably actually don't message on every push -------------------------------------------------------------------------------- c6157ca552 | advil | 2020-05-09 08:39:55 -0400 I'm gonna veto this one, sorry -------------------------------------------------------------------------------- 94ad2f9d5a | Aidan Holm | 2020-05-09 20:17:17 +0800 Split compass choosing out of directn.cc This commit splits compass choosing out of the main direction choosing class. This leaves direction_chooser with only one UI loop, making it more amenable to converting to a widget-based approach. This new function also contains a UI loop, but it's much smaller. It's also possible I will temporarily remove the mouse features during conversion, since it's fairly low-impact. -------------------------------------------------------------------------------- f7bcf9115c | Alex Jurkiewicz | 2020-05-09 20:01:44 +0800 Notify IRC for every build result -------------------------------------------------------------------------------- 2fbec62c1c | Aidan Holm | 2020-05-09 18:55:49 +0800 Consolidate directn shadow-step check I don't entirely understand this code, but the way the 'main loop' is set up, the target is always changed through set_target() before any key input will be processed; so there should be no change to valid_shadow_step between when it is set and when it is checked. This means that this shadow step code can be moved together. This makes the set_target() method very simple (and ready for removal), and it gets rid of a bit of state on direction_chooser. -------------------------------------------------------------------------------- fd92ea8195 | Aidan Holm | 2020-05-09 18:29:46 +0800 Split directn command handling into separate method -------------------------------------------------------------------------------- 49e72149f4 | Aidan Holm | 2020-05-09 17:01:31 +0800 Remove direction chooser show_items_once feature This didn't seem to be making any difference in how the direction chooser was being displayed. -------------------------------------------------------------------------------- 07f64c5e97 | Aidan Holm | 2020-05-09 17:01:31 +0800 Remove switch fallthroughs -------------------------------------------------------------------------------- 8ea86301a3 | Aidan Holm | 2020-05-09 17:01:31 +0800 Decouple key input from targeting_behaviour targeting_behaviour has absolutely no business getting user input directly; it should only encapsulate behaviour for a given targeter. How a given targeter responds to a given key event (i.e. the mapping of a key to a command) is fair game, but how that key event is received is not. This was never used in practice, thankfully. This will allow refactoring the direction chooser view with widgets, and also permit testing individual targeting behaviours, since they're no longer so tightly coupled to the input system. -------------------------------------------------------------------------------- d28c3ca9de | Alex Jurkiewicz | 2020-05-09 16:58:33 +0800 Include coverage of catch2 files in coverage tracking Filtering these files out is very slow (takes nearly 20mins), and it's arguably the wrong thing to do anyway. -------------------------------------------------------------------------------- bc0df25834 | Alex Jurkiewicz | 2020-05-09 16:58:31 +0800 Add build failure notification -------------------------------------------------------------------------------- d920e8e91e | Alex Jurkiewicz | 2020-05-09 16:56:46 +0800 Add a CI job for BUILD_ALL=1 -------------------------------------------------------------------------------- ebd775692e | Aidan Holm | 2020-05-09 14:47:02 +0800 Add key_recorder_raii helper class -------------------------------------------------------------------------------- cae8493d64 | Aidan Holm | 2020-05-09 13:14:17 +0800 Extract function and add tests Noticed this one while checking set_max_size(). -------------------------------------------------------------------------------- 80a8f0c930 | Edgar A. Bering IV | 2020-05-08 21:35:26 -0400 Add optional player-relative coordinates to the Monster/Item view This was requested as an accessibility feature for players using screen readers, as the ^x screen is much easier for them to use. This treats the up direction as positive y, even though crawl's grid uses screen coordinates. However, a standard right-handed cartesian coordinate system is more familiar to most users who are not graphics programmers, so the minus sign is worth it. -------------------------------------------------------------------------------- 522354d0d9 | Edgar A. Bering IV | 2020-05-08 18:55:00 -0400 Make "Leech" a sloppy eater (tylertfb) A cosmetic addition: strong hits with Leech occasionally turn monsters into large blood explosions. -------------------------------------------------------------------------------- 74ed164fb1 | Edgar A. Bering IV | 2020-05-08 17:49:59 -0400 Remove wands of scattershot The revised tremorstone provides a simillar level of access to evocable BEAM_FRAG damage with a more interesting targeter (one more cone targeter removed!) and mechanic compared to "yet another damaging wand". -------------------------------------------------------------------------------- 39b54811f6 | Edgar A. Bering IV | 2020-05-08 17:49:59 -0400 Revise tremorstones Tremorstones were in an awkward place; the lack of scaling meant that tremorstones didn't remain relevant. The rarity and AC requirement meant that few players would find them at a time when they were relevant and could use them. Additionaly, tremorstones introduced yet another targeter to crawl at a time when we're trying to move away from targeting. This commit resolves the issues above by: 1. Scaling tremorstones with evocations. This is done by scaling the number of explosions according to the same formula as scattershot beams, and scaling the damage of each explosion (lightly) with power. 2. Manual targeting is removed and replaced by centering the tremorstones at a point distance 3 from the player closest to the center-of-mass of monsters in LOS (including invisible monsters, with ties broken randomly). This is flavored as magnetic attraction. The specific explosions are then fuzzed according to the existing tremorstone fuzzing, so the player retains a chance of getting hit. -------------------------------------------------------------------------------- acf03c893f | Edgar A. Bering IV | 2020-05-08 17:47:22 -0400 Display monster statuses in ^x This provides greater accessibility to screen-reader players and an overview elaboration for players who see "…)" in an entry on the console monster list. This display is also added to webtiles; while the icons do duplicate this information, the purpose of ^x is to be clarifying, so the information is spelled out. -------------------------------------------------------------------------------- 201186dcf8 | Edgar A. Bering IV | 2020-05-08 17:47:03 -0400 Truncate monster status info cleanly in the console HUD Instead of just chopping the string to length, chop a little short and write "…)" so the player knows there's more going on and they should consult ^x. -------------------------------------------------------------------------------- bfd0dbb5ba | Edgar A. Bering IV | 2020-05-08 17:46:56 -0400 Display wands in the monster info pane (damerell) Inspired by Stoat Soup 063ee9f9 "Add "wand" status (ebering)". -------------------------------------------------------------------------------- dc7eba7276 | Edgar A. Bering IV | 2020-05-08 17:46:56 -0400 Refactor monster_info::attributes Move monster info flag names to their own data header, convert them to a vector of player priorities for display, and re-factor the attributes method and its clients to take advantage of these new names. -------------------------------------------------------------------------------- 8d0d4bad7c | Edgar A. Bering IV | 2020-05-08 17:46:56 -0400 Refactor mons_condition_string The previous commit introduced some new architecture, but had extra logic woven in that isn't needed (the newcondition/listall boolean parameter was only false when writing a description of the scene in the chardump, but it's fine to be verbose there). This commit simplifies the "vector of structs with boolean test functions" to a map from monster_info_flags to their singular and plural display names. A subsequent commit will refactor monster_info::atributes() to use the new structure to unify the two description lines. -------------------------------------------------------------------------------- ee693632f7 | David Damerell | 2020-05-08 17:44:56 -0400 Add additional functionality to console monster list The monster list now provides information even if more than one monster of a given type is visible, can tell you more than one thing about monsters, and indicates many more statuses, most importantly whether monsters are wielding polearms or missile launchers. The additional statuses have been added in an ordering that tries to follow the original; buffs like berserk first, then incapaciting conditions like paralysis, then maluses, then largely informational material like that a monster is invisible when you have SInv. Providing this information in the console HUD brings console closer to informational parity with tiles, where this information is communicated by monster sprites and status icons. [ Committer's note: Closes #979. Subsequent commits refactor and further extend this functionality. ] -------------------------------------------------------------------------------- 8218859876 | advil | 2020-05-08 15:49:50 -0400 missed one -------------------------------------------------------------------------------- 9b6a17f00c | advil | 2020-05-08 15:09:57 -0400 Don't let abyss xp stairs overwrite exits For some reason, DNGN_EXIT_ABYSS is not a stair, and not even a branch exit technically. I suspect another past source of UI confusion with xp exits was that a player could overwrite an xp-generated exit with down stairs by fighting more, and then never get another exit. (Whereas an exit could not overwrite a stairway, though that wouldn't have come up.) This also prevents xp exits from overwriting a few other things, such as transporters. It could be worth giving a message past the xp threshold in order to cue the player that they need to move if they want something to generate? -------------------------------------------------------------------------------- e06654808c | advil | 2020-05-08 14:55:46 -0400 Try to fix cross-compiling -------------------------------------------------------------------------------- eaa01bc6cc | advil | 2020-05-08 14:26:37 -0400 Give a chance for more than one abyss xp exit to spawn The fact that the first one is an exit, and everything after that is guaranteed to be a downstair, is very confusing to players / spoilery. (At an extreme, I've seen multiple reports over time of players thinking each time the stairs generated that they simply got unlucky, and continuing to fight to generate more, sometimes over and over again. Worst for qazlal players.) This commit changes things so that after the initial exit, there's a 50% chance for downstairs vs exit. The xp ramp continues until you exit the abyss. I considered other possibilities that were less of a change like resetting the bool on level change, but they were somewhat spoilery too. I don't think there's a balancing issue here, but if anyone else does, to get closer to the previous behavior you could adjust the probabilities as the XP threshold for spawning increases. -------------------------------------------------------------------------------- 1b96fe49b6 | advil | 2020-05-08 13:33:45 -0400 Standardize conditions for including unistd.h The immediate target of this is a report of compilation failure on freebsd, but I noticed that we are all over the place in how this is conditioned. Because several of these were non-windows defines, it's possible that this could break compilation on obscure/non-supported build targets like hurd(!). Probably this should be some kind of actual posix check... -------------------------------------------------------------------------------- ab8558aff4 | advil | 2020-05-08 11:42:06 -0400 Generalize b977e01cb5bc to other penetration crashes This guarantees that a ranged attack will be attempted for penetration weapons regardless of the state of the agent. In b977e01cb5bc I used YOU_FAULTLESS as the agent for cases where reflection kills the agent, and this commit generalizes this to use YOU_FAULTLESS for all cases where the agent is gone. This is conceptually odd, but better than crashing; and I think it is more consistent behavior than alternatives like causing the penetration attack to stop at that point, or letting it continue without damaging anything. -------------------------------------------------------------------------------- ccb83ce0d9 | Benoit Giannangeli | 2020-05-08 11:31:10 -0400 New morgue section `screenshots` Notes can have an associated screenshot. For now only user notes take screenshots. They are printed out in the `screenshots` section of the morgue. A one-screenshot per turn limit is enforced. [ Committer's note: tweaked for smooth forward upgrade compatibility. Squashed an rebased. Closes #1119 ] -------------------------------------------------------------------------------- 12724d6e4b | Aidan Holm | 2020-05-08 23:20:45 +0800 Make CrawlVector::pop_back() return void (#12220) It's returning a reference to a value that was just removed. This doesn't appear to be used anywhere, so let's just remove it entirely. -------------------------------------------------------------------------------- 0d6008aee3 | Aidan Holm | 2020-05-08 23:20:45 +0800 Fix warnings These functions aren't used at all on local tiles. -------------------------------------------------------------------------------- 7446190586 | Goratrix | 2020-05-08 11:00:08 -0400 Fix gitignore for windows packages Change to wildcard matching, also add the exe, which is already excluded elsewhere with *.exe, but should be also here for consistency. -------------------------------------------------------------------------------- 94bac08340 | Aidan Holm | 2020-05-08 21:39:53 +0800 Remove DEBUG_PANE_BOUNDS Removing because (1) we're trying to eliminate all ad-hoc scribbling on the screen, (2) it should be the render system's job to provide this sort of layout debugging feature (and it does provide it, for local tiles at least), (3) this probably hasn't been used in a long time, and (4) if using this was necessary, use of a debugger would probably be necessary to, so just using the debugger itself is probably easier. -------------------------------------------------------------------------------- 5a86851f4e | Aidan Holm | 2020-05-08 21:36:23 +0800 Show names of removed monsters -------------------------------------------------------------------------------- 2c54f16f28 | Aidan Holm | 2020-05-08 21:36:22 +0800 Remove dead monster code -------------------------------------------------------------------------------- b124a90d0f | Aidan Holm | 2020-05-08 21:36:20 +0800 Add some basic tests -------------------------------------------------------------------------------- ba654730c8 | Aidan Holm | 2020-05-08 21:36:19 +0800 Re-sync axed / removed monsters -------------------------------------------------------------------------------- dd2af9e06e | advil | 2020-05-07 10:29:07 -0400 Fix a bunch of basic errors with TOUCH_UI builds No guarantees that this actually, y'know, works, but it now compiles and lets me resolve #1371. We should probably figure out some way of either supporting this code a bit better or dropping it? Are there still any downstream consumers of TOUCH_UI=y builds? -------------------------------------------------------------------------------- 643b649470 | gammafunk | 2020-05-07 06:25:57 -0500 Correct a unit test function call doh! -------------------------------------------------------------------------------- c7cb02f774 | gammafunk | 2020-05-07 06:06:30 -0500 Make a map function non-static This one is needed for unit tests. -------------------------------------------------------------------------------- 6709f3f1ee | gammafunk | 2020-05-07 05:25:26 -0500 Properly declare some map functions as static -------------------------------------------------------------------------------- ec7a518341 | gammafunk | 2020-05-07 05:24:59 -0500 Declare some tags functions in tags.h These functions are now integrated into unit tests, hence must be non-static. Before this commit, they lacked declarations in tags.cc itself and had declarations in a unit test file, but this generated compilation warnings for tags.cc. Per discussion with aidanh, it's probably a good thing if the unit tests are forcing things that need to be tested to have header declarations, since it helps clarify program structure. So we move the required functions' declarations to tags.h and remove the duplicate declaration from the unit test files. -------------------------------------------------------------------------------- 8d059310dc | gammafunk | 2020-05-07 05:02:06 -0500 Rename some static tag helper functions These static functions are renamed to follow the leading underscore convention we use in the rest of the codebase. -------------------------------------------------------------------------------- 2f7e29601a | gammafunk | 2020-05-07 04:55:13 -0500 Remove a spurious semicolon -------------------------------------------------------------------------------- 87a53962fc | advil | 2020-05-05 17:44:07 -0400 Add a hacky way of counting monster spells to removedness script (gammafunk) -------------------------------------------------------------------------------- 40c2d6565b | advil | 2020-05-05 17:21:27 -0400 Script to assess removedness I became interested in the question of how much, quantitatively, gets removed and added from each vesrion. This script is able to provide counts for various kinds of things (species, branches, spells, item types) in crawl and will work on versions going back to 0.3 (with a few caveats before around 0.10). -------------------------------------------------------------------------------- c6eaff51cc | Nikolai Lavsky | 2020-05-05 00:53:25 -0400 Update the options guide This commit updates examples, removes mentions of obsolete items and spells, and fixes some typos. Also, it adds missing entries into TOC and reorders options in TOC so they match the order of the descriptions. -------------------------------------------------------------------------------- 1e880d33e3 | Aidan Holm | 2020-05-04 23:19:39 +0800 Fix show_map() sometimes falsely choosing target (#12250) This was caused by an uninitialized variable. -------------------------------------------------------------------------------- ad7ffe8aff | Quipyowert2 | 2020-05-04 21:37:01 +0800 Fix resource leak if allocating PNG structs fails. Cppcheck complains "Resource leak: fp" at lines 254 and 260 where the function write_png returns on error without closing the file opened at the beginning of the function. After write_png returns, the file would still be open, but the pointer to it has been lost. Cppcheck errors: [crawl-ref/source/rltiles/tool/tile_colour.cc:254] (error) Resource leak: fp [resourceLeak] [crawl-ref/source/rltiles/tool/tile_colour.cc:260] (error) Resource leak: fp [resourceLeak] -------------------------------------------------------------------------------- cfae464cf3 | gammafunk | 2020-05-03 21:35:43 -0500 Remove special flag from the Sceptre of Torment This flag prevents monsters from using the weapon and additionally prevents its use with spectral weapon. There's no particular reason to disallow monster usage, since although it would harm other hostile monsters nearby, it's also very effective at tormenting and damaging the player! Additionally this flag prevented use of this weapon with spectral weapon even for undead species who would actually want to use it, due to their torment immunity. -------------------------------------------------------------------------------- cfa9253478 | advil | 2020-05-03 22:19:15 -0400 Fix a pronoun case This got moved around in editing and the case didn't follow. -------------------------------------------------------------------------------- a522a9f31c | advil | 2020-05-03 22:02:33 -0400 Fix description of what happens when attacking summons Since 3db639d1 it has been, from the user's perspective, impossible to kill most friendly summons -- they are simply dismissed on an any damage or other annoyance. This is particularly important for something like lightning spire where dismissing the summon may be tactically useful. So, improve the description in an attempt to make it clearer what will happen if you anger such a summon. -------------------------------------------------------------------------------- 041635d5d1 | Edgar A. Bering IV | 2020-05-03 17:14:05 -0400 Reduce the delay before an eldritch tentacle enters The previous delay was set after the old out-of-los attacking behavior had been accepted and chosen with the old behavior in mind. Now that the player must stick around for the tentable to work, bringing it out in 1-2 turns instead of 2-4 is appropriate. This also increases the threat of Zot-trap opened gateways. -------------------------------------------------------------------------------- f879fa1a08 | Edgar A. Bering IV | 2020-05-03 17:06:59 -0400 Improve foxfire and ball lightning target acquisition (Lici the Crawler) Create foxfires and ball lightnings with autofoes, so they come into existence targeting something the player can see; this is partly for better player interface and partly to prevent an information leak. Also prevent them from using their ability if the only target is out of player los. Again, both for preventing out-of-los attacks (foxfire already didn't do damage out of los) and information leaks. -------------------------------------------------------------------------------- 27cb841e23 | Edgar A. Bering IV | 2020-05-03 14:49:49 -0400 Prevent Eldritch Tentacles from attacking out of LOS The summon-los-restriction dates to a9662255 in 2012. The commit message seems like this is intended to apply to all summons; however, eldritch tentacles are created with an abjuration duration of 0, so the code introduced at that time did not apply the restriction to them. Four years later, in 2016, the restriction was added to FAKE_ABJRATION allies. This too did not contrain the tentacle, which is timed out with ENCH_PORTAL_PACIFIED. In the 8 years since a9662255 this oversight or bug has become an accepted quirk of the spell and not treated like a bug. It is also a source of out-of-los attacks of the kind we intentionally prevent. So, in a long overdue commit this finally constrains malign gateways to not attacking out of LOS. -------------------------------------------------------------------------------- 5a33db65c3 | Edgar A. Bering IV | 2020-05-03 14:49:49 -0400 Remove targeting from Summon Lightning Spire SLS creates a tough, immobile ally that the player can manouver around to gain maximum benefit from. However, the initial placement was targeted, which provided a way to gain maximum benefit with no cost other than the invested MP. Removing the targeted construction is a nerf. It is also in-line with the guiding ideas behind positional magic: that tactical benefits from spells should be gained by movement rather than targeting. The strength of an optimally positioned spire remains the same, but the cost of obtaining that position now includes some amount of movement instead of only MP and targeting time. -------------------------------------------------------------------------------- 9f5dfa9815 | Alex Jurkiewicz | 2020-05-03 10:23:06 +0800 Set auto_butcher_max_chunks default to 10 -------------------------------------------------------------------------------- d22f3de0d2 | Alex Jurkiewicz | 2020-05-03 10:23:06 +0800 Change auto_butcher default to always Previously the default was to only butcher when very hungry. Since butchering is so low cost, it doesn't really make sense to limit how much butchering is done by default. Expert players who use animate dead and auto explore might prefer another value for this setting, as would players using auto explore but optimising for turncount(?!) and some other use-cases. But those players should be able to change this setting in their RC file easily enough. -------------------------------------------------------------------------------- 2618fe8269 | Alex Jurkiewicz | 2020-05-03 10:23:06 +0800 Change explore_auto_rest default to true For new players, it's a much better experience for this option to be enabled, to prevent accidentally auto-exploring at low HP into an orc priest or similar. Players aiming to maximise score will want to disable this, and potentially also Ghoul/Troll characters (although it's not a major issue past the first couple of floors). But on the whole, enabling by default seems to improve more games. -------------------------------------------------------------------------------- 39f137c8b7 | Edgar A. Bering IV | 2020-05-02 17:56:55 -0400 Prevent inadvertent opening of ebering_ghost_funeral_grove (#1077) In Swamp this vault blends in and a player might fireball it open not realizing it's a ghost vault. Monster tornado is highly unlikely to interact with this vault (but might as a rare Zot trap effect or if somehow an air elemental comes in), but again preventing inadvertent opening is important for the depth of this ghost vault. [ Closes #1077 ] -------------------------------------------------------------------------------- 3419481e97 | Edgar A. Bering IV | 2020-05-02 17:56:55 -0400 Don't pain bond friendly and neutral monsters (#1204) Pain bond is flavored as an "emotional response to pain", but monsters with different alignments have no positive feelings for one another. The edge case is surprising and puts a strange disincentive on fighting certain uniques which lead to neutral mosnters existing. [ Close #1204 ] -------------------------------------------------------------------------------- f7cfe1fbb0 | Edgar A. Bering IV | 2020-05-02 17:56:55 -0400 Allow monsters to place on traps (#1283) Traps are triggered by moving into them. Forbidding monster placement on traps dates back to a simulationist restriction on monsters placing on teleport traps. The restriction that traps only fire in sight of the player means we've given up on that illusion. The code comment indicates the restriction was to be limited to teleport traps, but in actuality applied to all traps, leading to frustrations with animate dead in spider and unexpected limitations on summoning. Restricting to a special case just for translocational traps seemed unnecessarily complicated, so this commit permits placement on all traps. [ Closes #1283 ] -------------------------------------------------------------------------------- 31946683ed | sdynet | 2020-05-02 17:56:55 -0400 Improve the Cloud card The old cloud card produces clouds that damage the enemy. This effect is more suitable for deck of destruction. The new effect creates black smoke that blocks vision instead of damaging enemy. This effect differs from fog scrolls and the tomb card by placing the clouds at the monsters, not surrounding the player in protection. [ Committer's note: revised the commit message, and included the monster's cell for cloud placement. Closes #1237 ] -------------------------------------------------------------------------------- d0b4d5de99 | sdynet | 2020-05-02 17:56:55 -0400 Remove summons from the Pain card Level 2 Pain card's old effect (summon flayed ghost) was an unsuitable effect on the deck of destruction. Also, the flay effect is just another torment. New effect: cast torment that does not damage the caster. [ Committer's note: added messaging, tweaked commit message. Closes #1232 ] -------------------------------------------------------------------------------- 9fd4d98c16 | Alex Jurkiewicz | 2020-05-02 17:56:04 -0400 Add recommended jobs and species to -playable-json More information made available to the outside world. [ Closes #978 ] -------------------------------------------------------------------------------- 73108e5cc2 | Alex Jurkiewicz | 2020-05-02 17:56:04 -0400 Use the new json_mkstring(string s) function -------------------------------------------------------------------------------- 0acc9a3179 | Alex Jurkiewicz | 2020-05-02 17:56:04 -0400 Add a version of json_mkstring that accepts string Cut down on some verboseness in calling code. -------------------------------------------------------------------------------- 6329fa547d | Alex Jurkiewicz | 2020-05-02 17:56:04 -0400 Add -branch-json Dump basic branch information as JSON. The key use of this is knowing how to refer to branches when talking about morgues. Depending on the branch, you might describe a place in the following ways: * the Temple * a Sewer * an Ice Cave * Pandemonium * level 1 of the Dungeon * level 1 of the Depths Without this data being accessible, figuring out the above programatically required a hardcoded lookup table, which is duplicated work and bitrots over time as the Dungeon's layout changes. -------------------------------------------------------------------------------- 7c84a75a33 | Thom Chiovoloni | 2020-05-02 17:56:04 -0400 Add auto_butcher_max_chunks option If auto_butcher is set, and this option is greater than zero, it prevents auto-butchering from happening when you have more than this many chunks in your inventory. Defaults to zero, which is the current behavior. [ Committer's note: tweaked and polished, added documentation. Closes #628 ] -------------------------------------------------------------------------------- fd9b2de1c4 | advil | 2020-05-02 17:41:54 -0400 Explicitly install python for catch2 tests -------------------------------------------------------------------------------- adb52c904e | advil | 2020-05-02 16:58:38 -0400 Fix a directory name -------------------------------------------------------------------------------- 5fcb2d6f64 | advil | 2020-05-02 16:54:51 -0400 Attempt to install python more carefully for actions -------------------------------------------------------------------------------- 17231afb6c | advil | 2020-05-02 16:20:52 -0400 Try a different yaml package name for actions -------------------------------------------------------------------------------- f370ab6804 | Kyle Rawlins | 2020-05-02 15:53:15 -0400 Issue template tweaks This issue template already strongly guides away from requesting features, and we probably don't really want to blanket discourage feature comments anyways, e.g. UI feature requests are actually welcome IMO. I think this prohibition came from a time when the issue template was more freeform (and was copied from similar wording in mantis). If people start using github issues to request new gods or the return of mountain dwarves or whatever, we can add it back in. -------------------------------------------------------------------------------- 4d83e081dd | advil | 2020-05-02 15:25:04 -0400 Let `easy_confirm=all` allow lowercase stat selection (#1349) This is somewhat more consistent behavior, where I think someone who hadn't read the (previous) options guide wording carefully would expect this option to affect any force capitalization prompts in the game, not just y/n. I say "somewhat" because it's not entirely clear to me that stat increases form a natural class with "dangerous" y/n prompts and if I were introducing this behavior from scratch, I'd probably be inclined to have it require caps for stat increases only under `easy_confirm=none`. But, for now keep the status quo since 68cc883211 as the default behavior. Resolves #1349. -------------------------------------------------------------------------------- 237ada30ef | advil | 2020-05-02 14:52:00 -0400 Add explicit header for iswalnum (#1372) I'm not sure under what exact build conditions this is needed, but it seems to be needed for Fedora and it should be pretty safe to add. Thanks to @sagitter for diagnosing this. Resolves #1372 -------------------------------------------------------------------------------- ca36f614e4 | Aidan Holm | 2020-05-03 02:41:21 +0800 Extract coord_def clamp helper function() -------------------------------------------------------------------------------- f80317f37c | Aidan Holm | 2020-05-03 02:41:21 +0800 Don't exit map view on invalid commands -------------------------------------------------------------------------------- 0b7a428101 | Aidan Holm | 2020-05-03 02:41:21 +0800 Remove now-unused redundant map scrolling state -------------------------------------------------------------------------------- 2fe5a39f5e | Aidan Holm | 2020-05-03 02:41:21 +0800 Split viewport calculation out of show_map() -------------------------------------------------------------------------------- 235c7b5e93 | Aidan Holm | 2020-05-03 02:41:21 +0800 Extract recentre_map_target() function -------------------------------------------------------------------------------- a6a3aeff32 | Aidan Holm | 2020-05-03 02:41:21 +0800 Simplify arithmetic expressions No chance of overflow here. -------------------------------------------------------------------------------- e98a5be7b8 | Aidan Holm | 2020-05-03 02:41:21 +0800 Split command processing out of show_map() This splits a ~700 line nightmare function roughly in half. The resulting process_map_command() function is functional and pretty easy to test, although I haven't added anything too fancy yet. This should also make the remaining code in show_map more amenable to further refactoring. Exposing the relevant stuff to tests required moving quite a bit of stuff to viewmap.h. Not all of the state inside show_map() is encapsulated in the map_view_state; so far I've only included the stuff used by process_map_command(). -------------------------------------------------------------------------------- 529d17c013 | Nikolai Lavsky | 2020-05-02 14:25:37 -0400 Remove a couple of obsolete menu_colour rules -------------------------------------------------------------------------------- f09614b0b8 | Nikolai Lavsky | 2020-05-02 14:25:37 -0400 Clean up some preferred food-related code These are leftovers from when potions of blood and more types of food for carnivores/herbivores existed. -------------------------------------------------------------------------------- 968d922a6d | Aidan Holm | 2020-05-03 01:44:09 +0800 Fix targeters sometimes being too short for Barachi (#11833) in_bounds() takes an absolute pair of coordinates, but the view code was passing in player-relative coordinates. This caused ray cells to be hidden along the top and left edges, where ep.y and ep.x were zero respectively, and thus fell out of the range of valid map cells when interpreted as a grid location. -------------------------------------------------------------------------------- 364e023d31 | Aidan Holm | 2020-05-03 00:37:45 +0800 Fix high CPU usage on Windows builds (Goratrix, advil) The timer callback should return an interval for the next call, but was erroneously returning 1 (from the SDL_PushEvent call), where instead it should have just been returning zero, as the callback did prior to a840853. The return value of 1 caused the callback to be called repeatedly every 1 millisecond, causing crashes and high CPU usage. -------------------------------------------------------------------------------- 1f02ff80f2 | Aidan Holm | 2020-05-02 23:26:40 +0800 Improve save version mismatch reporting There's no reason to only show 'major version mismatch' on dev builds, even though the additional technical information is useful. This commit merges the two descriptive forms, and additionally adds a minimum_version() helper function. -------------------------------------------------------------------------------- 4357695705 | Aidan Holm | 2020-05-02 23:26:39 +0800 Add support for minor tags > 255 Previous versions of crawl serialize the minor version as a single byte, which prevents storing minor versions greater than 255. This commit adds support for eventually moving to such minor versions: values greater than 255 are stored as a byte equal to 255, and then the real minor version as a four-byte big-endian integer. This commit also consolidates some of the chunk tag reading and writing. Most of the code for reading/writing various chunks directly accessed bytes; this commit adds two helper functions for reading and writing respectively. This change is being added now because directly adding a four-byte value, while possible, breaks the save browser, causing new games to not be displayed at all in older crawl binaries. This change adds immediate support for the save browser to read files with four-byte integer minors, even though saves will continue to use a single byte. By the time we reach minor 256 (perhaps around ~3 years at the current pace), most binaries in the wild should be newer than this binary. -------------------------------------------------------------------------------- f770d9629a | Aidan Holm | 2020-05-02 23:26:39 +0800 Remove raise_custom_event() -------------------------------------------------------------------------------- a8408532f3 | Aidan Holm | 2020-05-02 23:26:39 +0800 Run timer callbacks in main thread Previously, they were run in a separate thread spawned by SDL, which makes interacting with other code difficult, since most other code assumes single-threaded access. Note that this change queues an SDL event, but only the input loop in ui.cc actually handles this event by calling the callback. This is fine, because currently the only use of this API is to show tooltips after a delay, and the callback function for that worked by queueing an SDL event, so the callback now does nothing and the actual function is performed as a side effect. This may seem like a step backwards for code clarity, but it's a necessary step to removing the input loop in tilesdl. This was previously reverted at 431bb856fd. I'm adding it now after manual testing with both a crosscompile in Wine and in a Windows VM with MSYS2, both with mingw-w64-1686. Neither showed any lag or crashes. -------------------------------------------------------------------------------- c1fa99a940 | Aidan Holm | 2020-05-02 23:26:39 +0800 Clean up describe_item() code It's no longer possible to memorize anything from the describe item UI. -------------------------------------------------------------------------------- 48f1b6f60f | Aidan Holm | 2020-05-02 23:26:39 +0800 Further break externs.h apart -------------------------------------------------------------------------------- 30cafcbba1 | Aidan Holm | 2020-05-02 23:26:39 +0800 Move map_markers struct to mapmark.h -------------------------------------------------------------------------------- d6d150f7a2 | Aidan Holm | 2020-05-02 23:26:39 +0800 Move shop_struct to shopping.h -------------------------------------------------------------------------------- 4c921ade24 | Goratrix | 2020-05-02 21:47:31 +0800 Tweak phial of floods description (Flugkiller) Change description to better indicate that only monsters hit by the initial wave will be affected by silence, not monsters that walk into the water later. Also I noticed the acrobat amulet description having a line too long, so fixing that too. -------------------------------------------------------------------------------- 62861fb195 | Edgar A. Bering IV | 2020-05-01 21:32:49 -0400 Expose "can_go_frenzy" to clua -------------------------------------------------------------------------------- 237153e625 | Edgar A. Bering IV | 2020-05-01 21:27:03 -0400 Reveal frenzy immunity in the datura targeter (12197) -------------------------------------------------------------------------------- 084fcd9360 | Edgar A. Bering IV | 2020-05-01 21:10:58 -0400 Remove a testing comment (gammafunk) -------------------------------------------------------------------------------- 568ea92cc3 | Edgar A. Bering IV | 2020-05-01 21:08:32 -0400 Display !lignification AC in the description (12224) Tree form gives a fixed AC bonus per XL, using the functions implemented to display armour changes in armour descriptions this commit displays the player's base AC after quaffing the potion. -------------------------------------------------------------------------------- d7461d2276 | Edgar A. Bering IV | 2020-05-01 13:28:06 -0400 Fix typos in changelog (pblur, Goratrix, Flugkiller) -------------------------------------------------------------------------------- ac0430677b | Edgar A. Bering IV | 2020-05-01 10:10:27 -0400 Update the changelog -------------------------------------------------------------------------------- 76b13fe646 | Aidan Holm | 2020-05-01 22:01:45 +0800 Add coord_def ostream operator This allows coord_def instances to be converted to a string, which is handy in catch2 test assert messages. -------------------------------------------------------------------------------- ff86aee0ce | Aidan Holm | 2020-05-01 22:01:45 +0800 Extract search path generation from map code Probably a good candidate for a radius_iterator or one of those things. -------------------------------------------------------------------------------- e549c88646 | Aidan Holm | 2020-05-01 22:01:45 +0800 Remove unused show_map() allow_esc parameter -------------------------------------------------------------------------------- 9575aa3b0e | Aidan Holm | 2020-05-01 22:01:45 +0800 Revert "Fix map not panning with cursor" Reverted due to this introducing a crash when adjusting the map zoom. This reverts commit 3f1e787b38e5a3a4a3bc7aab67866ffdce85acfd. -------------------------------------------------------------------------------- 497542d149 | Goratrix | 2020-05-01 20:39:44 +0800 Enable deep elf elementalist tile animation When the new tiles from roctavian were added in 16654a8, the elementalist cycle animation wasn't added, due to wielded weapon not displaying correctly. Aidanh found the reason, it's that all the variant tiles need to be listed in get_weapon_offset in tilemcache.cc. This commit enables the animation, and also reuploads the tiles, because only 3 out of the 4 originally submitted tiles were uploaded in the previous commit, and they need to be in the correct sequence. I tested it in a local windows tiles build only, working fine here. -------------------------------------------------------------------------------- 6bf7129739 | Aidan Holm | 2020-05-01 19:36:21 +0800 Fix Leda's showing muddy lava (#11115) Should this be feat_is_solid()? -------------------------------------------------------------------------------- fe5977ef6f | Aidan Holm | 2020-05-01 18:54:38 +0800 Fix map cell corruption on unmarshalling (#12218) When marshalling flags, the unsigned flags are implicitly cast to a signed integer of the size being marshalled, but during unmarshalling no cast was performed, leading to values with the high bit set undergoing sign extension. This resulted in visual artefacts. I've added casts to the marshalling code, not because they are necessary, but because I don't like the implicit behaviour and want to make it clear to the reader that this is deliberate. -------------------------------------------------------------------------------- 3f1e787b38 | Aidan Holm | 2020-05-01 16:49:46 +0800 Fix map not panning with cursor -------------------------------------------------------------------------------- adf69d5009 | Edgar A. Bering IV | 2020-05-01 02:28:52 -0400 Update the credits -------------------------------------------------------------------------------- eaba134f46 | Edgar A. Bering IV | 2020-05-01 01:23:50 -0400 Prevent attitude change for ancestors and demonic guardians Both of these allies come from unique mechanics and interact poorly with attitude changes. The remaining two possible sources of attitude changes for these monsters are: enslavement (from a hostile monster wand) and frenzy (player discord or monster datura dart). This commit prevents them from changing attitude alltogether. Incorporates and closes #1374. -------------------------------------------------------------------------------- 6492fb5f8e | Edgar A. Bering IV | 2020-04-30 23:48:59 -0400 Permit inner flame on summons Commit 3fe85ef3 allowed immolation scrolls to affect summons; the previous commit removed a degenerate interaction with teleport other. So that the two effects are consistent, this allows casting inner flame on summons. If "ready" access to suicide bombers becomes an issue, inner flame can be made to annoy allies instead. However, this was already possible with skeletons and sticks to snakes and outside of "snakebombs" created with immolation scrolls players are not going around casting inner flame on allies in place of using fireball. -------------------------------------------------------------------------------- 799ed1240d | Edgar A. Bering IV | 2020-04-30 23:01:49 -0400 Make allies annoyed by translocations other than Recall Lesser beckoning working on allies offers opportunities for tedious ally micromanagement of a kind we'd rather not allow; the targeter already doesn't think the spell applies to allies, but if it was used on them it would work without angering them. This change is partly to remove this micromanagement, and partly for consistency with the change to teleport other. Teleport other on allies could be used as a tedious combination with zombies or summons and inner flame to seed a level with bombs from the safety of the stairs. Awake hostile monsters would engage the summon or ally and suffer explosion damage, possibly resulting in a kill. -------------------------------------------------------------------------------- 3fe85ef339 | Alex Jurkiewicz | 2020-04-30 22:11:17 -0400 Let scroll of immolation affect summons Since this scroll was added in 388d670c250b25dcf88b5f54042bb083f48a9a51, the effect has been limited to non-summoned creatures. It's hard to be exactly sure why. This limitation is a little non-intuitive, and for a limited resource like scrolls, probably unnecessary. The scrolls are situational enough as-is. -------------------------------------------------------------------------------- e280b876b2 | Implojin | 2020-04-30 22:03:26 -0400 Expose player::get_noise_perception() through clua. This commit adds a clua bind for you.noise_perception(). This information has been available to players visually through the noise bar, but it wasn't exposed through clua. Noise information can be helpful for scripted decisions re: resting and retreating, so here's a bind for it. -------------------------------------------------------------------------------- fe7ed1d377 | Edgar A. Bering IV | 2020-04-30 21:32:22 -0400 Further miscast simplifications Scaling miscast damage by how badly the roll missed made the damage distribution complicated, and as a result difficult to communicate. The long tail of damage meant that in rare cases miscasts could be significanlty more damaging than the status light indicated. This commit makes miscast damage a function of the raw_spell_fail: additional miscast effects scale with the chance of failure alone. The contamination still scales with the severity of the roll, as does the threshold before additional miscast effects kick in. It also tweaks the miscast damage numbers so that the additional effect does reasonable damage at "max fail", essentially cutting off the old long tail. Finally, the description exchanges expected miscast damage for maximum miscast damage. -------------------------------------------------------------------------------- 05d4e06a41 | Edgar A. Bering IV | 2020-04-29 18:38:25 -0400 Revert "Mark Leda's as no_ghost" This reverts commit d392131cc75f18731ec8fa803f37bb1b39863f0e. Now that it can be used while flying again ghosts can keep it. -------------------------------------------------------------------------------- 437a441e8f | Edgar A. Bering IV | 2020-04-29 18:35:04 -0400 Apply Leda's movement penalty regardless of flight status (kate-) The previous string of double-reverts restores permitting flight to continue while using Leda's. This commit permits flight by the caster and applies the movement penalty to the caster regardless of flight status. This removes the edge cases around Leda's interaction with Dragon Form and Tornado, without also allowing the player to immediately cancel Leda's to escape the movement penalty using abundant sources of flight. -------------------------------------------------------------------------------- 873053edc4 | Edgar A. Bering IV | 2020-04-29 18:13:31 -0400 Revert "Revert "Allow monsters to cast Leda's while flying and remove dead code"" This reverts commit f1e2f1be51d246bff6514627603ff4b84b6e4bf8. -------------------------------------------------------------------------------- f3960b09ed | Edgar A. Bering IV | 2020-04-29 18:09:27 -0400 Revert "Revert "Allow Leda's to persist while flying"" This reverts commit e14c9e38dd7b67ed3a840f6e197e669a17d814f8. -------------------------------------------------------------------------------- d392131cc7 | Edgar A. Bering IV | 2020-04-29 17:26:04 -0400 Mark Leda's as no_ghost Ghosts are always flying, so can't use the spell. -------------------------------------------------------------------------------- f1e2f1be51 | Edgar A. Bering IV | 2020-04-29 16:57:22 -0400 Revert "Allow monsters to cast Leda's while flying and remove dead code" This reverts commit fa5a36fad76091dd4c68280d61ed62f6e8007004. The dead code is resurrected because it is again relevant to enforce the flight restrictions on Leda's. -------------------------------------------------------------------------------- e14c9e38dd | Edgar A. Bering IV | 2020-04-29 16:53:58 -0400 Revert "Allow Leda's to persist while flying" This reverts commit 9cef9ebf1155240c094acc5bb7e38d1910827b7c. Flying cancels penalties from Leda's; now that the movement penalty is restored providing an easy out when there are ample sources of flight (some permanent) is not good. -------------------------------------------------------------------------------- b679d6390d | Edgar A. Bering IV | 2020-04-29 16:24:51 -0400 Partially revert "Buff Leda's Liquefication" (elliptic) This partially reverts commit bb9abfce8d09fc878997f2ce95cdf4c4463e56a6. Removing the movement penalty as well as the melee penalty moved Leda's into the category of "obvious always cast buff spells". As mentioned in the reverted commit message, if the buff went to far the movement penalty could be restored. This partial revert restores the movement penalty (without the melee attack penalty). -------------------------------------------------------------------------------- 340c9e8194 | Edgar A. Bering IV | 2020-04-28 18:15:07 -0400 Adjust monster behavior for working with ranged allies Commit 6f887751 (in 2008 by jpeg) added behavior to have monsters of animal intelligence or higher spill out of corridors when attacking the player if followed by other monsters; additionally it made intelligent monsters (at the time normal or higher, now just human) check for an aligned monster with a ranged attack further back and move out of the way. The example from the commit message: ####. .rgo@ ####. will within two turns change to ####g ...r@ ####o In that logic this movement only triggered if walls were in the way, even though opening up lines of fire for ranged attackers is a good thing to do in the absence of a corridor. This commit changes the behavior to only check the adjacent following monnster in the corridor situation, and check for ranged allies regardless of the presence of walls in the two spaces marked with ? ###?. c..o@ ###?. has a chance of changing to ###?. c...@ ###?o if the orc moves before the centaur, regardless of the features at the ?. The decision to spill out was given a coinflip later in the development history (hard to git blame because it moved from monstuff.cc to mon-act.cc), and the choice of up or down is also randomized. In the monster intelligence simplification of d63ab3c5 (in 2015 by PleasingFungus) the intelligence component of the ranged ally check was removed, but not mentioned in the commit message as an intended effect. This is restored, so that animal intelligence monsters can be used for "cover" of sorts. Finally, this commit has monsters treat the player as a "ranged attacking ally" for the purposes of this check. It's not a sophisticated "stay out of my line of fire" behavior requested by some players and might negatively effect players who use their Hepliaklquana ancestor to block while polearming. A more sophisticated behavior could be added, but without adding an ally command (ugh) or some complicated guessing about player behavior (also ugh) it's not clear what the right move is. -------------------------------------------------------------------------------- f695395b5c | advil | 2020-04-26 12:49:02 -0400 Pointer checks for lua userdata objects This systematically adds checks to ensure that when userdata wraps a c++ object in some way via pointer, the pointer is not nullptr. On the dlua side I'm just doing this for the sake of consistency and good practice, but on the clua side this aims to prevent an attacker from using calls to the `__gc` metamethod to get crashes on demand. I kind of hate all these macros, it could probably use a refactoring to make it less brittle. -------------------------------------------------------------------------------- 39757dd64f | advil | 2020-04-26 12:49:02 -0400 Handle another potential multiple delete case The setup is slightly different but the basic problem is the same: the function `_delete_wrapped_item` is bound to the metamethod __gc on wrapped items that are available in clua, and __gc can be freely called from lua-land. -------------------------------------------------------------------------------- 7f8d8a8652 | advil | 2020-04-26 12:49:02 -0400 Guard against repeated calls to lua_object_gc (ruderubik) This call is bound to the metamethod __gc, which can be called arbitrarily from lua code (though it is always automatically called as a finalizer before lua collects the memory allocated by lua_newuserdata). This is a minimal change so that `delete` can't be called multiple times on the same pointer. (All of this code is a bit of a mess.) -------------------------------------------------------------------------------- 60a0bcd8b5 | Kyle Rawlins | 2020-04-25 22:17:38 -0400 Update SECURITY.md -------------------------------------------------------------------------------- 25f8dcc119 | Kyle Rawlins | 2020-04-25 20:32:46 -0400 Create SECURITY.md I clicked on github buttons until it suggested I add this file. -------------------------------------------------------------------------------- 681bda5bb4 | Aidan Holm | 2020-04-26 01:05:22 +0800 Add stub entries for removed spells This change lets spell_name() work again, which is important because it's used to show character action counts. Since games can span different versions, action counts for spells can still show removed spells' names. -------------------------------------------------------------------------------- c06b4bd658 | advil | 2020-04-25 11:16:38 -0400 Refactor frenzy to use a temporary attitude change The immediate target of this is interactions between discord and divine companions. `monster::is_divine_companion` checks permanent attitude for ATT_FRIENDLY, so under the previous implementation, while a divine companion was frenzied this function returned false. This could lead to all sorts of weird behavior, for example frenzied hepl ancestors that died would not be properly removed from the companions list and so would never be restored. Moreover, the ancestor cloning bug reported in https://crawl.develz.org/mantis/view.php?id=10753 was still present in trunk; this was supposed to be fixed in 0e8e6b5e25fb but this fix appears to assume that frenzy does not use a permanent attitude change, so I'm not sure how it could have worked. I've also seen unlinked item errors on a frenzied ancestor dying (though this has proven difficult to replicate) that may also be caused by this. I expect this will also remove some potential issues for beogh companions (and maybe yred companions if any of them can be frenzied). This fix doesn't explicitly repair a save file with a broken ancestor, because I'm not sure if there are any out there right now. (One was reported in https://www.reddit.com/r/dcss/comments/g6zfhu/lost_my_hep_ancestor_to_the_lvl_he x_spell_discord/ but that game is now complete.) It's possible the basic compat fixup might handle this case though? Untested. -------------------------------------------------------------------------------- 1f535e2ddc | Aidan Holm | 2020-04-25 23:12:42 +0800 Reindent code -------------------------------------------------------------------------------- 97ffa46023 | Aidan Holm | 2020-04-25 23:12:42 +0800 Add test cases for unmarshallSpells() -------------------------------------------------------------------------------- 4838036f53 | Aidan Holm | 2020-04-25 23:12:42 +0800 Remove dead spell code All of this code is no longer needed now that removed spells are removed from saves when the game is loaded. -------------------------------------------------------------------------------- 3557bf33da | Aidan Holm | 2020-04-25 23:12:42 +0800 Remove player's removed spells on load This commit filters the player's spells on load, from both their memorized spells and from the spell library. This should make it easier to remove dead code for these spells entirely. -------------------------------------------------------------------------------- 9d4679374f | Aidan Holm | 2020-04-25 23:12:42 +0800 Extract unmarshall_player_spells() function -------------------------------------------------------------------------------- 5c9e5b7a16 | Aidan Holm | 2020-04-25 23:12:42 +0800 Remove removed spells from monster spellsets This also allowed improving the fixup code for pre-flags spells, which had a bunch of code related to checking for SPELL_NO_SPELL. Since we filter these out first, this checking code can be removed. -------------------------------------------------------------------------------- aa01332a36 | Aidan Holm | 2020-04-25 23:12:42 +0800 Remove removed spells from Vehumet's gifts on load This is ugly, but of course sets don't support remove_if()... -------------------------------------------------------------------------------- 3e2dadc450 | Aidan Holm | 2020-04-25 23:12:42 +0800 Add removed spells to removed_spells() list. Huge numbers of spells were missing. Not sure how badly this will break... -------------------------------------------------------------------------------- 970948ccd0 | Aidan Holm | 2020-04-25 23:12:42 +0800 Extract unmarshall_vehumet_spells() function This CL also adds some rudimentary tests. -------------------------------------------------------------------------------- e9745dcf7e | Aidan Holm | 2020-04-25 23:12:42 +0800 Move SUMMON_SWARM out of removed spells It's still in use in the Fedhas sprint. -------------------------------------------------------------------------------- 6944ee31a2 | gammafunk | 2020-04-24 19:02:18 -0500 Fix two arrival vaults (Juliwen) The change in 3ae22969 sometimes erroneously places three additional random altars near the starting area instead of stone walls, since a shuffle is applied to the stone wall glyph. Remove this shuffle, since it only made the vault less interesting by having it place no random altar in the island area. Additionally remove a shuffle that inexplicably sometimes removed the arrival staircase, making the player arrive outside of the vault entirely at an entrance point randomly chosen by the level generator. -------------------------------------------------------------------------------- 81a31cfd23 | Aidan Holm | 2020-04-24 03:05:43 +0800 Fix crash on opening known-items menu Previous refactorings added code that aborted when invalid potion values were used, including POT_NUM_POTIONS. Unfortunately, this is used by the known-items menu to encode 'unknown potions', causing a crash. -------------------------------------------------------------------------------- fee0bf60c5 | Aidan Holm | 2020-04-24 01:52:33 +0800 Remove an unused parameter -------------------------------------------------------------------------------- 9ecea16cc4 | Aidan Holm | 2020-04-24 01:52:33 +0800 Remove more old potion code -------------------------------------------------------------------------------- 2ddb0c8792 | Aidan Holm | 2020-04-24 01:52:33 +0800 Remove is_blood_potion() -------------------------------------------------------------------------------- ffd75422ce | Aidan Holm | 2020-04-24 01:52:33 +0800 Remove code for old potion types This commit adds an CASE_REMOVED_POTIONS macro, intended to be used in switch statements, that will die() with an error for any removed potion type. It then improves the tags.cc conversion of old potions; now, *all* removed potions are converted, with a runtime crash on load guarding against forgetting to update this. This means that no saves can have these potions in the game. We follow up by removing reams of remaining cruft that's no longer necessary as a result. -------------------------------------------------------------------------------- 13a0117a0c | Aidan Holm | 2020-04-24 01:10:04 +0800 Add all_item_subtypes() This commit replaces explicit iteration over an enumeration with the use of a new helper function that encapsulates the intended behaviour, making call sites more readable and less likely to break. The function implementation is in a header file, which should allow the vector return value to be optimized away. This change permits refactorings removing old items from the game that additionally add runtime checks for old items. -------------------------------------------------------------------------------- 827379bd5b | Aidan Holm | 2020-04-24 01:10:04 +0800 Don't mark elven and mossy runes as removed They're *not* removed; sprints can (and do) still spawn them. -------------------------------------------------------------------------------- b37b1c29c3 | gammafunk | 2020-04-23 01:47:09 -0500 Fix Trog weapon gifting (elliptic) Trog weapon gifting was partially broken by 6d7e32a81, which accidentally removed the two successful random rolls needed if piety was at the 5* threshold required. This lead to excessive Trog gifts as well as it being impossible to actually reach 6*, since the gift timeout would consume most piety. This bug did not affect Okawaru weapon gifts, since the rolls were correctly applied. This code block was structured in a confusing way to begin with, so I've both fixed and refactored it to make the logic clearer. -------------------------------------------------------------------------------- 55863b0b92 | Kate | 2020-04-21 19:57:14 +0100 Don't crash when trying to describe potions Broken in 00990ba764544. -------------------------------------------------------------------------------- e42328e28c | Alex Jurkiewicz | 2020-04-22 00:22:37 +0800 Add CI jobs to test TAG_MAJOR_VERSION 35 Test with FULLDEBUG in console, tiles, and webtiles compilation modes. -------------------------------------------------------------------------------- 00990ba764 | Alex Jurkiewicz | 2020-04-22 00:22:37 +0800 Fix compilation with TAG_MAJOR_VERSION 35 Several latent issues have crept into the codebase over time, this commit fixes all of them in C++ files. There are additional changes that have to be made to text files, see util/tag-35-upgrade.py for a solution for those. -------------------------------------------------------------------------------- 239cf252b2 | Alex Jurkiewicz | 2020-04-22 00:22:37 +0800 Add util/tag-35-upgrade.py This script automates the changes required to non-C++ files for a TAG_MAJOR_VERSION 35 bump. It's the first step in automatically testing this upgrade process in CI, which is required to stop errors creeping in over time. -------------------------------------------------------------------------------- b28a33faff | Alex Jurkiewicz | 2020-04-21 19:24:05 +1000 Standardise text file TAG_MAJOR_VERSION comments This will allow us to upgrade these files with a script, rather than by hand. -------------------------------------------------------------------------------- 4e6a552925 | Aidan Holm | 2020-04-21 00:01:17 +0800 Fix missing tile in popup description -------------------------------------------------------------------------------- a6db7940a5 | Goratrix | 2020-04-20 23:45:14 +0800 Add unused unidentified mechanical trap tile (#12170) This tile is the current Pressure Plate tile overlaid with the questionmark taken from the unknown portal tile. -------------------------------------------------------------------------------- dbf7afbd95 | Emily | 2020-04-20 22:00:31 +0800 Drop support for ANCIENT_SQLITE sqlite3_open_v2 was added in 2007 (https://www.sqlite.org/34to35.html); anyone trying to build Crawl with libraries that ancient probably has other problems, and should just use BUILD_SQLITE with the submodule. -------------------------------------------------------------------------------- c0736c7dca | Emily | 2020-04-20 22:00:31 +0800 Use pkg-config for SQLite SQLite ships an upstream sqlite3.pc file these days, and Linux distributions have included one for a long time now. This allows us to remove the hardcoded FreeBSD logic and build on more systems out of the box. Systems that don't have pkg-config, or that don't ship sqlite3.pc, will cleanly fall back to building the bundled SQLite submodule as usual. -------------------------------------------------------------------------------- 30a70f5460 | Aidan Holm | 2020-04-20 20:05:52 +0800 Split teleport trap feature in two (#12170) This allows looking up permanent teleport traps in lookup-help, and also fixes permanent teleport traps being shown as regular teleport traps after magic-mapping. -------------------------------------------------------------------------------- c5703f2676 | Aidan Holm | 2020-04-20 20:05:31 +0800 Add individual feature types for mechanical traps (#12170) This commit creates individual feature types for each mechanical trap type. This fixes incorrect tiles being shown after magic-mapping, and also enables showing descriptions in lookup-help for each trap type. This is pretty important because the various mechanical trap types are pretty different, e.g. net traps can trap you for several turns. There's currently still a shared feature for teleport and permanent teleport traps. I'll address that in a separate commit. -------------------------------------------------------------------------------- e86166c523 | Aidan Holm | 2020-04-20 20:05:31 +0800 Rename trap category -> trap feature -------------------------------------------------------------------------------- 6581751b11 | riverfiend | 2020-04-20 00:38:20 -0400 Add the possibility of one more Xom demon At low XL, it's difficult for Xom to effectively kill a waitscumming mummy or vampire. This change is largely washed out at larger XLs, but should effectively create more nasty monsters to drop on low-level waitscummers. -------------------------------------------------------------------------------- e3a6afd762 | Peter Gerlagh | 2020-04-20 00:27:01 -0400 Remove autotravel water disincentive for merfolk Formerly, merfolk pathfinding would count a tile of water as having taking 2 turns to cross so that merfolk would avoid traveling through water because 'their boots would meld'. This behavior interrupted travel, but that travel interrupt was fixed in 771548fc26. This commit makes merfolk pathfinding count a tile of water as 1 turn. [ Committer's note: Closes #1343, reworded commit message to refer to the autotravel fix. ] -------------------------------------------------------------------------------- 0199dc3540 | Skrybe | 2020-04-19 23:59:56 -0400 Update layout_cellular.des -------------------------------------------------------------------------------- c0ddf3c23e | Edgar A. Bering IV | 2020-04-19 21:55:32 -0400 Don't crash when skill target set to 27 -------------------------------------------------------------------------------- 2ff8117762 | Alex Jurkiewicz | 2020-04-19 18:46:52 -0400 ci: Install PyYAML for Python 3 on macOS The CI runner environment comes with Python 3 and pip3 installed by default: https://github.com/actions/virtual-environments/blob/master/images/macos/macos-1 0.15-Readme.md -------------------------------------------------------------------------------- eca56f19ef | Alex Jurkiewicz | 2020-04-19 18:46:52 -0400 Make species-gen.py work with Python 2 & 3 Rather than requiring Python 2 installed as 'python' (which is no longer the case on some systems, like MSYS and Alpine Linux). The Makefile will auto-detect python3 and preferentially use it, falling back to python otherwise. (Thanks ebering for this suggestion.) The docs have been updated to specify Python 3 is required -- it seems simpler than explaining all this and it should be the default version assumed for "Python" going forward. -------------------------------------------------------------------------------- 270f1c643a | nirrattner | 2020-04-19 18:39:17 -0400 Prevent overtraining skill targets Currently, skill targets are not always respected when a single experience gain is large enough to push the the skill level to and beyond a skill target. This is fairly easy to reproduce when starting a new game and training only one skill with a skill target of 0.1 -- after the first experience gain, the skill will likely jump beyond 0.1 (perhaps 0.2, 0.3, etc. depending on the gain) before turning off. This change will better ensure that skill targets are respected and not overtrained. It's a minor change with an arguably negligible impact on gameplay, but some players, like myself, prefer to train to "round" numbers ending in .0 or .5 and are put off when the skills are trained beyond the set targets. Potions of Experience will ignore skill targets as in the current behavior. The interaction with the Experience skill menu and training is very cross-loaded code wise: training is called by the skill menu in this case, with very strange results if the skill menu prompt is re-invoked. Correctly handling training targets with !exp in this exact fashion will require a more extensive set of changes that don't seem worth it. [ Committer's note: Closes #1198, Squashed and rebased, tweaked interaction with potions of experience ] -------------------------------------------------------------------------------- ab441bd002 | Alex Jurkiewicz | 2020-04-20 00:51:10 +0800 Always save macros We don't need to ask the player this. It's a simpler mental model for macro changes to be always saved, rather than sometimes asking the player (during normal session end, but not eg webtiles tab close / dgamelaunch hangup). -------------------------------------------------------------------------------- 5fea3be289 | Umer Shaikh | 2020-04-19 11:39:37 -0400 Save compatibility for changes to regen items [ Committer's note: Closes #1291, squashed and reworded some messages ] -------------------------------------------------------------------------------- 4828e68a6e | Umer Shaikh | 2020-04-19 11:37:56 -0400 Make TLA and regen artefacts activate after maxing hp Currently it makes sense to swap to troll leather armour or armour with the regen+ artefact property when resting, provided one is going to rest long enough and can do so in a safe enough position. This is because the regen allows one to rest faster, helping the player deal with the clocks in the game (piety decay, nutrition, portal timers, score). Although in practice this seems to mostly be the province of speed-runners, it's often also a tedious-but-optimal tactic for normal play. This commit makes that tactic unavailable by extending the current disincentive for swapping amulets of regeneration to regen armour. Regeneration items now only affect regen rate after the player has healed to max hp with the item on. Thus benefiting from regen requires a long-term equipment choice. Deactivating a regen item on unequip is moved to an unequip_effect instead of handling it in player_reacts, on the principle that status changes that happen due to unequiping an item should probably happen there. This commit makes it so melding a regen item stops the regen bonus, but does not deactivate the item, i.e., you don't have to rest up to full to get the effect back after untransforming. [ Committer's note: added artefact names to messaging, refactored a switch statement to use comma_separated_line from stringutil instead ] -------------------------------------------------------------------------------- 0ddb669d6f | Umer Shaikh | 2020-04-19 10:36:55 -0400 Refactor some regen code Factor out the logic for activating a prop if some condition is met, which was repeated several times for activating regeneration, mana regeneration, and acrobat amulets when hp or mp maxes out. This function isn't used anywhere else, and that seems unlikely to change soon, so it's now a static function in player-reacts.cc. -------------------------------------------------------------------------------- 2d4e2cfd7f | advil | 2020-04-19 09:59:23 -0400 Simplify mac zip naming I can't think of a good reason to have a different naming scheme depending on whether it is a release or not. -------------------------------------------------------------------------------- d808e8321f | advil | 2020-04-19 09:59:23 -0400 A few more windows build cleanups (Goratrix) Also, clean up the use of `rm` a bit, add back in the overall zips target (n.b. I haven't tested this, but it doesn't appear that make clean will delete these.) The windows build process here looks like it is in need of a thorough overhaul, I have to say. For example, why are these targets invoking `make clean` instead of taking `clean` as preconditions? Why isn't the cross-compiling check a precondition? etc. -------------------------------------------------------------------------------- 363036d654 | Goratrix | 2020-04-19 09:59:23 -0400 WIndows installer package build cleanup 1. The installer package build (unlike the zip build) currently doesn't delete the build-win folder after it finishes and the folder needs to be deleted manually. There may be reason that I'm missing, but I can't think of any, as the zip build deletes the folder, only the installer build doesn't. 2. The final win packages are actually named 'stone_soup...', so update gitignore accordingly. -------------------------------------------------------------------------------- 03277fe0e5 | Alex Jurkiewicz | 2020-04-19 09:59:23 -0400 Remove unnecessary continuation -------------------------------------------------------------------------------- 449611fb78 | Alex Jurkiewicz | 2020-04-19 09:59:23 -0400 Simplify CI version detection actions/checkout only gets the most recent commit by default, which means DCSS's version detection system (based on most recent tag) doesn't work. We were faking the release version for non-release builds and loading the version from a special variable for release builds, which was a little complex. It's simpler to get the repo's full history and rely on our existing version detection logic. -------------------------------------------------------------------------------- 520075d945 | Alex Jurkiewicz | 2020-04-19 09:59:23 -0400 Update release process Re-organise the process from: 1. Tag locally 2. Build and test locally 3. Push the tag 4. Upload builds To: 1. Tag and release on GitHub 2. Builds are created automatically -------------------------------------------------------------------------------- d17ee4b226 | Alex Jurkiewicz | 2020-04-19 09:59:23 -0400 Upload release builds to GitHub releases Whenever a GitHub release is created, GitHub Actions will add the following builds: * Windows (32-bit) console & tiles zips, plus combined install * macOS console & tiles apps Also make the following changes: * Disable some unnecessary Clang builds * Rename windows package Makefile targets * Use advzip on macOS packages -------------------------------------------------------------------------------- 50c693f418 | riverfiend | 2020-04-18 19:14:10 -0500 New Hep+Dith shared overflow altar Committer's Note: Cleaned up glyph usage, simplified some statements, and tweaked wall tile placement to be a bit more symmetrical. Closes #1352. -------------------------------------------------------------------------------- 58bd18402a | Edgar A. Bering IV | 2020-04-18 17:28:10 -0400 Prevent allies from blinking near traps (Pekkekke) Since most traps target the player and the remaining remove the ally from the player's presence, make allied monsters avoid blink activities when traps are in sight. This includes blinking other monsters; making a blanket exception is easier than conditioning on trap type. -------------------------------------------------------------------------------- 0be837aa77 | Kate | 2020-04-18 20:23:08 +0100 Don't allow casting Tukima's Dance under Sac Love -------------------------------------------------------------------------------- ab8e1e778f | Nikolai Lavsky | 2020-04-18 13:05:14 -0400 Tweak lava pools in nicolae_crawler_farm Currently, this vault has a few demonic crawlers trapped behind lava, because they can no longer cling to walls. -------------------------------------------------------------------------------- c6e39c492d | Goratrix | 2020-04-18 12:54:38 -0400 Adjust Vehumet gift range Based on discussion in Mantis ticket 12221, this tweaks the range of Vehumet spell gifts to try to avoid repeated offers at gifts number 10, 11 and 12. Extending the range from 6-7 to 5-7 is a small nerf, however level 5 contains desirable spells (Fireball, LRD). To compensate, range of gift 12 (the last one before the final) is extended from 6-7 to 6-8. -------------------------------------------------------------------------------- 3ae22969f6 | Byrel Mitchell | 2020-04-18 12:47:43 -0400 Add room for tactics to arrival vaults in small.des evilmike_arrival_hilbert_curve: Pretty much regardless of which entrance you have, you're stuck with a single exit. There's no handy way of adding pillars or additional exits without messing with the hilbert curve theme, so I just added some escape hatches. evilmike_arrival_rings: Each ring has a single exit, and the internal path is split so you can't use it as an pillars. I added a second door to the outside. minmay_arrival_stair_chambers: This vault already placed statues in place of the unused entrances, which served as pillars. However, this was pretty spoilery since they're in enclosed rooms. I added windows to the rooms so a player unfamiliar with the vault can know they have that option. minmay_arrival_stone_box: This vault has a stone box with a pillar inside, so if the surrounding dungeon gen is particularly hostile you can retreat into there. However, it was not no-monster-gen (so you could get trapped in there) and there was no way for an unspoiled player to know there was useful terrain in there. I added windows and no_monster_gen to the corridor in the box. minmay_arrival_statue_studded: This vault was a single exit box. I added two side-exits. erik_arrival_orb_chamber: This vault had three problems: it was spoilery (placing a big horde of rats inside), had potentially uninteractive starting terrain depending on dungeon layout, and deviated from the layout it's supposed to evoke in order to keep the rats from being zapped on dungeon entrance. I reworked it so that you start in the orb chamber, and the rats are replaced with orb guardian statues (which your neophyte adventurer only knows as 'hideous four-limbed creatures'.) I also modified the terrain to more exactly match the hall of zot orb chamber. Selecting orb guardian statues required adding a synonym in dc-feat.txt dpeg_arrival_lava/water_altar: These vaults potentially placed an altar over a deep water/lava pool from the player, with a dice roll deciding whether the player could see it without flight. I guaranteed that it's in sight of an accessible tile to avoid rewarding spoiled players, and added a small pillar around the start to allow for tactics. dpeg_arrival_chase: This vault places 5 kobolds around some stones across deep water from the player, and some other monster across deep water on the other side of the player. The gimmick here doesn't work any more; all the placed monsters are zapped because they're in LoS. It also wouldn't work because they wouldn't pick up the stones, and I'm not sure it's a really good arrival vault concept in the first place (can 4 kobolds with stones kill a NaWr before it gets out of the vault? Or a bad NaWn roll? etc.) So I removed it. dpeg_arrival_rooms_c: This vault has a 4-tile deep water pillar which will probably be entirely replaced by shallow water due to pool fixup. So I added no_pool_fixup. dpeg_arrival_shrine: This vault was single-exit. Instead of randomizing the location of the single exit, I made it always place both. dpeg_arrival_stone_temple_mockup: This vault is single-exit. I added no_pool_fixup to ensure the 4 pools can serve as pillars. dpeg_arrival_lava_temple_mockup: This vault is single-exit. Adding pillars or additional exits might disrupt the homage (I'm not familiar with the source) so I added an escape hatch. dpeg_arrival_leaves_temple_mockup: This vault is single-exit. Adding pillars or additional exits might disrupt the homage (I'm not familiar with the source) so I added an escape hatch. zelgadis_glass_arrival_large: This vault is a single exit spiral. I cut the spiral at the center to provide a small pillar. dpeg_arrival_stonehenge_12_columns: This vault is essentially an open plane near the center; with no_monster_gen off it's possible for you to not be able to get to any of the distant pillars. I added an escape hatch near the center in case you get such a bad roll. dpeg_arrival_simpleton_b: This vault could be a single-exit room, if you spawned in the north-east room, and it's possible for none of the features in the large room to be statues. I added a couple doors to the rest of the vault from the north east room, which provides a pillar and a second exit no matter where you spawn. dpeg_arrival_prison: This vault is a single-exit room. I added a pillar. dpeg_arrival_ratfight: This vault could be a single-exit room. I made the other exit guaranteed. dpeg_arrival_houses_and_road: This vault had a single exit staring room. I added a guaranteed second exit. zaba_arrival_water: This vault had the potential that you could be spotted by a monster outside the vault which could block you into the shallow water (and if it was a gnoll with polearm or a swimmer, potentially keep you from going back and looping to another path.) I changed the exits to doors to prevent you triggering stealth checks till you're to the final room. lemuel_arrival_tunnels: This vault was single exit. I added a couple of guaranteed pillars lemuel_arrival_broad_hall: This vault's internal pillars had a 1:6 chance of not existing. Removed that chance. lemuel_arrival_behind_the_door_large/small: This vault was effectively single exit. I added a couple pillars. dpeg_arrival_pond: This vault is an open alcove with one exit. I added a small shallow water path to loop around. dpeg_arrival_rhombi: This vault has a single exit. I added some internal doors to guarantee an internal island. dpeg_arrival_arbitrary_a: This vault could be single exit. I made it guaranteed that you can access both exits, and added a small pillar. dpeg_arrival_subterranean_lakeside_camping: This vault could be single exit. I made it guaranteed that you can access both exits. dpeg_arrival_more_subterranean_lakeside_camping: It was possible for this vault to generate without a path to the exit for one of the starting locations, invalidating its placement. I fixed it so there's always a path to the exit. dpeg_arrival_erosion: With monsters generating, your starting room was single exit. I turned on no_monster_gen so you have access to the good terrain in the vault. dpeg_arrival_round_a/b: Cleaned up a meaningless shuffle line. dpeg_arrival_short_road: The starting room could be single exit into the monster-generating vault. I added another exit and a pillar to the NW starting room. dpeg_arrival_court: The starting rooms were single exit into the monster generating vault (with lots of good terrain.) I marked part of the vault near the start doors as no_monster_gen. dpeg_arrival_signposts: Added a pillar to this single exit room. onia_arrival_mini_maze/_b: It was possible to get stuck in the starting corridor. I added a corridor break which provides a pillar and ensures you can get out regardless of where a single monster spawns. onia_arrival_handbag: This vault had some cruft in it, including an escape hatch UP specified. I cleaned that up and added a small pillar and 'back door' to your nearby escape hatch to each starting location. eino_arrival_cavern_e: This vault is single-exit. I added a pillar. onia_arrival_zoo_common: It was possible to get trapped in your starting corridor by a monster just outside your LoS. I added no_monster_gen to the tiles where this would be possible. minmay_arrival_arboretum_small: Depending on what the dungeon generated, this could be a pretty nasty start. I added a couple of glass pillars. co_arrival_random_square_maze: This was a single exit vault. I made it generate three exits to the vault. sevenhm_arrival_forest_fort_small_2/4/5: These vaults were single exit and I added a second one. sevenhm_arrival_forest_fort_small_3: This vault was single-exit so I added a tree as a pillar. saegor_arrival_miasma: This vault was single exit so I added a second one. lightli_arrival_statuegarden: This vault was single exit so I added a second one. lightli_arrival_windingriver: This vault was single exit so I added a tree to serve as a small pillar. nicolae_arrival_washed_ashore: This vault is single-exit, but one of my favorite-flavors. I added some ruined pillars randomly placed on the beach to allow for tactics. minmay_arrival_shattered_statue: The first part of theis vault is single-exit, but the second room has a stuatue to walk around and two exits. I marked the vault as no_monster_gen. wander_arrival_fairy_ring: It was theoretically possible that no trees or fungus placed in this vault; I added a guaranteed tree in sight of the start. [ Committer's note: Formatted commit message to 80 cols and resolved conflicts with #1304, Closes #1327 ] -------------------------------------------------------------------------------- 4798a01ea9 | theJollySin | 2020-04-18 12:20:43 -0400 Add room for tactics in small arrival vaults Add another exit to: * evilmike_arrival_fibonacci_small * minmay_arrival_stair_chambers * minmay_arrival_widening_spiral_wide * dpeg_arrival_lava_temple_mockup Add a pillar to: * evilmike_arrival_grusome_pit * minmay_arrival_widening_spiral_narrow * minmay_arrival_loop * evilmike_arrival_sounds_zot Remove: * evilmike_arrival_sounds_zot * onia_arrival_larder [ Committer's note: Closes #1304 ] -------------------------------------------------------------------------------- 0023389d77 | gammafunk | 2020-04-18 01:30:19 -0500 A new curse skull tile (kormed) -------------------------------------------------------------------------------- d415a3ffb0 | Emily | 2020-04-18 01:50:08 -0400 Rename the book of Enchantments to Hexes It no longer contains any Charms, so the historical name doesn't make sense any more. -------------------------------------------------------------------------------- 8b45d1b2b9 | Emily | 2020-04-18 01:50:08 -0400 Rename deflection to repulsion in code and dumps Now that DMsl is gone, this function corresponds exactly to whether RMsl is active, and /deflect(ion)?/ barely appears in the codebase or output, so standardize on the simpler terminology. -------------------------------------------------------------------------------- 5ff3ae7edd | Emily | 2020-04-18 01:50:08 -0400 Remove logic for multi-level missile deflection With the DMsl spell gone, missile_deflection() can only ever be 0 or 1; change the return type to a bool and remove obsolete DMsl-handling code. -------------------------------------------------------------------------------- 2ea948a12f | Emily | 2020-04-18 01:50:08 -0400 Give monsters that had Deflect Missiles +2 EV To compensate for the nerf. -------------------------------------------------------------------------------- c449921327 | Emily | 2020-04-18 01:50:08 -0400 Remove the Deflect Missiles spell The RMsl spell was removed in 6993651381ec54b41ad219c4c6380028b2801db6, and most of the arguments for its renewal also apply to DMsl. It's true that it requires much more investment, but that also makes it much more marginal: we carry around the code and design complexity of multiple missile repulsion levels, and the notion of non-expiring "permabuff" spells, for a spell that essentially duplicates an item property but stronger, without it even being something that most characters will have any opportunity or reason to learn. After this commit, the design is crisper and easier to learn: there's one level of missile repulsion and you get it from armour, gods, or intrinsically; spells don't come into it. -------------------------------------------------------------------------------- 53a3069714 | Emily | 2020-04-18 01:50:08 -0400 Remove obsolete temporary RMsl status logic Players haven't been able to access temporary RMsl for some time now. -------------------------------------------------------------------------------- 7dfdf1ca8f | Edgar A. Bering IV | 2020-04-18 01:42:55 -0400 Add miscast effects to spell descriptions Now that miscasts are simplified the effect can fit in a sentence and be displayed to the player. TODO: Decide how to reveal average slow/poly/dimension anchor and nameless horror strength. -------------------------------------------------------------------------------- 6fc3743e77 | Edgar A. Bering IV | 2020-04-18 01:15:19 -0400 Tone down miscast effects and retool severity colors New miscast effects were... a bit too severe. This commit refactors the tuning parameters to the spl-miscast header and turns them up (larger means less severe). Severity colors are also revised, so that "safe" is only displayed only if no secondary miscast effect can happen. -------------------------------------------------------------------------------- 88dfbedd84 | Edgar A. Bering IV | 2020-04-18 01:06:53 -0400 Tone down hell effect miscasts A level 5, fail 50 miscast does 125 damage on average with the new miscast formulas, and fail was being called with random2avg(97,3) for hell effects. This reduces hell effects to level 5, random2avg(40, 3) miscasts, which do a maximum miscast damage of 100, and an average of 50. This will be further reduced by a subsequent commit toning down miscasts over all. -------------------------------------------------------------------------------- 19abc6cbe4 | advil | 2020-04-17 19:48:20 -0400 Put D:1 monsters back to sleep (#1357) 955fa49 tweaked spawn behavior on D:1 to avoid the dungeon entrance, but accidentally (based on comments at least) made them unconditionally awake at the same time, by preventing the `else` branch that put them to sleep from running. Resolves #1357, patch from @c-andy-martin in that issue. -------------------------------------------------------------------------------- 5b70d41e48 | Goratrix | 2020-04-17 11:27:29 -0400 Clarify windows package build instructions Currently INSTALL.md refers to the release guide for building packages under MSYS2, which is not very clear and also doesn't mention the zip and nsis dependencies. While users can figure this out, I think it would be good to have it explained directly in the INSTALL file. Additionally, the 'mingw64/' prefix in row 222 is not needed. -------------------------------------------------------------------------------- b22c70e859 | advil | 2020-04-16 17:26:44 -0400 Fix a typo [skip ci] -------------------------------------------------------------------------------- de7f6e42b9 | advil | 2020-04-16 17:21:10 -0400 Update credits A bunch of the server stuff was very out of date. -------------------------------------------------------------------------------- 0e9e85fc21 | Nikolai Lavsky | 2020-04-17 01:02:29 +0800 Fix the x-mode description of walls covered in ice and blood Currently, if icy walls made by Frozen Ramparts are covered in blood, then they have only the second part of a covering description: for example, "A rock wall, and spattered with blood." -------------------------------------------------------------------------------- 655279ceaa | gammafunk | 2020-04-15 19:52:09 -0500 A spell tile for Frozen Ramparts (CanOfWorms) -------------------------------------------------------------------------------- c44aebf4fe | gammafunk | 2020-04-14 12:15:15 -0500 Update Wu Jian's Whirlwind description (gressup) The pinning effect of Whirlwind was removed in 59c31d1a9, so update the descriptions of the ability in Wu's religion screen appropriately. Replace the text about pinning in the "Extra" table with a line mentioning that Whirlwind can attack multiple monsters at once. -------------------------------------------------------------------------------- 622e69b31f | Alex Jurkiewicz | 2020-04-13 21:28:31 -0400 Send DCSS processes SIGABRT rather than SIGTERM Both signals do the same thing now (controlled crash), but this is hopefully the first step in changing SIGTERM to handle the same way as SIGHUP (cleanly shut down). It was a bit off a toss-up between using SIGQUIT and SIGABRT. QUIT means "quit program" while ABRT means "abort program", so both are probably suitable. But dgamelaunch-config uses ABRT already: https://github.com/crawl/dgamelaunch-config/blob/master/utils/webtiles so we'll follow convention. -------------------------------------------------------------------------------- 398c232eb9 | Alex Jurkiewicz | 2020-04-13 21:06:43 -0400 Example webtiles systemd unit file -------------------------------------------------------------------------------- 357ffb74ea | Alex Jurkiewicz | 2020-04-13 20:45:48 -0400 Correct a step name -------------------------------------------------------------------------------- 713ffed48a | Alex Jurkiewicz | 2020-04-13 20:45:48 -0400 Fix CPU detection on macOS -------------------------------------------------------------------------------- bf642f89ba | advil | 2020-04-13 18:51:32 -0400 Fix a miscast crash If a miscast with BEAM_NEG flavour is triggered, then mons_adjust_flavoured can kill the monster and do monster_die (by way of calling drain->exp). The logic here is overall odd but we can at least fix the crash by assuming that the monster isn't necessarily alive after mons_adjust_flavoured; this could matter for other flavours too. Before this commit, replicable with arena: miscasts 5 pandemonium lord v 20 20-headed hydra delay:0 t:10 -------------------------------------------------------------------------------- d9a95f1d30 | gammafunk | 2020-04-13 17:18:57 -0500 Remove a no longer relevant Donald line -------------------------------------------------------------------------------- 40ae2d4f90 | Kate | 2020-04-13 21:24:33 +0100 Add details to the "Beogh" status light description On the off-chance that somebody forgets how it works but knows to look up the status description. -------------------------------------------------------------------------------- 43196ba697 | Kate | 2020-04-13 21:07:36 +0100 Don't print auto item slot adjustments on turn 0 As with spells being automatically assigned by the RC option, print new slots when they're assigned during play, but not on game start. -------------------------------------------------------------------------------- f7929f599a | Kate | 2020-04-13 20:39:19 +0100 Give the plutonium sword a chance to polymorph monsters again Since it was tragically lost in the rework of miscast effects. -------------------------------------------------------------------------------- a3f3f81586 | Kate | 2020-04-13 18:22:40 +0100 Use BASELINE_DELAY for some enchantment durations -------------------------------------------------------------------------------- 53dc3366b1 | Aidan Holm | 2020-04-13 23:50:13 +0800 Fix bugged acquirement menu (#12234) It looks like select() can do a number of things, including toggling, but was in this instance a no-op. I've switched it to deselect_all() for the sake of readability. -------------------------------------------------------------------------------- 34829ab59b | Aidan Holm | 2020-04-13 22:21:43 +0800 Fix another arena crash (#11894, #12238) This was another crash caused by the tiles rendering code. -------------------------------------------------------------------------------- 6f2fc6eb8c | Edgar A. Bering IV | 2020-04-13 08:56:45 -0400 Nameless horror tile (CanOfWorms) -------------------------------------------------------------------------------- a8ac3e9bb0 | Edgar A. Bering IV | 2020-04-13 07:25:55 -0400 Fix an arena crash -------------------------------------------------------------------------------- 0ecfff5982 | Kate | 2020-04-13 02:43:26 +0100 Tweak wording and fix a typo -------------------------------------------------------------------------------- 8a17258929 | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Update spell failure coloring Now that miscasts roll a consistent damage number (for non-damaging schools this is an abstraction but reflects the degree of the miscast) we can compare the expected value of this abstract damage roll to the player's max hp. The tiers of spell danger are: tier | expected damge | colour "safe" | <= 5% max hp | LIGHTGREY "slightly dangerous" | 5-15% max hp | YELLOW "quite dangerous" | 15-25% max hp | LIGHTRED "extremely dangerous" | 25-50% max hp | RED "potentially lethal" | >50% max hp | MAGENTA While the schools with nondamaging miscasts aren't ever directly lethal, having a very long duration slow, dimension anchor, polymorph, or a very strong namelesss horror show up are probably not going to go well for the player. If this stretches the definition of potentially lethal too far, very dangerous can be brought back for RED tier miscasts. -------------------------------------------------------------------------------- 9c6f73562d | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Implement summoning miscasts A summoning miscast now summons a nameless horror with hd = 2 * dam / 3, where dam is the usual damage roll for a miscast, capped at hd 27. These are durably summoned from spell miscasts, and have an abj_deg of 4 from other sources (spellbinder). -------------------------------------------------------------------------------- 22dff59d80 | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 New Monster: nameless horror This monster is designed to be an hd-scaled summoning miscast. The name is an Earthsea reference, reinforced by the quote. Practically the monster is giant, tanky (120 hp at 15 hd reference point, 10 AC, 2 EV), antimagic swinging (dam = hd * 2 AF_ANTIMAGIC), and has abjuration as a natural ability. -------------------------------------------------------------------------------- 8a08d0b149 | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Refactor monster abjuration to be a true spell Monster abjuration is automatically added to monsters with certain summon spells, but the implementation was a bit of a hack. This refactors the code to use a modern spell_logic struct for abjuration. It keeps the check to abjure instead of using certain summon spells, in lieu of adding SPELL_ABJURATION to a bunch of monster spell books, but the codepath is now similar to legendary destruction instead of a different form of special casing. -------------------------------------------------------------------------------- 3e08ee0495 | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Refactor and revise miscasts Miscast code was notoriously opaque, the array of miscast effects dizzying, and the whole soup not particularly effective at making casting dangerous spells dangerous. This commit re-writes spl-miscast.cc to simplify things significantly. Spell success chances are unchanged, the value of fail is the margin the player misses the casting roll by. Miscasting a spell now has the following effects as a function of spell level and fail: 2 * (level * level * fail + 250) contam and a roll_dice(level, level * fail) / 10 "damage" school effect. The school effects are: - charms: debuff and damage turns of slow - hexes: debuff and damage turns of slow - summoning: TODO in this commit - translocation: damage turns of dimension anchor - transmutation: damage power polymorph (malmutate on monsters) - conjurations, fire, ice, air, earth, and poison all do appropriate flavored damage (with flavor effects). Miscasts from other sources (Kiku and Veh wrath, Hell effects, Spellbinder, and the plutonium sword) skip the contam and just do a school effect. -------------------------------------------------------------------------------- c46e80e7f0 | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Decouple Zot trap effects from miscasts and revise The Zot trap effect code was very old, wedged into the miscast system for convenient access to certain things the old miscast class handled. The effect list was long and had a highly variable impact and threat level. This commit re-implements zot trap effects directly in traps.cc with a much pruned list. The new table of effects is below, with 2/3rds of the weight spent on "evil magic" and 1/3rd on "hostile summoning" as loose categories. Evil magic (total weight 16): - lose 1 + r2a(5,2) stats (weight 4) - 7000 + r2a(13000,2) contam (weight 4) - 2 - 5 turn paralysis (weight 1) - mp drain to 0 wt (weight 2) - petrification wt (weight 1) - random2(20) turns of magic vulnerability (weight 4) Summoning (total weight 8): - word of recall 2 - 4 foes (weight 3) - durably summoned greater demon (weight 3) - malign gateway (weight 1) - twister (weight 1) These effects will need further tuning (and possible re-weighting). -------------------------------------------------------------------------------- dc3872be64 | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Refactor malign gateway creation code Separate out creating the gateway and player spell casting setup, so that gateways can be used without a caster. -------------------------------------------------------------------------------- 1285b1578e | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Remove miscasts from Xom effects Now that miscasts effects are focused and meant to punish spell misuse they are less useful as "random wacky junk" in the Xom effect roster. Removing the lethality margin also significantly simplifies things. Xom effects probably need a more thorough looking-at, but that is beyond the scope of this change. -------------------------------------------------------------------------------- 03a4b90f3d | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Remove miscasts from Kiku wrath Replace them with death curses of a severity equal to the player's XL. In subsequent commits miscasts will be overhauled and simplified. While a necromancy miscast would still be thematic for Kiku, the more varied effects of mummy death curses are a better fit for the god of death. -------------------------------------------------------------------------------- fb0a38e7c0 | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Adjust the scythe of Curses Remove the dependence on necromancy miscasts, replacing them with death curses. On wield the scythe delivers a severity 0 curse, and on hit a severity min(damage done, 27) curse to monsters of natural holiness. Also remove the item cursing. That was a flavourful annoyance more than a serious limitation considering the quantity of ?rc available to players. -------------------------------------------------------------------------------- 336ef83941 | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Refactor and revise Mummy death curses Death curses were previously necromancy miscasts at varying power. This commit implements death curses as their own effect, separated from the miscast system. The effect list is pruned. The remaining effects scale with severity, and the weights among the effects shift with severity. Mummies use their hd for severity; for reference the hds are - guardian mummy 7 - mummy priest 10 - greater mummy 15 - khufu 18 Kiku's partial curse protection divides severity by two. If this isn't good enough, increasing the divisor to 3 should work. New curse effects: "message" - message only, shown only when the player is hit to avoid message spam "pain" - 5 + r2a(2*severity, 2) damage if not rTorm "slow" - severity turns of slow "drain" - x_chance_in_y(severity, 27) chance of 1 + r2a( severity / 3, 2) stat drain (player only) - else (severity / 27) * 100 drain "torment" - torment Effect weights are determined by linearly interpolationg between these two weight sets, with the weight of "message" not permitted to be negative. As a result, Khufu has a slightly lower chance to cause a "pain" curse, and a slightly higher chance to do slow, drain, or torment, compared to a standard greater mummy. | severity | message | pain | slow | drain | torment | | -------- | ------- | ---- | ---- | ----- | ------- | | 0 | 80 | 20 | 0 | 0 | 0 | | 15 | 0 | 40 | 20 | 20 | 20 | -------------------------------------------------------------------------------- 86a13c9327 | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Remove dead code from chaos melee miscasts Now that chaos melee does not use miscasts and the randarts access them through their own codepath this code can be removed. -------------------------------------------------------------------------------- 47bc34da0a | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Remove miscasts from Yred wrath Replace the single necromancy miscast with a bolt of draining. Yred's theme is unlife, not necromancy (that's Kiku). A bolt of draining is a more thematic tool for Yred to use in anger, drain life style. This also has the technical improvement of decoupling wrath from miscasts. -------------------------------------------------------------------------------- 2736e7e68b | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Decouple distortion unwields from miscasts Distortion unwielding penalty is now: 50% teleport to monsters, 25% banishment, 25% severe contam. -------------------------------------------------------------------------------- 7d7414004a | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Adjust Fedhas wrath Remove random elemental miscasts from Fedhas wrath to remove dependence on spell miscast and make wrath more flavourful. The elemental miscasts are replaced with a random choice of Corrosive Bolt, Primal Wave (rain throwback), or Thorn Volley. -------------------------------------------------------------------------------- f8edb28dd6 | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Adjust Cheibriados wrath Replace miscasts in Cheibriados' wrath in two places. Miscasts are used a as a source of "random bad stuff" and its better to have "thematic bad stuff". For "very high tension" retribution, add a lot of noise and then fallthrough to the sleep and slow effects (to bring monsters to the debilitated player). For "low/no tension" retribution, deal some stat damage. The noise is given a clock flavour (Cheibriados strikes the hour.), and the stats are in line with Cheibriados' gifts. -------------------------------------------------------------------------------- 571808c64f | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Adjust Lugonu wrath Replace the (50% translocation miscast/50% random translocation) part of the wrath with: (50% teleport to monsters / 25% banishment / 25% just summons). This is to decouple wraths from spell miscasts while keeping the most impactful translocations of Lugonu's wrath. -------------------------------------------------------------------------------- a40a96fbb7 | Edgar A. Bering IV | 2020-04-12 19:58:39 -0400 Adjust Trog wrath Remove the chance for rotting; while it was intended as "physical damage" (judging from the comments) rotting is necromantic. Replace the fire miscasts with a pure fireball, to remove the dependence of Trog wrath on miscast code. A fireball scaled with player XL is a fine "firey rage" to fit with the theme of Trog. -------------------------------------------------------------------------------- 59c31d1a9f | Kate | 2020-04-13 00:07:44 +0100 Remove the pinning effect from WJC whirlwind attacks The pinning effect allowed for near-free escapes from any enemy, without even requiring a successful martial attack. Remove the pin so that whirlwind attacks are just focused on their main function of allowing attacks against multiple targets while moving. -------------------------------------------------------------------------------- c9e437d3e5 | Kate | 2020-04-13 00:07:44 +0100 Refactor and simplify Heavenly Storm Re-implement the scaling bonus from Heavenly Storm in a similar way to Powered by Death, using a prop and cleaner way of decaying the bonus. The slaying bonus now starts at 5, is capped at 15, increases by 1 per martial attack, and decays by 1 every 20-30 aut, with the storm expiring once it reaches 0. -------------------------------------------------------------------------------- ac708d3437 | Kate | 2020-04-13 00:07:44 +0100 Clear water elemental engulfing when walljumping -------------------------------------------------------------------------------- 404d5d30d4 | Kate | 2020-04-13 00:07:44 +0100 Make WJC wall jumps only activatable via the ability Activating it by moving into a wall was extremely complicated on the code side, and on the player side it resulted in a lot of interface inconsistency for little benefit compared to just consistently treating it as a regular ability. -------------------------------------------------------------------------------- 84dc20635f | Aidan Holm | 2020-04-12 20:50:03 +0800 Revert "Shut down cleanly on SIGTERM" Reverted because the stale process handler uses SIGTERM to terminate hung processes (process_handler.py:487). Unfortunately this is not something that's easy to change, since webtiles servers generally do not restart automatically. This reverts commit 4d5fadd62c62fa2ab1704ed8f00dd03fea444a06. -------------------------------------------------------------------------------- be65d2b916 | Aidan Holm | 2020-04-12 19:17:31 +0800 Work around crash caused by early-game messaging This works around a crash caused by a Gnoll skills check during game resumption. If a gnoll had all skills at 27, a message was printed before the game had been fully restored. The check changed in this commit blocks layout changes until the game has been fully restored; this also prevented the message window from being given a size. To work around this, we explicitly give the message region an arbitrary size. Unfortunately I can't remember which parts of the tilesdl code were crashing or how to reproduce that issue. The underlying issue is that the message handling code does its own screen output. But, as with all things crawlcode, this is extremely non-trivial to fix. Fixes #1346. -------------------------------------------------------------------------------- 01bdca394d | Aidan Holm | 2020-04-12 19:11:43 +0800 Fix lint errors in util.py, and add type hints This is made somewhat more complicated by Tornado hinting some functions as accepting a str with a default of None; necessitating several type ignore comments. Some more were added to quickly deal with the forced addition of an attribute to instances of one of Tornado's classes (not a great idea...). This also removes a race condition from the FileTailer class. -------------------------------------------------------------------------------- 2f0c327db6 | Aidan Holm | 2020-04-12 17:49:21 +0800 Remove needless conditional compilation for MSVC This code removed the PURE annotation for MSVC, but there were already other instances of unguarded PUREs throughout the codebase, so these are likely safe to remove. Easy enough to conditionally undefine PURE if needed. -------------------------------------------------------------------------------- 5222f23389 | Alex Jurkiewicz | 2020-04-12 17:09:29 +0800 Fix humanise_bytes unit -------------------------------------------------------------------------------- 4d5fadd62c | Alex Jurkiewicz | 2020-04-12 15:56:57 +0800 Shut down cleanly on SIGTERM Treat SIGTERM the same as SIGHUP -- eg gracefully save and quit. When a SSH client disconnects from a remote session (eg, with dgamelaunch), the session processes receive SIGHUP. But if a local user runs eg `killall crawl`, the processes are sent SIGTERM which crashes the game. Most job control systems (eg systemd, docker) send SIGTERM, so it makes sense to handle this with the logic that already exists for SIGHUP. Don't rename any of the functions or variables relating to this, eg handle_hangup or seen_hups. That can be done in a future commit, if desired. -------------------------------------------------------------------------------- 26c3a87c45 | gammafunk | 2020-04-11 00:02:29 -0500 Adjust wall selection for Frozen Ramparts (#1330) This spell used a distance iterator to select walls in range, but that iterator requires locations to be in bounds for player movement, meaning at least two squares from the map border. This meant that the spell couldn't affect otherwise normal walls adjacent to the map boundary, as seen in #1330. This commit switches to a LOS_NO_TRANS radius iterator, letting the player affect these walls with Frozen Ramparts. The use of LOS_NO_TRANS is a new restriction, but is appropriate since we don't generally allow damaging monsters behind glass. Additionally, this commit allows the spell to work on permarock walls, since there's no reason why these should be excluded. Closes #1330. -------------------------------------------------------------------------------- 23b457fb4a | gammafunk | 2020-04-10 20:04:04 -0500 Fix icy wall descriptions The icy walls made by Frozen Ramparts have a covering description for the 'x' and 'x-v' commands that wasn't updated when the spell was changed in c9638ee9a. Update the descriptions to refer to ice instead of icicles, and expand the wall covering description to give the effect details we provide for the spell. -------------------------------------------------------------------------------- 4f93b0e1ec | gammafunk | 2020-04-10 17:18:34 -0500 A Gauntlet map with a choke point The map gammafunk_gauntlet_mixed_choke_point features mostly 7x7 arenas, but with all 9 paths leading through a central 9x9 arena. The paths start with a choice of 3 7x7 arenas that are tier 1 difficulty, leading to the central arena that has a 50% chance to be tier 2, followed by a choice of 3 7x7 arenas that are tier 2. -------------------------------------------------------------------------------- 73332aeda9 | gammafunk | 2020-04-09 01:48:48 -0500 A gauntlet map featuring an early escape option The map gammafunk_gauntlet_77_escape_option features a linear path through 5 7x7 arenas where the player may take a transporter to the minotaur after each of the first four arenas instead of proceeding. Arenas upgrade to tier 2 difficulty as early as the 3rd arena, with the loot count likewise increasing. The average total loot from all arenas is 8.75 items, which is a bit higher than the average of 7.5 for other maps, but getting all items requires completing all 5 arenas. It's fairly likely that the player will encounter a difficult arena and want to exit to the minotaur instead, but the extra loot in the later arenas might compel them to take a risk. -------------------------------------------------------------------------------- f7d8cd8a05 | advil | 2020-04-08 21:44:19 -0400 Fix some demonic rune messaging issues (12232) The main problem here was that these mpr calls weren't run from the vault epilogue. Of course, epilogues were somewhat broken until recently so fixing those was a precondition for this commit. The logic fo holy pan is still a bit odd but I think it shouldn't cause any major problems unless pan ever gets pregenerated in bulk. The rest of 12232 was already fixed in ea548f19b60. -------------------------------------------------------------------------------- 50bb873abc | advil | 2020-04-08 21:17:03 -0400 Make vault epilogues work again This mostly affects messaging when entering wizlabs, and in cases where a special panlord level generated as the first Pan level and this level got generated out of order. (Could happen on full pregen, or if a player entegered a zig before pan.) Epilogues have been semi-broken since pregeneration. They are intended to run after the player has entered the level, but before pregeneration this always happened immediately after level generation with a guarantee of full generation information kicking around. The bug is that if a level is generated and not immediately entered, its vaults get saved to disk and the epilogue is not serialized. On load, an incomplete map_def is used for the vault information that is missing most things you'd need for generation (rightly so), including the epilogue. So the epilogue code tried to run, but was always empty in this case. Rather than serialize the epilogue (which may be possible, but seems like a bit of a minefield as I don't think we serialize any lua code right now), the fix here is to run the epilogue from the current .des cache's copy of the map. Obviously this could lead to save compat issues, but this is exactly how lua code for markers is handled and the issues are the same. -------------------------------------------------------------------------------- 0472a16d6a | advil | 2020-04-07 12:23:58 -0400 Suppress builder dprf spam from main message window by default These logs are saved with the level via a message_tee and are accessible via &ctrl-l in wizmode. This is basically because incremental pregen in a fulldebug build produces a huge amount of log spam whenever any non-trivial level change happens. Hopefully this doesn't step on some workflow I'm not thinking of, but it's configurable (and could be made more configurable). -------------------------------------------------------------------------------- 633e9c3c14 | advil | 2020-04-07 00:02:33 -0400 Work around a seed stability issue in regret_index_temple_of_mockery This places different monsters depending on player species. The choices it makes can affect rng differently depending mainly on the items that come with some of these monsters (but potentially other factors as well). This commit works around the problem by placing the mocking monster when the player enters los, rather than immediately. An alternative would be to use a subgenerator (perhaps for all vaults, or for some with a specified tag), but there's not a great way to do that that doesn't have a huge effect on many seeds that I came up wuth. It still might be worth doing in trunk. (cherry picked from commit d1d2a07e1b2fd3e404ac047ccad46cef83ad69a9) -------------------------------------------------------------------------------- 14964f1db5 | Edgar A. Bering IV | 2020-04-06 12:02:15 -0400 Make distortion tacticool The teleportation effect was a "light instakill" for distortion, with a variable impact from "a bit more than blink" to "that was a tough monster I don't want ambushing me so now I've got to hunt it down". Banishment works better as a true instakill, and the remaining weights have been moved to the other distortion effects. For comparison the old weights table: 33, SMALL_DMG 22, BIG_DMG 5, BANISH 15, BLINK 10, TELEPORT 10, TELEPORT_INSTANT 5, NONE And the new weights table: 35, SMALL_DMG 25, BIG_DMG 10, BANISH 20, BLINK 10, NONE This was not a proportional distribution of weight, and if the new distortion becomes too strong with a 10% banish these numbers can be further adjusted. -------------------------------------------------------------------------------- 9dbc7a090b | Alex Jurkiewicz | 2020-04-06 23:58:22 +0800 Add a basic gitignore -------------------------------------------------------------------------------- 3c463ed35c | Alex Jurkiewicz | 2020-04-06 23:58:22 +0800 Allow editing non-existent RC files Servers no longer need to create a blank RC file for every player in every game 🙌. -------------------------------------------------------------------------------- 2cfbf905ed | Alex Jurkiewicz | 2020-04-06 23:58:22 +0800 Fix to numeric game IDs -------------------------------------------------------------------------------- 763baa6c66 | Alex Jurkiewicz | 2020-04-06 23:58:22 +0800 Improve test coverage of auth.py -------------------------------------------------------------------------------- 1f78941bf9 | Alex Jurkiewicz | 2020-04-06 23:58:18 +0800 Add humanise_bytes() helper method Pypi's humanize cannot be used, as it is 3.5+ only. -------------------------------------------------------------------------------- e1c5cbf416 | Alex Jurkiewicz | 2020-04-06 23:39:22 +0800 Remove useless ValueError catch _parse_login_cookie() handles internal ValueErrors, and the remaining code shouldn't raise one. -------------------------------------------------------------------------------- e1ddf72ad1 | Alex Jurkiewicz | 2020-04-06 23:38:53 +0800 Fix returning user auto-login Not sure what caused this change in behaviour -- possibly related to Python 3 and/or Tornado upgrade? -------------------------------------------------------------------------------- 57989bdc17 | gammafunk | 2020-04-06 02:21:30 -0500 Fix Royal Jelly spawns for Absolute Zero Just as we do for Uskayaw's Grand Finale and other means of killing the Royal Jelly, run the usual fineff to create spawns when the monster is killed by Absolute Zero. -------------------------------------------------------------------------------- 31aab680a6 | gammafunk | 2020-04-06 02:05:22 -0500 Rework Absolute Zero range and spell noise Although this spell has some fundamental limitations compared to the other level 9 direct damage spells given its single monster effect and target randomization, it does feel kind of "cheap" at the highest ranges. Deleting a monster that comes into view in a single turn may be a valid effect for such a high cost spell, but doing this repeatedly can be a bit dull. This commit limits the range of Absolute Zero to 5 and restores the original behaviour of having noise scale with spellpower. The spell makes noise 40 effect at 0 spellpower, scaling down to 0 effect noise at spellpower 200. The casting noise of 9 at the player's position will always be present. Additionally we fix the spell noise display to properly consider spellpower in the noise description. This change doesn't prevent combinations of Vehumet, Darkness spell, Robe of Night, and the Nightstalker mutation from achieving LOS range for the spell, but getting those things in the right combination is at least somewhat rare. -------------------------------------------------------------------------------- de951dce62 | Aidan Holm | 2020-04-06 00:43:26 +0800 Don't use ncurses CFLAGS on tiles builds -------------------------------------------------------------------------------- 143fc31978 | Aidan Holm | 2020-04-06 00:43:26 +0800 Refactor LUA_PACKAGE/BUILD_LUA handling Again, the high-level goal (build lua if there's no suitable system version) was obscured by the huge if-else structure. -------------------------------------------------------------------------------- 79a37018c4 | Aidan Holm | 2020-04-06 00:43:26 +0800 Detect -rdynamic support automatically The platform-specific lines obscure the high-level concept: we want -rdynamic if it's available. -------------------------------------------------------------------------------- 31213489bf | Aidan Holm | 2020-04-06 00:43:26 +0800 Remove unused platform detection code The less of this gunk, the better. -------------------------------------------------------------------------------- cbee7f0cb1 | Aidan Holm | 2020-04-06 00:43:25 +0800 Use includes relative to source directory This makes the locations of files more obvious, allows improved file navigation in Vim, and eliminates the possibility of files being shadowed from the wrong directory. -------------------------------------------------------------------------------- 0fc42ec244 | Nikolai Lavsky | 2020-04-06 00:27:08 +0800 Allow autotravel to shafts (12196) Also, fix autotravel trying to path around shafts and ignoring shorter routes. -------------------------------------------------------------------------------- 4845790874 | Nikolai Lavsky | 2020-04-05 02:11:30 +0800 Fix stash search menu not showing tiles for some dungeon features Commit 4e0c6439 introduced a couple of bugs: * the stash search menu no longer displays tiles for some dungeon features, e.g. altars; * the ?/F lookup-help finds nothing for queries like `trap`, and `.*` displays a hard-coded description of a dry fountain instead of showing a list of all features. This happens because feat_by_desc() can no longer find a feature's dungeon_feature_type in the feature description cache. Previously, all feature names stored in the cache ended in a full stop. After 4e0c6439, strings returned by feature_description() no longer end in a full stop. As a result, the cache has no feature names that end in a full stop too, so feat_by_desc() should be changed accordingly. -------------------------------------------------------------------------------- 6fb8d1b6dd | Goratrix | 2020-04-05 02:07:10 +0800 Correct meliai and hornet spectral and simulacrum To properly derive the bee spectral and simulacrum tiles from the new meliai and hornet zombies. -------------------------------------------------------------------------------- 2667425ccc | Alex Jurkiewicz | 2020-04-05 01:56:15 +0800 Fix import sorting -------------------------------------------------------------------------------- 19a9338ac1 | Alex Jurkiewicz | 2020-04-05 01:56:15 +0800 Fix isort arguments -------------------------------------------------------------------------------- ccf301f2a3 | Alex Jurkiewicz | 2020-04-05 01:56:15 +0800 Add CI for webserver -------------------------------------------------------------------------------- 32492954b1 | Aidan Holm | 2020-04-05 01:55:05 +0800 Fix spurious lint failure -------------------------------------------------------------------------------- 603da076d2 | gammafunk | 2020-04-04 00:26:41 -0500 Fix some issues in a vault The vault gammafunk_dig_for_victory used light blue coloring for transparent stone, but this is the same color used for grates. Remove most of the wall recoloring, using it only inside the vault for transparent stone that's surrounded by transparent rock. This recoloring helps to draw attention to which tiles are diggable without looking odd from the outside. Supplement the wands charges in the supplied wand of digging so that it will have enough to dig a reasonable number of times if the player is going through the vault carefully. Also supplement the loot with more good potions and scrolls, so that we're more likely to tempt people in. Finally, remove no_item_gen, since it's not necessary, fix up the no_tele_into KPROP, and realign the DES statement. -------------------------------------------------------------------------------- a8a4922b4f | gammafunk | 2020-04-04 00:26:41 -0500 Update loot in a vault Supplement gammafunk_its_a_trap with more good potions and scrolls, so that we better cover the variety of things that might tempt a player. Also properly align DES statements. -------------------------------------------------------------------------------- e9988fc0fb | Edgar A. Bering IV | 2020-04-03 11:23:51 -0400 Allow autotravel to snuff foxfires (12188) Now that there is no self damage for walking into a foxfire autoexplore should walk through them. -------------------------------------------------------------------------------- 54349f4560 | Edgar A. Bering IV | 2020-04-03 11:19:46 -0400 Add attack strength punctuation to Vamp Drain (12183) -------------------------------------------------------------------------------- 3851f72b99 | Edgar A. Bering IV | 2020-04-03 10:45:29 -0400 Refactor and revise monster target acquisition set_nearest_mosnter_foe is very old, it has its own duplication of a distance_iterator. This commit refactors the function to use a distance_iterator and adds a LOS restriction to cells considered. As a consequence, ball lightning and foxfire no longer attempt to get at monsters on the other side of clear rock. -------------------------------------------------------------------------------- 2b5350a25b | Edgar A. Bering IV | 2020-04-03 10:45:28 -0400 Prevent torpor snails from slowing conjurations (12190) Foxfires and ball lightnings are spell intermediaries, not true monsters, and should not be slowed by torpor snails. -------------------------------------------------------------------------------- b30f108f01 | Kate | 2020-04-02 20:29:13 +0100 Add a missing TAG_MAJOR_VERSION check -------------------------------------------------------------------------------- 7f8a7979f0 | Nikolai Lavsky | 2020-04-01 22:47:36 -0500 Fix stray commas in chardump notes for dungeon features After c225cfcd, notes for dungeon features end in a comma instead of a full stop. For example, "60174 | Depths:2 | Found a sacrificial altar of Ru," -------------------------------------------------------------------------------- 25a338df49 | Andrew York | 2020-04-01 15:33:21 -0500 Update god-abil.cc Add "Absolute Zero" to the list of spells Vehumet supports (and therefore, can gift, right?) -------------------------------------------------------------------------------- bc3157b2f0 | nlavsky | 2020-04-01 20:34:05 +0100 Tweak staff of Olgreb description (#1334) As a followup to 234afa57, this commit replaces an outdated reference to multiple evocable spells with a reference to OTR. -------------------------------------------------------------------------------- 890751e744 | gammafunk | 2020-03-30 19:46:51 -0500 Update the changelog Through 0.25-a0-696-g42a9e46d90. -------------------------------------------------------------------------------- 42a9e46d90 | gammafunk | 2020-03-30 15:20:50 -0500 Fix grammar in a spell description (Goratrix) For Frozen Ramparts, fix a sentence and rephrase the description of how only one wall affects a monster at a time. -------------------------------------------------------------------------------- ec580293c3 | gammafunk | 2020-03-30 14:06:41 -0500 Update the Frozen Ramparts description Give some more basic details about how the damage works. -------------------------------------------------------------------------------- c26c3c957c | gammafunk | 2020-03-30 14:06:41 -0500 Reduce the range and damage of Frozen Ramparts This spell's current radius of 3 can create a quite large number of squares in typical use cases: 9 in corridors and potentially much more than this when used at junctions of multiple paths. Reduce the radius of effect to 2, which still gives plenty of affected squares. Also reduce the portion of the damage affected by spellpower by 20%. At a max spellpower of 50, it will slightly exceed the damage of Freeze. These changes will bring the damage per cast a bit more in line for a single school, level 3 spell. -------------------------------------------------------------------------------- b2edecfc75 | gammafunk | 2020-03-30 14:06:41 -0500 Use a spell range lookup instead of a constant All of the relevant code already has access to the spell range lookup function, so use this instead of an additional constant that could get out of sync with the spell data. -------------------------------------------------------------------------------- 52d85a3de6 | Kate | 2020-03-30 19:14:22 +0100 Make Frozen Ramparts damage awaken monsters -------------------------------------------------------------------------------- 382ef09bc6 | Umer Shaikh | 2020-03-31 00:50:09 +0800 Check holiness before casting dispel undead Commit 3b7ae84e64 removed SPELL_DISPEL_UNDEAD from monsters and replaced it with SPELL_DISPEL_UNDEAD_RANGE, but forgot to update the case in _ms_waste_of_time accordingly. This resulted in monsters attempting to cast dispel undead on non-undead creatures; before they never thought that was worth trying. This commit restores the check. -------------------------------------------------------------------------------- 234afa57d4 | Kate | 2020-03-30 02:20:06 +0100 Adjust the staff of Olgreb Give it a chance to deal poison arrow-flavoured damage on hit (similar to regular enhancer staves but only checking evocations skill), and remove its chance of casting Venom Bolt on top of OTR when manually evoked. -------------------------------------------------------------------------------- 75bb5f1c00 | Kate | 2020-03-30 01:55:52 +0100 Rework staves of poison Give them the same type of resistible damage-on-hit effect as other evoker staves, instead of just a weak skill-based chance to inflict poisoning. -------------------------------------------------------------------------------- f17ce215b2 | Kate | 2020-03-30 01:55:42 +0100 Consider magical staves and pain weapons to be wizardly for Trog conducts Pain-branded weapons and evoker staves were technically permitted under Trog, but very unlikely to be useful unless converting with the relevant skills already trained, which resulted in awkward edge-cases for some types of acquirement or chances of offering nearly-useless items. Instead add a stricter conduct preventing their use, resulting in piety loss or penance for making attacks with magical staves (including the various unrand staves) or pain weapons, or for evoking their abilities. -------------------------------------------------------------------------------- efd68434e6 | Kate | 2020-03-30 01:55:07 +0100 Rework the phial of floods The combination of high direct damage and summoned water elementals made it substantially more powerful than a lot of other evokers. Remove its very powerful summons, but keep their effect of applying temporary silence by applying a "waterlogged" enchantment to enemies within the flooding area. -------------------------------------------------------------------------------- a947b41d75 | Kate | 2020-03-30 01:39:14 +0100 Remove staves of power Their effect was already provided by a ring type, and is a lot less desirable on a weapon-slot item - staves of wizardry could likewise potentially also be removed or reworked. -------------------------------------------------------------------------------- 218c6e4ed0 | Kate | 2020-03-30 01:39:09 +0100 Remove crystal balls of energy Their design was very messy and they were ultimately mostly a trap for unspoiled players. Their complicated but potentially powerful effect is much more appropriate to an unrand than to a regular evoker, and so still exists in a similar form on the staff of Wucad Mu. -------------------------------------------------------------------------------- 9d5f834e75 | Kate | 2020-03-30 01:25:55 +0100 Remove lamps of fire Of the multiple types of direct-damage-based evokers (lamp of fire, lightning rod, and now tremorstones), their effect was the most underwhelming - the complicated targeter made them difficult to use reliably and the wand of clouds also has a similar but simpler effect. -------------------------------------------------------------------------------- a6edddd4f1 | Kate | 2020-03-30 01:16:29 +0100 Remove sacks of spiders Between boxes of beasts, sacks of spiders and phantom mirrors there were a large number of consumable summon-based evokers, resulting in increased inventory load for most characters. Although the sack does have the web effect, overall it's a much less interesting set of summoned creatures than the others. -------------------------------------------------------------------------------- 2a2dd087f9 | Kate | 2020-03-30 00:33:33 +0100 Remove fans of gales Miscellaneous evocable items are currently a very overloaded item type, with many items that are worth every character carrying once found, as well as a lot of duplicated effects. This results in lots of inventory slots being dedicated to evokers, a worse interface when picking items, and a lot of uninteresting choices between similar items. Narrowing down the list of evokers substantially will allow them to have a smaller number of distinct effects, without taking up so much inventory load. The fan of gales AoE knockback is a very niche escape effect, and isn't really interesting enough to dedicate an item to - it falls into the category of evokers that end up always being carried around even though in practice it's only quite rarely useful. -------------------------------------------------------------------------------- df4e720381 | Aidan Holm | 2020-03-29 22:55:33 +0800 Remove force_article parameter from thing_do_grammar() The only cases where this was non-false was when using feat_is_trap(); when this evaluates to true, the description passed to thing_do_grammar() started with a lower-case letter, so the feat_is_trap() check was redundant. -------------------------------------------------------------------------------- 38bdf733c1 | Aidan Holm | 2020-03-29 22:55:33 +0800 Remove add_stop parameter from thing_do_grammar() -------------------------------------------------------------------------------- 4e0c6439a7 | Aidan Holm | 2020-03-29 22:55:33 +0800 Remove add_stop parameter from feature_description() -------------------------------------------------------------------------------- c225cfcdae | Aidan Holm | 2020-03-29 22:55:33 +0800 Remove add_stop parameter from feature_description_at() -------------------------------------------------------------------------------- 76631587b9 | Aidan Holm | 2020-03-29 22:55:33 +0800 Extract god_speaker() function The name of the god will need to be substituted in via the i18n system, so that different languages can change the word order. -------------------------------------------------------------------------------- 857d98e98d | gammafunk | 2020-03-29 04:30:07 -0500 Add an effect flash for Absolute Zero Flash the screen light cyan upon successful cast. It would be neat to have a more custom animation that centered on the target, but this flash will do for now. -------------------------------------------------------------------------------- 38ce9ef878 | gammafunk | 2020-03-29 04:30:00 -0500 Allow Absolute Zero to target tentacles Otherwise it can't affect things like eldritch tentacles, which seems odd. This will leave blocks of ice where the tentacle or tentacle segment died, but this seems fine. Firewood and allied and neutral monsters are still excluded, as before. -------------------------------------------------------------------------------- f3ad0b3c7c | gammafunk | 2020-03-29 04:28:02 -0500 Add range scaling for Absolute Zero Replace the spellpower-scaled noise reduction with a spell range that scales with spellpower. The range scales from 1 at power 0 to 7 with max power, with the range typically being 5 when the spell is first castable. This is a more natural way to scale the strength of the effect with spellpower, and gives some reasonable incentive to train more Ice or use spellpower enhancers. Instead of scaling the noise, give the spell a casting noise of 9 and an effect noise of 25, which is still quite loud. -------------------------------------------------------------------------------- b3b5f875f8 | gammafunk | 2020-03-29 04:26:28 -0500 Fix two bugs for Absolute Zero Don't crash when using 'Z' with no monster in LOS. Also properly consider monster invisibility for messaging and attack prompts when such a monster is targeted by the spell. -------------------------------------------------------------------------------- 0b37f7bc48 | hellmonk | 2020-03-29 04:25:45 -0500 Absolute Zero, a replacement spell for Glaciate. This level 9 ice spell targets the enemy nearest the player (breaking ties randomly and skipping firewood and tentacles) and instantly kills it, turning it into an ice block. Because it always targets and kills the closest monster, range and damage scaling with spellpower don't work. Instead, noise decreases as spellpower increases, from an ear-shattering 40 at zero power to 0 at maximum power (the spell also always makes 4 noise at the player's location). This is one of the glaciate replacement proposals that's been kicked around on discord etc. Motivation for the change is that all four of the level 9 direct damage spells are large aoe spells, and of the four, glaciate seems to be the worst from both power level and interface perspectives. Also, ice is supposed to be the least blasty school I think? This spell is effectively single target damage, so there's some overlap with lcs and friends, but it's somewhat different in function. Some concerns with this spell: it's very feast-or-famine in terms of effect. Really good against Cerebov, horrible against packs of any significant size. If it's too good in the good situations, it could be nerfed by lowering the range or by adding a second school (probably hexes?); given the other effects available at levels 8 and 9 I don't anticipate absolute zero being op. It's much harder to buff the spell if it's too weak, and imo it's important that the new spell be at least as good as glaciate, preferably a bit better. It's also possible that this type of instant death effect will just lead to fundamentally bad gameplay, but that's to be decided by playtesting. Finally, replacing glaciate with absolute zero will nerf megazig characters. I don't consider megazigs a 'real' part of the game but that's probably worth noting. Commiter's Note: A subsequent commit will adjust this spell to replace the spellpower-scaled noise reduction with a scaling spell range from 1 to 7, with the spell typically having range 5 when it's first castable. Depending on how this feels in practice, we may later change the spell to have a fixed but smaller range of 5, possibly restoring the noise reduction so that spellpower is still relevant. I wrapped commit comment lines and ran checkwhite within this commit. -------------------------------------------------------------------------------- d2fb8c69fd | Aidan Holm | 2020-03-29 02:42:46 +0800 Extract known items menu to known-items.cc -------------------------------------------------------------------------------- 50981ef59b | Aidan Holm | 2020-03-28 21:10:53 +0800 Add server chroot migration scripts This adds some scripts for migrating aging server chroots to newer ubuntu images. Checkwhite change is needed since some inline patches require tabs. -------------------------------------------------------------------------------- c8f5b8b992 | Aidan Holm | 2020-03-28 21:08:11 +0800 Add missing mypy.ini (alexjurkiewicz) -------------------------------------------------------------------------------- ea548f19b6 | advil | 2020-03-27 17:50:48 -0400 Don't make splash noises during level generation This fixes one part of https://crawl.develz.org/mantis/view.php?id=12232. The other part is trickier. It's possible that everything to MSGCH_SOUND should be suppressed during level generation? -------------------------------------------------------------------------------- b977e01cb5 | advil | 2020-03-26 15:16:49 -0400 Fix a piercing + omnireflection crash If a piercing ranged attack is reflected by warlocks mirror, kills the thrower, and then hits a monster after that, the game would crash, because the attacker is invalid. This fix lets the piercing ammo continue without crashing by using YOU_FAULTLESS as the attacker in this case. It isn't quite right, since the to-hit is now calculated based on a fake YOU_FAULTLESS rather than a monster that the beam/ranged_attack objects no longer has access to. I can see a couple of possibilities; we could just make a copy of the monster (extremely heavy), we could somehow only clean up the monster with a fineff (tricky to implement), or rewrite this code to defer dead monster cleanup until the end of monster handling (also tricky to implement, but probably how I would do this if writing all of this code from scratch -- this would have avoided many, many bugs over the years). I can't see any simpler options than these right now. Another change might be to have the ammo vanish when the monster dies, on the premise that piercing is a magic effect that requires the thrower to be focusing. -------------------------------------------------------------------------------- ccc90369ac | advil | 2020-03-26 15:13:48 -0400 Don't let a reaching weapon override M_PREFER_RANGED This mainly affects merfolk javelineers. Because the reaching check unconditionally succeeded as long as the monster is at reaching distance, javelineers with a reaching weapon would prefer that weapon, never using their ammo. This is in contrast to how regular melee weapons work. -------------------------------------------------------------------------------- a69d64035b | gammafunk | 2020-03-25 14:46:07 -0500 Prevent felid revival in isolated Gauntlet areas Courtesy of a reddit report forwarded to me by amalloy, gammafunk_gauntlet_branching had an isolated area felids can revive into, since it's not flagged no_tele_into: https://i.redd.it/d16o9wqnavo41.png I've added some of the usual lava and statue decorations to this area. Additionally I've flagged this and some similar areas in gammafunk_gauntlet_one_two_three as no_tele_into. Although felids now can't revive into these areas due to the lava, might as well be extra careful in case we add weird new lava-swimming species or forms. I've checked the other Gauntlet maps, and they have no isolated areas, hence don't need updating. -------------------------------------------------------------------------------- ff0ac36fb1 | gammafunk | 2020-03-25 01:45:31 -0500 Properly apply effect noise for Frozen Ramparts Before we made the effect noise only at the player's position in addition to the casting noise at this same position. Instead apply the 8 effect noise at each affected wall position, which is where the effects take place. Also tweak the casting message to simply refer to ice instead of icicles, since the spell no longer has the latter theme. -------------------------------------------------------------------------------- ace7076f2c | Kate | 2020-03-23 20:39:50 +0000 Make indestructible vault trees unaffected by tornado (#12141) -------------------------------------------------------------------------------- 955fa49e81 | gammafunk | 2020-03-23 14:48:56 -0500 Adjust spawn locations of D:1 monsters Some vaults are small and place transparent rock, which means level generation monsters can spawn in LOS of players. Although a very large majority of these situations can be survived, it's not great to have such a monster onslaught from turn 1. The function _zap_los_monsters() deals with this by removing monsters that spawn with line of fire, but this both reduces monster count and doesn't handle monsters that have line-of-sight. Extending said function to line-of-sight would further remove monsters, so a better approach is to prune D:1 monster spawn locations without pruning the monsters themselves. This commit introduces PROX_AWAY_FROM_DUNGEON_ENTRANCE and applies it to level monster spawn locations on D:1. Any D:1 level monsters will not choose a spawn location within LOS distance of the player, choosing another location instead. This is just a strict distance check, not considering actual line-of-site to the player, to avoid situations where a monsters are very close to the starting position of the player, but just around a corner or door in the starting vault. This change doesn't handle monsters from any vaults that happen to generate too close. That would very rarely be an issue, and we leave _zap_los_monsters() in place to handle this reasonably. Objstat runs before and after this change confirm that D:1 monster counts and XP are not affected by this change. Now players who get the infamously small scummos_arrival_simple_fountains, recreated here for your viewing pleasure, can be glad they'll no longer be potentially surrounded by a swarm of instantly awakened monsters: ....... .T...T. ..mmm.. ..m{+.. ..mmm.. .T...T. ....... If there are concerns about D:1 being easier, we might look into providing some more interesting difficulty by adding some spicy rare spawns to the D:1 monster table. -------------------------------------------------------------------------------- 55ea3d2053 | gammafunk | 2020-03-22 13:31:19 -0500 Rework trap placement in a Volcano map (SFR) The map volcano_village placed an alarm trap in a mandatory passage near the start of the map. Move this to an area before the guaranteed loot room so that the player has more of a decision for triggering the traps. Also reglyph the map and rework monster placement a little; it was attempting to place a monster glyph that isn't defined, since the "villager" set for the fiery_guardians() function only makes two monster types. -------------------------------------------------------------------------------- 7a61802294 | Goratrix | 2020-03-23 00:47:40 +0800 Add zombie hornet tile -------------------------------------------------------------------------------- db1d69e2aa | Aidan Holm | 2020-03-22 14:37:46 +0800 Use single-line style for Python imports -------------------------------------------------------------------------------- 728da59b6a | Aidan Holm | 2020-03-22 14:37:30 +0800 Fix lint / type errors for userdb.py -------------------------------------------------------------------------------- e95d391c20 | Aidan Holm | 2020-03-22 11:53:55 +0800 Add some test cases for cookie authentication -------------------------------------------------------------------------------- ecb0247d05 | Aidan Holm | 2020-03-22 11:53:55 +0800 Extract cookie authentication logic to its own file -------------------------------------------------------------------------------- 74e85d6d08 | Aidan Holm | 2020-03-22 11:53:55 +0800 Refactor userdb.py with a context manager -------------------------------------------------------------------------------- 6255c8be16 | Aidan Holm | 2020-03-22 11:53:55 +0800 Fix lint errors -------------------------------------------------------------------------------- 6245e20cc0 | Aidan Holm | 2020-03-22 11:53:55 +0800 Add requirements.txt tools, formatting, and linting This commit adds a simplified build setup for the webserver project. User and developer dependencies are specified in requirements.in/ and compiled to version-pinned dependency lists in requirements/. This commit also adds some basic linting and formatting tools. All formatting warnings are disabled, and should be enabled one by one as the code is organized. I've also thrown in pytest and coverage, although I haven't set them up yet. -------------------------------------------------------------------------------- c9638ee9a8 | gammafunk | 2020-03-21 21:48:05 -0500 Simplify and rebalance Frozen Ramparts This spell nicely fills the gap left by the removal of Throw Frost, but it suffers from being a mashup of two ideas: mine was a wall-oriented positional spell and ebering's was a spell to slow monsters in some interesting way. The former idea is relatively straightforward for a damage spell, but slowing monsters has the potential pitfall of introducing too much kiting. There's room for a spell that does both, but this is harder to balance for the low-level spell we're going for. Right now the slowing aspect of Ramparts isn't interesting, and the spell is very strong while being in the strongest starting book in the game. This commit simplifies and rebalances the spell by removing the slow movement monster debuff and making the damage pure BEAM_COLD. Hence Ramparts is no longer partly resistable, but it will slow cold-blooded things like hydras. I think a mass-freeze spell that uses walls is interesting and reasonably balanced at level 3. I've also tweaked the damage message to include damage punctuation and to always use singular "wall" in the message. Many players aren't aware that only one wall can ever effect a monster regardless of how many icy walls are adjacent. Incidentally, this is also true of slimy walls burning monsters, but the player *can* be affected by multiple such walls. Monsters, they're dirty cheaters! -------------------------------------------------------------------------------- 8c222c7a2b | Aidan Holm | 2020-03-21 21:02:23 +0800 Remove open() call with both read and write modes Doesn't work on Python 3. -------------------------------------------------------------------------------- d8b0990838 | Aidan Holm | 2020-03-21 20:57:23 +0800 Fix str/bytes issues -------------------------------------------------------------------------------- c3cff19e7c | Aidan Holm | 2020-03-21 20:57:23 +0800 Add type hints -------------------------------------------------------------------------------- e9e63544fe | Aidan Holm | 2020-03-21 19:03:19 +0800 Convert exception indexing to py3-compatible code -------------------------------------------------------------------------------- d602d06ee1 | Kate | 2020-03-21 01:49:20 +0000 Mark scarves of rMsl useless with innate rMsl (#11157) -------------------------------------------------------------------------------- db18ab75e8 | gammafunk | 2020-03-20 18:09:45 -0500 Fix recasting after Divine Exegesis (AliasTheSpectator) It's possible to cast a spell under Sif's Divine Exegesis and then use the spellcasting interface to recast the spell using the '.' key even when the spell isn't memorized. Spells cast this way don't get the benefits of Divine Exegesis, so this bug only lets you save spell levels by casting unmemorized spells you'd otherwise already be able to cast. This commit fixes the spellcasting UI to properly unset the value of the last cast spell if it isn't memorized before the spell prompt is made, preventing the exploit. -------------------------------------------------------------------------------- b4487340cb | Goratrix | 2020-03-20 15:43:17 -0400 Fix randart weapon names (12228) Missing end of line, probably caused by the recent commits that reorganized the lookup files. -------------------------------------------------------------------------------- 7f95dfe86c | Byrel Mitchell | 2020-03-20 12:02:46 -0400 Added room for tactics to vaults in simple.des This file is also intended as a tutorial of sorts for reading vaults, so I attempted to keep changes I made as syntactically simple as possible. This was most impactful in some of the large vaults (eg erik_arrival_triangle_huge) which needed the first few rooms marked no_monster_gen; I made the entire vault no_monster_gen rather than introduce a KMASK in such cases to retain their syntactic simplicity. Vault list: minmay_arrival_wavy_path: Single path, single exit vault. I moved the entrance to the center of the wavy path and added second exit symmetrical to the first. matt_arrival_spirals: Two of the three starting locations could have you trapped by a randomly generated monster. Adding no_monster_gen allows the player to get to the main corridor, with multiple exits, prior to finding monsters. lemuel_arrival_funnel: The island in the center of this vault had a 1:8 chance of being removed. In that case, this vauls was single-path, single-exit. I removed that possibility from the SUBST list. minmay_arrival_pointy: Single path, single exit. I added a corridor between the points, which should allow you some tactical flexibility. dpeg_arrival_radiant: This had a change to generate a single exit; I changed it to guaranteeing two. I also fixed what appeared to be a typo making the top-right path have two chances to be closed off, instead of one like the rest of the paths. dpeg_arrival_tiny_i/j/k: These have the potential (or guaranteed for k) for the left end of the path to be blocked off by mapgen (making it single exit.) I added an escape hatch in case that happened. dpeg_arrival_windows_large_door: Single-exit room. I added a door to the back side of the room as well. erik_arrival_triangle_small/medium/large/huge: All of these have the potential for a monster to be generated in one of the first 3 rooms, before you have any interconnectivity or options. I marked these vaults as no_monster_gen; possibly they should be moved out of this file and a KMASK applied to just the first 3 rooms. minmay_arrival_plants_in_alcoves: Single path, single exit. I added an island made of plants/fungus/bushes/trees to the center. noname_arrival_rooms_in_the_neighbourhood: This one was single-exit rooms, and was missing the SHUFFLE statement to make it possible to spawn in each room. I added a second exit to each room and the SHUFFLE statement, and moved it to small.des since the header was too long for simple.des. onia_arrival_mini_spirals: This one had 4 paths with no interconnection and a single exit. I added a door connecting two of the paths and marked it as no_monster_gen to avoid a monster spawning in one of the initial spirals. zelgadis_glass_arrival_small: This has guaranteed islands outside of the spiral. I added no_monster_gen to avoid monsters spawning and blocking the initial spiral. dpeg_arrival_snail: Single path, single exit. I added a door to allow the player to generate a pillar in the center of the spiral while maintaining the current auto-explore spiral path. ncdulo_halloftheorcs: Single exit room into the rest of the vault with monster_gen on. I added a second exit to the room (facing the same direction to give the player a similar first time experience.) tarquinn_simple_flora_water_a: Single path, single exit. I removed the tree that kept you from walking around it. tarquinn_simple_flora_water_c: Each side is single path, single exit unless pool_fixup creates a shallow water path across. I added a second exit to each side (and eliminated a meaningless A in the second subst.) tarquinn_simple_flora_water_e: Single exit room. I added two more exits. saegor_arrival_simple_d: Single exit room, and no handy way to add an exit without changing the aesthetics. I added an escape hatch instead. scummos_arrival_gate: Single path into a single exit room. I added pillars of shallow water and lava to the sides of the path. lightli_molten_gateway: Single exit room, and no handy way to add an exit without changing the aesthetics. I added an escape hatch instead. mrwooster_arrival_statue_1/2/3: Open alcove design. I added a couple statues to the center to give the player something to work with tactically. wheals_arrival_linesprint: Single path, single exit. I added a door connecting two parts of the 'line-sprint'. wheals_arrival_shading: Room with a single exit. I added a couple islands. lightli_arrival_flooded_house: Single path, single exit. I added a second exit. giann_wishing_wells: This vault had a single exit with a plain antechamber; not much you could do aside from retreat to one of the sides. I added a couple more entrances to the antechamber. psy_arrival_conway: This vault actually had two shallow water exits (one toward the top and one toward the bottom) which could be used for pretty interesting tactics. However, it's not clear without fully exploring which of the 4 alcoves are dead ends and which have a path, which makes this spoilery. I added a third path across which ensures that no matter which way you run, you'll find a path before you have to commit to an alcove. psy_arrival_dodecagon: This vault had a 50% chance to be a single exit room. I added a second guaranteed exit. psy_arrival_heroes: This was a single exit room. I added a couple more hero statues which could be used as pillars or chokepoints as needed. wander_arrival_desolate: This vault is essentially just empty space. Odds are that this will be fine, since D:1 mapgen will probably put multiple entrances to it, but that's dependent on the current choice of map generator for D:1. Just in case, I added an escape hatch. I also applied the 'desolate' floor tiling to the features (arch, fountains, dungeon-exit, and escape hatch.) wander_arrival_chamber: Single exit room. I added two more exits. -------------------------------------------------------------------------------- 3cd4bd21d0 | RojjaCebolla | 2020-03-20 09:11:31 -0400 Add more kinds of divine favor tired of seeing Foo's Supremacy on items! -------------------------------------------------------------------------------- 391622d9d0 | klorpa | 2020-03-20 09:08:28 -0400 British Spelling corrections Most important are the corrections to the manual and options guide, the monster shouts, and the database descriptions. This commit also corrects a variety of comments in the codebase. [ Committer's note: Closes #1321 ] -------------------------------------------------------------------------------- 189b929d56 | gammafunk | 2020-03-20 03:01:20 -0500 Add a player ghost door_vault variant This door vault places multiple player ghosts, 7.5 on-average and up to 10. This will make an extra challenging yet rare door vault variant that's sure to delight fans of gammafunk_ghost_cemetary. Accompanying the ghost are 8 and 9 spawns, similarly to what is done for the original door vault. It uses the same common setup function as other door vaults, hence places multiple loot items, but additionally places two more specialized loot items that more aggressively upgrade in quality with depth, as it done for other challenging ghost vaults. There is a ghost room variant for Vaults to go along with variants for this branch added in prior commits. The weight of these variants is 2 both because they're extra challenging and to keep placement less than the main door vaults. -------------------------------------------------------------------------------- 6e2ea9a1e6 | gammafunk | 2020-03-20 02:02:42 -0500 Some tweaks to reverse_door_vault This variant of door_vault is unique in that it places a single upstairs in an enclosed area, with the doors revealing this area fully. I've modified it to use the common door vault setup function, so now it places appropriate loot. I don't change the levels of placement, since this one isn't interchangeable with the other variants. The monster set and count are fine, since it only uses 8 and 9 spawns in the same numbers as door_vault. Due to presence of a staircase, this vault in its current form will always be less prone to killing people. Hence I'll probably revamp it to add traps and/or specialized monster placement. -------------------------------------------------------------------------------- edb9745848 | gammafunk | 2020-03-20 02:02:42 -0500 Revamp not_door_vault_due This "elephant" door vault variant placed normal and dire elephants, but notably placed a single hellephant. Unfortunately, non-demonic elephants are not challenging through the range of this vault's placement, and a single hellephant does make up for this. So rather than leaving this as an easier door vault variant, I've revamped the monster set to focus on its hellish and demonic themes. I've also brought its level placement in line with the other door vault variants to reduce spoilers. The new monster set includes hell hogs and hell hounds for Dungeon, a chaotic theme for Elf and Zot, and a mix of hell knights, hellions and balrugs for other branches. At least one hellephant is always present, and additional ones are added, scaling with depth of placement, up to 4 guaranteed hellephants in Geh and Dis. As I've done for the other door vault variants, the common setup function is used, which adds appropriate loot. There is also now a version of this vault for the Vaults branch. -------------------------------------------------------------------------------- 0b42b9124f | gammafunk | 2020-03-20 01:53:36 -0500 Some tweaks to not_door_vault_mu Make this whimsical version of door_vault place over the same range as the actual door_vault. This way there aren't spoilers as to which branches can give you an easy door vault. Use the shared setup function, which also means we place loot. These vaults place late in the game and this variant is weight 1, so some free loot in exchange for the bravery of opening a door vault is fine. Finally, add a variant for Vaults branch as an "empty" room. -------------------------------------------------------------------------------- 88be836da1 | gammafunk | 2020-03-20 01:53:23 -0500 Revamp door_vault This is one of the great spoiler vaults that we allow to remain in the game, but the vault could use some improvements. Expand its placement a little to include D:13-14 instead of just D:$. Subsequent commits will reduce the number of spoilers it does have by giving it and its look-alike variants the same placement, for the most part. That way, no matter where you open door vault, you may discover an 8 and 9 spawn zoo, a hellephant zoo, or just a room full of lovely butterflies! Tweak the monster sets to have uniformly difficult branch-specific monsters together with end-level branch spawns at somewhat higher weight. Before this change, the monster lists had individual weaker monsters in addition to a high-weight normal branch spawn entry, which is redundant. I've also made the nasty spawns more memorable, with attention given to the top-tier branch-unique monsters. Finally, this commit adds a common setup function for all door vault variants to set loot and door markers and glyphs. Door vault was notorious for not placing loot, making it purely an exercise in XP gain. The addition of on-average 8 good items makes the decision to open a door vault feel less silly. -------------------------------------------------------------------------------- 9331b4e32b | gammafunk | 2020-03-20 01:50:38 -0500 Tweak placement of a ghost vault The vault gammafunk_ghost_crypt places ordinary liches in Dungeon, which are scary but comparable to other out-of-depth spawns for the branch, hence it doesn't need down-weighting there. Also allow it to place from D:13-D:15 instead of just D:15. -------------------------------------------------------------------------------- 0c6c292ef3 | Goratrix | 2020-03-19 19:05:01 -0400 Add the new octopode loading image to webtiles Commit ee0576305db0a1a64f1e85ae863a749289b8fd71 added the new image to local tiles, but not to webtiles. I used commit da47cbf8c3a56b00bc71d06f4eb5fa7dc4a1203e as a template for this. -------------------------------------------------------------------------------- d1561dc703 | klorpa | 2020-03-20 01:10:13 +0800 TypoFixes -------------------------------------------------------------------------------- 3dcfff35b7 | Goratrix | 2020-03-19 23:51:12 +0800 Fix spelling in god descriptions Correct spelling of 'worshiper' -> 'worshipper' in Sif Muna and Fedhas descriptions, consistent elsewhere in the game. -------------------------------------------------------------------------------- 7713895373 | advil | 2020-03-18 15:43:24 -0400 Refactor init_user to be asynchronous This code calls a script via a subprocess. On CAO, this script takes about 600ms to run on average for new users, and so was triggering timeouts on nearly every new user (potentially on logins as well), presumably blocking the server as well. This refactors things so that the exit condition is checked and handled in a callback rather than in the same function after the subprocess returns. (This code be cleaner in pure python 3, but I couldn't get any of those solutions to fully work with the needed backwards compatibility.) -------------------------------------------------------------------------------- c915619fb7 | advil | 2020-03-17 21:38:03 -0400 Fix a bytes/str issue (I think) I think this will pop up with any wrapper scripts, like save upgrades. I haven't been able to test this hypothesis because I don't have a local dgamelaunch-config setup to test it in, and the scripts are fairly complicated. -------------------------------------------------------------------------------- 764d637734 | Alex Jurkiewicz | 2020-03-17 18:48:41 -0600 Don't print to stderr This just messes up ordering of output, eg https://github.com/crawl/crawl/pull/1309/checks?check_run_id=486144227 -------------------------------------------------------------------------------- df4ec1e6d9 | Alex Jurkiewicz | 2020-03-17 18:48:41 -0600 Refactor deps.py * Simplify main program flow * Type functions -------------------------------------------------------------------------------- 0d1dd5979a | Alex Jurkiewicz | 2020-03-17 18:48:41 -0600 Add retry support to deps.py -------------------------------------------------------------------------------- ce76ff1ea0 | Goratrix | 2020-03-17 20:46:30 -0400 Small spelling and grammar fixes 1. Rattle-Snake -> Rattlesnake 2. rembered -> remembered 3. make capitalization consistent to the rest of the text and correct singular: 'A Ballistomycete release spores' -> 'A ballistomycete releases spores' -------------------------------------------------------------------------------- 6753bc3f19 | Goratrix | 2020-03-17 18:43:39 -0600 Correct transparency in shortened scarf tiles Deleted transparent pixels had RGB values white instead of black, causing slightly larger files. -------------------------------------------------------------------------------- 303c1a17cd | Goratrix | 2020-03-17 18:43:39 -0600 Shortened versions of scarf tiles (#12210) Some of the current scarf tiles are too long and obstruct the body armor underneath. This commit makes all of them the same length, which is 2 pixels shorter than the current shortest ones. -------------------------------------------------------------------------------- 55f492496c | Edgar A. Bering IV | 2020-03-17 20:39:48 -0400 Correct spelling (ByrelMitchell) -------------------------------------------------------------------------------- 16f5e22943 | theJollySin | 2020-03-17 20:34:30 -0400 Added a few more strings for random item name generation -------------------------------------------------------------------------------- fdc68c5d1e | theJollySin | 2020-03-17 20:34:30 -0400 Alphabetizing some random item word lists -------------------------------------------------------------------------------- 2400ba0dc2 | advil | 2020-03-17 20:28:36 -0400 Add a workaround for the LoggerAdapter py35 bug It seems that many typical server configurations at the time of commit are likely to have python 3.5 (thanks to alexjurkiewicz for investigating), so an actual workaround is probably a good idea. -------------------------------------------------------------------------------- 40a04f2576 | Byrel Mitchell | 2020-03-17 17:52:01 -0600 Fixes comment about Trog paralysis protection. passive_t::extend_berserk is available at 0 stars of piety, so there's no minimum protection level. -------------------------------------------------------------------------------- 63583cfaac | advil | 2020-03-17 19:12:18 -0400 Add a comment about the LoggerAdapter chaining issue -------------------------------------------------------------------------------- ba6b7f88fc | advil | 2020-03-17 19:12:18 -0400 Override a mypy error for backwards-compat code -------------------------------------------------------------------------------- 20d90ebb82 | Kate | 2020-03-17 20:02:09 +0000 Update some webtiles stat colouring It appears that the AC boost from the Demonspawn icemail mutation doesn't have support for being highlighted in webtiles, but otherwise this should now be back in sync with console colouring. -------------------------------------------------------------------------------- 382eb01629 | advil | 2020-03-17 11:19:27 -0400 Do admin check with a decorator Will make it less likely that the check ever gets broken, also now handles logging again. -------------------------------------------------------------------------------- cb3c808f77 | Aidan Holm | 2020-03-17 22:39:44 +0800 Simplify admin announce code Apart from the fact that this is less code, it's also more obviously correct, with less state to manage. -------------------------------------------------------------------------------- 73ad250637 | gammafunk | 2020-03-17 00:02:21 -0500 A player ghost level for Ziggurats This commit adds a player ghost monster set for Zigs that places ghosts of players who've died in a Zig. The rest of the monsters have suitable undead theme: * soul eaters for LOS-wide HP drain and spectral warriors to remove MR (moderate weight decreasing with depth). * deep elf death mages and ghost crabs to heal their fellow undead (flat, low weight). * shadow dragons for ranged and melee draining as well as trampling (flat, low weight). * eidolons for af_slow and revenants for dispel undead (increasing up to a moderate weight). * black suns for more dispel undead and slowing as well as antimagic (flat, low weight). * curse skulls and curse toes for torment and bogging players down with summons (flat, low weight). This gives a nice mix that's light on ghosts in early depths but ramps up to 5 or more by halfway through the Zig. The player ghost set replaces the "draining" monster set, since draining monsters are well represented by this new one along with the Tartarus and Crypt sets. This set remains at weight 2 to keep the frequency of "undead" floors from being too high. TODO: The Zig permastore bones file we ship has 45 ghosts, which is already over the max of 20 we allow for adding new ghosts. Since a server's permastore can thus only replace ghosts and won't grow past 45, and since the non-permastore bones file is even smaller, player ghost Zig levels are likely to see repeated ghosts. This is especially true of mega Zigs, where monster counts of 650+ mean that a given ghost will be repeated 12 times on-average. It might be good to have a higher limit for the Zig bones files specifically, and to perhaps save XL27 characters that die in extended branches in the Zig file. This is especially the case since we aren't currently using these extended ghosts, although that's a separate issue to address. -------------------------------------------------------------------------------- f4b266557c | advil | 2020-03-16 11:26:59 -0400 Tweak the logging fix getLogger always succeeds, so a try...except block wasn't the way to go. -------------------------------------------------------------------------------- 9bc587e015 | advil | 2020-03-16 11:19:44 -0400 Suppress most access logging for tornado >= 3 There was code to do this that worked for Tornado 2.4, but it needed to updated for later versions which have a more sophisticated logging setup. This hides the flood of `200 GET` messages that are involved in a normal connection. -------------------------------------------------------------------------------- 6918904177 | gammafunk | 2020-03-16 01:43:10 -0500 Properly set the admin flag in the WebTiles client Some testing code was leftover from debugging the client-side portion of the new admin panel such that all users saw this panel regardless of actual admin status. The user admin check was properly handled in the WebTiles server, so no non-admins could successfully use the message facility. This bug just affected the visibility of the panel in the client lobby. -------------------------------------------------------------------------------- d0df705f03 | advil | 2020-03-16 00:33:55 -0400 Fix the ancient tornado compat code I'm not clear on why this is necessary. Also, remove some debug code. -------------------------------------------------------------------------------- 7ee555d2e0 | advil | 2020-03-16 00:03:46 -0400 Fix an import Avoid unneeded lazy implicit loading -------------------------------------------------------------------------------- e46d086124 | advil | 2020-03-15 22:54:51 -0400 Move admin panel fully into client.html It turns out this may need to be manually copied, incorporate it back into client.html. -------------------------------------------------------------------------------- eab1ddba54 | advil | 2020-03-15 21:27:22 -0400 Remove some debug code -------------------------------------------------------------------------------- 85570c75f3 | advil | 2020-03-15 21:23:57 -0400 checkwhite new file -------------------------------------------------------------------------------- 7c741bda01 | advil | 2020-03-15 21:18:43 -0400 Add a rudimentary serverwide announce facility to webtiles This lets DGL admin users make server-wide announcements, e.g. if the server is going to shut down. The announcement appears both in game logs and in the chat window. The facility is pretty basic, but functional, and is designed with the intent that it would be *extremely* rarely used. Some questions: * should the admin panel remain part of client.html? * Is DGL admin the right permissions level? * what else should be added to the new admin panel? * is announcing to both the game and chat too much? * will this work with ssh games? (I think so?) -------------------------------------------------------------------------------- 75b0bbc335 | advil | 2020-03-15 21:07:51 -0400 Fix another bytes/string issue in a callback -------------------------------------------------------------------------------- 0321be95db | advil | 2020-03-15 12:58:32 -0400 A few cleanups to tornado compatibility code (aidanh) -------------------------------------------------------------------------------- 631d16749a | advil | 2020-03-15 12:36:23 -0400 checkwhite -------------------------------------------------------------------------------- 734848013d | advil | 2020-03-15 12:33:27 -0400 Tornado 2.4 compatibility hacks It seems that many or all servers may be running the patched version of Tornado 2.4 found in edlothiel's git repository. To ease transition to modern versions, this commit implements several compatibility patches needed to not completely break these servers. Everything in this commit is ugly and not supposed to be permanent. (We know how that always goes...) -------------------------------------------------------------------------------- 918647650c | advil | 2020-03-15 11:31:27 -0400 Log an error on `idle_connection_timeout` for old Tornado versions Previously, this just prevented the server from starting and users of old Tornado versions were instructed to install a patched version of Tornado. This takes an alternative strategy of just ignoring the timeout parameter, which is implemented on Tornado 4 and later. Hopefully this won't cause problems for any active servers... -------------------------------------------------------------------------------- 2bf96b3bd9 | Aidan Holm | 2020-03-15 23:03:52 +0800 Fix broken static files base path The existing setting is broken on newer versions of Tornado (>=3.1), and apparently ignored on older versions. This is not a significant security regression, as webtiles executes within a chroot anyway. -------------------------------------------------------------------------------- c9c9e4cfe1 | Aidan Holm | 2020-03-15 11:16:58 +0800 Add missing IOLoop import -------------------------------------------------------------------------------- b30770a0c0 | advil | 2020-03-14 11:24:37 -0400 A few small tweaks + one more byte/str fix * fix a regex (aidanh) * add an instance of `from __future__ import absolute_import` (aidanh) * fix a missed byte/str confusion: the function is correctly typed but it's only used as a callback, so the type checker missed it. -------------------------------------------------------------------------------- f09cd5ce19 | advil | 2020-03-14 11:24:37 -0400 Webtiles: static type annotations for low-level messaging This didn't find any further bytes/str problems, but it did find some messy Tornado inheritence stuff involving coroutines. -------------------------------------------------------------------------------- 9a49a99f9a | advil | 2020-03-14 11:24:37 -0400 Webtiles: minimal type annotations to pass static type checking This is done in a way for maximal python 2.7 compatibility, using comment annotations and very careful importing; not all versions of py27 will have `typing` even available without installing a package. (Though the most recent ones should.) However, to actually do the type checking, mypy should be run on the webserver directory in python 3.7 or so with Tornado 6, which has full type annotations. The fact that this passes is a good sign, but this commit only deals with a bunch of global variables that mypy complained about; everything else is implicit or inherited from Tornado. -------------------------------------------------------------------------------- 58c0c3d08e | advil | 2020-03-14 11:24:37 -0400 Updates for python 3 compatibility The most challenging part of this was, not unexpectedly, the bytes/str difference; I don't feel sure I've gotten every instance correctly. But, in my testing this does work for everything. After this commit, the webserver runs without change (as far as I have been able to tell) on both python 2.7 and python 3, as well as Tornado version 3.2.1, 5.1, and 6.0.3. The one thing I know I haven't carefully tested is ttyrec writing. -------------------------------------------------------------------------------- 6dcb09c756 | advil | 2020-03-14 11:24:37 -0400 Preliminary support for Tornado 5+ This involved 3 main changes: 1. restructuring how the ioloop is handled for Tornado 4.1+ standards. Previously, ioloop instances were manually managed, but this was deprecated in 4.1 and removed somewhere around 5. What I am not sure of is whether the previous code, when run on Tornado 3ish, entailed many ioloops in one process (something not actually supported by Tornado). 2. Rewriting GameDataHandler so that it doesn't override `get`. Apparently this is a challenging thing to do right; the new version parses the version number out of the url on request. 3. Restructuring shutdown/stop for better signal handling. The old code looks slightly broken to me, and I suspect that issues here may be the source of some issues where cleanup doesn't happen properly. There are also a bunch of other miscellaneous fixes, some pulled from webtiles-changes. In my testing, this actually seems to all be backwards compatible to Tornado 3.2.1?? Which is a bit too good to be true... -------------------------------------------------------------------------------- 443c2f7d93 | Aidan Holm | 2020-03-14 15:20:31 +0800 Remove remember-me checkbox It's pretty unintuitive to reload the page and be immediately logged out. -------------------------------------------------------------------------------- 2ad0d861f1 | gammafunk | 2020-03-13 00:02:02 -0500 Complete the documentation of c_choose_acquirement The previous commit's documentation was incomplete. -------------------------------------------------------------------------------- a39ba6bebb | gammafunk | 2020-03-12 23:54:57 -0500 A clua interface for scrolls of acquirement With the despoilering of acquirement in 0.25, a lua interface to the acquirement menu is necessary so that clua users can inspect the results and determine which item to choose. This commit adds a hook c_choose_acquirement() that is called if it's defined in clua. It's expected to return a valid index from the set of choices, using 1 for the first item as is customary for lua. If no c_choose_acquirement function is found, or if the call generates an error, or if the returned index is invalid, the acquirement proceeds normally to the acquirement menu. A valid call and return index will cause the indicated item to be acquired, bypassing the menu. This commit also adds items.acquirement_items() to the items library, which returns a lua array of items.Item representations of the generated items. All item details are provided, since acquirement gives fully identified items. If acquirement is not in progress, this function returns nil. Any c_choose_acquirement() function should call items.acquirement_items() and inspect the results to make a determination. I'll later add a commit to elliptic/qw#30 to add support for 0.25 acquirement to qw using this interface. Ideally we'd not have to have items.acquirement_items as its own function and could just pass the item table as an argument to c_choose_acquirement. I'm not sure if lua's "light userdata" facility can accommodate this, and we have limited support passing arguments from C++ to lua. If it turns out to be possible, we can refactor the interface in a later commit. -------------------------------------------------------------------------------- 1e14c549ee | gammafunk | 2020-03-08 17:19:33 -0500 Update the mailmap for one of kate's addresses -------------------------------------------------------------------------------- a6ea776cab | gammafunk | 2020-03-08 17:19:33 -0500 Update some vaults (minmay) The vaults minmay_tri_stars and minmay_expanding_circles have diggable loot areas or subsections. For tri_stars, these don't add anything aside from wasting wand charges or luring deep troll earth mages. In that vault, replace a back set of clear rock walls with floor for each loot location. Also adjust the depth check to specifically check for Depths branch instead of using an absdepth cutoff. For expanding_circles, the vault partitioning can better be done with clear runed doors, so add one for each inner section. Also tone down the loot placement, since this vault was placing one loot item per monster. Finally, remove some extra glyph usage that is no longer needed. -------------------------------------------------------------------------------- b4d47b2760 | Aidan Holm | 2020-03-08 21:11:21 +0800 Bump copyright year to 2020 -------------------------------------------------------------------------------- 4257648271 | Aidan Holm | 2020-03-08 19:52:28 +0800 Add zombie meliai tile -------------------------------------------------------------------------------- c85e6996e4 | Aidan Holm | 2020-03-08 19:52:28 +0800 Add development_mode webserver setting -------------------------------------------------------------------------------- 3e75c3e6b8 | Aidan Holm | 2020-03-08 19:52:28 +0800 Fix Loading... webtiles text not vertically centred -------------------------------------------------------------------------------- 696c2ac64d | Kate | 2020-03-07 14:55:13 +0000 Remove an extra newline -------------------------------------------------------------------------------- e45d3a369c | Kate | 2020-03-07 14:49:30 +0000 Don't list AC changes in descriptions when the player doesn't exist For example when looking up items from the main menu. -------------------------------------------------------------------------------- d0a4aac95e | Kate | 2020-03-07 14:46:52 +0000 Remove some duplicated AC info from descriptions The information on how much AC mundane armour would provide is mostly obsoleted by armour now displaying accurate details on AC changes later in the description. -------------------------------------------------------------------------------- 1597fd302c | Kate | 2020-03-07 14:41:32 +0000 Unbrace -------------------------------------------------------------------------------- 550ad5aafd | Kate | 2020-03-07 14:06:38 +0000 Don't display AC changes for unusable armour (Yermak) -------------------------------------------------------------------------------- c91f01c39c | Alan Malloy | 2020-03-02 14:02:15 -0800 Remove unused parameters (geekosaur) -------------------------------------------------------------------------------- a4619f409e | Kate | 2020-03-01 19:14:17 +0000 Update dragonskin cloak's resistances (Bcadren) To give rCorr instead of rSticky. -------------------------------------------------------------------------------- 50b708a4c4 | Kate | 2020-02-29 20:48:09 +0000 Prevent using tremorstones while confused As with other targeted evokers. -------------------------------------------------------------------------------- 05681f805d | Kate | 2020-02-29 20:48:09 +0000 Don't allow invoking decks when silenced Treat Nemelex's card draw abilities like normal invocations, since there's no special justification for them to be treated otherwise outside of their historical existence as items. -------------------------------------------------------------------------------- e92a065291 | Kate | 2020-02-29 20:48:09 +0000 Re-brace -------------------------------------------------------------------------------- 45c6412621 | advil | 2020-02-29 11:59:16 -0500 Disallow evoking lamp/phial while confused These two are almost the last remaining holdover of evocables that could be used while confused. (I notice that tremorstones also work.) These silently applied target fuzzing (see 657136525ae) in this case; if these were to be usable while confused in modern crawl, I think they would need to indicate to the player somehow what might happen. I ran across this in a crash where an extremely desparate player was constricted and chain-confused by golden eyes tried to target the constricting naga with the phial, and fuzzing cause the wave to go the other direction and hit a friendly demon. Luckily for this player, the game crashed during knockback on the demon. See cccf84277269a for wands, and 6178f7666a6f for rods. Unlike these cases, I do think it's possible that lamp/phial might not be completely useless with fuzzed targeting, so I wouldn't be opposed to bringing this back if someone can solve the UI problem. -------------------------------------------------------------------------------- 79084b9aa6 | advil | 2020-02-29 11:39:33 -0500 Add a pointer check to actor::collide This is to address a crash triggered by primal wave. It is in principle a bug that the agent would be unset when a collision is triggered by primal wave via phial, but I can't actually replicate the exact circumstances that cause it to be unset. I think it may be able to happen, somehow, when the player is confused? In any case, this code can't assume that a pointer argument will not be null like this. -------------------------------------------------------------------------------- b5e01bddfa | Edgar A. Bering IV | 2020-02-28 09:25:36 -0600 Remove evilmike_run_for_it We probably should have done this long ago, this arrival vault is a big spoiler and places a monster so doesn't pass older criteria for arrival vaults. With the hatch it does slightly better on the "permit tactics" score, but not well enough to be worth keeping. -------------------------------------------------------------------------------- 7c1f9fe3b3 | Byrel Mitchell | 2020-02-28 09:25:36 -0600 Add room for tactics to vaults in twisted.des I also simplified a few of the vault definitions by removing meaningless statements, etc. Vault list: - shiori_arrival_whats_in_store_for_you This vault has a single path and half of the time a single exit, which makes it possible for the player to get trapped by a bad monster spawn outside the vault. I made it always have 2 exits. - dpeg_arrival_solitude This vault has one of three single-exit paths. I added a second exit to each. I also simplified a shuffle/subst sequence that had meaningless features. - dpeg_arrival_connections This vault could potentially spawn you in a corner with no paths behind you; depending on what the randomly generated terrain and monsters are, that could be pretty bad. I added an escape hatch in whichever quadrant the player arrives in. - shiori_arrival_maze It's possible for this vault to only give you exits from the starting chamber to a single corner, and then only be able to leave that room to the outside through a singe exit. I added a second exit to each corner room. I also removed a meaningless SHUFFLE command. - erik_arrival_cave_to_civilisation The only guaranteed paths away from each starting location are single-tile-wide single-path corridors for quite a ways. I added a second internal path near each starting location to give some tactical space. - shiori_arrival_elements Another single exit vault. There's not really a way to add a second exit without screwing with the theme of this vault, so I added an escape hatch to the starting room. - nagdon_arrival_double_spiral Another single-exit, single-path vault. I removed a couple of walls in the center to provide some tactical depth while preserving the in/out spiral symmetry. I also removed a KFEAT statement with no corresponding glyphs. - nagdon_arrival_zigzag_paths There are two versions of this vault which were single-path, single-exit. I added a second exit to each. [ Committer's note: wrapped message to 80 cols. Closes #1299 ] -------------------------------------------------------------------------------- 5969469250 | Byrel Mitchell | 2020-02-28 09:25:36 -0600 Modify five vaults in large.des to add tactics The current arrival vault standard is for arrival vaults to have multiple exits, a hatch, or a large enough internal space for relevant tactics. I went through large.des picking out clear offenders (using the simplified rubric that anywhere a single gnoll could spawn should still leave you with more options than 'tab and hope you win.') elethiomel_arrival_infinity_welcomes_careful_drivers: This vault has an issue if a gnoll spawns in the closet just outside the starting room. I marked the contents of the infinity-symbol as no_monster_gen. erik_arrival_gehennom: This vault explictly places a goblin and kobold (with standard weapon generation) right outside the starting room. Many starts are incapable of fighting a goblin and kobold with a bad weapon spawn in this layout. This vault is also spoilery and doesn't even match any vaults in Nethack (which it's supposed to be an homage to.) I removed it. kilobyte_arrival_exit_the_forest: This vault is effectively a single long corridor with monster-gen on; if a gnoll spawns and you can't fight him, you're screwed. I added a path through the woods in the northwest so you have a large pillar to work with, and a second exit past the water to the south-east. arrival_zaba_pyramid: Each of the possible starting rooms are single-exit, and monster-gen is on. So it's possible for a gnoll to spawn right in front of the door to your room, and completely block you in. I marked the small intermediary rooms as no_monster_gen. minmay_arrival_shoal_huts: This vault is another case with single-exit entry rooms which can be blocked by an unlucky gnoll spawn. I added a hatch to each entry room as an additional option. [ Committer's note: wrapped message to 80 cols. Closes #1290 ] -------------------------------------------------------------------------------- e51c5052c3 | theJollySin | 2020-02-28 08:31:44 -0500 Improve the tactics of some overly-simple arrival vaults There were three vaults in particular without decent tactical options: * lightli_arrival_noodles * minmay_arrival_checkered_box * minmay_arrival_solitary_statue Two more arrival vaults were borderline and so got slightly tweaked: * dpeg_arrival_water_temple_mockup * evilmike_arrival_run_for_it [ Closes #1284 ] -------------------------------------------------------------------------------- 33daf1f691 | Alex Jurkiewicz | 2020-02-28 08:24:13 -0500 Don't fail CI if Codecov upload fails Pull requests from forked repositories don't have access to secrets in the master branch (because attackers could trivially retrieve them). This means we can't upload Codecov reports from cross-repo pull requests. Luckily, the Codecov action has an option for this. (In future, it would be better if this value was `true` for in-repo builds and false for cross-repo builds, but the implementation of that is awkward and probably not worth it. (For the record: write a previous step which uses a shell script to determine the parent repo and set `true` or `false` as an output, which you can reference to set the value of fail_ci_if_error.) -------------------------------------------------------------------------------- 062765be81 | ufshaikh | 2020-02-26 16:54:11 +0000 Put runes back on default autopickup (Lici the Crawler) (#1298) Fixes a syntax error in 458a23e4a. -------------------------------------------------------------------------------- 8875c97ebb | Kate | 2020-02-25 20:14:11 +0000 Remove Maxwell's etheric cage The upside of faster MP regeneration now exists in a fairly common form on amulets, and even if it were a more notable upside, the downside of doubled contamination also isn't very relevant with the removal of Haste spell. -------------------------------------------------------------------------------- e09e1d40ed | Kate | 2020-02-25 19:02:16 +0000 Update lightning rod description -------------------------------------------------------------------------------- 458a23e4a9 | Kate | 2020-02-25 19:01:24 +0000 Don't list zigfigs on the autopickup menu They're a unique(ish) item like the horn of Geryon, and not something that the player would want to toggle autopickup for in the course of normal play. Add them to default autopickup instead like runes, to make sure they don't get missed. -------------------------------------------------------------------------------- 93f73f95a8 | Umer Shaikh | 2020-02-25 19:01:09 +0000 Disallow -tele on artefact weapons and jewellery -tele is usually not a meaningful bad artefact property on weapons and jewellery, since swapping away from those items is so quick. Furthermore, putting -tele on quick-swapping items allows the player to explore with a -tele item equipped and swap to their "real" equipment for fights, thereby avoiding teleport traps and teleportitis at marginal cost. This is frustratingly uninteresting gameplay. And it allows the player to neutralize the gameplay benefits of teleport traps with little risk and no real investment or decision-making regarding their character's loadout. A simple solution is to prevent -tele from spawning on any weapons or jewellery. We could also try to make sure that on jewellery and weapons -tele always pairs with other properties that make swapping less trivial (*contam, fragile, harm, etc.), but I am skeptical that the complexity is worth the trouble. I also considered changing the behaviour of -tele to stop translocations only from an internal source. Then wearing -tele would not affect teleporting unless the player could already choose whether or not to teleport, so there is no reason to swap to -tele to explore. However this is additional "player-facing" complexity, in that there is another somewhat fiddly rule for the player to learn; even very careful players don't need to know about rules governing placement of artefact properties. Furthermore it does not address the first issue mentioned, that weapon and jewellery -tele is rarely an interesting drawback. Finally this approach takes away an arguably interesting strategic choice that players are making, to wear -tele on armour to prevent teleport traps in particular places (esp. Zot). [ Committer's note: simplified and added a comment. Closes #1292 ] -------------------------------------------------------------------------------- 0977b4d109 | Nicholas Feinberg | 2020-02-24 21:28:59 -0800 Rename a variable (alexj) -------------------------------------------------------------------------------- 3013cc3748 | Nicholas Feinberg | 2020-02-24 21:28:56 -0800 Remove Call Imp type scaling (Wise Wolf) The type of imp you could get would vary subtly with spellpower, but only after a baffling secret 46-power breakpoint. (Introduced in 854173f2e9b9 / 48f4e9825740 almost 10 years ago, at a time when the maximum power for the spell "seemed to be 71"?) I don't think there's any particular need to make a level 2 spell marginally more useful in the mid-game, and this change should have almost no effect on how the spell is used in practice. Just simplifying it so we don't need fun graphs like https://i.ibb.co/qBvQt9d/unknown.png . -------------------------------------------------------------------------------- be304fddcf | Nicholas Feinberg | 2020-02-24 21:07:38 -0800 Improve new Brilliance (bhauth, kate) Restore the duration to its old length, to match might and stabbing - the new effect and the old one were closer in power than I'd realized at plausible mid-game stat + skill values. Also remove the hunger cost entirely, to make the effect more dramatic. -------------------------------------------------------------------------------- 78a2afb0af | Kate | 2020-02-23 21:54:57 +0000 Remove Berserk's strength bonus as well For consistency with might. -------------------------------------------------------------------------------- 38680ca743 | Kate | 2020-02-23 21:49:31 +0000 Don't recolour Dex on the HUD with agility active -------------------------------------------------------------------------------- e1aed2b2b9 | Nicholas Feinberg | 2020-02-23 13:48:47 -0800 Cleanup might potion str -------------------------------------------------------------------------------- c801180b7c | Nicholas Feinberg | 2020-02-23 13:11:38 -0800 Remove the str bonus from !might !might is a potion that makes you much better at melee combat. It also, incidentally, gives you 5 str, which adds a little more melee damage, improves your accuracy and spellcasting chances in armour, and so on. Simplify and focus on the core idea of the potion by removing the bonus strength. The bonus damage remains very beefy and noticable, and there are plenty of other ways to play with HUGE STRENGTH. -------------------------------------------------------------------------------- a2a17f8f3d | Kate | 2020-02-23 20:55:54 +0000 Update brilliance status description -------------------------------------------------------------------------------- 6c87d81395 | Kate | 2020-02-23 20:42:20 +0000 Improve potion of stabbing description -------------------------------------------------------------------------------- 72f5e5e9d2 | Kate | 2020-02-23 20:42:20 +0000 Update status documentation -------------------------------------------------------------------------------- 797ef2793a | Kate | 2020-02-23 20:42:16 +0000 Simplify agility to only apply bonus evasion Remove the +5 dex and bonus to stealth, both of which were far less relevant than the fixed bonus to evasion. -------------------------------------------------------------------------------- 26026c6c98 | Nicholas Feinberg | 2020-02-23 07:57:34 -0800 Rework the potion of brilliance At present, the potion of brilliance is an odd bird. It decreases spell failure cost dramatically and increases spell power slightly, essentially acting as a 'potion of cast high fail chance spells'. This encourages players to memorize spells that they can't normally cast just for the few times during a game they'll use !brill. The UI for this isn't great (how do you tell what your fail chance will be after you drink it?), and it's relevant to almost all characters, meaning that everyone's inventories and tactical options are cluttered with it. This changes !brilliance to instead do two specific things: act as a universal spell enhancer (like archmagi) and reduce spell hunger costs by half. The former is a buff for 'casters', but probably not something most 'melee-focused' characters care about (and thus need to have in their inventory). The latter is intended to act as moral encouragement to blast away with your most powerful spells while the potion is running. The new brilliance looks more powerful than the old one, so its duration is roughly halved. -------------------------------------------------------------------------------- 6e6e6501ad | Kate | 2020-02-22 17:03:09 +0000 Mark a slime entry vault as no_tele_into (#12206) -------------------------------------------------------------------------------- 19b58906dc | Kate | 2020-02-22 17:03:09 +0000 Re-brace -------------------------------------------------------------------------------- 27a0b5d1ef | Nicholas Feinberg | 2020-02-20 20:08:31 -0800 Fix tremorstone vaults -------------------------------------------------------------------------------- 0bd1ac1125 | Nicholas Feinberg | 2020-02-20 19:11:51 -0800 Make tremorstones multi-use As with boxes of beasts and sacks of spiders, each tremorstone item can be used repeatedly until it (1/3 chance) collapses. The goal is to make them a bit stronger and worth carrying, since a single shot of a rare item wasn't quite worth it in practice. -------------------------------------------------------------------------------- e4db218afc | gammafunk | 2020-02-20 00:01:59 -0600 Update the changelog (PleasingFungus, Ge0ff) Through 0.25-a0-544-gee0576305d. Remove the entry for the staff of Battle, since that was already released in 0.24! oops. -------------------------------------------------------------------------------- ee0576305d | gammafunk | 2020-02-19 15:07:35 -0600 A new octopode splash screen from Nibiki Nibiki has agreed to license this image under CC0. Many thanks to him for this great artwork. -------------------------------------------------------------------------------- 450b2806fe | Alex Jurkiewicz | 2020-02-19 15:33:28 -0500 Create ~/.ccache if needed -------------------------------------------------------------------------------- 5e20511321 | Byrel Mitchell | 2020-02-19 10:06:18 -0500 Change chance of triggering paralysis/pain bond to be turn-length invariant Previously, this formula gave you a significant higher chance of triggering a paralysis or painbond event per aut if you were taking shorter actions: 0 auts remaining on TIMER: 10 aut turn => 0.01 events/aut 5 aut turn => 0.02 events/aut 200 auts remaining on TIMER: 10 aut turn => 0.0033 events/aut 5 aut turn => 0.004 events/aut This incentivizes doing fast actions whenever you have to wait at higher piety instead of simply resting. It's even optimal when enemies are out of sight, since a paralysis/pain bond event triggering when no enemies are in sight resets the relevant TIMER to 0. The new formula makes the expected value of events proportional to the duration of the turn, and so eliminates all turn-length dependence except for rounding errors. Event rates are all set to the same as with 10 aut actions previously, regardless of action length. This is probably a slight nerf in general, but a significant nerf to quickblade Uskers. -------------------------------------------------------------------------------- a829c891c6 | Alex Jurkiewicz | 2020-02-19 09:39:17 -0500 Improve macOS Makefile support BSD sed (used on macOS) lacks -r and has different semantics for -i, which causes some incompatibilities. Allow the user to override the sed command for these sed calls, eg "make SED=gsed" macOS also has BSD find which lacks -o as an alias for -or. Change the Makefile to use -or as GNU find also supports this. -------------------------------------------------------------------------------- 8ea5abb603 | Alex Jurkiewicz | 2020-02-19 09:38:35 -0500 Add size limits to ccache -------------------------------------------------------------------------------- c37ea4fa11 | Alex Jurkiewicz | 2020-02-19 09:38:35 -0500 Display ccache config per-build -------------------------------------------------------------------------------- 0a83c12206 | Alex Jurkiewicz | 2020-02-19 09:38:35 -0500 s/coveralls/codecov/ -------------------------------------------------------------------------------- bfe250d9be | Alex Jurkiewicz | 2020-02-19 09:38:35 -0500 Exclude catch2-tests/ from coverage data -------------------------------------------------------------------------------- 360c081f3e | Alex Jurkiewicz | 2020-02-19 09:38:35 -0500 Disable Codecov pull request comments -------------------------------------------------------------------------------- 9273b557bc | Edgar A. Bering IV | 2020-02-19 08:47:09 -0500 Update new dev guidelines As the newest dev I suppose this falls to me. This update restores the information about the process for adding a member to the team that got lost in the dev-doc-shuffle of 2017, wraps things to 80 columns, and updates some links and process information to point to github. -------------------------------------------------------------------------------- 8cb9f22522 | Edgar A. Bering IV | 2020-02-19 07:54:11 -0500 Wrap to 80 columns Closes #1275 -------------------------------------------------------------------------------- f48561505f | Alex Jurkiewicz | 2020-02-19 07:54:11 -0500 Remove install instructions for Void Linux They were added several years ago by a now deleted user in #460. The package names are all unsurprising and no special steps are required, so it seems unnecessary to include. -------------------------------------------------------------------------------- 9592c2e932 | Alex Jurkiewicz | 2020-02-19 07:54:11 -0500 INSTALL.md improvements * Install pngcrush & advancecomp * Add a section on using DCSS's packaged dependencies -------------------------------------------------------------------------------- fa7a6018de | Nikolai Lavsky | 2020-02-19 07:02:08 -0500 Don't mention player-only mechanics in monster spells descriptions Several monster spells use descriptions of similar god abilities, which reference the Invocations skill or player-only mechanics. Fix this and, as a followup to 9231cdcb, adjust description for the Drain Life spell. -------------------------------------------------------------------------------- 60722c7f10 | Nikolai Lavsky | 2020-02-19 07:02:08 -0500 Extend alias functionality for database lookups Currently, descriptions for abilities, spells, and dungeon features can be reused via aliases, d52d0508. But it's not possible to use an alias and then add details to it. This commit adds support for a new type of marker for database entries, [[foo]]. Any [[foo]] marker in a database entry will be replaced with a corresponding entry's text before being displayed to the player. -------------------------------------------------------------------------------- 88f1615ccf | Nikolai Lavsky | 2020-02-19 06:57:56 -0500 Update Summon Drakes description Dragons were cut from the spell and replaced with lindwurms in 9b5a2163. -------------------------------------------------------------------------------- 6b7c99946c | advil | 2020-02-18 16:35:06 -0500 Convert dummy agility to stabbing, not degen -------------------------------------------------------------------------------- 3d8dea327d | advil | 2020-02-18 16:31:09 -0500 Assimilate handling of dummy agility to other removed potion types This is unfortunately ugly, but it does not crash. Basically, treat this very temporary potion like any other potion that's been removed -- even though it's last in the enum, keep it around until a major version tag, and do save compat unconditionally. This is a semi-revert of 08029b5080ff (sorry). -------------------------------------------------------------------------------- 11ec75b3b8 | Kate | 2020-02-18 20:21:48 +0000 Fix a flight message not displaying Appears to have been broken by 4dc341646031. -------------------------------------------------------------------------------- 55f47c2aea | Kate | 2020-02-18 20:21:48 +0000 Reword a hint -------------------------------------------------------------------------------- c048b62713 | Kate | 2020-02-18 20:21:48 +0000 Fix a monspeak entry (#12201) -------------------------------------------------------------------------------- 9afb2ee040 | Nicholas Feinberg | 2020-02-17 18:41:16 -0800 Remove a funny message Jokes are like fish: they begin to smell after three days. -------------------------------------------------------------------------------- 2462c7bb1f | Nicholas Feinberg | 2020-02-17 15:55:10 -0800 Fix garbage potions -------------------------------------------------------------------------------- b5d5f98535 | Nicholas Feinberg | 2020-02-17 09:15:12 -0800 Cleanup !agi cleanup -------------------------------------------------------------------------------- 08029b5080 | Nicholas Feinberg | 2020-02-17 09:08:39 -0800 Cleanup !agi Remove the dummy potion hack. -------------------------------------------------------------------------------- 16a9eb376c | gammafunk | 2020-02-17 02:49:30 -0600 Mark potions of agility as removed (Yermak) It's necessary to add these potions to the removed_items set so that we don't get a "potion of bugginess" entry in the unknown item listing of the identification menu. This entry might also be necessary to disable things like generation, but I haven't checked this. A subsequent commit should TAG_MAJOR various portions of agility potion code, the related agility duration code, and remove the effect from the list of Xom effects. -------------------------------------------------------------------------------- 766966629d | Nicholas Feinberg | 2020-02-16 22:10:34 -0800 Potion of agility -> stabbing Potions of agility were not an interesting item. You plopped them on when you were going to get in a big fight and they made you take slightly less damage. It wasn't something that you used differently from !might or !brill or arguably !haste, just another buff to stack on the pile and clog up your inventory. Instead, replace !agility with !stabbing, which gives a 50% chance to upgrade weak stabs (distraction, etc) to strong stabs (sleep, etc). This is most useful for 'stabbers', but any character that can generate distractions (from allies, evocables, gods etc) and stab people can use it, in a reasonably meaty and distinctive way. Minor note: it's not marked useless for Ru chars who sacrificed stealth because they could, in principle, still stab. (I think?) -------------------------------------------------------------------------------- f8b3a32422 | gammafunk | 2020-02-16 17:50:41 -0600 Adjust floor and overlay tiles for Frozen Ramparts With CanOfWorms' wall overlay tiles, the tiles for floors adjacent to icy walls and for icy floor overlays look too bright and cyan. This commit lightens and adjusts hue for both sets to work better with the wall overlays. Now the icy floor tiles aren't such a contrast compared to the final overlayed icy walls for wall types with darker tiles. The wall overlays currently have clear boundaries between tiles. If these overlays were reworked to fit together more continuously like our wall and floor tiles do, it would improve the appearance. The floor overlays are not necessary now that we have wall overlays, but the floor overlays do fit together nicely and help break up the wall boundaries, so I'm keeping them for now. -------------------------------------------------------------------------------- 7d600cd9ad | gammafunk | 2020-02-16 00:13:57 -0600 Have Fedhas protect plants from clouds (sdynet, 12195) Fedhas now protects plants from a wide variety of player effects, including explosions and LOS damage spells, but clouds aren't currently included. Since we now track god conducts for cloud placement, it's best to have the prevent placement of harmful clouds made by Fedhas' worshipers at the locations of plant allies. This prevents e.g. scrolls of immolation having Fedhas ally protection from the explosions but not ally protection from the flame cloud placement. -------------------------------------------------------------------------------- 2e551bc22a | gammafunk | 2020-02-16 00:13:57 -0600 Remove an unused function argument -------------------------------------------------------------------------------- fc522ff6eb | Aidan Holm | 2020-02-16 13:34:42 +0800 Disable lua load(), loadstring() bytcode loading -------------------------------------------------------------------------------- e77a69270c | gammafunk | 2020-02-15 01:25:06 -0600 Clean up icy walls upon level load Frozen Ramparts creates "icy walls" with the FPROP_ICY property. It expires the props when the Ramparts duration expires, but early versions of the spell didn't do this properly. In this commit we unset the prop for all squares with the property that don't that aren't properly in LOS of the last position of any active cast of Frozen Ramparts. This will fix walls changed by buggy versions of the spell upon level load. This cleanup is tag-majored, since it shouldn't be necessary for versions where the spell logic is fixed. Additionally, the icy wall presence level state is now updated properly upon level load when any valid icy walls are found for a current cast of Frozen Ramparts. Previously this wasn't done, so casts active at time of save didn't have working icy walls when the save was reloaded. -------------------------------------------------------------------------------- a8e59b5b3b | gammafunk | 2020-02-15 00:54:50 -0600 Properly handle recasting of Frozen Ramparts (shummie) This spell should only be castable when the Ramparts duration isn't already active, but I never added this restriction. By recasting the spell before the duration expires, we allow too many icy walls at once. This also creates a bug allowing semi-permanent icy walls. The previous set of walls never had the icy wall property cleared, so when later casting the spell, the old walls would become active if in LOS of the player. With this commit, Frozen Ramparts can't be cast until its duration expires. A subsequent commit will fix walls with stale property flags by cleaning those up upon level load. -------------------------------------------------------------------------------- fc656d3889 | gammafunk | 2020-02-15 00:52:01 -0600 Improve UI for attempting to recast Dragon's Call Move the check to deny casting the spell when either the Dragoncall or -Dragoncall durations are active to spell_uselessness_reason(). Now Dragon's Call is properly marked as useless while these durations are active. -------------------------------------------------------------------------------- e065f6de7d | Kate | 2020-02-14 14:06:15 +0000 Turn the boots of the Assassin into a hat The flavour of detecting monsters and spotting vulnerabilities didn't really fit on a pair of boots, and is much more appropriate for a piece of headgear. -------------------------------------------------------------------------------- 1cd534d472 | Kate | 2020-02-14 14:03:06 +0000 Remove Bloodbane and merge its properties into Leech Leech loses its tacked-on AC-3 and EV-3 and gains Bloodbane's main distinguishing feature of */+Rage, with Leech's reliable vampiric effect to help compensate for *Rage as a downside. -------------------------------------------------------------------------------- 3095992e70 | Kate | 2020-02-14 12:43:57 +0000 Fix the skin of Zhor's inscription Since it was claiming to cast the wrong spell. -------------------------------------------------------------------------------- f66f01b915 | gammafunk | 2020-02-14 01:47:29 -0600 Fix unrand uniqueness for acquirement (AliasTheSpectator) Scrolls of acquirement copy item definitions for the generated items and remove the created items, only re-making the selected item when the player makes a choice. For unrands, the item def has to have its uniqueness status cleared, but this wasn't properly reinstated if the unrand ended up being chosen by the player. Hence it was possible to generate a specific unrand again after acquiring it, either through another acquirement or as random loot. With this commit, we properly set the unrand's uniqueness status when making the final item in acquirement, making it actually unique. -------------------------------------------------------------------------------- 344202577d | gammafunk | 2020-02-14 01:47:29 -0600 Fix acquirement for rare cases (amalloy) If you worship Trog and have all 27 skills, the current acquirement code will always generate a menu with one less item than usual when the book class is randomly chosen. This is because Trog hates all spellbooks and all manuals are useless, so no valid acquirement book item can be made. This is an obscure case, but in general we'd like the acquirement code to be more robust for handling classes where we can't generate an item for whatever reason. This commit refactors the code to generate each item as it iterates over all possible classes in a random order, only adding to the final set if an item could be generated for a given class. This will stop when we've reached the desired number of items or when we've exhausted all valid item classes. Hence the acquirement choices will be as close to the desired number of items as we can make it. -------------------------------------------------------------------------------- ae4569222e | Nicholas Feinberg | 2020-02-13 21:01:39 -0800 Split tremorstone explosions in half (Wise Wolf) This makes them effectively 6x resisted by AC, which means they're *actually* relatively safe to use as a moderately armoured character. -------------------------------------------------------------------------------- 768f60da87 | Aidan Holm | 2020-02-13 21:31:55 +0800 Disable lua bytecode loading -------------------------------------------------------------------------------- e281fa673e | Nicholas Feinberg | 2020-02-12 07:35:54 -0800 Value Tremorstones lower Since they're single-use now, make them worth a bit less in shops and acquire them in pairs. -------------------------------------------------------------------------------- 6516661a7a | Nicholas Feinberg | 2020-02-11 19:40:18 -0800 Re-alphabetize items.txt -------------------------------------------------------------------------------- 299d110614 | Nicholas Feinberg | 2020-02-11 19:17:37 -0800 New single-use item: Tremorstone Tremorstones are single-use evocables that cause a radius 2 explosion at range 3. Their explosion is skewed by 1 tile from the target, so they always have at least a 1/3 chance of hitting the player. However, since they do 6d12 BEAM_FRAG damage, players with 20-25 AC will usually take little to no damage. (BEAM_FRAG checks 3x AC.) As such, this is intended to be a fun toy for well-armoured characters and a desperation option for others. A design space that I've wanted to explore for many years is the '3x AC' damage type (ala LRD and the late, lamented Orb of Fragmentation). I initially tried to make it into a spell, but it's very much the opposite of the modern Earth school philosophy and in general makes more sense as a tool for armoured, less-spell-focused characters. This will always warn about self-targeting, which is a bit clunky. Since it's not especially common and it's nice to warn players who might not have read the description before they blow themselves up, though, that seems OK. -------------------------------------------------------------------------------- e26b6a5e7f | gammafunk | 2020-02-11 18:40:23 -0600 Some changelog trimming (PleasingFungus) Remove a couple things that are basically minor bugfixes. Don't mention the two float vaults, since that's better HYPED in the Trunk Updates. Despite the request of our beetle overlords, I'm keeping the cloud god conduct changes entry, since that impacts some fairly commonly scenarios like use scrolls of immolation. -------------------------------------------------------------------------------- 34b160fbb8 | Kate | 2020-02-11 23:54:41 +0000 Adjust some unrand descriptions -------------------------------------------------------------------------------- fae6501f5f | Kate | 2020-02-11 23:54:37 +0000 Remove incorrect Xom pronouns -------------------------------------------------------------------------------- cd06b9e333 | Kate | 2020-02-11 23:33:46 +0000 Improve handling of skills for manual acquirement De-duplicate a list - WJC wasn't correctly handled in the check for skill uselessness. -------------------------------------------------------------------------------- 8c4878dea3 | Kate | 2020-02-11 15:54:59 +0000 Fix some changelog typos -------------------------------------------------------------------------------- 8e6394d6b4 | theJollySin | 2020-02-11 08:12:40 -0500 Fix an outdated file reference in a comment [ Committer's Note: Small wording and colour tweaks, elaborated on commit messages and adjusted tense. Closes #1254 ] -------------------------------------------------------------------------------- de76ec36f1 | theJollySin | 2020-02-11 08:12:40 -0500 Document an arrival vault guideline (ebering) -------------------------------------------------------------------------------- 147f899702 | theJollySin | 2020-02-11 08:12:32 -0500 New arrival vaults - dark_side_of_the_moon a large pillar with a dark motif - battle_scene a bloody room with many corpses - enchanted_forest a circle of stone arches in a wood full of magic - ceremonial_halls a marble tomb - henge a less enchanted ring of arches in a wood - glass_houses for those who do not throw stones -------------------------------------------------------------------------------- 44cc58d149 | gammafunk | 2020-02-10 22:18:39 -0600 Update the changelog through 0.25-a0-491-gd071885120 [skip ci] -------------------------------------------------------------------------------- d071885120 | Nicholas Feinberg | 2020-02-10 19:10:47 -0800 Pavise -> tower shield (various) I wildly underestimated how obscure a term 'pavise' was. Let's be a bit more clear. -------------------------------------------------------------------------------- 7f6d498c3f | Alex Jurkiewicz | 2020-02-10 20:21:37 -0600 Add Github Actions CI I initially implemented this for code coverage support, which is included. But using GA for all CI tasks has several advantages over Travis: * Native support for building on macOS. * Simpler configuration language. * Easier composability of steps from third parties. The steps can be published as Docker images or Node modules and are fully versioned. * Better integration with GitHub (one status check per build job, rather than one for the whole CI system). Requires `CODECOV_TOKEN` set up as a GitHub repo secret (from codecov.io). -------------------------------------------------------------------------------- 9ae84a01e3 | Alan Malloy | 2020-02-10 11:26:17 -0800 Describe item you plan to acquire -------------------------------------------------------------------------------- 03579ab4a3 | Nicholas Feinberg | 2020-02-09 17:58:13 -0800 Fix unrand pavise player tiles And remove support for caps. -------------------------------------------------------------------------------- c70b7ad80a | Nicholas Feinberg | 2020-02-09 17:51:38 -0800 Fix some unrand shield player tiles -------------------------------------------------------------------------------- 9aada8127a | Nicholas Feinberg | 2020-02-09 16:36:21 -0800 Rename shield -> kite shield As explained in ca9fc5ac96d, we'd like to be able to refer to an item without confusing it with a category. A kite shield was a large, teardrop-shaped shield. It would be more accurate to use the term 'heater shield' for the shields in game, but that name is even more anachronistic and silly. Other alternatives considered were: - targe (too close to a buckler in both size and meaning) - hoplon (a shield used by a hoplite - too obscure) - aspis (the 'proper' name for a hoplon, but come on) - dhal (again, too close to a buckler) - umbumbuluzo (cool but way too long) - ihawu (cool but it's three syllables) I think the closest alternative contender was 'targe', fwiw. The shield of resistance and of the gong were intentionally not renamed, which I don't believe should cause confusion, but we can rename them later if it does. -------------------------------------------------------------------------------- 9ae4f581c4 | Nicholas Feinberg | 2020-02-09 16:36:21 -0800 Rename large shield -> pavise Having the name of a category (shields) also be the name of an item in that category (shields, large shields) has always been annoying and confusing. ("Oh, I'm using a long sword and a shield." "What kind of shield?") Use a more specific word instead. (A pavise is a roughly body-sized shield. Often they were placed in frames and used in a stationary fashion, but the same is true of triple crossbows. A little hyperbole is good for adventurers.) This is part 1 of a 2-part change. The following commit will rename shields. -------------------------------------------------------------------------------- b7f6864ba1 | gammafunk | 2020-02-09 18:00:17 -0600 Refactor some vault loot statements The commit a45ed2c2 fixed some previous errors in these two vaults, but we have item lists in dungeon.lua specifically to help with this kind of loot, so let's use those instead. The original vault for biasface_vaults_ghost_orc_armoury for non-Vaults branches already does this. -------------------------------------------------------------------------------- 6f036f9bbc | gammafunk | 2020-02-09 17:24:01 -0600 Fix Dith's Shadow Mimic for Teleport Other (joemaro) Dithmenos currently shadow mimics Teleport Other unconditionally, like it does for other hexes. This creates a problem where a player trying to teleport (or remove teleport from) a monster has their work potentially undone by the shadow mimic if their initial cast was successful. This commit has Dith not shadow mimic if Teleport Other hits its intended target and successfully changes its teleportation state on the first cast. If the Teleport Other was unsuccessful, Dith still has the usual chance to shadow mimic the spell. Closes #1273. -------------------------------------------------------------------------------- 9b3b753f3f | Kate | 2020-02-09 20:53:20 +0000 Improve armour AC change descriptions Don't display a pointless line for shields (although it might be good to extend this functionality to handle changes in EV and SH). -------------------------------------------------------------------------------- 37d6d75d0a | Kate | 2020-02-09 19:50:31 +0000 Fix Warlock's Mirror not reflecting piercing ranged weapons (#12142) -------------------------------------------------------------------------------- a45ed2c2fa | Kate | 2020-02-09 19:50:31 +0000 Fix some vault item definitions (#12191) -------------------------------------------------------------------------------- 8579842fd4 | Nicholas Feinberg | 2020-02-08 09:39:08 -0800 Small Cigotuvi's tweaks and fixes - Use the actual base AC property as defined in art-data.txt rather than hardcoding a second constant. - Don't clobber the AC on load. - *Drain rather than *Curse (Jimmahdean) - generally a similar effect, but one that we do less often and that might provide a more consistently interesting tradeoff re: taking the armour off. - Make armour decay faster at high corpse counts to make megakills a bit less persistently silly, but upgrade the armour-per-corpse scaling 50%. -------------------------------------------------------------------------------- 33c61bdccf | gammafunk | 2020-02-07 23:50:55 -0600 Have Vehumet support Frozen Ramparts This is not a Conjurations spell, but like Freeze it directly damages monsters and should be supported by the god. -------------------------------------------------------------------------------- 6e9f9c6944 | gammafunk | 2020-02-07 18:17:10 -0600 Give Cigotuvi's Embrace *Curse (hellmonk) We don't want to give the player a reason to frequently swap off armor in order to animate remains or eat corpses. Adding *Curse will still let this be done to some degree, but now that will be limited by availability of scrolls of remove curse. -------------------------------------------------------------------------------- 910574c326 | gammafunk | 2020-02-07 18:17:10 -0600 Tweak god conducts for Cigotuvi's Embrace (PleasingFungus) Originally the unrand tracked conducts based on the corpse (desecrating the remains of holy/souled beings) with the "did evil" conduct applying only if a corpse conduct didn't apply. This is an evil item and that conduct should always apply. This commit applies the conduct when any corpse harvesting happens, applying any specific corpse conducts in addition to "did evil". -------------------------------------------------------------------------------- aca3a16f85 | Nicholas Feinberg | 2020-02-07 18:15:57 -0600 Cigotuvi's Embrace, unrand body armour Cigotuvi's Embrace is a unique body armour (currently based on ring mail) that automatically sucks up corpses within LOS and turns them into temporary AC. This is primarily intended to provide a fun press-your-luck mechanic - how long can you keep fighting and keep your corpse armour on before you have to rest? It also comes as something of a 'hunger' conduct (since you can't eat those corpses) and effectively turns off most forms of necromancy, which can be a plus or a minus, depending on whether you're a necromancer or your enemies are. At present, the Embrace starts as +4 rN+ rRot armour (the rRot is for flavour). It goes to +8 with one corpse harvested, which takes about 100 turns to fully slough off. Four corpses give you about +12 and take 200 turns to fully go away, sixteen corpses give about +20 and take 400 turns to fully rot away, etc. All numbers are very much open to discussion. The original Embrace was removed because it couldn't compete with necromancy as a spell; as an unrand it might be more feasible to balance and make fun. Comitter's Note: Merged with a couple tweaks in the subsequent two commits. Closes #1272. -------------------------------------------------------------------------------- a8a2ee3166 | Alex Jurkiewicz | 2020-02-05 21:46:13 -0600 Change the messaging for abandoned shops So there's no ambiguity about "will they open again"? Inspired by watching a player on CPO. -------------------------------------------------------------------------------- 90c0af583b | gammafunk | 2020-02-05 20:43:09 -0600 Fix monster AI for damaging walls (howmanybefore) The monster movement code makes calculations to deciding whether to move near damaging slimy or icicle covered walls. If the count of adjacent damaging walls at a potential destination square is higher than that of their current square, they'd not move unless their HP is high. However monsters only ever take damage from one wall at a time, regardless of how many are adjacent. Hence this calculation can lead them to incorrectly refuse to move when both source and target had damaging walls, but the number of such walls at the target was higher. In these situations, monsters with low HP would stand in place, taking damage. This bug also applies to slimy walls, but those are rare outside of Slime Pits. In that branch, all monster spawns have immunity to the slimy wall effect, so the bug was hard to see in practice. This commit fixes the AI by only considering whether the number of damaging walls is above zero at source and target for these calculations. -------------------------------------------------------------------------------- 9f28dab4e5 | gammafunk | 2020-02-05 18:26:31 -0600 End Frozen Ramparts upon level change (Lightli) The implementation for level cleanup when the Ramparts status expires wrongly assumed that the player is still on the current level. They could, of course, leave the level and have the status expire on the new level, returning to the old level later. This meant that walls could become permanently be flagged as icicle covered, even though they would only operate as such if the player was in LOS and had the spell active. This commit has the Ramparts status expire and trigger the usual feature property cleanup whenever a level change happens. -------------------------------------------------------------------------------- 78e40d7af6 | gammafunk | 2020-02-05 14:15:09 -0600 Wall overlays for Frozen Ramparts (CanOfWorms) A set of wall overlays by CanOfWorms for the icicle covered walls created by the Frozen Ramparts spell. Add code support for making the wall overlay as well as choosing an overlay variant based on the wall's location. These look relatively subtle compared to the extremely cyan 'programmer art' floor tiles and floor overlays I made, which were simply color changes of the ones from slimy walls. Hence I'll probably need to modify said tiles to be more inline with these new wall overlays. -------------------------------------------------------------------------------- d6c695c3ee | gammafunk | 2020-02-05 12:03:12 -0600 Remove an unused variable (geekosaur) -------------------------------------------------------------------------------- d9b0b5b0f1 | gammafunk | 2020-02-05 01:13:16 -0600 Tweak Frozen Ramparts spell description Don't imply that it only works on rock walls and clean up some of the text. -------------------------------------------------------------------------------- 215f0e6760 | gammafunk | 2020-02-05 00:27:28 -0600 Frozen Ramparts, a level 3 Ice spell This spell is available to Ice Elementalists in their starting Book of Frost. Frozen Ramparts temporarily changes all non-permarock walls in radius 3 of the player into icicle covered walls that damage and debuff monsters that walk adjacent to them. The damage per 10 aut is a bit less than Freeze, although this spell has a higher spellpower cap of 50. The debuff is the Frozen status that slows monster movement (but not other actions). The player and allies are not affected by these walls and can move safely adjacent to them. Player LOS of the monster is required for the walls to have an effect, and walls revert to normal when the Ramparts status expires. Spellpower increases the duration of the walls as well as their damage. The damage uses BEAM_ICE, hence is only 40% resistible, yet it does apply AC, unlike Freeze. The wall effect is themed as a release of a blast of icicles that encases the victim in ice. -------------------------------------------------------------------------------- a1f3808ed8 | gammafunk | 2020-02-05 00:12:55 -0600 Icicle covered walls This wall feature property will be used in an upcoming spell which temporarily changes surrounding walls to damage and debuff monsters that wonder nearby. The effect works similarly to the acid damage slimy rock walls used in the Slime Pits. This commit adds support for the feature property itself, the level state tracking, the description of the property seen in-game, as well as Tiles and console rendering of the walls. Monster AI is updated to consider the walls in the same way they currently do for slimy walls, although the actual damage effect will be added in a subsequent commit that implements the spell. Give description support for both highlight and full description (i.e. x-v and X-v), with the full description giving details about the effect the walls have on monsters. Add "icy" floor and overlay tiles that are rendered in the same way as slimy walls. For console, we animate the icicle walls with ETC_ICE and recolour adjacent floors to light cyan. As a technical note, use of a property instead of a dedicated feature type for the icicle covered walls works better here. We'd like the spell to affect all kinds of non-permarock walls and wouldn't want to make unique "icicle covered" features for each wall material. -------------------------------------------------------------------------------- 78e9c91b01 | gammafunk | 2020-02-04 23:44:46 -0600 Make checks for slimy walls more accurate Some Tiles code tries to infer whether to try for slimy wall overlays based on the player's branch location. Whether a slimy wall exists is more accurately stored in the level state, which is updated every time stairs are taken. Use this data instead. -------------------------------------------------------------------------------- 8e44f26cd4 | gammafunk | 2020-02-04 23:44:46 -0600 Correct and refactor monster enchant durations The monster enchants Aura of Brilliance (used by deep elf high priests), Empowered Spells (conferred by Aura of Brilliance), and Frozen (debuff from Flash Freeze) monster enchants have have default durations that incorrectly use AUT scale for a count of turns. This meant that Aura of Brilliance and Frozen enchants were added with 10 times the intended number of turns. This doesn't have much gameplay significance in practice, since deep elf high priests can just recast the buff when it expires and Frozen is generally not applied to monsters. The default duration for Empowered Spells was unused, as this duration was applied elsewhere in a way that was almost correct. None of these enchants factor in the monster's intrinsic speed like they are supposed to. This commit corrects the default durations to the right scale and incorporates monster intrinsic speed. The duration application of Empowered Spells now uses the default duration instead of having an independent calculation. -------------------------------------------------------------------------------- 3004169c2b | Nicholas Feinberg | 2020-02-02 21:30:17 -0800 Staticify rot resistance Oops! -------------------------------------------------------------------------------- ed13d95810 | Nicholas Feinberg | 2020-02-02 20:59:51 -0800 Refactor rot resistance I devoutly pray the silly Zin exception will be removed, but this is a cleaner take on the current situation. -------------------------------------------------------------------------------- 68aa37aee3 | theJollySin | 2020-02-02 18:46:29 -0600 Clarified scroll only summons allied creatures -------------------------------------------------------------------------------- ecf17560b0 | gammafunk | 2020-02-02 17:18:51 -0600 Don't apply god conducts for ignite blood (vt, 12189) We now apply god conducts for damaging cloud placement that harms allies, which can happen via Demonspawns' ignite blood mutation. Ignite blood is a non-targeted, passive placement, so we don't want to apply god conducts in this case. This commit exempts passive blood from god conducts. -------------------------------------------------------------------------------- 4f2eb97ec1 | Nicholas Feinberg | 2020-02-02 12:25:53 -0800 Improve unrand documentation Clarify what exactly "REGEN: 1" means (even when the spell existed, it wasn't a very useful reference). Also remove references to the randapp property, which has been unused since 103bc38328, over a year ago. -------------------------------------------------------------------------------- 2d526bc93e | Nicholas Feinberg | 2020-02-02 11:01:58 -0800 Make the staff of Battle less tubular Make the description more concise (esp. the second sentence, which was a bit of a run-on), and don't imply that Iskendrun had hands. -------------------------------------------------------------------------------- 6fc7858b95 | Edgar A. Bering IV | 2020-01-31 09:37:43 -0500 Punctuation and wording tweaks (aidanh) -------------------------------------------------------------------------------- fd0a09164b | Edgar A. Bering IV | 2020-01-31 08:55:28 -0500 Consistently use DCSS in documentation [ Closes #1250 ] -------------------------------------------------------------------------------- fe06877dbd | Edgar A. Bering IV | 2020-01-31 08:54:58 -0500 Further INSTALL.md revisions - Wrap to 80 characters - Add missing backticks - Reorder and deduplicate some instructions -------------------------------------------------------------------------------- 7f9a73cb9d | Alex Jurkiewicz | 2020-01-31 08:54:58 -0500 Update msys2 Python instructions (Goratrix) Python 2 was removed and Python 3 packages have been renamed. -------------------------------------------------------------------------------- a84b7e589d | Alex Jurkiewicz | 2020-01-31 08:54:58 -0500 typo (amalloy) -------------------------------------------------------------------------------- e2881a364e | Alex Jurkiewicz | 2020-01-31 08:54:58 -0500 Simplify language -------------------------------------------------------------------------------- 50f8ac8374 | Alex Jurkiewicz | 2020-01-31 08:54:58 -0500 INSTALL improvements (gammafunk) Improve the "running DCSS" section header, and provide help forum links both in this section and globally at the bottom. -------------------------------------------------------------------------------- fe4ac87022 | Alex Jurkiewicz | 2020-01-31 08:54:58 -0500 Update community links Add the /r/dcss subreddit and /r/roguelikes Discord chat, both of which are very active. -------------------------------------------------------------------------------- 3c00d48056 | Alex Jurkiewicz | 2020-01-31 08:54:58 -0500 Update license information Fix the link to the global license file, and simplify the history description. -------------------------------------------------------------------------------- 20d0cbd702 | Alex Jurkiewicz | 2020-01-31 08:54:58 -0500 Rewrite INSTALL Convert to Markdown and perform a large restructure. Assumptions & goals: 1. Majority of users want to compile tiles from a Git repository 2. These users want two pieces of information: 1. What dependencies are required and how to install them 2. What commands to run to compile 3. Reduce branching / decisions in the basic instructions, to help new users. 4. Put the key compilation process as close to the top of the file as possible, so advanced users don't have to hunt for it. -------------------------------------------------------------------------------- 1f46b9f714 | advil | 2020-01-30 22:23:52 -0500 Maybe fix a -tele crash on levels with tele traps This was passing a pointer to a copy via the vector. -------------------------------------------------------------------------------- ff83419037 | wheals | 2020-01-30 11:54:14 -0500 Avoid unnecessary copying of item_defs. The struct isn't that small, and if it has any props it can get pretty big (orc corpses, for example, may contain an entire monster struct). -------------------------------------------------------------------------------- 92cdcce9cb | Aidan Holm | 2020-01-30 20:08:17 +0800 Revert "Allow non-local ui::pop_layout()" Reverted due to redraw issue when exiting map view and returning to search results; this is due to the fact that the UI stack is temporarily empty, so the UI framework redraws the screen. This reverts commit 07d6442d42d038d322de7b1b93851c6ddede88c4. This reverts commit 302732ab6c032dcc3182d82d315fe9636195a08b. -------------------------------------------------------------------------------- 07d6442d42 | Aidan Holm | 2020-01-30 18:47:23 +0800 Fix freeze after stash search map view (GH #1270) This issue was caused by the showmap code popping off all UI layers widgets, due to 302732ab6c. Unfortunately after closing the map view, the menu was still open, even though its widget had been popped. This change makes the menu (and for completion, everything using run_layout()) re-push the widget layout if the menu (layout) is still running. Alternate solutions include: 1) stack-of-stacks for UI layouts; this would permit pushing an empty UI stack for the showmap code, and then popping back to the unaltered UI stack for the menus, and 2) a showmap widget that fully obscures all layers below it and renders the map view. The previous solution was the UI cutoff mechanism, which temporarily prevented rendering of layers. Unfortunately that interacts badly if there is an underlying "main game" widget responsible for drawing the main view. -------------------------------------------------------------------------------- a4d2f0cd0c | Aidan Holm | 2020-01-30 18:27:11 +0800 Rename get_event_count() -> next_event_is() It only ever returned 0 or 1; this makes the actual semantics clearer. -------------------------------------------------------------------------------- ece2dee8bd | Aidan Holm | 2020-01-29 18:22:37 +0800 Make macro code slightly clearer This change makes the difference between getchm() and getch_with_command_macros() slightly clearer. -------------------------------------------------------------------------------- dcbd824e23 | Aidan Holm | 2020-01-29 18:22:37 +0800 Remove getchm rgetch parameter getch_ck is always used at this point. -------------------------------------------------------------------------------- 431bb856fd | Aidan Holm | 2020-01-29 18:20:25 +0800 Revert "Run timer callbacks in main thread" Reverted due to freezing and lag on windows tiles, compiled with msys. This reverts commit 67f526bef1c047e5179196a77422487f15c23cc7. -------------------------------------------------------------------------------- 67f526bef1 | Aidan Holm | 2020-01-29 16:41:09 +0800 Run timer callbacks in main thread Previously, they were run in a separate thread spawned by SDL, which makes interacting with other code difficult, since most other code assumes single-threaded access. Note that this change queues an SDL event, but only the input loop in ui.cc actually handles this event by calling the callback. This is fine, because currently the only use of this API is to show tooltips after a delay, and the callback function for that worked by queueing an SDL event, so the callback now does nothing and the actual function is performed as a side effect. This may seem like a step backwards for code clarity, but it's a necessary step to removing the input loop in tilesdl. -------------------------------------------------------------------------------- 302732ab6c | Aidan Holm | 2020-01-29 16:41:08 +0800 Allow non-local ui::pop_layout() There are some UI transitions which pop multiple popups, e.g. evoking an item from its description. Previously this required nasty hacks, such as having the inventory window still open, but hidden by a cutoff_point. This commit fixes this mess by permitting non-local popping of layouts. Now the evoke UI (well, direction chooser UI really) can simply pop off UI layouts until there are none left. This means that UI layouts that permit the display of arbitrary sub-widgets must check whether their layout is still active when appropriate. -------------------------------------------------------------------------------- 8c9d837f8b | Aidan Holm | 2020-01-29 16:41:08 +0800 Add widget->on_layout_pop() hook This commit adds a hook that is called when a layout is popped; it is fired only on a layout's root widget. -------------------------------------------------------------------------------- 3b8d5a1ed6 | Aidan Holm | 2020-01-29 16:41:08 +0800 Add const -------------------------------------------------------------------------------- 7dc260b4ef | Aidan Holm | 2020-01-25 17:03:49 +0800 Fix more() being called while swapping monsters monster::moveto() immediately broke any constrictions, which could cause a more() prompt. Since monster::swap_with() moved one monster after the other with moveto(), this could result in a prompt with both monsters in the same position. more() redraws the screen, and this caused an assertion failure, until more() was changed to avoid redrawing any changes to the dungeon area. This commit changes swap_with() to be more robust, preventing the possibility of a more prompt being called while monsters' positions are invalid. -------------------------------------------------------------------------------- 4b9beb1024 | Aidan Holm | 2020-01-25 16:59:21 +0800 Remove getchk() It's now a no-op. -------------------------------------------------------------------------------- 92db936f3c | Aidan Holm | 2020-01-25 16:59:21 +0800 Merge libunix getch_ck into getchk These key remappings seem pretty important and I can't think of a situation where you wouldn't want them. Also, since this behaviour is unix specific, it's likely buggy for win32 in various places. -------------------------------------------------------------------------------- d412b83276 | Aidan Holm | 2020-01-25 16:59:21 +0800 Remove win32 console key_to_command() remapping I'm not entirely sure what this was supposed to do, but it doesn't make much sense; it's converting CKs to other CKs, and like the unix-specific key conversion events, would only apply on windows for the subset of get_key calls that happened to use this API. -------------------------------------------------------------------------------- 55608276e7 | Aidan Holm | 2020-01-25 16:59:21 +0800 Remove m_getch() On all platforms, m_getch just called getchk. -------------------------------------------------------------------------------- 8fc31a4ec6 | Aidan Holm | 2020-01-25 16:59:21 +0800 Merge libunix m_getchk down into getchk On unix, to get a key, getch_ck calls m_getch, which calls getchk, which finally pulls the key from ncurses with get_wch. m_getch gets mouse events from ncurses when a KEY_MOUSE is delivered, and also optionally filters resize events; both of these are probably things that should be done all the time. -------------------------------------------------------------------------------- cf7b942d6d | Aidan Holm | 2020-01-25 16:59:21 +0800 Simplify unix m_getch() control flow proc_mouse_event() only ever returned the two values tested for, so only mouse_enabled needed to be checked. -------------------------------------------------------------------------------- 4e4398398a | Seve Monahan | 2020-01-24 21:29:21 -0600 Tweak Maggie's spawn range slightly (hellmonk) This should make Maggie a bit more of a threat without making her excessively difficult to kill or avoid. -------------------------------------------------------------------------------- 9048b99c0d | Seve Monahan | 2020-01-24 20:54:55 -0600 Comment some player.cc methods -------------------------------------------------------------------------------- 22a91f9759 | Seve Monahan | 2020-01-24 20:54:54 -0600 Make armour descriptions show how AC will change when worn. I apologize for including various miscellaneous testing and refactoring in this commit, but I think trying to divide it would just risk causing weird between-commit problems. -------------------------------------------------------------------------------- 7d9e569eea | gammafunk | 2020-01-23 20:53:26 -0600 Fix a vault NSUBST (riverfiend) The Zot definition for the 2 glyphs was missing a comma, which made it place unwanted features and messed up the loot placement there. Also reformat a couple other NSUBST in this vault to have a consistent style. -------------------------------------------------------------------------------- 0e000e855e | Alan Malloy | 2020-01-23 11:19:39 -0800 Fix a custom meatsprint monster's spell list (p0a) -------------------------------------------------------------------------------- 80bd347ae0 | gammafunk | 2020-01-19 02:23:42 -0600 Add an aliveness check for LRDing a monster Don't let LRD attempt to fragment using a dead monster as the source. This probably could not arise in practice, as currently nothing can trigger an LRD on a monster that has already died. Still, if the monster at the target is dead, we should ensure that any appropriate terrain at the location is used as the LRD source instead. Also ensure that no god conducts are applied for LRD happening at a dead monster's location. -------------------------------------------------------------------------------- c46a48dfac | gammafunk | 2020-01-19 02:23:10 -0600 Remove a redundant application of god conducts Airstrike applied god conducts twice, once in cast_airstrike() and once in _player_hurt_monster(); let the latter handle any conducts. -------------------------------------------------------------------------------- 1567df3305 | gammafunk | 2020-01-19 02:22:10 -0600 Refactor a player spell damage function It's easier to understand if we let monster::hurt() do death cleanup and only do cleanup in _player_hurt_monster() for the exceptional case where no damage was done. Also document our requirement that a monster be alive if we're handling god conducts in this function. -------------------------------------------------------------------------------- 1657e5263c | gammafunk | 2020-01-19 01:20:16 -0600 Restore cloud/conduct changes and fix a crash The application of conducts for cloud placement in d5a9e69a didn't include a check that the target monster is alive. Effects like immolation can place a cloud when a monster dies, triggering an assert. Add an aliveness check before applying any conducts. A cloud can't harm a monster if it's already dead (in the HP sense), after all. This restores commits d5a9e69a through 7650d0de. -------------------------------------------------------------------------------- 1cc7eeb0d1 | Alan Malloy | 2020-01-17 11:10:42 -0800 Revert cloud/conduct changes They were causing crashes with inner fire This reverts commits d5a9e69a through 7650d0de. -------------------------------------------------------------------------------- 7650d0de75 | gammafunk | 2020-01-16 23:21:27 -0600 Add attack prompts for Ring of Flames and Tornado With da09f83f, these spells respects god conducts when placing clouds that harm allies or attack from a sanctuary. Ring of Flames had no attack warning at all, and Tornado had one that warned about harming allies, but made no mention of penance. This commit gives both spells attack warnings that includes any relevant mention of penance. -------------------------------------------------------------------------------- 9db6740682 | gammafunk | 2020-01-16 23:21:16 -0600 Remove an unnecessary scope -------------------------------------------------------------------------------- 4be4e3ae42 | gammafunk | 2020-01-16 23:16:00 -0600 Document some cloud functions -------------------------------------------------------------------------------- d5a9e69a94 | gammafunk | 2020-01-16 23:16:00 -0600 Apply god conducts when placing clouds Currently most damaging cloud spells don't apply god conducts for attacking allies (Okawaru and the good gods) or attacking while in Zin's sanctuary. The UI does warn the player about penance in some cases (Freezing Cloud, Poisonous Vapours) but not all (Ring of Flames, Tornado), and in nearly all cases the conduct is not actually applied after any attack. This commit puts conduct tracking in the place_cloud() function, which is used by all spells to place clouds. This properly considers whether the target is actually affected by a damaging cloud. Ice beasts are immune to freezing clouds, for example, so placing one on an ice beast gives no warning and causes no penance. The existing conduct warning and application code already correctly ignores conjured or "object" monsters made by player conjuration spells. -------------------------------------------------------------------------------- da09f83f66 | gammafunk | 2020-01-16 23:15:47 -0600 Refactor conducts for Zin's sanctuary Before this commit, any code that applied god conducts had to make its own additional checks for sanctuary violations and potentially call remove_sanctuary(). This commit moves this handling into set_attack_conduct() and the god_conduct_trigger class so that separate sanctuary checks aren't necessary. Technical note about Toxic Radiance and #999: A comment noted that the god conduct had to be applied before any toxic radiance damage in order to properly apply conducts for monsters killed the turn the spell is cast, but this was not true as of the current code. A unique_ptr in the trigger holds a monster object that has the properties of the original monster copied by value before any damage is made; any victim data necessary to apply the conduct is hence still available. -------------------------------------------------------------------------------- 719d9921ed | Emily | 2020-01-17 03:42:34 +0000 Remove the per-weapon-type vorpal brand adjectives These mostly served to confuse players and hide the relation between the vorpal brands. -------------------------------------------------------------------------------- 3b4b6a4ccc | Alan Malloy | 2020-01-13 10:59:40 -0800 Bah, humbug! Christmas is over (Goratrix) Revert "Changing 'slaying song' to 'sleighing song'" This reverts commit 5f8687bca5ed173a039bdfd0014589c418b5cf6d. -------------------------------------------------------------------------------- 1430e7d239 | gammafunk | 2020-01-13 10:28:01 -0600 Improve the cone of clouds targeter Previously this targeter didn't indicate when a square would be unaffected by the wand due to presence of an existing cloud or due to Zin's Sanctuary. Now only squares that would actually receive a cloud are highlighted. Ideally this targeter would prevent accepting a target when no squares would be affected, but this will take a bit of rewriting to do properly. This wand probably should not use the shotgun targeter at all, since it doesn't actually use the concept of multiple beams firing like the wand of scattershot does. -------------------------------------------------------------------------------- cdfab47c19 | gammafunk | 2020-01-13 10:28:01 -0600 Disallow targeting a cloud spell to a sanctuary Zin sanctuaries prevent clouds from placing at all, but currently the game lets you waste a turn casting e.g. Freezing Cloud even when you target a sanctuary square that would create no clouds at all. Although we could let the targeter choose a sanctuary square if it would create at least one cloud out of the sanctuary, it's more consistent with the spell's current behaviour to disallow this. Freezing cloud refuses to target a square with an existing cloud regardless of whether empty squares are adjacent to it, for example. This commit prevents the player from targeting sanctuary squares and gives a message to that effect in the targeter. -------------------------------------------------------------------------------- 53dbb631d1 | Seve Monahan | 2020-01-12 16:08:06 -0600 Don't create random 0 byte files when running catch2-tests -------------------------------------------------------------------------------- 96e9fc7a18 | Seve Monahan | 2020-01-12 15:09:27 -0600 Checkwhite -------------------------------------------------------------------------------- e97b98a362 | Seve Monahan | 2020-01-12 13:57:44 -0600 Remove some support rough black scales mutation. This mutation was removed around four years ago, I am OK with somebody trying to use a save from that long ago losing some AC for their trouble. -------------------------------------------------------------------------------- 508b930957 | Seve Monahan | 2020-01-12 13:52:44 -0600 Refactor player::base_ac some -------------------------------------------------------------------------------- 4db4e4fac0 | Seve Monahan | 2020-01-12 13:51:30 -0600 Create a test fixture which creates a mock player you. Ignore the odd discussion of refactoring base_ac in the comments, it's coming in the next commit. -------------------------------------------------------------------------------- e02885a60e | Edgar A. Bering IV | 2020-01-12 10:35:05 -0700 Tone down the new swamp ending Specifically, remove spectral and simulacrum Learnean variants and ghouls. Reduce monster density at high-rolls and reduce monster variance. -------------------------------------------------------------------------------- c1b5a34292 | Alan Malloy | 2020-01-09 13:24:14 -0800 Don't crash when failing to acquire an item At least one way this could happen is when trying to create a manual while all your skills are at 27. -------------------------------------------------------------------------------- 49d089a364 | Edgar A. Bering IV | 2020-01-08 11:01:57 -0700 Re-enter acquirement selection after a HUP a0cd47f incorrectly included the code that made this change. This commit is to point that fact out for posterity. [skip-ci] -------------------------------------------------------------------------------- a0cd47fd9c | Edgar A. Bering IV | 2020-01-08 11:00:11 -0700 Display appropriate capitals for easy_confirm = none In shopping and acquirement confirmation prompts, which use yesno and so respect easy_confirm but write their own prompts, the easy_confirm = none user was not reminded to use capitals. -------------------------------------------------------------------------------- 35c6a73c01 | Edgar A. Bering IV | 2020-01-08 10:04:20 -0700 Re-enter Stack Five ordering after a HUP -------------------------------------------------------------------------------- d3051d076b | Edgar A. Bering IV | 2020-01-08 09:31:37 -0700 Display drawn cards immediately when re-entering Stack Five When returning to the uncancelable Stack Five after a HUP the previously drawn cards were not immediately displayed, only after another draw. -------------------------------------------------------------------------------- cf1075a8b3 | gammafunk | 2020-01-07 22:00:50 -0600 Remove an unused Lab timer effect Labs no longer exist. Set up removal upon update to next major version tag. -------------------------------------------------------------------------------- 1920f1ac21 | gammafunk | 2020-01-07 16:23:03 -0600 Remove an unused private field (geekosaur) -------------------------------------------------------------------------------- fa5a36fad7 | Edgar A. Bering IV | 2020-01-07 14:49:55 -0700 Allow monsters to cast Leda's while flying and remove dead code Currently only player ghosts have Leda's; this is more about removing an otherwise unused function. -------------------------------------------------------------------------------- 9cef9ebf11 | Kate | 2020-01-07 21:26:40 +0000 Allow Leda's to persist while flying When cast by the player - being stuck in hostile Leda's will still prevent flight. -------------------------------------------------------------------------------- 3fbb973fcc | Kate | 2020-01-07 20:59:45 +0000 Rename a function for clarity Since it's not just used for silence. -------------------------------------------------------------------------------- 97f579c7b8 | Kate | 2020-01-07 20:36:16 +0000 Make a local function static -------------------------------------------------------------------------------- 28aa74ec57 | Edgar A. Bering IV | 2020-01-07 12:29:09 -0700 Have Confusing Touch check MR instead of HD As a Hex this spell should be checking the magic resistance mechanic. Dazzling Flash keeps its HD check with its dual school nature. This also increases the power cap to be more in line with being a level 3 spell. -------------------------------------------------------------------------------- 61946d84f9 | Edgar A. Bering IV | 2020-01-07 12:29:09 -0700 Raise Confusing Touch to level 3, Remove Confuse Confusing Touch was absurdly powerful at Level 1; Confuse also is quite strong at Level 3. Of the two ways of applying confusion, confusing touch is the more interesting one, so that effect stays at level 3 (replacing Confuse in all relevant books). Corona replaces confusing touch in the book of Cantrips. -------------------------------------------------------------------------------- c98b7b2d62 | Edgar A. Bering IV | 2020-01-07 12:29:09 -0700 Return Dispel Undead to level 4 Unlike Agony, which deals damage scaling with the target's HP, Dispel Undead is a normal dice roll. With its melee range restriction, Level 5 is no longer appropriate. -------------------------------------------------------------------------------- 67d9bde936 | Edgar A. Bering IV | 2020-01-07 12:29:09 -0700 Remove the range-dependence from Dazzling Flash The range dependence made the spell harder to reason about for little payoff, and the spell is too weak with it. -------------------------------------------------------------------------------- bb9abfce8d | Edgar A. Bering IV | 2020-01-07 09:51:31 -0700 Buff Leda's Liquefication Make the caster immune to the maluses imposed by liquefied ground. This goes all the way back to the introduction of the spell in 2010, and the justification given then was simulationist. Hexes are intended to support other combat styles, but the attack fumbling and slow movement penalties meant that Leda's made little sense for any archetype and as a result the spell was little-used. The shrinking radius and re-cast delay imposed by the radius 0 period should provide sufficient buffer against aggressive kiting strategies with the spell; if this proves incorrect the movement penalty can be restored (without the fumble penalty). -------------------------------------------------------------------------------- 41a7e554cb | gammafunk | 2020-01-06 22:22:31 -0600 Fix felid acquirement (alexjurkiewicz) We were assuming there would be 3 classes that aren't food or gold to draw from, but felids now only have two of those. -------------------------------------------------------------------------------- 3ac56c63e1 | Edgar A. Bering IV | 2020-01-06 20:24:16 -0700 Add the join god screen revisions to webtiles fd4a3aefb759 implemented these UI changes but did not include the changes in webtiles. -------------------------------------------------------------------------------- 90aa2f6c38 | gammafunk | 2020-01-06 20:29:52 -0600 Remove the miscellaneous acquirement category This category gifts evocable items, most of which are consumable. These gifts are harder to balance relative to equipment and spells, since each type of consumable accumulates without limit for each type. Gold acquirement already covers "consumable acquirement" through shops, which are limited by dungeon generation (nerf Gozag imo). Although players should have acquired misc often due to how reliably the category gives a useful item, it remained relatively unpopular, making it an easy target for removal. -------------------------------------------------------------------------------- 148af02efd | gammafunk | 2020-01-06 20:29:52 -0600 Rework the scroll of acquirement Scrolls of acquirement are spoilery items. It benefits the player know internal game logic in order to make a decision on which choice is the most likely to give a desirable acquirement. This logic isn't something we'd like to display in-game. While some acquirement logic could be simplified to reduce the amount of spoilers, it's probably not feasible to fully do this as long as acquirement uses the player character's data to affect item generation. This commit mostly removes acquirement spoilers by having the scroll present a set of fully generated items as choices instead of asking for a choice of item categories. Reading an acquirement scroll opens a popup menu presenting 5 generated items: * It always generates food and gold acquirement item. * For the remaining three items, it chooses three categories without replacement from the six available. * Each randomly chosen category has an equal chance of being chosen. * The menu has a toggle between selection and inspection, to allow showing the detailed view of generated items. * Because of the toggle, it confirms any selection in selection mode. * The menu is uncancellable to prevent problems with unrand item generation. More detailed wiki writeup https://github.com/crawl/crawl/wiki/Acquirement-Reform Technical notes: The old acquirement() function that handled both interactive and non-interactive requirement is gone, with non-interactive instances having been moved to use acquirement_create_item() in a previous commit. The new acquirement_menu() function uses an AcquireMenu class to build a menu based on a modified shop menu. The scroll generates the items and stores them in a player prop. These remain and repopulate the menu until the player actually selects an item, so it works properly across HUPs. -------------------------------------------------------------------------------- 4094881d89 | gammafunk | 2020-01-06 20:29:52 -0600 Refactor some calls to acquirement Since the acquirement scroll interface will be rewritten in a subsequent commit, we don't want to use the same function for interactive and non-interactive acquirement. Have various instances of god acquirement gifts call acquirement_create_item() directly, as this function does all the callers need with a simple interface. -------------------------------------------------------------------------------- bb2a68f3fc | gammafunk | 2020-01-06 20:29:52 -0600 Fully use a function parameter -------------------------------------------------------------------------------- f734a50c3c | Byrel Mitchell | 2020-01-06 19:21:49 -0700 Enchant Wyrmbane for Maggie/Margery Since, in young form, she's killed a dragon; and in older form killed at least two. [ Committer's note: reworded commit message, set force_item. Closes #1255 ] -------------------------------------------------------------------------------- 9ac4296c3e | Seve Monahan | 2020-01-06 19:18:55 -0600 Add a comment to branch-data.h -------------------------------------------------------------------------------- 91ddc7e73e | Seve Monahan | 2020-01-06 19:18:41 -0600 Refactor some code related to disabled (swap) branches. Creates a new file (ng-init-branches.cc) and a couple new test files. Some of the new tests are characterization tests which should probably be removed when somebody wants to actually change the behavior, but I'm leaving them in for now. -------------------------------------------------------------------------------- fd4a3aefb7 | Edgar A. Bering IV | 2020-01-06 17:47:21 -0700 Refactor and streamline the join god screen (12160) First, this commit refactors the code to remove some gotos. Next, this enables one-key joining from the pray-at-altar screen by pressing J or Enter. (There is still a [Y]es/[N]o prompt for abandoning.) There's some concern that this behavior might lead to inadvertent conversion when using the G_ feature. However, G_ does not initiate prayer, the player must press > before seeing this screen. -------------------------------------------------------------------------------- d2ca0b7745 | Edgar A. Bering IV | 2020-01-06 13:55:13 -0700 Allow casting BVC with shift+dir (12164) Now that BVC is bolt-like. -------------------------------------------------------------------------------- 5f064afb62 | Edgar A. Bering IV | 2020-01-06 13:09:53 -0700 Respect quiet for flight checks (12171) -------------------------------------------------------------------------------- 9cab249bb1 | Edgar A. Bering IV | 2020-01-06 11:58:23 -0700 Fix a crash in monster collisions (12156) -------------------------------------------------------------------------------- 04aae9b36d | Edgar A. Bering IV | 2020-01-06 11:24:32 -0700 Add attack strength punctuation to unrand effects -------------------------------------------------------------------------------- 1537728274 | Edgar A. Bering IV | 2020-01-06 11:14:45 -0700 Add attack strength punctuation for staff damage -------------------------------------------------------------------------------- 45ab75433c | Edgar A. Bering IV | 2020-01-06 11:05:49 -0700 Refactor staff damage application (12149) This ensures staff damage messaging occurs, fixing a bug. It also deduplicates code for actually inflicting staff special damage, and despaghetties the printing of the message. -------------------------------------------------------------------------------- a0877dfadb | Seve Monahan | 2020-01-06 10:00:57 -0600 Give Maggie and Margery a 1% chance of carrying Wyrmbane This is another cute flavour nod to Margery being a dragonslayer. -------------------------------------------------------------------------------- 6c1ce5ffb1 | Seve Monahan | 2020-01-06 10:00:56 -0600 Tweak Maggie description to explain her dragon armour -------------------------------------------------------------------------------- 28ae719854 | Seve Monahan | 2020-01-06 10:00:56 -0600 Adjust the armour Maggie and Margery spawn with. (hellmonk) Maggie now has a steam/acid/swamp dragon armour (which should be interesting in the games she spawns) while Margery has a shadow/storm/fire dragon armour (to distinguish her from Maggie). It might be worth reducing Maggie's weight some if this ends up warping the amount of dragon armour available to players. -------------------------------------------------------------------------------- 0b69049c8a | Seve Monahan | 2020-01-06 10:00:56 -0600 Adjust Maggie's range (hellmonk) -------------------------------------------------------------------------------- c4e65cee02 | Seve Monahan | 2020-01-06 10:00:56 -0600 Change Margery's weights This is intended to make Margery spawn approximately the same percentage of games as she did before Maggie was added. -------------------------------------------------------------------------------- 56651bb4db | Seve Monahan | 2020-01-06 10:00:55 -0600 New unique: "Maggie" This a test at a new story-telling technique for dcss: having multiple uniques which represent the same character. See here for the proposal: https://crawl.develz.org/tavern/viewtopic.php?f=8&t=26482 Flavorfully, this unique is a younger version of Margery. Mechanically, this unique is meant to be an early introduction to the Mesmerise spell. Maggie and Margery will not appear in the same game. The Maggie tile is just a Jessica palette swap. Hopefully it will be replaced with a superior tile later. The Maggie tile's palette is based on normal Margery. -------------------------------------------------------------------------------- 516bc45ae0 | Aidan Holm | 2020-01-05 22:24:48 +0800 Fix crash on startup with map-generated messages This is a variation of the previously-fixed crash; turns out startup messages can be generated even earlier than I previously anticipated. -------------------------------------------------------------------------------- 7600c65aa0 | Kate | 2020-01-04 15:31:03 +0000 Remove an unused parameter (geekosaur) -------------------------------------------------------------------------------- e76b031baf | Edgar A. Bering IV | 2020-01-03 15:58:57 -0600 Don't trigger ball lightning and foxfire on firewood (pblur, 12154) -------------------------------------------------------------------------------- bb0aff56fe | Edgar A. Bering IV | 2020-01-03 15:58:57 -0600 Prevent allies from swapping with foxfire (12153) -------------------------------------------------------------------------------- 90ccd6aac3 | Nikolai Lavsky | 2020-01-03 15:26:12 -0600 Fix an information leak about Mara and rakshasa clones The player could use a scroll of immolation to find the real Mara, because the scroll doesn't affect summons. The Inner Flame spell has a similar problem. Also, when the original is behind a clone or another monster, the spell's targeter will happily inform the player that "You can't see any susceptible monsters within range!" This commit fixes that by making Mara and rakshasa clones inner-flameable. As a side effect, all other illusions - illusions created via a card, evocable, or monster spells - become inner-flameable too. -------------------------------------------------------------------------------- 519431ee42 | Edgar A. Bering IV | 2020-01-03 11:41:38 -0600 Fedhas protects plants from Ignite Poison (12161) -------------------------------------------------------------------------------- 05e59b54bc | Edgar A. Bering IV | 2020-01-03 11:15:56 -0600 Reveal floor traps when magic mapping (12167) The cause of 12167 is magic mapping stores extra info about the terrain type allowing it do distinguish tc_forbidden and tc_dangerous; alone this is not a bug, but it becomes a bug because traps share glyphs with floor, causing an information leak. There are three possible solutions: 1. Add a special case in _get_travel_colour() to not report that magic mapped trap cells are dangerous. 2. Add a new magic mapping feature/glyph pair for unidentified trap and report that. 3. Reveal floor traps when magic mapping. This commit takes soultion number 3; since traps are revealed it makes sense to treat them like other features (more like statues and doors than shops/altars). Approach 2, adding a feature DNGN_UNKNOWN_TRAP seems like it will also require a new trap type and some complications; the simplicity of approach 3 is why I favored it. -------------------------------------------------------------------------------- 9f54f116a7 | Kate | 2020-01-03 16:44:28 +0000 Fix spacing [skip ci] -------------------------------------------------------------------------------- 9e2f79d0c6 | Kate | 2020-01-03 16:44:28 +0000 Don't make Trog's Hand increase passive hunger rate It caused hunger while active in the same way that the regeneration spell did, but as an activated ability it makes more sense for the hunger to be an up-front cost (as with berserk), so just slightly increase its food cost instead. -------------------------------------------------------------------------------- 7e26dd5d75 | Emily | 2020-01-03 16:44:20 +0000 Remove the Regeneration spell This spell is one of the few that offers a pure buff without any meaningful downside at a relatively low level, and that is so universally useful as to be worth learning on any character that can cast it. It also duplicates a god ability (Trog's Hand). In light of these factors, it has been chosen as a sacrifice to the God of Removal. Agony takes its place in the Book of Necromancy (making the book single-school), while the Book of Battle receives Ozocubu's Armour as a replacement defensive buff. -------------------------------------------------------------------------------- 7c9d860b3b | Kate | 2020-01-02 18:41:53 +0000 Add a cast message for harpoon shot (#11454) -------------------------------------------------------------------------------- 1045be4518 | Kate | 2020-01-02 18:20:30 +0000 Add descriptions for ranged Agony/Dispel Undead (#12148) -------------------------------------------------------------------------------- 148cd443ae | Kate | 2020-01-02 16:00:55 +0000 Fix inner flame messages displaying out of LOS (#12168) -------------------------------------------------------------------------------- ed6d54792d | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Improve gcovr arguments Don't try and re-use gcov data between runs, the way gcov files automatically get merged could lead to some very confusing results. This approach is slow, but more reliable. Also ignore a bunch of machine-generated source files which otherwise generate errors. -------------------------------------------------------------------------------- 386efcfdeb | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Don't clean gcno files with make clean-coverage These coverage-related files are generating during debug compilation, so treat them like .o files and only delete with `make clean`. -------------------------------------------------------------------------------- 340c3955ff | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Improve coverage documentation -------------------------------------------------------------------------------- ca889fb587 | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Use gcovr preferentially over genhtml -------------------------------------------------------------------------------- 10fadfea08 | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Improve catch2 test compilation Don't relink the binary if it's not strictly necessary. -------------------------------------------------------------------------------- f682754af2 | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Remove trailing whitespace -------------------------------------------------------------------------------- 81cf26a3d9 | Alex Jurkiewicz | 2019-12-31 19:45:45 -0600 Add code coverage tracking Supports both GCC and LLVM toolchains. Bluffer's guide: 1. make catch2-tests 2. util/coverage More explanation has been added to testing.md (which reworks testing.txt) and `util/coverage --help`. -------------------------------------------------------------------------------- 140ab784a8 | Kate | 2019-12-30 15:33:25 +0000 Fix Trog being unable to gift artefacts (#12159) But restrict them to the same brand set as non-artefacts. Also prevent gifting the staff of Olgreb (since other unrand enhancer staves are disallowed), and unrand weapons of pain such as Morg. Other unrands can currently still be gifted regardless of brand. -------------------------------------------------------------------------------- a29699c70a | Aidan Holm | 2019-12-30 22:55:27 +0800 Prevent entering excluded area from stair exclusion -------------------------------------------------------------------------------- 2677940bf2 | Aidan Holm | 2019-12-30 22:46:00 +0800 Update tiles every turn, not every refresh (12144) The main change here is the conditional increment of you.frame_no, but there's also an additional `mon_id` parameter to tileids_monster_base, which is only used as an additional input to randomize the tile; it should be something that identifies the monster across frames, but not necessarily across turns; a coord_def is fine. The purpose of this is to vary the chosen tile if there are multiple monsters of the same type on the screen. -------------------------------------------------------------------------------- 44e4e8591a | Aidan Holm | 2019-12-30 21:44:42 +0800 Fix crash on load if level had exclusions d626285191 introduced a crash for saves with exclusions on the current level; messages were processed before the message window was given a size, due to do_layout exiting early. The root issue is that the message window requires the window size to be ready when printing with mpr(). This adds unnecessary coupling between messaging and with screen rendering. The message code should just store messages into a ring buffer, and the message window should display that ring buffer. -------------------------------------------------------------------------------- d85ed3479c | Aidan Holm | 2019-12-30 20:51:47 +0800 Fix excluded stairs not being cycled through (12166) This happened because excluded stairs do not exclude their tile, but instead prevent traversal, so travel_point_distance was not set to PD_EXCLUDED. -------------------------------------------------------------------------------- 6f074c887a | Aidan Holm | 2019-12-29 15:59:25 +0800 Fix draconians always being mottled at xl 7 -------------------------------------------------------------------------------- a1faa1601d | Seve Monahan | 2019-12-28 23:47:37 -0600 Suppress a compiler warning (libw32c.cc) -------------------------------------------------------------------------------- b37b713d4c | advil | 2019-12-27 18:52:22 -0500 Revert "Remove Yak player species" This reverts commit e4dd1522aaec2eab40eb9aec1633f407cf286207. -------------------------------------------------------------------------------- e4dd1522aa | Aidan Holm | 2019-12-27 20:26:08 +0800 Remove Yak player species Hopefully all of the crashes are out, but in any case not having this unsightly fallback species data should make unsound code easier to find (aka much crashier). -------------------------------------------------------------------------------- d626285191 | Aidan Holm | 2019-12-27 20:26:08 +0800 Don't do_layout if player isn't loaded The local tiles UI (at least) accesses the player species during layout. This commit simply stops all layout until the player species is loaded, so layout will happen on the main menu after the player loads and saves a game. Layout will also happen in the arena, since the arena sets the player species to human. -------------------------------------------------------------------------------- bc038bb554 | Aidan Holm | 2019-12-27 20:26:08 +0800 Remove unnecessary make_hungry() call As far as I can see, this call does absolutely nothing. It makes no change to the hunger state and doesn't trigger a message, nor does it initialize a "previous hunger state" variable. Removing because it references the player (you_foodless()) during startup. -------------------------------------------------------------------------------- 168f80a5ff | Aidan Holm | 2019-12-27 20:26:08 +0800 Avoid checking player species during startup mons_genus() will check the player species if given a player illusion, to see if the player is a draconian. Since we only care about statues, we can just look at the monster data genus directly. -------------------------------------------------------------------------------- 0fa9f1078f | Aidan Holm | 2019-12-27 20:26:08 +0800 Skip checking threat level for MILEV_NAME As best as I can tell, this MILEV thing is an optimization, where parts of the monster_info will not be filled out if not required. Monster names are calculated during game initialization, and at this point the player struct (you) is invalid; currently this points to the Yak entry, but we're trying to remove that. In general, this is kind of weird. I think it'd be preferable if the monster class did name calculation (since I don't see how that can possibly vary depending on player knowledge), with monster_info deferring to monster. There's some similar things like color() with MILEV_NAME that should also really be moved. -------------------------------------------------------------------------------- 3eb5a028ed | Aidan Holm | 2019-12-27 20:26:08 +0800 Split Clua::init_lua() This commit allows Clua instances to not load most of the stuff that clua and dlua load. This commit also inlines load_cmacro() and load_chooks(), since these functions were not descriptive of what the code actually did. -------------------------------------------------------------------------------- 14707fcbb5 | Aidan Holm | 2019-12-27 20:25:48 +0800 Refactor species JSON dumping This commit changes the output data slightly; the base draconian entry is moved after the derived types' entries, due to the underlying enum ordering. -------------------------------------------------------------------------------- 41b2ec9121 | Aidan Holm | 2019-12-27 20:24:37 +0800 Factor out NUM_SPECIES, NUM_JOBS This commit removes coupling with the underlying enums by using the playable/all species/job functions instead. -------------------------------------------------------------------------------- 5dae2b7853 | Aidan Holm | 2019-12-27 20:24:37 +0800 Add job_is_removed() -------------------------------------------------------------------------------- e160d0f489 | Aidan Holm | 2019-12-27 20:24:37 +0800 Add all_species() There is no corresponding all_jobs() function, since it would return the same results as playable_jobs(); that is, all jobs are playable. -------------------------------------------------------------------------------- ab48cecf9d | Aidan Holm | 2019-12-27 20:24:37 +0800 Refactor out is_good_combination() This helper function just wasn't really doing much. The new code also uses playable_species() directly instead of iterating over the underlying enum, which is much better for encapsulation. Todo: CC_UNRESTRICTED should probably be called CC_RECOMMENDED. -------------------------------------------------------------------------------- e792f88662 | Aidan Holm | 2019-12-27 20:24:37 +0800 Add species_type_valid(), job_type_valid() Fairly straightforward; the idea here is to encapsulate the process of checking species_type/job_type validity. We lose reporting of the exact invalid value in tags.cc, but it's not as if that's terribly useful information in the first place. -------------------------------------------------------------------------------- b09b68f387 | Aidan Holm | 2019-12-27 20:24:37 +0800 Refactor _resolve_species() and _resolve_job() This code is still pretty wonky, but hopefully this change makes it somewhat more readable. -------------------------------------------------------------------------------- 235a6da892 | Aidan Holm | 2019-12-27 20:24:37 +0800 Fix CLua::execfile() showing the wrong error message Previously it would always show the error message for a hard-coded global CLua instance, not the current instance. -------------------------------------------------------------------------------- 00b82eacc2 | Aidan Holm | 2019-12-27 20:24:37 +0800 Replace CL_RESETSTACK_RETURN with lua_stack_cleaner lua_stack_cleaner is a much better idiom for doing this; less typing, less reasoning about macro substitution, and much harder to get wrong. -------------------------------------------------------------------------------- 03d1ba0c0f | Aidan Holm | 2019-12-27 20:23:33 +0800 Fix space not showing god join prompt on webtiles (Yermak) -------------------------------------------------------------------------------- 3677130cb1 | gammafunk | 2019-12-26 21:29:51 -0600 An Abyss-themed transporter ghost vault The ghost of a poor adventurer who got banished and managed to escape from the abyss, only to die to some horrors they brought through the gate. Monsters are a variety of abyss spawns that include abyss-only natives as well as monsters that also spawn in connected branches. The nastiest spawns are equivalent to an 8 spawn, but scale up in placement slowly and are appropriate 8-level difficulty for the branch of vault placement. As the source of the ghost's banishment, the vault places a monster wielding a distortion weapon, or in the case of Spider, a Zot trap or two. There is a guaranteed loot item with translocations or Lugonu theme, and the monster and loot counts scale up with placement depth. Places in all ghost-viable branches save Vaults, until we can fix transporter placement in that branch. -------------------------------------------------------------------------------- b629ede6a3 | gammafunk | 2019-12-26 21:25:12 -0600 Generalize some ghost vault monster weapon lua Use lua tables of monster weapons and weights instead of a series of conditionals. Make a function that can be used by any ghost vault wanting to set up weapons using these weapon sets. -------------------------------------------------------------------------------- 60aa035f14 | Kate | 2019-12-26 23:30:21 +0000 Make friendly foxfire dissipate when swapped into by the player Instead of giving frequent warning prompts. -------------------------------------------------------------------------------- 207b656796 | Kate | 2019-12-26 23:30:21 +0000 Fix messaging inconsistencies when reflecting projectiles For consistency with beam reflection messages, and to use the pronouns of the monster doing the reflecting, rather than the pronouns of the projectile. -------------------------------------------------------------------------------- 446fb84131 | Kate | 2019-12-26 23:30:21 +0000 Fix some crawlcode -------------------------------------------------------------------------------- 5f8687bca5 | Brendan Hickey | 2019-12-24 20:15:22 -0500 Changing 'slaying song' to 'sleighing song' -------------------------------------------------------------------------------- d28d56f9c5 | Seve Monahan | 2019-12-23 23:43:50 -0600 Mention catch2 macro problems in platform.h comment -------------------------------------------------------------------------------- 1d5616665a | Alex Jurkiewicz | 2019-12-23 23:07:37 -0600 Fix macOS OS detection with catch2 Catch2 erroneously defines TARGET_CPU_ARM on macOS, which causes platform.h to mis-detect the target OS as Nintendo DS. Fix this by changing the order of OS detection. There are a couple of alternate approaches for this fix: * Fix Catch2 so that TARGET_CPU_ARM (and possibly other TARGET_CPU_* defines) is not erroneously defined on macOS * Remove Nintendo DS support from the project -------------------------------------------------------------------------------- e4868ce5c1 | Seve Monahan | 2019-12-23 11:17:13 -0600 Revert "Test whether travis-ci can detect failing catch2 tests" Test was successful, travis-ci reported the error. This reverts commit 9aa3435fcc3cbed86b065d4cce91ea0505110db5. -------------------------------------------------------------------------------- 9aa3435fcc | Seve Monahan | 2019-12-23 00:24:57 -0600 Test whether travis-ci can detect failing catch2 tests -------------------------------------------------------------------------------- 5769b184a2 | Seve Monahan | 2019-12-22 23:17:05 -0600 Add automatic catch2 tests to travis-ci builds -------------------------------------------------------------------------------- a901c2c2c7 | Seve Monahan | 2019-12-22 22:45:04 -0600 Integrate catch2 testing framework into crawl. In order to compile and run the catch2 tests, use the "make catch2-tests" command. If you want to see an example test file, look at catch2-tests/test_english.cc. It should be possible to test any leaf functions in crawl just by copying that file and making minor changes. Future work: For some reason whenever I try to change the names of the test files from using underscores to using dashes, I get a "No such file or directory" error for pty.h (util/fake_pty.c:5:12, which #includes ). Note I am using the current way of compiling on Windows suggested in INSTALL.txt. It would be good to fix whatever is causing this so the test files can use dashes to separate words like most crawl files. Travis ci should be configured to verify the catch2 tests are working at the same time it compiles. This should be pretty easy - it just needs to run the "make catch2-tests" command and verify that command exits without an error. It would be good to eventually create a way of faking some globals to enable easier testing - player you is a big offender. -------------------------------------------------------------------------------- 60f0ac2d9a | Seve Monahan | 2019-12-22 11:20:55 -0600 New function in includes.sh: checkcc -------------------------------------------------------------------------------- e4380fb850 | Aidan Holm | 2019-12-22 19:30:39 +0800 Also clear main menu name on space (#12157) -------------------------------------------------------------------------------- eac79542e2 | Byrel Mitchell | 2019-12-20 18:28:28 -0700 Change player tile to use multiple levels of poison Follows the same breakpoints as the color of the 'Pois' status indicator. -------------------------------------------------------------------------------- ae7c9bc87e | Umer Shaikh | 2019-12-20 19:57:39 -0500 Fix dancing weapon headsup messages (hittemvvvhard) Commit 7046ed1b expanded the conditions under which headsup messages happen and how much information they give, but broke the special case of dancing weapons. The result was that when multiple enemies came into view the game tried to warn the player about an interesting dancing weapon with the unhelpful message 'There is .' This commit fixes that. -------------------------------------------------------------------------------- 3faca94807 | Seve Monahan | 2019-12-20 01:44:35 -0600 Remove a few more redundant #includes Does contain some massaging to reduce the net number of includes, such as accessing the same program constructs with different #includes -------------------------------------------------------------------------------- 0164aa517b | Seve Monahan | 2019-12-19 23:12:24 -0600 Remove redundant #includes from player-reacts.cc Split off from previous commit due to a slight bit of complexity: player-reacts.cc needed access to artefact.h, which was being included transitively through melee-attack.h (melee-attack.h #includes attack.h, which in turn #includes artefact.h). So we now #include artefact.h instead of melee-attack.h in player-reacts.cc. -------------------------------------------------------------------------------- e0ea79d902 | Seve Monahan | 2019-12-19 23:12:15 -0600 Remove more redundant #includes -------------------------------------------------------------------------------- 1f6dc261b7 | Seve Monahan | 2019-12-19 23:11:08 -0600 Add a new function to util/includes.sh The new function, checkafter, allows you to effectively "restart" a cancelled or frozen run of the checkall function. -------------------------------------------------------------------------------- 9f758675c1 | Seve Monahan | 2019-12-19 12:16:27 -0600 Remove unused variable (libw32c.cc) -------------------------------------------------------------------------------- 8baffb9bfa | Seve Monahan | 2019-12-19 10:55:59 -0600 Move some #includes from artefact.cc -> art-func.h (Fixed version) These #includes were used only in art-func.h and therefore should be included from art-func.h Found with util/includes.sh This commit has an identical diff to commit ba943c654d. ba943c654d was reverted out of caution when the build started failing, but the fault was in a different commit pushed at the same time. -------------------------------------------------------------------------------- 6aab8bdaf8 | Seve Monahan | 2019-12-19 10:52:40 -0600 Remove a bunch of redundant #includes (Fixed version) These were found with util/includes.sh. I didn't finish checking all headers for redundant inclusion due to the huge amount of time it takes util/includes.sh to run, so expect another similar commit in the near future. If you're planning to use util/includes.sh to find the remaining redundant includes: the next header I was about to check for unnecessary inclusion was initfile.h. I finished checking all header files which appear before initfile.h in alphabetical order. This is a revised version of b2f3ebf68f2 which has been tested against the tiles builds. -------------------------------------------------------------------------------- ced51cce45 | Seve Monahan | 2019-12-19 00:55:43 -0600 Revert commits which broke the tile builds Accidentally broken in ba943c6 or b2f3ebf. Attempted to revert both, but messed up again and just polluted the history. -------------------------------------------------------------------------------- 6bd3a3edb7 | Seve Monahan | 2019-12-19 00:42:40 -0600 Revert "Revert "Remove a bunch of redundant #includes"" This reverts commit 18b4d129d3da0dd7cf5b1d3f398c359d72baef40. Somehow slipped my mind to check the tiles builds. Reverting both my most recent commits after travis-ci revealed the failure. -------------------------------------------------------------------------------- 18b4d129d3 | Seve Monahan | 2019-12-19 00:42:25 -0600 Revert "Remove a bunch of redundant #includes" This reverts commit b2f3ebf68f21b493f31f90f8d5e94d820562c764. -------------------------------------------------------------------------------- ba943c654d | Seve Monahan | 2019-12-19 00:12:08 -0600 Move some #includes from artefact.cc -> art-func.h These #includes were used only in art-func.h and therefore should be included from art-func.h Found with util/includes.sh -------------------------------------------------------------------------------- b2f3ebf68f | Seve Monahan | 2019-12-19 00:11:34 -0600 Remove a bunch of redundant #includes These were found with util/includes.sh. I didn't finish checking all headers for redundant inclusion due to the huge amount of time it takes util/includes.sh to run, so expect another similar commit in the near future. If you're planning to use util/includes.sh to find the remaining redundant includes: the next header I was about to check for unnecessary inclusion was initfile.h. I finished checking all header files which appear before initfile.h in alphabetical order. -------------------------------------------------------------------------------- ea9b1ad378 | advil | 2019-12-15 15:12:20 -0500 Fix ally warning prompt for irradiate This prompt should trigger for monsters that are not protected by fedhas, rather than players that are not protected by fedhas. -------------------------------------------------------------------------------- e69d3d4235 | advil | 2019-12-15 14:45:59 -0500 Focus arena text input widget automatically -------------------------------------------------------------------------------- aa31f046c4 | advil | 2019-12-14 17:33:00 -0500 Make fedhas_protects less likely to crash if player is in the mix This function was routinely called with *act->as_monster(), which is a fairly bad paradigm since player::as_monster() returns nullptr, and so a segfault was guaranteed of a protecting monster check is missed. As long as this is so, it is better for this function to take a monster pointer instead of reference. -------------------------------------------------------------------------------- 84510d0c19 | advil | 2019-12-14 17:09:31 -0500 Fix a missing ! -------------------------------------------------------------------------------- 4a1327ee3a | Alan Malloy | 2019-12-12 18:38:33 -0800 Solidify grunt_spider_rune_circles There was a crack in the stone wall surrounding it -------------------------------------------------------------------------------- 406d6369f5 | advil | 2019-12-12 17:26:08 -0500 Various improvements to seed selection This started just as an attempt to get the seed input dialog to be focused on game start, but that led to various other issues: * [enter] only begins the game when seed selection or the begin game button are selected. * ctrl-v now works for pasting. * the [enter] button is disabled when there is no valid seed (rather than acting like esc in that case) * full pregen button is reenabled offline, there is still demand. * hotkeys -, p, and d now work when the seed input box is focused. * hotkeys -, p, d now cause the seed input box to become focused. * a bug (I think) where hotkeys always preempt other events, even if their handler returns false, is fixed. (I could be misunderstanding the intent here, as this looked semi-purposeful -- but this doesn't seem like the behavior that would be intended.) * other formatting / wording tweaks. Main remaining issues that I know of: * clicking enter while - or d buttons are selected (via tab) in webtiles still starts the game if it can; in local tiles it does nothing. This seems to be because clicking on a button in webtiles doesn't change the focus. * in all platforms, hitting [esc] while anything is focused defocuses it. This is most weird in the seed input box, on tiles/webtiles, where players won't have been as likely to navigate the ui with keys, and so will be expecting [esc] to cancel. * webtiles could use some visual tweaking * if you hit esc from the species menus after seed selection, it returns to the main menu instead of seed selection. * It's posible this ui should give some clearer indication that entering 0 will actually start a different game type than anything else. -------------------------------------------------------------------------------- b77388520f | advil | 2019-12-12 17:18:27 -0500 Fix (?) a race condition with ui state syncing When starting up the game and opening the seed selection dialog, the game fills in a seed and attempts to sync that to the js client. If the js client doesn't receive and process that message fast enough, it will send a sync message to the game with a blank text field; in my local setup these actually cross paths and things end up in an inconsistent state: the game thinks the field is empty, but there is still a number showing on the client side. (If the player does more things in the UI that number will be resynced, so it is only on immediately pressing enter that there is buggy behavior.) This fix is very brute-force, and I'm not sure it'll really get all the cases. I'm generally worried that this syncing mechanism can have race-cases like this beyond just the game start, and also it seems like the possibility of messages crossing paths might need to be dealt with more consistently. -------------------------------------------------------------------------------- 56a5b49892 | advil | 2019-12-11 14:40:21 -0500 Don't crash when checking if fedhas protects player from igniting act->as_monster() returns nullptr for the player, so some check like this needs to happen. Not immediately sure if clouds under the player should return 0 or a negative value, this goes with negative. -------------------------------------------------------------------------------- 8ac039397e | Byrel Mitchell | 2019-12-11 10:43:14 -0800 Add new swamp ending vault with Fedhas and Yred theming. Includes an undead lerny (which should generally be weaker than a living lerny; the only one that does more damage is simulacrum which is 8 speed and low MR). Equal chance of the rune being in each lobe. Yred lobe has 2 vampire knights, assorted yred gifts and some undead hydrae/drakes. Fedhas lobe has several thorn hunters/shambling mangroves, 2 spriggan druids, and a handful of oklobs. The antechamber is watery, and populated by a bunch of swamp drakes/dragons and an undead Lerny. -------------------------------------------------------------------------------- cba6f664f8 | gammafunk | 2019-12-10 23:20:11 -0600 A swamp worm tunnel vault (mikee) Prepare to get slurped! Swamp worms line a narrow corridor of Zot traps with briar patches on either side. The worms are contained by lava and try to collide the player with lava, the briar patches, or the Zot traps, depending on the player's position and whether they are flying. Either flying over the lava or destroying the briar patches offer paths to the loot. Loot consists of good jewellery and aux armour along with some star items. Number of worms and loot items scale with depth, which is D:12-$ and Swamp. Original notion suggested by mikee, but you can definitely blame me for everything about this vault. -------------------------------------------------------------------------------- 26646b4e49 | gammafunk | 2019-12-10 23:18:42 -0600 Clean up some DES syntax for a vault Use the predefined aux armour list in dungeon.lua instead of making our own list, use better syntax for NSUBST, and clean up statement alignment. -------------------------------------------------------------------------------- e7e91ba8d0 | Kate | 2019-12-10 22:20:39 +0000 Allow staff of Olgreb to grant poison immunity to monsters And improve its descriptions. -------------------------------------------------------------------------------- 8a0eb6d9bd | Alex Jurkiewicz | 2019-12-10 15:19:01 -0500 Ignore VS Code editor config -------------------------------------------------------------------------------- 8d3aca7c4b | Alex Jurkiewicz | 2019-12-10 15:18:45 -0500 Update my mailmap entries -------------------------------------------------------------------------------- fa4545f159 | advil | 2019-12-09 23:21:01 -0500 Fix message replay at main menu This is sort of a quick fix. e48d713e changed the behavior of split_string so that it parsed '' into a single segment '', where before it would turn '' into an empty segments list. The old behavior implicitly prevented the log replay from filling the buffer with many empty lines. This commit fixes the issue by restoring the old behavior just for log replays, and doesn't address the question of why these empty log messages are there in the first place. -------------------------------------------------------------------------------- 53730b6a6f | Kate | 2019-12-09 22:04:43 +0000 Account for variable range in Dazzling Flash range checks (sdynet) The range check always considered it to be cast with power -1 so would falsely claim that no enemies were in range when the flash reached radius 3. -------------------------------------------------------------------------------- 06d23272f8 | gammafunk | 2019-12-09 04:35:21 -0600 Update the changelog Through 0.25-a0-277-g7046ed1b37. -------------------------------------------------------------------------------- 7046ed1b37 | Umer Shaikh | 2019-12-08 17:24:18 -0500 Make headsup function less strict about warnings (11875) When multiple monsters come into view at the same time, the game warned you if a monster was using a dangerous weapon but ignored other equipment, even if that equipment was interesting enough that it would be flagged if the monster were alone. This commit liberalizes what the game is willing to note. It also changes the function to check equipment through the monster info instead of directly, on the grounds that warnings should be based on revealed information only. As a side-effect this liberalization also fixes a small bug with alerts for dual-wielding monsters. This commit increases message spam, which is unfortunate. But warnings about what items monsters have are relatively important messages, especially since many players use force_mores to warn about dangerous monsters. [ Committer's note: Squashed and rebased. Reworded one commit message since the change had been implemented in trunk but the commit contained helpful comment clarifications. Closes #1215 ] -------------------------------------------------------------------------------- cebdc9ce17 | Umer Shaikh | 2019-12-08 17:23:19 -0500 Adjust warnings about monster gear on coming into view Update conditions for including information about monster gear in the "comes into view" message in several ways: - monster gear is all identified, so no need to check that - now warn for all artefacts as well as for branded equipment (an orc warrior with Maxwell's Patent Armour is often at least as interesting as an orc with branded plate, but its armour wasn't noted) - the old rules were not warning for wands in the alt weapon slot (I'm not clear on whether this can even happen?) if they were not offensive wands. The rules for warning about wands shouldn't depend on what slot the wand is in. Also one often wants to be warned or force-mored for monsters with wands of digging, despite their being non-offensive. That leaves wands of random effects as the only non-offensive wand; rather than special casing the single wand type, we warn for all wand types. [ Committer's note: Monsters may learn to use random effects in the future, this is good future proofing. ] -------------------------------------------------------------------------------- 3be302651b | Umer Shaikh | 2019-12-08 17:22:18 -0500 Clarify comments in is_offensive_wand -------------------------------------------------------------------------------- 84948a95e6 | Umer Shaikh | 2019-12-08 17:21:05 -0500 Expose missiles in monster inventory to x and ^x The function get_monster_equipment_desc already tried to get a description including what is quivered, but this part of the inventory wasn't copied from the monster to its corresponding monster info. This commit makes that copying happen. This allows players to rely less on animations to tell which monsters are doing what. -------------------------------------------------------------------------------- 5ba6e9ada1 | Edgar A. Bering IV | 2019-12-08 13:35:00 -0500 Prevent an information leak with Mara Illusions (11946) -------------------------------------------------------------------------------- 87e124ad65 | Edgar A. Bering IV | 2019-12-08 13:14:58 -0500 Correct Flay status light colour (12147) The cause was an unintentional fallthrough. -------------------------------------------------------------------------------- 0af21f4d7a | Edgar A. Bering IV | 2019-12-08 12:28:54 -0500 Clarify Heal Other description (12128) -------------------------------------------------------------------------------- a1f8d6e4d9 | Edgar A. Bering IV | 2019-12-08 12:20:05 -0500 Fix summoner highligting for console in webtiles builds -------------------------------------------------------------------------------- ec1133e99d | Alex Jurkiewicz | 2019-12-08 10:54:51 -0500 Let the player renounce religion while silenced Divine abilities are blocked by silence, but renouncing your religion isn't really a divine ability. -------------------------------------------------------------------------------- d25cbf0ff0 | James Buck | 2019-12-08 10:53:54 -0500 Fix initial god ability slot assignment in local tiles Ability slots need to be claimed before setting initial piety. This is because if a player's starting piety is at least 1*, the local tiles version will trigger a redraw of the ability tab, a side effect of which is to fix any available but unassigned abilities using the default logic (starting at f) rather than the god ability rules (a-e + X). -------------------------------------------------------------------------------- c224260491 | marksg07 | 2019-12-08 10:41:50 -0500 Refactor common functionality between look_around functions [ Committer's note: Squashed and rebased. Closes #1109 ] -------------------------------------------------------------------------------- 5fe89d543c | Gabriel Marks | 2019-12-08 10:41:20 -0500 Add crawl.get_target This clua function opens the targeting dialog in the same way it is opened when you press x to examine. The user is allowed to move the cursor around (same as examine). If the user makes a selection and presses enter, this function returns the player-relative coordinates of the selection. Note that the target is valid even if it is past the bounds of the map, so there is no leak of world borders. If the user cancels the selection, this function returns nil. -------------------------------------------------------------------------------- 7af84ae0ac | Edgar A. Bering IV | 2019-12-06 22:12:15 -0500 Keep allies out of Conjure Flame embers (advil) Allies smothering a player's conjured flame is frustrating and doesn't lead to interesting gameplay. Allies are smart enough to not step in traps; they can also not put out player conjured flames. This is implemented as a change to monster behavior; if a player casts Conjure Flame then swaps with an ally the fire will still be put out when the ally is moved into the embers cloud. -------------------------------------------------------------------------------- 17cbeb888d | Edgar A. Bering IV | 2019-12-06 17:13:52 -0600 Scale Conjure Flame embers by current player speed Using BASELINE_DELAY + 1 auts for the duration of the Embers cloud initially created by conjure flame meant that a slowed player could not use the spell at all. The movement requirement already puts slow players at a disadvantage when using Conjure Flame, there is no need to prevent them from using the spell outright. This commit sets the cloud's lifespan to player_speed() + 1 to allow slow players to use the spell; it also prevents hasted players from taking an action in the embers cloud before moving out of it. -------------------------------------------------------------------------------- 9d16a9d099 | Edgar A. Bering IV | 2019-12-06 16:11:33 -0600 Remove some debugging lines (amalloy) -------------------------------------------------------------------------------- aca421d890 | Edgar A. Bering IV | 2019-12-06 15:50:46 -0600 Fix a crash in apply_toxic_bog -------------------------------------------------------------------------------- 6783385f1d | advil | 2019-12-06 09:18:31 -0500 Add frontmatter to issue template [skip ci] -------------------------------------------------------------------------------- 9a32677d9a | advil | 2019-12-06 09:13:26 -0500 Relocate issue template to modern location -------------------------------------------------------------------------------- 7a49f6cbb4 | advil | 2019-12-06 09:11:03 -0500 Tweak issue template slightly [skip ci] -------------------------------------------------------------------------------- 6d7e32a812 | Alex Jurkiewicz | 2019-12-05 01:09:09 -0600 Adjust Trog weapon gifting (ebering) Only gift melee weapons with a restricted set of brands (plain, vorpal, flaming, antimagic). This is to differentiate Trog gifts from Okawaru's further, and in line Trog's theme of crude anger, fire, and hatred of magic. Gifting only melee weapons also makes Trog slightly simpler, which is a bonus for new players. This also slightly modifies the minimum enchantment of gifts from Trog and Okawaru. Previously the minimum was 0 or 1 (random per-item), now it is always 0. [ Committer's note: Significantly revised the approach in the change to acquirement. The acquirement system did not previously distinguish ranged and melee weapons, doing so required a rather deep dive. Closes #1208 ] -------------------------------------------------------------------------------- 105ea27cc8 | kitchen-ace | 2019-12-05 01:09:09 -0600 Fix edge cases for destroying Summon Forest's trees Tornado and forest fires were not checking whether a tree was created by Summon Forest. -------------------------------------------------------------------------------- c5e4228de7 | sdynet | 2019-12-05 01:09:09 -0600 Ely's Divine Protection always protects at ***** At present, the always protection of this power begins at 131 piety. This figure is slightly different from when the player's faith becomes ***** (120). This subtle difference is confusing for a player who doesn't read a spoiler because nothing in-game alerts the player to the moment when the odds of protection are 100%, though the guarantee is described in the ^ screen. This confusion can be resolved by aligning the point at which the protection probability is 100% to the moment at which the number of stars changes. As a result players will be able to clearly see when this sentence means without a spoiler: Especially pious individuals may be certain of this help. [ Committer's note: revised the commit message. Closes #1212 ] -------------------------------------------------------------------------------- 32a057a6c3 | sdynet | 2019-12-05 01:09:09 -0600 Make the Elemental Staff an enhancer for all elemental schools The melee gimmick and resists alone did not make the elemental staff a particularly attractive unrand, most staff users would strongly prefer an enhancer. This enhancer counts for each school separately, so gives two enhancers to the handful of multi-element spells. [ Committer's note: revised description and commit message. Closes #1211 ] -------------------------------------------------------------------------------- b31bfc5473 | kitchen-ace | 2019-12-05 01:09:09 -0600 Make fire spells better at burning trees Fireball could previously burn trees with all squares of its explosion, not just the centre, but this was inadvertently changed in be81960. This commit restores that behaviour. Also make the new spell Starburst burn trees properly. It also allows the spells Fire Storm and Ignition to burn trees, because it seemed strange to me that the most powerful fire spells did nothing on trees. This allows a player to easily clear out large amounts of trees at once, but by the time a player can cast these spells, this is not usually all that relevant. [ Committer's note: corrected Ignition Fedhas logic. Closes #1189 ] -------------------------------------------------------------------------------- 6f1b5d974a | James Buck | 2019-12-04 12:40:28 -0600 Add missing SUBST to gammafunk_ghost_icy Fixes an ugly green tile when placed in Lair. -------------------------------------------------------------------------------- c8cd6a5d6a | advil | 2019-12-04 10:50:20 -0500 Fixup recently placed ghosts correctly d0e028f13a handled fixup for placement of new ghosts, but any ghosts placed between TAG_MINOR_POSITIONAL_MAGIC and TAG_MINOR_GHOST_MAGIC didn't get updated, because the spells are copied from the ghost_demon list into the monster list on placement. Resolves #1222 fully (I hope). -------------------------------------------------------------------------------- 572059c536 | Edgar A. Bering IV | 2019-12-04 00:33:15 -0500 Prevent Foxfire from using stairs -------------------------------------------------------------------------------- 53a6a0d877 | Edgar A. Bering IV | 2019-12-04 00:06:36 -0500 Update credits -------------------------------------------------------------------------------- 542a2242a2 | Edgar A. Bering IV | 2019-12-03 22:49:40 -0500 Fixup Sting and the description (advil, kitchen_ace) The effect of Sting on resistant monsters that got merged was not the exact intended behaviour in the experimental branch; the changes got lost in a rebase shuffle. Sting does Poison Arrow flavored damage, but with a reduced number of poison stacks; specifically adding 1 stack to a monster, or 0.5 if the monster is resistant (implemented with div_rand_round). -------------------------------------------------------------------------------- 18654cfe15 | advil | 2019-12-03 11:45:29 -0500 stringer -> stinger (ebering) -------------------------------------------------------------------------------- 3ee35aba1e | advil | 2019-12-03 11:43:09 -0500 Clarify Sting description (12145 / kitchen_ace) The flavor is actually still the same as poison arrow, but the description implied that it would poison even immune things. -------------------------------------------------------------------------------- 58704a1ebd | advil | 2019-12-02 14:36:03 -0500 Fix some shadow warnings for older compilers Happened quite a bit on rebuilds. -------------------------------------------------------------------------------- d0e028f13a | Edgar Bering | 2019-12-02 14:04:46 -0500 Correctly fixup ghost spells -------------------------------------------------------------------------------- 618c0ec234 | advil | 2019-12-02 12:51:14 -0500 Mark dazzling flash as unusable for saved ghosts This spell is set with spflag::no_ghost, so all that is needed is to keep ghosts that saved with dazzling spray from using it. -------------------------------------------------------------------------------- ce69c89b74 | advil | 2019-12-02 11:02:53 -0500 Improve beforeunload future compatibility I noticed while trying to figure out how to detect the back button during gameplay that this code could be a bit more general. I don't think this will change behavior on any particular browsers right now, because the return value is the method that is supported by the most browsers, but this approach is deprecated. The only non-deprecated method for doing this is event.preventDefault, so I added this, as well as another deprecated approach. (Of course, the one you're supposed to use *isn't* supported by most browsers.) See https://developer.mozilla.org/en-US/docs/Web/API/Window/beforeunload_event for the full compatibility table. -------------------------------------------------------------------------------- 28950d1e32 | advil | 2019-12-02 10:42:55 -0500 Handle HUPs better in lua interpreter Previously, this code ran in a tight loop if a hup was received, because the input function always returned immediately. This led to stuck high-cpu processes and crashes when a webtiles client disconnected, or when an ssh connection was lost, while the lua interpreter was running. This commit should simply break the loop on this case. It's possible it would be even safer to not do a repl loop at all on empty input for online games... -------------------------------------------------------------------------------- 5bc340afbf | Edgar A. Bering IV | 2019-12-02 07:48:24 -0500 Replace Flame Tongue with Foxfire in the FE description -------------------------------------------------------------------------------- 216da55150 | Edgar A. Bering IV | 2019-12-02 07:48:05 -0500 Remove a vestigal line -------------------------------------------------------------------------------- e0175898a2 | Edgar A. Bering IV | 2019-12-02 07:47:33 -0500 Actually use the foxfire monster tile -------------------------------------------------------------------------------- 716fc43bfc | Edgar A. Bering IV | 2019-12-02 07:41:48 -0500 Actually use the new foxfire tile -------------------------------------------------------------------------------- 0889b22a1b | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Monster save compatibility for positional magic This commit uses the same TAG_MINOR as the previous commit. -------------------------------------------------------------------------------- 688896fa5c | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Player save compatibility for positional magic -------------------------------------------------------------------------------- 592f7d0648 | gammafunk | 2019-12-02 00:54:18 -0500 Positional magic ⛰️ 💀: Rework BVC targeting This commit brings Borgnjor's Vile Clutch targeting in line with most other earth magic spells, making it use a directed beam instead of a smite-targeted 3x3 square. The BVC beam always penetrates and never misses, to affect up to 6 squares. This is a nerf to a spell that was already sitting at a good power level. However another aim of the 0.25 magic changes is to reduce the overall strength of the Necromancy school given how many strong spells it has. BVC is routinely overrated and not actually in the overpowered set, so we don't want to make the spell bad just because of perception. The reasons given for rating BVC so highly include synergy with allies, lowering monster evasion, damage per cast, smite targeting, and being in such a strong school. Allies are vastly stronger than BVC and capable of clearing entire floors quite on their own, and the spell doesn't improve accuracy enough versus a majority of monsters to warrant spend a turn using BVC instead of a better Earth magic damage spell. Its damage per cast is good, but at reasonable spellpower levels and in the most important use cases, it's a lot better to spend MP each turn on a spell that kills monsters sooner. Removing the smite targeting combined with changes to other spells that reduce the power of the Necromancy school will help with player perception without making the spell too weak. I do also want to take a look at the spell's damage per turn with the highest spellpower levels. Part of the perception problem the spell has comes from constriction having a lot of small effects that are hard for the player to evaluate. If Necromancy settles on a kind of "melee support" role in 0.25, it might be good to simplify the spell's effects somewhat toward this aim. -------------------------------------------------------------------------------- d51b216b00 | gammafunk | 2019-12-02 00:54:18 -0500 Simplify and document some beam logic conditions -------------------------------------------------------------------------------- 165abee8e4 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 💀: Revise Corpse Rot (CanOfWorms) Unlike the other attack spells, where position was not relevant enough, Corpse Rot was too positional: it relied on the combined relative position of (player, monster, immovable floor object). This revision changes Corpse Rot to place clouds in a ring around the caster, with the number of clouds equal to the number of corpses rotted. The cloud duration is reduced This should keep in a less-constrained way the relative-to-corpse positioning, while making the player's position relative to terrain and monsters more relevant. -------------------------------------------------------------------------------- 3b7ae84e64 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 💀: Reduce the range of Agony and Dispel Undead Reduce player Agony and Dispel Undead to range 1. Necromancy is a very strong school, with a lot of spells in it. Direct damage spells that are ranged and can't miss (Agony checks MR but with a large power boost) are very strong. Reducing these spells to range 1 is a way to add positional considerations to the spells, makes them thematically fit with Vampiric Draining, and nerfs them to boot. Necro needs the nerf. -------------------------------------------------------------------------------- 0ea3b1b79e | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 💀: Remove Bolt of Draining as a player spell The "bolt spell but black", one of many removed in this overhaul. Necromancy has plenty of direct-damage spells, this one will not be missed. -------------------------------------------------------------------------------- c910babebc | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic tiles: Noxious Bog icon (CanOfWorms) -------------------------------------------------------------------------------- 949bf585d4 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic tiles: Toxic bog feature -------------------------------------------------------------------------------- e4a03fbc05 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🐍: New spell: Eringya's Noxious Bog New spell Eringya's Noxious Bog, L6 Posion/Transmutation. Gives a player the "Bog" status for 4 + random2( power / 10 ) turns. While this status is active, as the player leaves behind a trail of temporary "toxic bog" cells. Each toxic bog cell remains that way for 10 + random2avg( power/ 20, 2) turns. Ignite poison places flame clouds over bog cells, but at present does not remove them. The spell replaces Leda's Liquefication in the Fen Folio (though perhaps a different spell could be removed from the Fen Folio instead) and is added to the Book of Alchemy. -------------------------------------------------------------------------------- f462223248 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🐍: New dungeon feature type toxic bog Create a new dungeon feature type, toxic bog, which does Poison Arrow flavor damage to creatures in it and imposes shallow water penalties. -------------------------------------------------------------------------------- b3f3dca9e8 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🐍: Adjust Venom Mage start With Poison Magic being revised to emphasize transmutations and alchemy, and Venom Bolt removed, this moves VM's starting Conjurations skill to Transmutations and adds Ignite Poison to the Young Poisoner's Handbook. This is especially relevant since Sting has become Poison/Transmutations. The manual and background descriptions are terse enough to not require a change, but it might be nice for flavor reasons to add some reference to alchemy. -------------------------------------------------------------------------------- 3cb921fa59 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🐍: Revise Sting In the overarching design writing for this overhaul I wrote that some space for single-target ranged spells must remain. Sting is one of those. However, LOS range poison damage that sometimes poisons is dangerously close to darts. Further, Sting is immediately outshone by Poison Vapours. This commit changes Sting to be a range 3 Poison/Transmutation spell, with the same beam flavour as Poison Arrow (still Sting damage and to-hit). Since Poison Arrow is removed as a player spell, this beam-type re-use doesn't steal from Poisons L6 niche. -------------------------------------------------------------------------------- b75774f94e | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🐍: Poison removals Remove Venom Bolt and Poison Arrow, as single target conjurations that do not fit in with this magic overhaul. -------------------------------------------------------------------------------- 4a65e1fc46 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: Revise Spellforged Servitor Servitor now takes the highest-level servitor spell available for player users. The spell description indicates the spell the servitor will use. This behavior could already be accomplished by a player by removing most of their damaging spells and was a good idea. However the process of modifying one's spell list introduced a variety of tedious incentives in its interaction with amnesia. Now that servitor takes only one spell, the spell list is adjusted for players (for monsters, since the monster servitor takes every spell this has no effect). The servitor prioritizes ranged targeted damage spells of level 4 and higher, followed by clouds, followed by low level and short range spells. [Thanks to hellmonk for suggesting the servitor description display the spell to use and that the spell list be revised.] -------------------------------------------------------------------------------- 60c6236f93 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: New Iskenderun's Mystic Blast Re-introduce IMB as a player spell that detonates on the player with range 2. The spell attempts to hit each non-conjured monster within this range with MMISSILE flavor damage, and then knocks the target back. The damage is currently half that of old IMB: 2 dice with a max damage of 6 + pow / 6. This change also flattens the knockback curve of Force Lance for monsters. For both spells the knockback distance starts at 2 and scales with power. -------------------------------------------------------------------------------- 9ec2bd9bd2 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: Rename and revise Dazzling Spray Rename Dazzling Spray to Dazzling Flash. The effect is now a radius 2-3 flash, centered on the player, that has a power dependent chance of dazzling living monsters. The chance decreases with distance. The spell is silent. [Thanks to cwz testers for feedback on this spell.] -------------------------------------------------------------------------------- 1d4a33eb31 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: Remove Force Lance as a player spell Continuing with the magic overhaul, Force Lance is made a monster only spell. The new Iskenderun's Mystic Blast will take the knockback effect, to be added in a subsequent commit. -------------------------------------------------------------------------------- c6818cb5b8 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: Remove Dazzling Spray as a zap type In preparation for a new version of dazzling spray. The spell was already unusable by monsters but some old code for supporting dazzle ghosts was still around. That gets removed. -------------------------------------------------------------------------------- 45c4a977d6 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: Remove IMB as a zap type and from monster spells A subsequent commit will introduce a new version of Iskenderun's Mystic Blast as a player spell. IMB gets lost amidst the sea of similar direct damage conjurations; as a monster spell the explosions did not add much. It is replaced by force lance in various monster books that used IMB, or just removed from monsters. -------------------------------------------------------------------------------- 4305f63ada | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ⭐️: Simplify Searing Ray (minmay) Searing ray is a rather complicated spell because of beam aliasing, and yet Cj is a hints mode background. This changes searing ray to always fire at max range at the player's selected target (even if the target moves), or in the player's selected direction. If the target dies the ray continues firing at the target's last position. If there was no monster, the spell proceedes like old searing ray (but fires for the full distance). In addition to the targeting change, the three beams are given the same damage and to-hit, chosen so the damage distribution matches that of old Searing Ray, and are all penetrating. -------------------------------------------------------------------------------- bd1a5c2d44 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ❄️: Adjust Ice Elementalist start Now that the book of Frost contains a single conjuration, starting IE with some conjurations skill does not make sense. This commit concentrates their skill in ice magic, leaving the player to chose how to branch out through the remainder of the book. -------------------------------------------------------------------------------- c46f9d66a9 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ❄️: Buff Refrigeration Not strictly a positional change; Ozocubu's Refrigeration was the second lowest-damage level 6 damage spell (doing only slightly more than a freezing cloud), and comes with significant draw-backs (self damage and loss of potions). This commit adds a damage die to the spell, making it do 4d(5 + power / 10) up from 3d(5 + power / 10) and removes the self damage. The spell retains its -Potion effect. This is still on the weaker side of level 6 spells in terms of raw damage, but it hits full LOS, is single-school, and is quiet. -------------------------------------------------------------------------------- 2846b0adcb | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic tiles: Hailstorm icon (ontoclasm) -------------------------------------------------------------------------------- 0364848250 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ❄️: New Ice spell: Hailstorm Hailstorm is a Level 4 Conjuration/Ice spell. It replaces Throw Icicle in the IE starting book. When cast it fires a ring of inner radius 2 and outer radius 3 of BEAM_ICE (like throw icicle) flavoured beams. Icy monsters are immune, so this spell gets along with ice beasts and simulacra but not other minions. Having it skip allies all together is something to consider. Currently, Veh does not add a fourth ring, that would almost double the number of affected squares. The damage is that of throw icicle but the accuracy is higher. [Thanks to cwz testers and Bacchus for early feedback on this spell.] -------------------------------------------------------------------------------- 290c60e7f6 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic ❄️: Ice removals Remove Throw Frost, Throw Icicle, and Bolt of Cold. These targeted, "damage but blue" spells did little to distinguish the school from others (despite their slightly different ranges) or from ranged weapons. The current result is that the IE book is a bit thin. New ice spells will be added in subsequent commits. -------------------------------------------------------------------------------- daefaf095a | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic tiles: Foxfire monster, icon, and trails (ontoclasm) -------------------------------------------------------------------------------- 48bd468c4c | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🔥: New spell Foxfire Foxfire is a L1 Conjurations/Fire spell that replaces Flame Tongue. Foxfire conjures two foxfires adjacent to the caster which seek the nearest target and burn the target, or dissapate if they fail to reach the target after making 8 moves. Monsters and the player can swap with foxfire, but doing so triggers the foxfire attack. Each foxfire burn does slightly more than half the damage of Flame Tongue, but does not miss. This makes the spell better than FT when fighting in the open (discounting the delay), but much worse in corridors. Foxfires have see invisible; with their high move speed this allows them to attack first, dissipating and allowing the monster to then move towards the player. [Thanks to hellmonk, tealizard, Doesnt, EN0N, and cwz testers for feedback in development of this spell.] -------------------------------------------------------------------------------- e44d55d700 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🔥: Modify inner flame Inner flame is a very positional spell; unfortunately it's somewhat impractical to use, explosions come only when the monster dies. To open up new possibilities, this commit adds an on-damage effect to the enchantment. Inner Flamed monsters have a chance of creating a short-lived flame cloud on their own cell when they take damage. -------------------------------------------------------------------------------- 0d78dbbffe | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic tiles: Starburst icon (ontoclasm) -------------------------------------------------------------------------------- e3d4451385 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🔥: New Fire spell: Starburst Starburst provides a L6 damage spell fitting into a similar place as the old Bolt of Fire spell. Where Bolt of Fire was targeted, Starburst is un-targeted. Instead, Starburst fires eight range 5 (six under Vehumet) bolts of fire in the principal directions. [Thanks for early feedback from cwz players in the design of this spell.] -------------------------------------------------------------------------------- 7758758a4e | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🔥: Nerf conjure flame (minmay, tealizard) Smite targeted, renewable flame clouds are extremely strong. This changes Conjure flame to create the cloud on the player. The player initially creates a cloud of smoldering embers. These ignite the turn after if nothing is in the cell. Conjure flame is still very strong and permits many of its old uses. This increases the time cost of those uses and prevents degenerate things like refereshing a blocking flame indefinitely. It also did not work well as a monster spell; the only monsters that still cast it were player ghosts, so it's been removed from them and is now player only. -------------------------------------------------------------------------------- f302f3d7ce | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🔥: Fire removals Remove Throw Flame and Bolt of Fire as player spells. They live on on monsters and in wands. Both of these are "damage but red" single target spells, on the chopping block in this magic overhaul. -------------------------------------------------------------------------------- 1b0f4d352a | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Positional magic 🌪: Airstrike The air school is already quite positional: targeted spells require bolt bouncing to use with maximum effectiveness, the remaining spells require different positional considerations to use well. Airstrike is smite-targeted, which makes it more interesting than most single-target spells. However, it is just ``smite but air''. This commit scales airstrike damage with the number of adjacent empty cells to the target. Specifically, when there are more than three empty cells adjacent to the target, each empty cell contributes a linear amount to the affine base damage and reduces the variance by addinng another roll to average the damage over. At 100 spellpower this results in the following damage statistics, depending on the number of empty adjacent spells. | | 0-3 | 4 | 5 | 6 | 7 | 8 | | --- | ---- | ---- | ---- | ---- | ---- | --- | | avg | 15.5 | 16.3 | 17.2 | 18.1 | 19.1 | 20 | | std | 4.61 | 3.27 | 2.68 | 2.32 | 2.08 | 1.9 | [ TODO: Refactor mons-cast airstrike damage to be in the same place as player damage. Take another swipe at the spell description. ] -------------------------------------------------------------------------------- abb5cbb05e | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Use targeter_radius hitfuncs for friendly fire checks This replaces the helper function _irradiate_is_safe -------------------------------------------------------------------------------- 8bd92b5b85 | Edgar A. Bering IV | 2019-12-02 00:54:18 -0500 Generalize and rename targeter_los Rename it to the more accurately descriptive targeter_radius, and include a constructor parameter for specifying a range minimum to exclude an inner radius. -------------------------------------------------------------------------------- 0bb11aece9 | Edgar A. Bering IV | 2019-12-02 00:43:05 -0500 Don't crash in the ignite poison cloud tracer Only check Fedhas protection from clouds for players; monster Fedhas worshippers clouds will hurt plants. Only relevant for player ghosts. -------------------------------------------------------------------------------- 5ba96148f3 | gammafunk | 2019-11-30 22:57:29 -0600 Remove an outdated comment -------------------------------------------------------------------------------- 8d00908bc7 | gammafunk | 2019-11-30 22:57:29 -0600 Fix monster ranged attack logic for some wands Monsters learned how to use wands of clouds, iceblast, and scattershot in 0.24, but the logic to determine whether monsters have ranged attacks was not updated. This logic is used for player sensing nearby danger and some aspects of monster movement; monsters were able to use these wands before this commit. -------------------------------------------------------------------------------- 17f9c9cab5 | Aidan Holm | 2019-12-01 10:35:28 +0800 Fix chat keeping focus trapped after hiding (#12140) When spectating with chat activated, the player quitting/dying/exiting caused the chat input to be hidden, which did not deactivate the focus trap. This fix uses a MutationObserver, which does require IE10; AFAIK, the previously supported minimum was IE9, but we shall see if anyone complains first.. -------------------------------------------------------------------------------- c6a9f38f4b | Aidan Holm | 2019-12-01 10:35:28 +0800 Fix minimized chat not being expandable via click Caused by over-eager click event filtering; turns out the minimized chat window is a totally separate element (#chat_hidden). -------------------------------------------------------------------------------- b8371ea956 | Aidan Holm | 2019-12-01 10:35:28 +0800 Fix webtiles chat stuck focus issue When clicking the chat input, document.activeElement has already been updated by the time the focusin event is received, so the focus trap stores the chat input as the previously focused element; when it is deactivated, it will then refocus the chat input. The focus-trap docs refer to a setReturnFocus option, but this doesn't seem to work as intended. Disabling return focus fixes this for now. Unfortunately this means that entering and exiting chat from a UI with focusable elements (e.g. seed selection) will lose the currently focused element, until a workaround is implemented. -------------------------------------------------------------------------------- 61c9e09f56 | Brendan Hickey | 2019-11-30 20:45:15 -0500 Rewrite Barachi +LOS fakemut description. Before: "Shadows flee at your approach. (+LOS)" After: "You can be seen from farther away. (+LOS)" The issue is that 'Shadows' are always monsters. Unless we want to cause Shadows to run from Barachi let's use text with less potential to mislead the player. The rewrite is based on the species description. I think the players in general understand reciprocal LOS, so this formulation (rather than saying "You can see things farther away.") will be convey that their LOS radius is bigger and Tomb is going to be harder. -------------------------------------------------------------------------------- ece12570e2 | gammafunk | 2019-11-29 21:04:25 -0600 Remove unused Fedhas corpse rotting code This is no longer used, since the god no longer gains piety through rotting corpses. -------------------------------------------------------------------------------- 0f3e877b0e | gammafunk | 2019-11-29 21:04:16 -0600 Fix outdated food logic when worshiping Fedhas These were relevant when the god accepted rations as a cost for some abilities, but this is no longer the case. Don't always have a food acquirement option when worshiping Fedhas. Also don't consider food always useful and always an interesting autoexplore target under Fedhas. -------------------------------------------------------------------------------- b5a0cb1028 | gammafunk | 2019-11-29 20:53:10 -0600 Remove an outdated acquirement rule under Fedhas The acquirement code prevented acquiring weapons with the reaping brand under Fedhas, specifically the Sword of Zonguldrok. The god no longer has a no-corpse-necromancy conduct, so remove acquirement restriction. -------------------------------------------------------------------------------- a656ec442d | gammafunk | 2019-11-29 19:52:38 -0600 Update the Fedhas flavor of a Lugonu vault (minmay) Give a randbook with Recall as the "useless" insult item for Fedhas worshipers, since nearly all allies Fedhas grants are stationary ones that can't be recalled. The exception would be wandering mushrooms granted from Fedhas' Overgrowth ability, but who could take a mushroom seriously anyways? -------------------------------------------------------------------------------- 27fffb8c76 | Aidan Holm | 2019-11-29 13:57:10 +0800 Don't show monster threat levels by default It'd be nice to show these on the monster lists only, but that's technically challenging, and on webtiles the monster list already displays the threat level. -------------------------------------------------------------------------------- f71692caf1 | Aidan Holm | 2019-11-28 20:32:06 +0800 Add documentation for tile_show_threat_levels -------------------------------------------------------------------------------- c5e1d6b9e0 | Byrel Mitchell | 2019-11-28 20:32:06 +0800 Add webtiles support for threat level indicators -------------------------------------------------------------------------------- 61c6e967c8 | Psymania | 2019-11-28 20:32:06 +0800 Add monster threat level indicators Webtiles and console both have a monster list at the bottom-right of the screen which lists all monsters in view color-coded by rough threat level. Many players have expressed a desire for something similar in offline tiles, to provide always-visible indicators of the threat levels of all enemies in view. This commit adds translucent colored backgrounds -- dark grey, light grey, yellow, and red -- to indicate trivial, easy, tough, and nasty monsters respectively. Additionally, these indicators are configurable with a new option in the options file, "tile_show_threat_levels". Each type of indicator can be independently enabled or disabled by including or omitting it in the option file line. For example, the following... "tile_show_threat_levels = tough nasty" ...will show only yellow (tough) and red (nasty) threat indicators. I have experimented with various styles of indicators, as shown in the following thread: https://crawl.develz.org/tavern/viewtopic.php?f=8&t=26439 I am open to changing back to a different style, or even making multiple styles available and letting the player choose which style to use, if any. This style is the best in my opinion, as it is very noticeable while being subtle enough not to interfere with any other monster or monster-associated graphics. I have playtested this feature through a 6-rune run with no problems, technical nor cosmetic. -------------------------------------------------------------------------------- 280d70d74f | Nikolai Lavsky | 2019-11-28 20:31:26 +0800 Remove an inventory hotkey for corpses and skeletons Although the player cannot pickup carrion anymore, the pickup menu still displays a hotkey for it. The hotkey already does nothing because corpses and skeletons are stationary objects (62bc8482). -------------------------------------------------------------------------------- 6cfeca75b2 | advil | 2019-11-26 18:44:59 -0500 Remove some obsolete batform code (alexjurkiewicz) This is a relic from the times when you ended a transformation by setting its duration to 2, something that hasn't been in play since 0970d1a616d41. For reasons unclear to me at this remove (something to do with food maybe) the exact threshold for ending batform was increased to 5 from 2 in 19d229916a4423. -------------------------------------------------------------------------------- cd15a05269 | advil | 2019-11-26 15:16:56 -0500 Update the github issue template Mostly just wanted to provide instructions on how to upload a save file directly to github, but I ended up revamping the whole thing. [skip ci] -------------------------------------------------------------------------------- d5e5576b6f | advil | 2019-11-26 12:29:39 -0500 Clarify "master archer" code This shouldn't change any behavior for monsters that actually place. This cleans up some ranged code to be more consistent with the (apparent) intent of the flags, and renames a flag to be more consistent with what it does (since what was called `M_DONT_MELEE` has no impact on melee outside of monsters with missile-based ranged attacks, and also doesn't actually prevent melee -- you would do this by giving the monster no melee attacks I think). I'm not 100% sure why MONS_STATUE (which doesn't place) was M_ARCHER | M_DONT_MELEE, but I have kept its status. This may be for things like the statue in minmay_dual_archer_statues? -------------------------------------------------------------------------------- 090528c340 | Byrel Mitchell | 2019-11-26 22:10:22 +0800 Added webtiles support for Possessable icon (Yred enslave soul status) -------------------------------------------------------------------------------- e5692877c6 | Byrel Mitchell | 2019-11-26 22:00:32 +0800 Show monster poison level as a debuff icon Currently has 3 tiles for 1, 2 or 3, 4 stacks of poison. -------------------------------------------------------------------------------- dbf363a776 | Aidan Holm | 2019-11-26 20:28:26 +0800 Fix "Found item" messages not being coloued correctly (gammafunk) This was caused by mpr() not supporting formatted_strings, which were being silently converted to plain std::strings, discarding all colour information. -------------------------------------------------------------------------------- 4c60e79141 | gammafunk | 2019-11-26 01:49:09 -0600 Don't trap monsters in Zig pillars (AliasTheSpectator) The Ziggurat pillar vault ziggurat_pillar_centre_drop places monsters behind fully opaque walls, providing a teleport trap to release them. This no longer works with LOS requirements for trap triggering, so make the vault always have transparent rock or stone windows. I've also modified the vault substitutions so that the windows will always be diggable when the rest of the vault is. -------------------------------------------------------------------------------- c9f82b1288 | gammafunk | 2019-11-25 17:32:57 -0600 Allow Divine Exegesis without a memorized spell (12129) The check for the ability to cast spells includes one for having at least one spell memorized. Don't require this condition for Exegesis, as this ability casts directly from the spell library. -------------------------------------------------------------------------------- d145f35b4e | gammafunk | 2019-11-25 15:32:46 -0600 Fix spell colors for Divine Exegesis No longer show spells listed by Divine Exegesis as dark grey if they couldn't be memorized due to spell level restrictions, since the ability doesn't care about spell levels. -------------------------------------------------------------------------------- 379fad0a35 | Edgar A. Bering IV | 2019-11-25 14:41:19 -0500 Extend Fedhas protection to collisions (12082) There is no messaging or indication to the player that Fedhas doesn't protect plants from player-induced collision damage. For consistency's sake the best solution here is to extend the protection. -------------------------------------------------------------------------------- 3835771c07 | Edgar A. Bering IV | 2019-11-25 13:43:22 -0500 Checkwhite -------------------------------------------------------------------------------- bad95dda2c | Edgar A. Bering IV | 2019-11-25 13:42:13 -0500 Convert summon damage dismissal into a fineff (12082) The solution in 0.25-a0-106-g3db639d13e led to crashes; use contexts of behavior_event do not expect that the behavior event might kill the monster. Converting the dismissal to a fineff prevents these problems. -------------------------------------------------------------------------------- 1a393a3f05 | Aidan Holm | 2019-11-26 01:37:41 +0800 Tidy up tilesdl.cc a bit -------------------------------------------------------------------------------- 4f669b765a | Aidan Holm | 2019-11-26 01:37:41 +0800 Simplify some local tiles code -------------------------------------------------------------------------------- 9513415ccb | advil | 2019-11-25 10:19:51 -0500 Detect an empty des cache This is designed to preempt cryptic error messages that can happen if you run tests directly without previously building the des cache; it's maybe a bit of an overly clever method to do so but also very easy to write. Resolves #1121 -------------------------------------------------------------------------------- 0adb1bad81 | Aidan Holm | 2019-11-25 22:49:33 +0800 Add webtiles dev option note to readme [skip ci] -------------------------------------------------------------------------------- 529652008a | Aidan Holm | 2019-11-25 22:39:54 +0800 Show sprint help for sprint menu help button (GH #1203) This handler is only called for the tutorial and sprint menus, and the tutorial lacks a help button, hence the assertion. '6' is the hotkey for the sprint section. Blegh. -------------------------------------------------------------------------------- f1674c6136 | Aidan Holm | 2019-11-25 21:21:33 +0800 Fix webtiles chat not responding to mouseclicks (12136) Predictably, the focus-trap library was responsible here, along with some over-eager trapping of events. Thankfully the focus-trap has a very useful allowOutsideClick hook which does exactly what we want; pass through click events to attached handlers under certain conditions. Separately, we also need to not capture all events if the focus is outside the popup; this allows exiting the chat window with the escape key when a popup is open. Regrettably, the focus-trap library does not provide onPause/onUnpause hooks to facilitate this, but we can make do. -------------------------------------------------------------------------------- 836c352ace | gammafunk | 2019-11-24 14:42:35 -0600 Declare a global function This was apparently omitted in the artefact code perfomance improvements made in ca9b7906. -------------------------------------------------------------------------------- 16436c4407 | advil | 2019-11-22 17:21:55 -0500 Don't crash when right clicking in local tiles I don't understand the circumstances under which this event is getting sent, but just ignoring it seems to work. Resolves #1210 -------------------------------------------------------------------------------- 8b14890379 | advil | 2019-11-22 16:49:57 -0500 Don't crash if tornado dismisses a friendly summon -------------------------------------------------------------------------------- b55e97dba5 | Istvan Marko | 2019-11-22 00:07:37 -0500 Use yaml.safe_load instead of load PyYAML'S yaml.load is insecure and it is deprecated in 5.1. Some distributions even disable it, making it difficult to build DCSS on them. Use the recommended safe_load instead. -------------------------------------------------------------------------------- 00f8f0cddd | Edgar A. Bering IV | 2019-11-21 12:18:32 -0500 Fix a typo in the previous commit -------------------------------------------------------------------------------- f5240d96fa | Edgar A. Bering IV | 2019-11-21 12:14:00 -0500 Add Boris to the Orb Run Give Boris a chance to come back on the Orb run if he spawned in the game. Boris has the same chance as a named lord whose rune you've taken. While Boris isn't the most threatening Orb run spawn, he definitely poses a threat and having him spawn is great flavour. -------------------------------------------------------------------------------- b7fd73da8f | Aidan Holm | 2019-11-21 08:38:11 +0800 Fix mouse click not working in skill menu (12133) The event handler was being called with a CK_MOUSE_CLICK dummy key sent from UISkillMenu::on_event(), delivered directly to the skill menu via Widget::on_event(). This meant that the event did not bubble, and would not be caught by a handler attached to the skill menu parent. -------------------------------------------------------------------------------- d1d2e81aba | advil | 2019-11-20 12:08:20 -0500 Simplify some holiness checks for monster swapping One of these checks changes behavior. Requiring the same holiness for swapping around intelligence in general seems really spoilery and weird. If this doesn't work out (e.g. there's too much swapping as a result, or some noticeable effect on balance) I'm open to reverting or modifying this. However, I think if something like this needs to be in place, then we should first try a more obvious rule, e.g. nothing can swap past undead. (Which I think is the main use case anyways.) The demonic change is just an optimization and shouldn't affect behavior. (Full holiness checks are costly if done a lot, because they check damage types -- but this is irrelevant for the demonic check.) -------------------------------------------------------------------------------- 282e4f8531 | advil | 2019-11-20 11:30:19 -0500 A few more monster movement optimizations These eliminate/reduce a few more hotspots. The bounds check in _handle_movement shouldn't lead to any behavior change, since if the player is out of bounds they can never see any other cell; but it cuts a biggish case to do the check preemptively, as opposed to inside various loops. -------------------------------------------------------------------------------- 59b909255d | Aidan Holm | 2019-11-20 14:33:21 +0800 Fix various small alignment issues Switchers with scrollers inside them generally need to have align_x set to stretch, so that the scrollbar will be flush against the right-hand side of the screen on local tiles. -------------------------------------------------------------------------------- 260bac964e | Aidan Holm | 2019-11-20 14:32:07 +0800 Use consistent desc/quote switch text This code is pretty heavily duplicated from describe_monsters(). For reasons unknown, show_description() does not show quotes at all on webtiles... -------------------------------------------------------------------------------- 0c4bda3fdf | Aidan Holm | 2019-11-20 12:12:11 +0800 Fix input_dialog key binds on webtiles (kitchen_ace) -------------------------------------------------------------------------------- 11d28fe0fd | Aidan Holm | 2019-11-20 10:58:05 +0800 Grammar fixup -------------------------------------------------------------------------------- 7faa4cee5b | Aidan Holm | 2019-11-20 10:48:32 +0800 Use textbox widget for msgwin_get_line() popup -------------------------------------------------------------------------------- 0541610ab6 | Aidan Holm | 2019-11-20 10:48:32 +0800 Fix hotkey binding encoding on webtiles client On the crawl server, all key events are encoded as integers; HTML/JS does not provide a way to map a keydown event to an ascii keycode (while crawl does a whole lot of rather strange mapping, the keys we care about and wish to bind as hotkeys are almost all within a-zA-Z0-9). This makes complete sense because a key and a character are separate things, but it does mean some extra conversion is required. This commit adds ui.utf8_from_key_value() and ui.key_value_from_utf8(); these convert a key value name string, such as "D" or "Enter" to/from an integer that the crawl server recognizes. -------------------------------------------------------------------------------- b6c28e0f30 | Aidan Holm | 2019-11-20 10:48:32 +0800 Remove unneeded focus -------------------------------------------------------------------------------- ce263d24b7 | Aidan Holm | 2019-11-20 10:48:32 +0800 Add textbox paste from clipboard function -------------------------------------------------------------------------------- f2554d85d0 | Aidan Holm | 2019-11-20 10:48:32 +0800 Fix focus traps breaking webtiles chat Focus traps on the top-level popup prevent the chat box from being focused. To fix this, when showing the chat, we enter a new focus trap, and leave it when returning to the game. This is complicated by the fact that the chat JS is effectively non-modifiable (not in game_data), so we attach to the focusin event. You can tab around within the chat popup; the focus-trap class prevents nested traps when doing so. -------------------------------------------------------------------------------- afe43dc842 | Aidan Holm | 2019-11-20 10:48:32 +0800 Improve focus rendering for webtiles watchers On watching clients, don't use focus traps, and disable all focusable input elements. Since we can no longer rely on the input focus, we add a style-focused class to take its place on watching clients. This produces a much better experience when spectating. -------------------------------------------------------------------------------- 1c8e11a960 | Aidan Holm | 2019-11-20 10:48:32 +0800 Remove unnecessary set_focused_widget() calls -------------------------------------------------------------------------------- f460fa4231 | Aidan Holm | 2019-11-20 10:48:32 +0800 Remove unused headers -------------------------------------------------------------------------------- 40106efd0c | Aidan Holm | 2019-11-20 10:48:32 +0800 Make webtiles seed selection dialog scrollable -------------------------------------------------------------------------------- 1855e6e8d2 | Aidan Holm | 2019-11-20 10:48:32 +0800 Small refactor of event handlers -------------------------------------------------------------------------------- cd842479fa | Aidan Holm | 2019-11-20 10:48:32 +0800 Extract MenuButton focus-on-hover behaviour Previously, buttons would take input focus when hovered. Now, this only happens for buttons within OuterMenus, and it is the OuterMenu which adds the event handlers for this. This makes MenuButtons much nicer to use outside of OuterMenus, and they will probably be moved into ui.cc Since they can be hovered without being focused, some additional rendering code is needed. -------------------------------------------------------------------------------- da5b7fe257 | Aidan Holm | 2019-11-20 10:48:32 +0800 Use textbox for arena UI -------------------------------------------------------------------------------- 0ead14ac95 | Aidan Holm | 2019-11-20 10:48:32 +0800 Refactor menu button activation handling This adds an ActivateEvent and a corresponding on_activate_event() helper. Activate events are emitted when a button (and, in the future, other widgets?) is activated by clicking, pressing its hotkey, or pressing space/enter while it has input focus. Activate events bubble, so you can add a handler to the button itself, or to a higher-level container containing many buttons within it. -------------------------------------------------------------------------------- b87a47e8d2 | Aidan Holm | 2019-11-20 10:48:32 +0800 Refactor event delivery This commit attempts to make event delivery more centralized, by moving most calls to widget->on_event() to a single function responsible for event delivery up and down the widget layout. This should make event propagation easier to understand. -------------------------------------------------------------------------------- 2c8c973532 | Aidan Holm | 2019-11-20 10:48:32 +0800 Add ui-specific event class Mostly necessitated by the need to add an event target member. Different event types are now implemented as subclasses. Unfortunately this means downcasting via static_cast<> in some cases, although the new on_foo_event() handlers remove that need by passing a derived event. I'm not too sure about the Event::Type::Foo verbosity... otherwise, it's mostly a net improvement. In C++20 you can do `using enum Event::Type;` which might help, when we get C++20. -------------------------------------------------------------------------------- 65a9246054 | Aidan Holm | 2019-11-20 10:48:32 +0800 Add event handler helper functions This commit hides the ugly event handler slots mechanism, adding clearly named event handler helpers that, in the case of on_keydown_event, removes the need to check the event type. -------------------------------------------------------------------------------- 52f71b681c | Aidan Holm | 2019-11-20 10:48:32 +0800 Sync all widget state on layout push Initial widget state is often set before pushing the new layout, causing sync messages that are discarded by the webtiles client (since the corresponding layout HTML has not been created). In order for these widgets to have the correct state on webtiles clients, the state must be resent on push. -------------------------------------------------------------------------------- 78f1d665fd | Aidan Holm | 2019-11-20 10:48:32 +0800 Add focus sync Mostly straightforward. One caveat is that widgets require a sync-id to have their focus state synced correctly, even if they have no other data that can be synced. A console warning will be issued if you tab to such an element, so manual testing during development should catch any missing ids. -------------------------------------------------------------------------------- 69b4fc02ef | Aidan Holm | 2019-11-20 10:48:32 +0800 Protect against network races with popup generation IDs This commit adds a simple mechanism intended to ensure that widget sync messages are always delivered to the correct widget. Widget layouts / popups have a generation id, which is an increasing integer that never repeats. Sync messages include the current client/server generation ID, which is used to discard invalid messages on the other end. Sync messages for widgets / elements not on the top layout / popup are discarded. One reason for discarding these is that 1) on the server, while getting the generation ID of the top layout is easy, getting the generation ID of an arbitrary layer would require more API changes; and 2) it's unlikely for these to be generated on the webtiles client. While it's quite easy to change the state of any widget given a pointer on the server, discarding these messages should not cause any issues, as the entire set of syncable widgets are resynced on layout push/pop. An example of how a sync message could be sent to the wrong widget without a mechanism like this in place: 1) Client changes widget state, e.g. textbox contents 2) Simultaneously, server pops layout 3) Server receives widget state from client for previous layout -------------------------------------------------------------------------------- 465f1a91d0 | Aidan Holm | 2019-11-20 10:48:32 +0800 Add generic webtiles UI state syncing This commit adds an improved widget state synchronization system. Widgets now have a sync_id property. If set to a non-empty string, widgets' state will be synchronized automatically in both directions, which should allow phasing out the clunky ui_state_change() sync mechanism. Note: the currently focused widget is not yet synchronized. -------------------------------------------------------------------------------- 0499068236 | Aidan Holm | 2019-11-20 10:48:32 +0800 Improve seed generation UI This commit improves the seed generation UI, using the new text entry and checkbox widgets, as well as the new focus system. UI state is not yet synchronized between webtiles and server. This commit also adds a HTML implementation; previously, the CRT emulation system was being used. -------------------------------------------------------------------------------- 74bebdfac3 | Aidan Holm | 2019-11-20 10:48:32 +0800 Add widget focus cycling This implements a more versatile input focus layer for local tiles and console. Widgets can now be focusable or not, depending on derived type. On UI hierarchy change, a DFS is performed of all widgets and all focusable widgets are collected into an array, which is then used for cycling between focusable elements. This commit adjusts keyboard event delivery. The keyboard event (key up or down) is delivered first to the focused widget, which has a chance to handle the event and stop propagation. Next, tab, shift+tab, and esc are handled; if one of these keys is pressed, propagation stops. Otherwise, propagation continues upwards. Input focus on webtiles is decoupled from input focus on the server. The current plan is that the webtiles implementation for a given UI layout will have corresponding focusable HTML elements, and that UI state, including focus, will be synchronized in both directions. -------------------------------------------------------------------------------- b7d4c039f0 | Aidan Holm | 2019-11-20 10:48:32 +0800 Make shift-tab work on unix console -------------------------------------------------------------------------------- c9420b3d73 | Aidan Holm | 2019-11-20 10:48:31 +0800 Move controller event handlers to popup widgets -------------------------------------------------------------------------------- 37c931e5a9 | Aidan Holm | 2019-11-20 10:48:31 +0800 Add widget internal child tracking It's not uncommon for non-container widgets to have internal children as an implementation detail, invisible to the code using the non-container widget. This new API requires such internal children to be explicitly marked as such, allowing the UI system to enumerate them. for_each_internal_child() iterates over internal children, and the somewhat verbose for_each_child_including_internal() iterates first over internal widgets, and then over all children. These new APIs are added because widget users will not expect to see internal non-child widgets they did not add when iterating over a widget. -------------------------------------------------------------------------------- 383bcb0925 | Aidan Holm | 2019-11-20 10:48:31 +0800 Improve Widget::for_each_child() helper Previously, it only worked on containers, so if you only had a Widget* you had to use a dynamic_pointer_cast and an if statement: ugly. Now regular non-container widgets just do nothing by default. It's also been given a clearer name. -------------------------------------------------------------------------------- c74a01a412 | Aidan Holm | 2019-11-20 10:48:31 +0800 Remove Layout::add_event_filter() API -------------------------------------------------------------------------------- 74dbbd1b81 | Aidan Holm | 2019-11-20 10:48:31 +0800 Use new hotkey API -------------------------------------------------------------------------------- 50eff3ad4f | Aidan Holm | 2019-11-20 10:48:31 +0800 Add hotkey event handling support The purpose of this hotkey handling API is to be more explicit about the purpose of individual event handlers, replacing the add_event_filter() API. Hotkey handlers are only called for keydown events, before all other handlers get a chance to run. Note: hotkey handlers get called for *all* keydown events, due to the large number of handlers that have switch statements. -------------------------------------------------------------------------------- 5d773dd3d0 | Aidan Holm | 2019-11-20 10:48:31 +0800 Add text entry widget This commit adds a rudimentary textbox widget. It is single-line only, and does not support text selection or, indeed, most of the niceties of regular OS/toolkit-provided textboxes. That can come later. This widget has an inner LineReader class, which is a gutted version of the line_reader class, permitting independent modification. line_reader, meanwhile, will hopefully eventually be removed as more and more UI layouts are widgified. -------------------------------------------------------------------------------- ab78da221f | Aidan Holm | 2019-11-20 10:48:31 +0800 Add checkbox widget This adds a rudimentary checkbox widget. Currently, hovered checkboxes and checkboxes with input focus are visually indistinguishable. -------------------------------------------------------------------------------- fe7bffbe7c | Aidan Holm | 2019-11-20 10:48:31 +0800 Add improved console cursor positioning API Widgets may wish to show the console cursor at a particular position, e.g. a focused text entry widget should indicate the current cursor position. However, the cursor position is also changed while rendering widgets in general, and widgets have no control over the order in which they are rendered, by design. This API allows a widget to explicitly request, for one render cycle, that the on-screen cursor be positioned in a given position. The UI framework will then move the cursor to that position after rendering, just before the screen is updated. -------------------------------------------------------------------------------- 66650a8186 | Aidan Holm | 2019-11-20 10:48:31 +0800 Rename MouseEvent -> wm_mouse_event Partially for consistency with the other wm_event types, but also because I want to use MouseEvent as a derived type of a new ui-layer specific Event class, without having to worry about changing all the cruft left over in tilereg-* -------------------------------------------------------------------------------- f485fd5ed0 | Aidan Holm | 2019-11-20 10:48:31 +0800 Refactor widget hover path handling This commit moves the hover path inside the UIRoot struct, which avoids the undefined destruction order of statically-allocated instances. I'm not sure that this was ever an issue in practice, but UB is UB, and in any case the code is cleaner now. This also fixes an issue when setting a widget's parent did not update the hover path. Now, the hover path is truncated if the widget has no parent, and recalculated afresh (delivering mousein/out events) if it is part of the top layout. Finally, this commit renames prev_hover_path to hover_path, which makes much of the code using it easier to read. -------------------------------------------------------------------------------- 87cb31babd | Aidan Holm | 2019-11-20 10:48:31 +0800 Extract UI debug drawing code This is purely a method extraction and shouldn't have any functionality changes. -------------------------------------------------------------------------------- 8dd6822314 | Aidan Holm | 2019-11-20 10:48:31 +0800 Make box alignment members protected This is necessary since changing box alignment should force a recalculation of the box's size. This was never an issue because noone was changing box alignments after showing the box, but it's better to have proper encapsulation. -------------------------------------------------------------------------------- eeaa2dc683 | Aidan Holm | 2019-11-20 10:48:31 +0800 Clean up ui.cc and ui.h -------------------------------------------------------------------------------- 166592d65c | advil | 2019-11-19 21:47:49 -0500 Various refactoring to make expensive calls less likely This is all in code paths that are involved in monster movement, so code that is called very frequently. Calls that check enchantments in particular seem to be disproportionately bad. -------------------------------------------------------------------------------- a07cd79442 | advil | 2019-11-19 21:47:49 -0500 Disable some debugging code even in FULLDEBUG This might be useful if this cache ever stops working, but right now it's just slowing down FULLDEBUG builds for no good reason. -------------------------------------------------------------------------------- b95ba5eb33 | Aidan Holm | 2019-11-20 10:46:33 +0800 Unbrace [skip ci] -------------------------------------------------------------------------------- 53d2a09ee0 | advil | 2019-11-19 20:31:48 -0500 Remove clinging This is a long-time spoilery corner of dcss monster behavior, and has been under consideration for removal for years (more or less since player clinging went). Clinging monsters had weird/unique pathfinding behavior with a bunch of hidden special cases that weren't ever well-communicated (or communicatable) to the player, for example a +4 search radius for players out of los. The special cases were also kind of error-prone, as in the 0.23 bug with clinging monsters behind glass walls. This commit removes clinging without replacement. If this is somehow a nerf to spiders, I would just make them able to unconditionally cross water. (But I sort of doubt it'll make a difference.) -------------------------------------------------------------------------------- 514c71c9f1 | advil | 2019-11-19 20:31:48 -0500 Fix a wizmode / test crash on randbooks -------------------------------------------------------------------------------- 94313f71df | advil | 2019-11-19 20:31:48 -0500 Refactor habitability checks around monster flight The airborne() call is quite heavy, given how many varied things it must check. This commit refactors habitability checks to only ever check airborne() if all other tests have failed, and if the terrain is actually one that would be saved by flight. -------------------------------------------------------------------------------- ca9b790695 | advil | 2019-11-19 20:31:48 -0500 Clean up some heavy-handed artefact code Any time you checked an artefact property, the old code made an entire copy of the CrawlHashTables for both the artefact props and its known state. Because artefact properties are checked frequently when monsters are carrying them (mostly in case they have flight), this could lead to heavy world_reacts on some levels, e.g. Vaults 5. This was particularly noticeable with step from time on a debug build. -------------------------------------------------------------------------------- e29c8f2358 | Aidan Holm | 2019-11-18 22:08:36 +0800 Check makefile deps in parallel When running make, the dependency files are first checked to see whether they are stale, which can take several seconds. This commit parallelizes that by forking for each dependency (currently around 350 in total). There are no race conditions because the output is merged linewise and there are no ordering constraints on the generated dependencies. This takes a NOP rebuild from ~3.6 seconds down to ~1.2 seconds on my machine. -------------------------------------------------------------------------------- e9c0e85935 | advil | 2019-11-17 19:09:22 -0500 Improve some webtiles logging messages in order to make cross-checking things a bit easier. (Added IP to login messages, and name to start/stop watching messages.) -------------------------------------------------------------------------------- da8bd6cf83 | AdamPG | 2019-11-16 17:01:40 -0500 Make the Warlock's Mirror's reflection chance scale as intended Commentary about the omnireflection property granted by the Warlock's Mirror (see line 3099 of beam.cc) indicates that it is intended to reflect 50% of ench-type effects at 20 displayed SH; however, the the actual chance is 33% due to a mathematical error. This commit changes the chance to the intended 50% at 20 SH. -------------------------------------------------------------------------------- 8addd88b59 | Edgar A. Bering IV | 2019-11-16 15:12:44 -0500 Clarify and correct Vampire status info (12121, 12035) Also, Closes #1202. -------------------------------------------------------------------------------- 3db639d13e | Edgar A. Bering IV | 2019-11-16 13:44:35 -0500 Dismiss most summons on attitude change (12082) For the most part, creating hostile summons is a bad thing for a player; however, there are some exceptions that led to degenerate behavior. Guardian Golem which has no attack and any of the stationary summons (SLS and Fedhas' summons) could be made hostile in order to block monsters indefinitely. This commit changes the behavior in the following way: - True summons are dismissed on attack. The exception is demons from Summon Greater Demon, which turn hostile. - "Summons" that are M_CONJURED (fulminant prisms, ball lightning, fire fire vortices, other spell proxies) take damage but retain ATT_FRIENDLY - Fake summons (snakes, undead, malign gateway tentatcle) become hostile on hit. This will need to be re-evaluated if stationary or attackless undead get added. -------------------------------------------------------------------------------- 2289b3b9f1 | Aidan Holm | 2019-11-15 16:27:11 +0800 Fix run_layout() clearing default focus By default, the child widget of the popup widget is focused; run_layout's initial_focus parameter broke this default. -------------------------------------------------------------------------------- e48d713e8b | Aidan Holm | 2019-11-15 16:00:17 +0800 Fix string_wrap removing trailing empty segments This was causing a trailing newline in text widgets to not be rendered properly on console. -------------------------------------------------------------------------------- 264caf7d7f | Aidan Holm | 2019-11-15 16:00:16 +0800 Set initially focused widget from run_layout() -------------------------------------------------------------------------------- bfa96ce22d | Aidan Holm | 2019-11-14 22:10:58 +0800 Add support for formatted_string + string -------------------------------------------------------------------------------- e1e9d9662a | Aidan Holm | 2019-11-14 20:59:31 +0800 Add support for formatted_string += string -------------------------------------------------------------------------------- 33052ceff8 | advil | 2019-11-13 11:56:26 -0500 Remove old flavor messaging from fedhas_altar_decomposition (12106) This vault seems ok without it, at least if one is fine with trapped monsters. Could just be removed entirely, perhaps? -------------------------------------------------------------------------------- fcdb843264 | gammafunk | 2019-11-13 00:19:17 -0600 Correctly cap duration for Fedhas summons The enchantment degree for the abjuration enchant is supposed to range from 1 to 6, but the checks on this for monster placement code aren't applied when non-spells set up the monster data. Code implementing non-spell abilities that create summons must itself enforce the degree cap, otherwise it can create permanent allies. This commit adds this degree cap to the Fedhas abilities. It took invocations of over 15 to achieve abjuration degrees above 6. Hence it wasn't 'free' to get permanent allies before this commit, but we want the allies to be temporary ones all the same. This change means that duration is maxed out at 15 invocations to 190 turns on-average, however the abilities continue to scale with past 15 invocations through increases to the allies' HD. -------------------------------------------------------------------------------- 0cf78c2f83 | Alex Jurkiewicz | 2019-11-12 09:23:21 -0500 Add !cancellation to Zig loot table (EugeneJudo) "Do cancellation potions not spawn in zigs? They're very useful for surviving -wiz on pan floors when things get out of hand (brilliance doesn't help, or at least it still leaves things unreliable to cast.) My supply is running low, while it's pretty rare that I ever use them." [Committer's note: Closes #1100] -------------------------------------------------------------------------------- 19cdb01801 | Alex Jurkiewicz | 2019-11-11 23:32:41 -0500 Rework some chaos brand effects * Common effects added: might, agility * Cloning can sometimes make neutral/friendly copies of monsters * Miscasts entirely removed. Too unpredictable for a weapon brand, and steps on Spellbinder's toes. -------------------------------------------------------------------------------- 4073cf80fb | Alex Jurkiewicz | 2019-11-10 19:59:50 -0500 Run GDB from /usr/local/bin on OSX [Committer's note: Closes #987] -------------------------------------------------------------------------------- 3c6720d1ae | Alex Jurkiewicz | 2019-11-10 19:27:16 -0500 Run gdb at lower priority Will help manage load for online servers -------------------------------------------------------------------------------- 9e23508adf | Umer Shaikh | 2019-11-10 17:13:59 -0500 Make the game check the floor when emergency eating Currently if the player is about to starve to death, they will automatically eat from their inventory if they have food available. Since the player can now eat directly from the floor, this commit extends that check to seeing if there is anything available to eat on the floor. This is an edge case and not likely to matter often, but it's good to have consistent and unsurprising behaviour. I take it the intention of commit 2474f45a (which added forced eating when starving) was just about eating rather than starving, if it's possible, and that nothing special about the location of the food in inventory was intended; if that's right, this commit updates behaviour to be in line with that intention. As a player I wouldn't expect location of the food to matter, only that the game is kindly not letting me starve from inattention to my hunger state; if that's the general player expectation, then this commit also makes the behaviour less surprising. -------------------------------------------------------------------------------- 1bb46122f9 | Edgar A. Bering IV | 2019-11-10 15:11:05 -0500 Revert "Add a trunk reminder for the 0.24 tournament" This reverts commit 9dd530fc128f9e15ccd22fabec984bd9d586efbc. -------------------------------------------------------------------------------- 20dcb12bf1 | Edgar A. Bering IV | 2019-11-10 14:16:00 -0500 Remove edge cases from Fedhas protection This commit extends Fedhas protection to piercing attacks done by all allies. Fedhas summons also worship Fedhas, so can shoot through plants. Other summons do not, but will shoot through briars because they "can be shot through". The result is players killing their own briars with a lightning spire or similar. The narrowest fix is to have Fedhas only protect briars from non-Fedhas allies, but the result of that approach is a thicket of special cases. This commit also extends Fedhas protection to ballistomycete spores (which had previously been excepted for reasons involving the old spore network system) and snaplasher vines (the remaining exception, which wasn't described anywhere). -------------------------------------------------------------------------------- 23bb404d27 | Aidan Holm | 2019-11-10 23:45:40 +0800 Fix overenthusiastic nullptr find-replace -------------------------------------------------------------------------------- 0e808ab1dd | Aidan Holm | 2019-11-10 20:09:08 +0800 Fix backspace-clears-name behaviour Previous commit did not stop treating backspace as 'clear' if any other key was pressed. Backspace will now keep clearing until you press a key that changes the name input (or backspace). -------------------------------------------------------------------------------- 355392fac7 | Aidan Holm | 2019-11-10 19:57:04 +0800 Partially restore backspace-clears-name behaviour (advil, 12119) Fully restoring the old behaviour is non-trivial, but this change should make clearing the initial name easy, which is the primary use-case. Backspace will now clear if it's the first key pressed, and delete one character at a time otherwise. -------------------------------------------------------------------------------- 1777079349 | Aidan Holm | 2019-11-10 19:46:53 +0800 Fix redraw issue when game ends (Goratrix, 12124) Fully redrawing the screen is only necessary when running, since a more() may be issued while running and the map should be updated to show the correct location. Otherwise, fully redrawing currently causes redraw issues and crashes if more() forces a redraw during monster moves; use the old draw code in this case for now. -------------------------------------------------------------------------------- a3d287bc14 | advil | 2019-11-09 12:51:50 -0500 Don't crash if there aren't enough spells for an acquired randbook This can happen, for example, if sif grants a mummy a pure transmutations randbook, and rolls a size of 8 -- there aren't enough spells in the school currently that a mummy can cast. -------------------------------------------------------------------------------- a6f17ae7d4 | advil | 2019-11-08 16:24:36 -0500 Don't update travel cache on excursion to unvisited levels (odiv) An excursion to unvisited levels can happen, since 0.23, for pregenerated levels when creating abyss terrain. The level excursion was putting an entry into the travel cache, leading to the level visited values in ctrl-o potentially being wrong. -------------------------------------------------------------------------------- 7617fd2bc2 | advil | 2019-11-07 14:50:15 -0500 Improve behavior of `remember_name = false` There were several cases where this option wasn't working as expected. Two main ones: * If a name was present in the sticky prefs, but this option was false, the saved name would still be loaded. * It was ignored on restart after a game end. This commit also lets `*` work to pick a random name at the main menu, not just at the name prompt. It's a bit of a hidden feature for now, not sure how best to document it to users. -------------------------------------------------------------------------------- 11f2770c52 | Aidan Holm | 2019-11-07 10:04:34 +0800 Link with the LLVM linker if available On my system, linking with lld is around 9 times faster than GNU gold, with link times of around 0.5 seconds. -------------------------------------------------------------------------------- fb64b48880 | Aidan Holm | 2019-11-07 10:04:34 +0800 Add const -------------------------------------------------------------------------------- a3fec9ad93 | Aidan Holm | 2019-11-07 10:04:34 +0800 Remove broken back-compat keybindings for hints menu This broke a while ago, once event delivery was changed to bubble up instead of down. No-one's complained, so let's quickly removed it; easy enough to add it in later, but currently it's in the way of further refactorings. -------------------------------------------------------------------------------- e945405b5e | Aidan Holm | 2019-11-07 10:04:34 +0800 Remove weird shift-X binding -------------------------------------------------------------------------------- 9b55229ae5 | advil | 2019-11-06 14:18:47 -0500 Don't crash on a few cases of invalid skill names in lua Handling of bad skill names is extremely mixed in l-you; a few other cases do actual error checking, but most just return fighting on errors, which seems maybe non-ideal. There are two dlua cases that will still crash on bad skill names that I didn't bother to fix. -------------------------------------------------------------------------------- 1d1f32e58f | Aidan Holm | 2019-11-06 10:05:54 +0800 Fix more compiler warnings This adds most of -Wextra, except for a few exceptions. -------------------------------------------------------------------------------- 5069e0ce05 | Aidan Holm | 2019-11-06 10:04:39 +0800 Fix enum + non-enum mixing in ?: expressions -------------------------------------------------------------------------------- 0d431de418 | Aidan Holm | 2019-11-06 10:04:39 +0800 Remove hacky function pointer casts -------------------------------------------------------------------------------- 2bcd1f60b1 | Aidan Holm | 2019-11-06 10:04:39 +0800 Remove/mark unused parameters This commit transitively removes unused parameter from all over crawl. If the unused parameters look like they're part of an interface, I've left them as is, but commented out the parameter name. In general, if I'm less confident that a parameter is intentionally ignored, i've marked it with UNUSED(). One pain point is that crawl has a lot of conditional compilation, and variables are sometimes only used by one ifdef branch. I've still used UNUSED in these cases, but it's less than ideal. -------------------------------------------------------------------------------- 359a7de824 | Aidan Holm | 2019-11-06 10:04:39 +0800 Add UNUSED(...) macro This allows use with parameter packs, and also allows specifying multiple arguments, e.g: UNUSED(arg1, arg2); -------------------------------------------------------------------------------- d92d1f55eb | Edgar A. Bering IV | 2019-11-05 20:00:37 -0500 Check appropriate tracers in monster wand usage (ManMan) Scattershot and Cloud cone were incorrectly using a fake_beam tracer to determine when to be used as wand spells, instead of the relevant tracer functions from mon-cast.cc -------------------------------------------------------------------------------- 9796ba8d15 | Aidan Holm | 2019-11-05 00:30:59 +0800 Fix incomplete draws while running (advil) The UI layer calls viewwindow() via redraw_screen() to ensure that the base layout (view, hud, and messages) is fully rendered before rendering any popups (if there are any). viewwindow() does not render the main view if the player is currently running, however, so if autoexplore is paused during a prompt (e.g. the inventory full during pickup prompt or rune pickup force-more), the view is not fully rendered on either tiles or console. This commit fixes this issue by only skipping rendering while running if the current mouse_control mode is MOUSE_MODE_NORMAL. Prompts via more() and yesno() change the mouse mode, forcing full rendering. This commit also fixes the turn counter not being updated while running, and partially fixes the more prompt while running. Currently, at least on local tiles, resizing the window causes the --more-- line to disappear, due to the way the message code is structured. -------------------------------------------------------------------------------- 6cdc7bcc1e | theJollySin | 2019-11-04 20:37:15 +0800 Remove haste potion from FoWn start (12115) -------------------------------------------------------------------------------- e910a4a285 | Edgar A. Bering IV | 2019-11-02 12:29:51 -0400 Don't feel safe near exploding monsters Change i_feel_safe to alert the player instead of waiting near friendly fulminant prisms, ball lightning, or ballistomyete spores. Currently this is slightly overzealous and will refuse to wait in sight of a fulminant prism regardless of distance, but this minor edge case is preferable to players waiting after a fight with Fedhas or CBL and dying after pressing 5. -------------------------------------------------------------------------------- f553b7a2c8 | Aidan Holm | 2019-11-02 22:00:48 +0800 Fix menu filtering from crashing (damerell, 12120) cursorto() moves the on-screen cursor to the correct position, given the cursor offset in the input text. However, resumable_line_reader never renders to the screen directly, so it's safe to NOP this function entirely. The crash itself seems to have something to do with the line reader start position, but I'm less interested in fixing this hacky mess because a replacement (textentry widget) is almost finished. -------------------------------------------------------------------------------- 7ce66cc934 | Aidan Holm | 2019-11-02 21:59:27 +0800 Remove unnecessary capitalization [skip ci] -------------------------------------------------------------------------------- e58f8a54b6 | gammafunk | 2019-11-01 23:53:32 -0500 Rework a worm vault (again) This commit reworks worms_lemuel to place more reasonable numbers of monsters in the earliest depths and to scale monsters and loot up with depth. For example, in D:7-10 it places only two on-average and 3 at maximum. The moths of wrath and/or torpor snails are also scaled more reasonably, only beginning to appear in Lair. Previously the vault used absolute depth for monster placement, but now it looks at branch and branch level. The vault's layout is slightly changed to accommodate the potential max number of spawns. I've also made the vault place within-branch monsters in Swamp/Spider, since placing swamp worms in Spider is not too interesting. Now it uses demonic crawlers in Spider and only torpor snails as the "assistant" monster there, since crawlers can't be berserked by moth of wrath. -------------------------------------------------------------------------------- 7dccc1bee0 | Aidan Holm | 2019-11-01 12:41:30 +0800 Fix description UIs not scrolling via keyboard Keyboard events now have to be explicitly passed to scroller widgets, as they cannot (currently) be focused. A better implementation is in the works. -------------------------------------------------------------------------------- fe832476f1 | Aidan Holm | 2019-11-01 11:22:00 +0800 Prevent pinned monsters from using trample (Yermak, 12062) -------------------------------------------------------------------------------- 7ed4e613ac | Aidan Holm | 2019-11-01 10:52:09 +0800 Fix some screens wider than minimum width (12008) The spell info and memorise menus were slightly wider than the minimum width. When viewing a description from one of these menus on a console screen with minimum width (79 chars), the UI layout engine takes the width of the lower layout into account, and makes the description view wider than the viewport. Any text outside the viewport is then truncated, leading to seemingly incorrect wordwrapping. Menu minimum widths are primarily determined by the width of the title string. Trimming off empty spaces at the end is enough to fix the issue. -------------------------------------------------------------------------------- fbcdf995c9 | Aidan Holm | 2019-11-01 10:52:09 +0800 Fix menu title/more margin size It's generally assumed that titles and entries of the same number of characters will have the same width. This was not the case because menu entry text has a right-padding of 10px. This commit adds a right-margin of 10px to both the title and the more, which fixes ellipsizing of menu entries when the window width is reduced. -------------------------------------------------------------------------------- befff83b7c | Aidan Holm | 2019-11-01 02:29:11 +0800 Fix win32 console branded colours Console crawl has a concept of 'branding' colours, which involves setting one of several high bits each corresponding to a given brand. This brand is then looked up in the options, allowing customization of e.g. how summons are displayed. On win32 console, branded colours were converted into actual colour pairs (fg and bg) much earlier than on unix console, (inside the real_colour() function), with the background colour being stored in bits 0xF0. This worked fine because win32 textcolour() actually updated both foreground and background colours simultaneously, until db4295c90eb, which corrected this API inconsistency, inadvertently breaking branded colours. This commit moves win32 console branding into libw32c.cc, and applies branding in the same way it is applied for unix console, fixing this issue. I'm not sure why the win32 branding was also enabled for all local tiles builds, since tiles never draws anything via the console... -------------------------------------------------------------------------------- 88673ef095 | advil | 2019-10-28 21:04:26 -0400 Remove an accidental swastika (Snack, minmay) Unfortunately it's not a good idea to cherry-pick this to 0.24 during the tournament (or maybe during 0.24) as this change will potentially affect any seed that uses minmay_the_grid. -------------------------------------------------------------------------------- 63109bb16d | advil | 2019-10-28 15:51:31 -0400 Fix some odd permastore update conditions (aidanh) This fixes weird behavior in two cases: (i) it keeps the permastore from being updated when ghosts are used during level load but the level is vetoed, and (ii) it keeps the permastore from being updated unintentionally using wizmode commands. -------------------------------------------------------------------------------- 7a5f90e2b2 | Aidan Holm | 2019-10-28 20:04:46 +0800 Revert "Add rudimentary win32 console colour adjustment" (advil) Win32 colour adjustment was added so that the new menu implementation was legible on windows console, but the legibility issue was fixed at 6844edd79dc0, which added explicit menu colouring. Meanwhile, colour adjustment is breaking the foreground text colour on the species/job menu on Windows. I'm not sure why unix is not affected. This reverts commit 40b4c6130089b08bb32c9d453dad5093658186d3. -------------------------------------------------------------------------------- f342c8b036 | advil | 2019-10-27 11:33:48 -0400 Several updates to the debian release guide, convert to md This introduces a bunch of extra detail and modifies some of the recommendations based on our experience packaging debs over the last few releases. Main changes: * explicit discussion of how to check dependencies of the built debs, hopefully avoiding ubuntu incompatibilities. * recommend always fully specifying OS/DIST/ARCH for creating and updating cows; this would head off some mistakes I've made at least. * convert doc to md, some cosmetic overhauls -------------------------------------------------------------------------------- 9dd530fc12 | gammafunk | 2019-10-25 15:21:12 -0500 Add a trunk reminder for the 0.24 tournament -------------------------------------------------------------------------------- a0c9b72eff | advil | 2019-10-25 10:04:50 -0400 Fix comma (Goratrix) -------------------------------------------------------------------------------- 68f861856e | advil | 2019-10-24 20:16:21 -0400 Add some missing credits I found some names (apparently) not in here while writing the release post. Also, apparently CXC was missing from here?? -------------------------------------------------------------------------------- 0753fd1ad2 | advil | 2019-10-24 14:28:07 -0400 Update debian changelog for release (cherry picked from commit a7d21def0a8b0b39c6825b643a3b51f371b73583) -------------------------------------------------------------------------------- 45a4e74662 | advil | 2019-10-24 14:27:59 -0400 Finalize changelog for 0.24 release (cherry picked from commit 54606e7572d31cb9608e76dcbdf8097f60c0c247) -------------------------------------------------------------------------------- 72b0ba0336 | advil | 2019-10-24 10:59:31 -0400 Fix a gcc warning -------------------------------------------------------------------------------- 9c56bcba70 | advil | 2019-10-24 09:13:43 -0400 Add vaults to stable version morgues We'll see if players think this is too spammy or too obscure, but for 0.24.0 at least this will be helpful for testing any seed issues that come up. -------------------------------------------------------------------------------- c466198565 | advil | 2019-10-23 20:42:08 -0400 Fix mummy death curses from ally kills (12104) This has been broken for a while; it was a mid/mindex confusion. I've also refactored the call so that it will better handle the case where your summon does before the fineff fires. -------------------------------------------------------------------------------- f0389da217 | gammafunk | 2019-10-23 14:53:17 -0500 Rework a wizard vault The vault cheibrodos_wizard_tower placed on-average 3 8-tier monsters at Lair depth, which is fairly nasty. This commit reworks the monster and loot placement to better scale with depth, starting with 1.25 monsters at D:7-9. The monster set now includes a possible deep elf annihilator in Dungeon, but only at depths where those are possible 8 spawns, and with a small chance. The monster count in Elf has been increased as well. The vault range is now increased to include D:13-D:$. The loot now has some thematic aux armor, randbooks, and staves mixed in, and the loot scales in count with depth. -------------------------------------------------------------------------------- 75acf02343 | advil | 2019-10-23 12:42:40 -0400 Changelog tweaks -------------------------------------------------------------------------------- 6843c08e71 | kitchen-ace | 2019-10-24 00:31:13 +0800 Warn when exploding portal projectiles would hit you 853fe2e fixed this for harming allies, but not yourself. -------------------------------------------------------------------------------- 2ac932518a | Edgar Bering | 2019-10-23 12:13:51 -0400 Correct a changelog entry (pblur) -------------------------------------------------------------------------------- 6afad29e87 | theJollySin | 2019-10-23 16:57:03 +0800 Fixed typo in wands mutation (12103) -------------------------------------------------------------------------------- 47823c4fae | Aidan Holm | 2019-10-23 16:23:21 +0800 Fix loading screen click activating main menu This fix drops mouseup events if the UI layout has been changed since the corresponding (well, previous) mousedown event. This fixes a bug where the loading screen would transition to the main menu on mousedown, and the mouseup event would then activate the button underneath the cursor. I'm not sure this is the best way to fix this. Some alternatives: - have the loading screen transition on mouseup - have the loading screen "swallow" the mouseup event explicitly via some new API - have menu buttons only activate on mouseup if they also received a corresponding mousedown -------------------------------------------------------------------------------- 29a1220a87 | gammafunk | 2019-10-23 00:29:05 -0500 Some updated invocations tiles from CanOfWorms Updated tiles for Sif Muna's Divine Exegesis and Fedhas' Wall of Briars, Overgrow, and Grow Oklob abilities. -------------------------------------------------------------------------------- 3121d2daec | gammafunk | 2019-10-22 23:31:56 -0500 More updates to the 0.24 changelog -------------------------------------------------------------------------------- 6c54e25894 | advil | 2019-10-21 11:17:42 -0400 Add seed as a logfile/score entry This is necessary if scoring (or perhaps sequell) is to do anything interesting with seeded games. This commit adds the seed for all game types, since even for normal games the seed is revealed on game end. Milestones do not have this field for any game type. -------------------------------------------------------------------------------- 6cf4ce537d | Aidan Holm | 2019-10-21 01:50:38 +0800 Fix formatted_scroller more text alignment A better fix would be to use the just-removed align_self, but I'd rather not revert that removal, and adding a better implementation would be too disruptive at this point (feature freeze). -------------------------------------------------------------------------------- 883716c04b | theJollySin | 2019-10-20 22:33:37 +0800 Adjust barehanded attack prompt wording (11907) -------------------------------------------------------------------------------- 710a5d0249 | theJollySin | 2019-10-20 22:33:37 +0800 Fix Sceptre of Torment inconsistency (12093) -------------------------------------------------------------------------------- 099c3e10fa | kitchen-ace | 2019-10-20 14:24:51 +0800 Draw shields on deep elf knights -------------------------------------------------------------------------------- 8155909c3e | kitchen-ace | 2019-10-20 14:24:05 +0800 Prevent torment from killing spriggan riders Torment shouldn't be able to kill spriggan riders or their mounts. -------------------------------------------------------------------------------- 303dd5b1f4 | Aidan Holm | 2019-10-19 16:55:46 +0800 Fix text bug (Goratrix) The Enter key does not close the popup. -------------------------------------------------------------------------------- 747a2b3c0c | Aidan Holm | 2019-10-18 05:51:48 +0800 Add icon to the high scores screen (advil) This also fixes the high score description text being centered in console. -------------------------------------------------------------------------------- 1393849f60 | Aidan Holm | 2019-10-18 04:09:29 +0800 Specify max menu width relative to font size (Siegurt, 12097) -------------------------------------------------------------------------------- 3d4e485b54 | Aidan Holm | 2019-10-18 03:46:46 +0800 Fix tile_menu_icons = false on local tiles ability menu -------------------------------------------------------------------------------- 14bc4967e4 | Aidan Holm | 2019-10-18 02:45:30 +0800 Show whether spells are in library in book description -------------------------------------------------------------------------------- f7f5d9a50a | Aidan Holm | 2019-10-18 01:14:01 +0800 Remove stray pixels from spell tiles -------------------------------------------------------------------------------- 99cdaf76fe | Aidan Holm | 2019-10-18 01:14:01 +0800 Add tiles for a few monster spells 63 to go... as measured by `grep -B7 GENERIC spl-data.h | grep ' SPELL'` -------------------------------------------------------------------------------- a86127ea33 | Aidan Holm | 2019-10-17 23:38:36 +0800 Tidy dc-spells.txt Sorts monster spells. The note for future removal referred to an entry for 'Rearrange the Pieces' that is already gone. -------------------------------------------------------------------------------- 65d077c5f1 | Aidan Holm | 2019-10-17 19:39:22 +0800 Disallow focusing widgets not in top layout (advil, 12098) On webtiles, focus events for the species menu buttons were being received after the attributes scroller had opened. On the server side, a callback would then focus the button, even though the menu had already been opened. This fix prevents widgets not in the top layer from being focused. -------------------------------------------------------------------------------- 6ac5fb96fa | Aidan Holm | 2019-10-17 19:29:42 +0800 Add ui::Widget::is_ancestor_of() -------------------------------------------------------------------------------- c393037b80 | Aidan Holm | 2019-10-17 18:46:37 +0800 Update the changelog -------------------------------------------------------------------------------- f18fdeb47f | Umer Shaikh | 2019-10-17 00:00:59 -0400 Show flay damage in status light It is tactically useful to know how much damage is due to flay. For example, it matters in deciding whether to quaff cancellation or who to attack. This information is already revealed to the player, but not in a convenient way. At the moment the careful player must pay attention to what the sources of damage are as the fight proceeds in order to know this; and, if this is neglected, it is difficult to recover the information from the message log later in the fight. This commit reveals that information more straightforwardly by adding it to the flay status light. I show a number instead of a more coarse-grained indicator. Note that otherwise the conscientious player will still want to keep track manually of damage since they can get better information that way. The damage is displayed as a negative number for consistency with the similar corrosion status light. -------------------------------------------------------------------------------- 72dcfe0359 | advil | 2019-10-16 09:55:41 -0400 Revert "Remove support for multi-key macro binds" + associated commits It turns out that multi-key macros were used for keybinds for multi-character sequences sent by some terminals corresponding to special keys. For example, under the VT100 standard, \{27}Ov is sent by numpad 6. Another example: on OS X, option+arrow keys send multi-character escape sequences as well (maybe even outside of terminal). This sequence of commits broke such old macro files, and even worse, tended to break ESC, since nearly all of these sequences are ESC sequences. We'll need to rethink how to simplify this. Some of these simplifications might be independent of the current revert project and could be restored... This reverts commit 049a78546b28e77ec9647cdfd40840a8451f18ad. (Note: also a partial revert of d158fba7, 0b1efcb, 0e779d2) This reverts commit 678ee33c32bb4efb2fda34a8b44ce857352add0c. This reverts commit 5a8975c3e2236cd5aa0d3cf1738ccfdd360a4ab3. This reverts commit 3ea5ddb52caf3a66e4f92f90f056132a344c65e3. -------------------------------------------------------------------------------- dc1bd944b9 | advil | 2019-10-15 21:38:37 -0400 Fix Ru sacrifice delay with faith (12096 / @Wise Wolf) Specific problem and solution found by @Wise Wolf on discord yesterday. -------------------------------------------------------------------------------- c5ee894079 | Edgar A. Bering IV | 2019-10-15 21:10:06 -0400 Further update the changelog Add in descriptions of the Vampire and Throwing changes -------------------------------------------------------------------------------- a5a8db46c7 | gammafunk | 2019-10-15 15:36:15 -0500 Update the changelog A quick pass that likely contains errors. I've left out Vampire and Throwing changes so that those can be written up by others. -------------------------------------------------------------------------------- 83157970ee | advil | 2019-10-15 16:14:35 -0400 Fix a js error in go_lobby Not sure what the conditions are that trigger this, but probably at least game_exit::abort. -------------------------------------------------------------------------------- 74baf033cd | advil | 2019-10-15 16:14:35 -0400 Add a webtiles seed selection popup At first glance, this may appear to be a feature, but it is in fact a bug: the bug is that paste doesn't work for crt-emulated input. Implementing this as an actual textbox is the only way I've found to get this to work in webtiles. This doesn't materially change the implementation of the seed selection ui for console/local tiles; it is just as bad as ever. -------------------------------------------------------------------------------- f4602a88a1 | Aidan Holm | 2019-10-15 23:14:54 +0800 Factor out Region::contains_point() This commit also fixes a few off-by-one bugs in widget hit testing. -------------------------------------------------------------------------------- b94451d52d | Aidan Holm | 2019-10-15 23:14:54 +0800 Don't allow showing messages on arena team choice UI It's always empty. -------------------------------------------------------------------------------- 2533fd6716 | Aidan Holm | 2019-10-15 23:14:54 +0800 Fix segfault when delivering mousebutton events The previous code used a reverse iterator that could be invalidated by the hover path changing during event handling, causing a segmentation fault. It may be better to first copy the hover path and then iterate over that; this would matter if an event handler changed something in the hover path. But the semantics of event emission aren't strongly defined at this point; better to wait for a use-case and revisit this then. -------------------------------------------------------------------------------- c27d5b89ad | Aidan Holm | 2019-10-15 23:14:54 +0800 Fix some event forwarding bugs Previously, the UI framework would propagate events from the topmost root widget down to child widgets. The framework has since been changed to propagate events up from a focused widget, inadvertently breaking these event handlers' custom event propagation. -------------------------------------------------------------------------------- bc5b4a9081 | Aidan Holm | 2019-10-15 23:14:54 +0800 Add ui::Switcher::current_widget() -------------------------------------------------------------------------------- 8ab17b4d2b | Aidan Holm | 2019-10-15 23:14:54 +0800 Fix off-by-one error -------------------------------------------------------------------------------- 1381ef2bc4 | Edgar Bering | 2019-10-15 07:47:17 -0400 Update CREDITS -------------------------------------------------------------------------------- b8d28a4aeb | theJollySin | 2019-10-15 07:37:24 -0400 Misleading text when renouncing religion (8887) -------------------------------------------------------------------------------- 2fe12d4386 | advil | 2019-10-14 16:25:26 -0400 Fix the build on non-webtiles (aidanh) -------------------------------------------------------------------------------- a8c9d54b12 | advil | 2019-10-14 16:09:42 -0400 Fix seed selection on webtiles Eventually this needs to be rewritten to use a browser text input box. -------------------------------------------------------------------------------- b6de7aaf3c | mwvdev | 2019-10-14 14:15:16 -0400 Fix manual typos -------------------------------------------------------------------------------- 771548fc26 | kitchen-ace | 2019-10-15 01:00:46 +0800 Don't stop travel for changes from (un)melding If you are auto-travelling, and you lose stats from armour melding or unmelding, don't stop auto-travel for that reason alone. This is really only relevant for merfolk with artefact boots, but the fix should apply to the general case. -------------------------------------------------------------------------------- 653463b16e | Nikolai Lavsky | 2019-10-15 00:45:52 +0800 Add details to the newgame dolls This commit adds hair, claws, and horns to player dolls on the species selection menu. These extra bits are selected according to the default values from `tilep_race_default()` and `fill_doll_equipment()`. -------------------------------------------------------------------------------- 8ac2ca0a91 | Nikolai Lavsky | 2019-10-15 00:45:52 +0800 Refactor the processing of species/job tiles This commit fixes a couple of enum names, removes unnecessary file extensions, and replaces repeating file paths with `%sdir`. -------------------------------------------------------------------------------- 8166f019b9 | Aidan Holm | 2019-10-15 00:45:52 +0800 rltiles: Allow referencing generated images by enum Wherever image filenames are used, you can now also refer to an already-generated tile by its enum name. The first such matching tile is chosen; there is no support (yet?) for selecting a variation. The motivation for this feature is to reduce duplication and ensure that changes between tiles are synchronized. -------------------------------------------------------------------------------- e7af4de912 | Aidan Holm | 2019-10-14 23:26:55 +0800 Fix abyss-gen level excursion milestones (kitchen_ace, 12078) Abyss generation can include parts of other levels, through a level excursion. When including part of a level that the player had never visited, a milestone was erroneously added. -------------------------------------------------------------------------------- 6559c6c67a | kitchen-ace | 2019-10-13 14:59:21 -0400 Show that bloodless vampires' bite can heal It's not obvious that vampires can heal themselves when they bite something, and that this works only when they're bloodless. Add some messages to the abilities screens. -------------------------------------------------------------------------------- 14d03b10f2 | kitchen-ace | 2019-10-13 14:58:48 -0400 Fix showing regen amulets as useless for Vampires Vampires now heal when bloodless as long as no monsters are in LOS. -------------------------------------------------------------------------------- ac51ba0f9b | gammafunk | 2019-10-12 20:40:28 -0500 Update ballistomycete descriptions (kitchen-ace) Updates the descriptions for ballistomycete and ballistomycete spores to remove an outdated reference to ballistomycetes growing and to describe the effect of the spore's explosion. Also add a description for the Sporulate ability using the same language. Closes #1183. [skip ci] -------------------------------------------------------------------------------- 0f74319286 | advil | 2019-10-11 12:18:19 -0400 Don't crash with equip_unequip I think this case just got missed in b57a41d. -------------------------------------------------------------------------------- a050431806 | Umer Shaikh | 2019-10-10 18:28:50 -0400 Allow putting on jewellery from the floor This commit extends previous functionality to work with puton_ring (which also handles amulets). Amount of time to perform the action is the same as putting on jewellery from the inventory. [ Closes #1136 ] -------------------------------------------------------------------------------- b57a41df76 | Umer Shaikh | 2019-10-10 18:23:04 -0400 Allow wielding and wearing from the floor This commit changes wield_weapon and wear_armour to use use_an_item so the player can wield and wear from the floor. It also changes use_an_item so * and - options are allowed to, respectively, view and choose from all items and (if selecting weapons) swap to bare hands. This means * is now available for quaffing and reading as well. The wield weapon menu can now be brought up even if there are no weapons around---indeed, even if there is nothing at all around. The first is because you can wield non-weapons with *. The second is because you always have your bare hands, and I am anticipating a menu where basic stats for weapons are displayed alongside the options (a long-standing feature request). This commit implements * to show all items. This preserves the current ability to wield non-weapons and fulfills a TODO marked in the existing use_an_item code, so that * can be used for reading scrolls and quaffing as well. However, my own feeling is that this is not a usefull bit of UI complexity from the player's side. You cannot quaff non-potions, read non-scrolls, or wear non-wearables anyway. And as far as I know the only practical use for wielding non-weapons is breadswinging, a niche speedrunning tactic. I suggest cutting this and cutting the ability to wield non-weapons. This commit makes wielding or wearing from the floor take the same amount of time as wielding or wearing from your inventory. I think this is the least surprising UI and is consistent with the current behaviour for quaffing and reading from the floor (10 aut). I anticipate this means speedrunners and the hyper-optimal will want to sometimes pick items up by wielding them from the floor (e.g., wielding arrows to pick them up). [ Committer's note: Wielding arrows from the floor to pick them up then switching back to the previously wielded item costs 15 aut and 2 turns. Just picking up the arrows costs 10. Whether turns or aut are used for scoring, just picking up arrows is faster. ] -------------------------------------------------------------------------------- b7a8766ae5 | Byrel Mitchell | 2019-10-10 18:06:47 -0400 Fixed bug in OTR variance reduction commit This makes it impossible to gain extra OTR duration by breadswinging during the final turn of duration. [Closes #1177] -------------------------------------------------------------------------------- 71cb82dfb8 | Aidan Holm | 2019-10-11 02:44:24 +0800 Fix crash when repeating menu evocations (gammafunk) When repeating the previous command via the ` key, the UI is not fully laid out. The current implementation depends on having the menu more text default to not being visible for the UI to layout correctly. On local tiles this isn't an issue, since scrollers render their own scrollbars, but on console the scroll position is rendered to the more, and the layout error was causing a division by zero in the position calculation. -------------------------------------------------------------------------------- ddf7d93d98 | Byrel Mitchell | 2019-10-10 14:29:33 -0400 Adjust OTR to be more turn length invariant. Changed direct damage to use turn length in auts (instead of 10s of auts) for direct damage, and to scale odds of adding a poison stack linearly between 1 and 20 aut turn lengths (instead of 50% odds regardless of turn length.) This has the same results as previous calculation at 10 aut turns, but eliminates the incentive to 'quick-blade-swing' to add poison stacks rapidly. -------------------------------------------------------------------------------- 36a6468e2f | Aidan Holm | 2019-10-11 01:41:06 +0800 Don't scale when rendering lines (Goratrix, 12085) This bug was caused by line buffer rendering correctness depending on the GL scale being the same when buffer packing and when rendering, which was only required due to the way the local tiles minimap worked. The local tiles minimap has been changed to render the boundary box with no scaling, fixing this weird quirk. -------------------------------------------------------------------------------- 5730307ebe | Nikolai Lavsky | 2019-10-10 13:36:11 -0400 Indicate damage done by Ignite Poison This commit brings Ignite Poison in line with other damaging spells that use exclamation marks to show the amount of damage done. It is a followup for PR #952 and commits 4a3ee908 and 1f260a4b. -------------------------------------------------------------------------------- 410b6b9510 | Aidan Holm | 2019-10-11 00:53:02 +0800 Revert "Remove UI_CRT and other UI gunk" Reverted due to https://crawl.develz.org/mantis/view.php?id=12090 This reverts commit ad5c9ccc1d3bb7aae20c7d970926c877ea0f62fe. -------------------------------------------------------------------------------- bc6939d5a1 | Aidan Holm | 2019-10-11 00:02:05 +0800 Fix minimap stretching on local tiles -------------------------------------------------------------------------------- fe114aac19 | Aidan Holm | 2019-10-10 22:45:34 +0800 Remove ui_ prefix from namespaced functions -------------------------------------------------------------------------------- ad5c9ccc1d | Aidan Holm | 2019-10-10 22:45:34 +0800 Remove UI_CRT and other UI gunk tiles_crt_popup() shouldn't be necessary, since these UIs don't use any cgotoxy/cprintf calls themselves. I'm not exactly sure of the purpose of the set_ui_state() calls here, but they shouldn't be required either for those UIs to work correctly. In general, we're trying to remove tiles_crt_popup() entirely, as it was an temporary hack used to wrap old-style UIs. As of this commit, the last remaining such UI is the skill menu UI. -------------------------------------------------------------------------------- 6733c4489b | Aidan Holm | 2019-10-10 22:45:34 +0800 Make text widget members private We also add size request invalidation, just in case someone is doing something interesting... -------------------------------------------------------------------------------- 6c541cf830 | Aidan Holm | 2019-10-10 22:45:34 +0800 Remove ui::Widget align_self property This only did anything inside a box widget, and was confusingly named (does it refer to main- or cross-axis alignment?). It seems to be unnecessary, although relying on the parent stretch property is probably slightly brittle. IIRC Flutter allows the parent to store a small amount of data on child widgets; perhaps adding a Box::set_child_cross_alignment() that utilizes this method will work well. -------------------------------------------------------------------------------- 83d332edcd | Aidan Holm | 2019-10-10 22:45:34 +0800 Make ui::Box member private -------------------------------------------------------------------------------- c303d00229 | Aidan Holm | 2019-10-10 22:44:26 +0800 Improve Box widget alignment property names "main" means alignment along the main axis, while "cross" means alignment along the cross axis. E.g. for a horizontal box, the main axis is horizontal and the cross axis is vertical. -------------------------------------------------------------------------------- d9e12f686b | Aidan Holm | 2019-10-10 22:42:55 +0800 Make RestartAllocation private to ui.cc -------------------------------------------------------------------------------- 1ec443c8e5 | Aidan Holm | 2019-10-10 22:42:55 +0800 Remove ui::vec utility array -------------------------------------------------------------------------------- cb6844083c | Aidan Holm | 2019-10-10 22:42:55 +0800 Remove use of ui::i2 -------------------------------------------------------------------------------- 9d7ac8f862 | Aidan Holm | 2019-10-10 22:42:55 +0800 Clean up headers -------------------------------------------------------------------------------- 87254cb62d | Aidan Holm | 2019-10-10 22:42:55 +0800 Add ui::Region helper class -------------------------------------------------------------------------------- aeaa904cbb | Aidan Holm | 2019-10-10 22:42:55 +0800 Add ui::Margin helper class This makes margin member accesses clearer, by allowing/forcing the use of symbolic names (top/left/etc) rather than array indices. Also adds several Margin() constructors, based on CSS notation; parameters are now forwarded by the set_margin_for_* helpers. Those helpers also now invalidate their size request, so updating margins live should also work. -------------------------------------------------------------------------------- 5029d81fa4 | Aidan Holm | 2019-10-10 22:42:55 +0800 Add ui::Size helper class -------------------------------------------------------------------------------- 2df86a587e | Aidan Holm | 2019-10-10 22:42:55 +0800 Add widget visibility Non-visible widgets don't get rendered or allocated and have a size request of zero. -------------------------------------------------------------------------------- 35933f4585 | advil | 2019-10-09 10:58:42 -0400 Don't let overgrow target out of bounds This directly provides bounds information, but that is the same as the dig and passwall targeters. The alternative (to avoid a crash) would be letting the targeter work, but the spell fail, which seems worse. -------------------------------------------------------------------------------- 2b6660483a | gammafunk | 2019-10-09 01:31:40 -0500 Fix use of Slimify on derived undead (CanOfWorms) The monster polymorph code had a special consideration (i.e. a hack) for derived undead that have the shapeshifter enchantment. This hack involved having the polymorph target check look at the monster type of the original type the undead monster derived from instead of the current type. A byproduct of this hack was that derived undead that got Slimified wouldn't polymorph into a death ooze yet would be converted to a neutral monster. Derived undead with the shapeshifter enchant shouldn't exist since undead are not normally able to polymorph. Hence this commit removes the hack to allow Slimify to work properly. Any derived undead that attempts to shift simply generate the "...looks momentarily different" message. -------------------------------------------------------------------------------- 06d714f949 | Edgar A. Bering IV | 2019-10-08 22:53:13 -0400 Add new airstrike formula to monster (minmay) -------------------------------------------------------------------------------- aa6b62e8fb | Edgar A. Bering IV | 2019-10-08 22:27:54 -0400 Add attack strength punctuation to waterstrike and airstrike These (and everything else in mon-cast.cc that does damage in mon-cast.cc instead of via beam.cc) were missed when attack strength punctuation was added to spells. -------------------------------------------------------------------------------- 4d0d9f2136 | Edgar A. Bering IV | 2019-10-08 22:25:17 -0400 Give monsters the player airstrike damage formula Commit a0cb8612 simplified airstrike damage for players; monster airstrike damage was previously a hack that gave a simplified damage formula and also reduced variance to work around the old formula's long tail. The new airstrike damage formula does not have the high-variance long tail and is appropriate for monsters to use. -------------------------------------------------------------------------------- 601f8f6d22 | kitchen-ace | 2019-10-08 20:52:30 +0800 Use felid blade hands tile with mons:natasha If the player has tile_player_tile = mons:natasha, show the felid version of blade hands. It's still not perfect (and doesn't match with many of the other felid tiles) but looks much better than the human blade hands tile. -------------------------------------------------------------------------------- e5367748bb | Aidan Holm | 2019-10-08 15:25:49 +0800 Fix grow oklob tile colour space reduction Unfortunately the previous iteration of the grow oklob ability tile had been saved with an unintentionally reduced colour set, due to the PNG being in indexed mode. -------------------------------------------------------------------------------- 92173c342a | Aidan Holm | 2019-10-08 15:24:53 +0800 Add tile for sprint monster spell -------------------------------------------------------------------------------- 048a31fd0b | John Stilley | 2019-10-07 18:15:48 -0700 Put an oklob in the tile for Fedhas's oklob ability (#1173) -------------------------------------------------------------------------------- 3fb7a4b9a4 | John Stilley | 2019-10-07 18:12:56 -0700 Improving redundant working on flight dangers (#1174) -------------------------------------------------------------------------------- 36f0aeb843 | theJollySin | 2019-10-07 16:23:12 +0800 Remove ill-fitting confusion text (1583) This visual doesn't work for monsters with 0 or 1 eyes [skip ci] -------------------------------------------------------------------------------- 74da537585 | S. Mark | 2019-10-06 17:51:03 -0400 Update mailmap. [skip ci] -------------------------------------------------------------------------------- 30414c0b45 | S. Mark | 2019-10-06 17:49:23 -0400 Fix typo. -------------------------------------------------------------------------------- 8ac54030cd | advil | 2019-10-06 17:37:31 -0400 Add an explicit bounds check to crawl_view_buffer () This is what was crashing in #1166 / mantis 12069, but because it was triggered by an invalid memory access, whether there was a crash was very system/build-specific. This makes a similar out of bounds error explicit in the future. -------------------------------------------------------------------------------- b0425b2895 | advil | 2019-10-06 17:37:31 -0400 Remove an ifdef related to seed selection This never really worked right anyways, and gave errors on CPO -------------------------------------------------------------------------------- f26d6114a7 | Aidan Holm | 2019-10-07 05:05:29 +0800 Fix dungeon feature quotes not visible (Vaamat, 12032) -------------------------------------------------------------------------------- 3be9bf80fb | Aidan Holm | 2019-10-07 03:52:55 +0800 Add keybind to clear player name (kitchen_ace, 12084) Using backspace to clear is not the best choice because a) it's kind of weird for backspace to delete everything, and b) difficult to determine when to delete everything and when to delete just one letter. -------------------------------------------------------------------------------- bb1ff42f1e | Aidan Holm | 2019-10-07 03:37:01 +0800 Fix invalid read causing map-view crash (jackofblades, 12069) -------------------------------------------------------------------------------- 643f6c6e1a | Aidan Holm | 2019-10-07 02:24:03 +0800 Fix main menus not handling app quit (Goratrix, 12080) -------------------------------------------------------------------------------- ad1f87bc89 | Aidan Holm | 2019-10-07 02:15:58 +0800 Fix empty high scores menu (Goratrix, 12080) The reported bug was caused by there being no focused UI widget, so the escape key was never handled. I really need to revisit that whole focus system... I also added in a placeholder text label for when there are no highscores, explicitly stating the fact. -------------------------------------------------------------------------------- 368c1644f8 | Umer Shaikh | 2019-10-03 15:47:11 -0400 Clean up a function Change the function is_habitable_feat to an equivalent formulation which is simpler and idiomatic. -------------------------------------------------------------------------------- dea222dd76 | Aidan Holm | 2019-10-04 00:31:51 +0800 Refactor and improve UI widget iterators This removes the honestly quite hacky container iterator implementation which deferred at runtime to a heap-allocated implementation class. Instead, each container type gets their own iterator. If you have a base class pointer and you want to iterate over it, the new foreach() helper function does that. It's a little ugly, but much better than before, especially since iterating over a derived type is the common case. -------------------------------------------------------------------------------- 98f196556d | Aidan Holm | 2019-10-03 22:45:37 +0800 Don't include debug drawing in release builds -------------------------------------------------------------------------------- fb0ce180c5 | Aidan Holm | 2019-10-03 19:53:41 +0800 Add widget margin debug drawing -------------------------------------------------------------------------------- 0be37ba3bd | Aidan Holm | 2019-10-03 19:53:25 +0800 Fix off-by-one error in mouse hover handling -------------------------------------------------------------------------------- f64bd74572 | Aidan Holm | 2019-10-03 19:29:35 +0800 Simplify code -------------------------------------------------------------------------------- f1eb651baa | Aidan Holm | 2019-10-03 19:26:33 +0800 Fix startup menu spacing issues This fixes a bug where there was no margin between the header text and the name entry row. This also replaces some conditional minimum heights with proper margins. -------------------------------------------------------------------------------- ca426f56c8 | gammafunk | 2019-10-02 15:27:12 -0500 Update descriptions for Fedhas (Snack ⑨) Update descriptions for the god and the general description of its powers, and update the descriptions for all ability to mention the affects of Invocations training. [skip ci] -------------------------------------------------------------------------------- f4813fd24d | gammafunk | 2019-10-02 14:56:40 -0500 Update the descriptions for Sif Muna (Goratrix) The god and god power descriptions were still based on the previous iteration of Sif. [skip ci] -------------------------------------------------------------------------------- 74cc3aede5 | Nikolai Lavsky | 2019-10-01 22:44:20 -0400 Fix display of detected gold on the minimap (11950) Currently, there are several Gold Sense-related bugs: * on webtiles, detected gold is not displayed on the minimap; * on local tiles, it disappears from the minimap after reloading the game and after reentering a floor; * on console, it's not possible to scroll the map in the X mode to see all detected piles of gold on a new level. This happens because now update_item_at() runs more than once for each pile of gold. Prior to 063869c, the gold detection code from files.cc:_count_gold(), which contains update_item_at(), run only once for each new level. After that commit and after 4488db6, the gold detection code, which is now in god-passive.cc:gozag_detect_level_gold(), runs twice when the player enters a new floor. First, it runs as a delayed action, then it runs for counting the generated gold (both calls come from files.cc:load_level()). When it's called the first time, gozag_detect_level_gold() sets the MAP_DETECTED_ITEM flag for each pile of gold, so they would appear on the minimap. When gozag_detect_level_gold() called after that, clear_item() removes this flag from the piles, and, since env.map_knowledge() already knows about those piles, gozag_detect_level_gold() won't set the flag again. The code path is god-passive.cc:gozag_detect_level_gold() -> show.cc:update_item_at() -> map-cell.h:set_item() -> map-cell.h:clear_item(). Unlike webtiles, local tiles update the minimap only after the first call, so detected gold appears on the minimap, but only until a current level is reloaded. This commit makes it safe to call gozag_detect_level_gold() multiple times: update_item_at() will be called only for undetected piles of gold. Also, force update of the minimap so piles of gold generated in new Abyss regions are displayed too. -------------------------------------------------------------------------------- bfa02ace7b | EC2 Default User | 2019-10-01 21:59:27 -0400 Fix wizdump loading when rotted or Gozag follower. Recognize "HP:" and "MP:" as mourge line starts. Recognize Gozag which doesn't have a piety meter, causing the God line to only have 8 fields. -------------------------------------------------------------------------------- bab67b8a05 | gammafunk | 2019-10-01 20:57:53 -0500 Remove an unused function for Dithmenos conducts Since Dith no longer cares about sources of fire, this function is unused. A similar function that tests for fiery monsters by monster class is still necessary for resistance checks. -------------------------------------------------------------------------------- a1bddc09a4 | gammafunk | 2019-10-01 20:57:53 -0500 Rework damage of ballistomycete spores Currently the spore damage is fixed at 3d15, which is pretty high when the 3* Grow Ballistomycete becomes available. This commit incorporates Invocations skill into the spore explosion damage and decreases the initial damage. The new explosion damage is 3d(5 + spore HD), with spore HD ranging from 1 at 0 Invocations to 28 at Invocations 27. Hence the max damage at 27 Invocations is 3d33, which is very similar to max spell-power Fireball. -------------------------------------------------------------------------------- 27a75b7c53 | gammafunk | 2019-10-01 20:57:53 -0500 Fedhas rework part 11: simplify conducts Fedhas used to care about corpse-violating spells or items, a minor conduct thematically connected to how piety was gained for this god. Now that Fedhas appreciates kills, this conduct doesn't make thematic sense. It was also too minor a conduct, so the two best options are removing it or expanding it to a more significant set of conducts thematically connected to the current god. One option is making Fedhas hate all of necromancy. This is similar to the removed no-fire-magic conduct for Dith, but it affects a much larger number of spells in a school that's one of the strongest. Unfortunately, the reasons for current Fedhas hating necromancy are a bit tough to justify. Something about necromancy disrupting the natural cycle of life and death in nature is a bit sketchy when so many other things could do this. Another option is to make Fedhas a good god, which introduces some gameplay changes as well as an even more pervasive set of conducts. Unfortunately, Fedhas is a god that's significantly stronger early on relative to how strong they are later in the game. Since being a good god would remove any wrath effects at all for most god swaps and even allow retaining piety for switches to the good gods that are stronger than Fedhas later on, this opens up a lot of no-brainer god switches. In the end, I wasn't satisfied with either option, so for now I'm simply removing Fedhas' conducts related to undead worhsipers and corpse violation without replacement. This means that ghouls, mummies, vampires and those unblessed with the mighty lich form can now worship Fedhas. I'm open to re-adding something like the no-necromancy/undead conduct or another interesting conduct if details can be properly hashed out. Fedhas also had a minor conduct related to letting a permanent ally die which I've also removed. Fedhas no longer makes permanent allies, so this conduct no longer makes sense. Fedhas still gives penance if you kill an actual plant or a summoned ally, of course. -------------------------------------------------------------------------------- dacd3b15af | gammafunk | 2019-10-01 20:57:44 -0500 Fedhas rework part 10: Grow Oklob ability A 5* ability to summon an oklob plant at a smite-targeted location within radius 2 for a cost of 6 piety. The HD of the oklob is increased by 1 for each level of Invocations skill, which increases its summon duration, its HP, the damage from its Spit Acid ability, as well as the frequency with which it uses Spit Acid. These aspects are all done in the same way as Fedhas' previous Evolution ability had Invocations influence oklobs. This is not an especially creative ability, but it's fun to play with strong stationary allies. At a cost of 6 piety, a player at 6* could make quite a few oklobs, so it's still possible to make a large group for a single fight on e.g. Zot:5. -------------------------------------------------------------------------------- 286ebac72d | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 9: Overgrow ability A 4* ability that transforms any (non-permarock) walls, trees, doors, or diggable solid features in a 3x3 smite-targeted area into plant allies at a cost of 12 piety. The created monster is a summon, but the wall is permanently destroyed. This commit implements a targeter UI that only shows cells as affected if they contain a wall that's a valid target for Overgrow. To be affected, a wall must be in LOS and not blocked by a feature that blocks translocations (e.g. clear walls). Open doors won't be affect if they contain a monster, and if it turns out there was an invisible monster in the open door, the ability will fail but still use piety. Currently the set of possible plant allies is weighted towards oklob saplings, wandering mushrooms, and burning bushes, with lower chances for ballistomycetes and oklob plants. The plant HD is increased by 1 with each level of Invocations, which for oklob saplings, burning bushes, and oklob plants will give more damage per use of their abilities, and oklob plants will get an increase in their "spit" rate. All monsters will get increased HP and summon duration with Invocations. -------------------------------------------------------------------------------- 8f1ea3d74c | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 8: remove Rain Part of what Rain does is allow creation of plants, but this is no longer relevant, since the other Fedhas ally creation abilities don't need plant intermediaries. The other prominent aspect of Rain is permanent creation of deep water, but this leads to a lot of luring. The new Wall of Briars ability provides some instantaneous limitation of monster movement, but in a way that doesn't make permanent terrain changes and hence less encourages luring. -------------------------------------------------------------------------------- 7ac76a7cd5 | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 7: rework Reproduction This commit replaces Fedhas' Reproduction with Grow Ballistomycete, an ability that creates a summoned ballistomycete at any smite-targeted location within radius 2 at a cost of 5 piety. Ballistomycetes have been simplified in the previous commit and now use their Sporulate ability to create spores that try to reach their target in order to explode. The explosion radius has been reduced to 1, so this combined with more flexibility in positioning will make it easier for players to avoid the explosion. If explosion avoidance ends up still being too big an issue, we could have a Fedhas passively protect players from the explosion to some degree. Ballistomycetes get increased HD and duration with Invocations, gaining 1 HD per level of the skill. The only effect of this HD increase at present is more HP. We probably don't want to increase the usage rate of Sporulat like we do for Oklob Plant's spit acid, since rapidly creating too many spores will create...a lot of explosions. Fedhas wrath places spores around corpses using some of the same functions that were previously used for Reproduction. Hence these have been moved to god-wrath.cc. It would probably be best to simplify this wrath by creating durably summoned ballistomycetes instead, but I'm not doing that for now. -------------------------------------------------------------------------------- 7da3b9efa7 | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 6: simplify ballistomycetes Ballistomycetes (ballistos) are complicated monsters that grow based on interactions with the spore monsters. Spores leave mold as they move, which can give rise to the production of new ballistos. This set of behaviors fell into the realm of "complexity for the sake of complexity". One had to wait a while for this "reproduction" to play out, only to get a few more ballisto spores. Now that we're putting stronger limits on ally usage through use of summons, it's a good time to simplify the way ballistos and their spores work. This commit removes the reproduction aspect of ballistos, removes mold itself, and simplifies ballistos down to one type of monster. Additionally, ballistos now have a Sporulate natural ability they occasionally use to create a single spore as a short-lived summon. The spore will seek after the ballisto's target and explode upon hit, still producing the damaging explosion that applies confusion to living targets. A subsequent commit will make a Fedhas active ability to let the player to create a ballisto summon, and this will replace Fedhas' Reproduction. -------------------------------------------------------------------------------- dd8df34df5 | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 5: remove Evolution As per the Fungal Bloom and Growth ability removals, we don't use plants as intermediaries for creating allies. New abilities to create some of these monsters as summons directly will be added in future commits. -------------------------------------------------------------------------------- 6ba74d5838 | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 4: remove Growth Fedhas will use summons to create all allies instead of creating permanent ones using actual plant monsters as intermediaries. Hence Growth, also referred to as using the descriptor `RING_OF_PLANTS` in the source, is no longer necessary. -------------------------------------------------------------------------------- 1d64b78cf4 | gammafunk | 2019-10-01 20:47:15 -0500 Fedhas rework part 3: remove Sunlight Sunlight is a pretty tedious to use ability that strongly overlaps with TSO. Removing shallow and deep water when flight is extensively available is also not especially interesting. This adds a minor version tag to handle save compatibility, since we're removing a member of the global env that maps sunlight-affected squares. -------------------------------------------------------------------------------- 9563602592 | gammafunk | 2019-10-01 20:47:14 -0500 Fedhas rework part 2: Wall of Briars ability A 2* ability that encircles the player with summoned briar patches. The player can fire through these plants, and the briars damage monsters that attack them. Monster AI is changed so that hostile monsters always try to attack briars that are friendly to the player. Only floor or shallow water tiles that have no monsters are viable summon locations. The briar patches' HP scale with Invocations by adding 1 HD with each level of this skill. -------------------------------------------------------------------------------- 0b10f196a5 | gammafunk | 2019-10-01 20:47:14 -0500 Fedhas rework part 1: piety gain Fedhas is a plant-themed god originally intended to support range combat. The god gives you plant allies that you can move and fire through allows you to create water to impede monster movement. Unfortunately the current design gives access to too many allies that are strong enough to carry the player through much of the game. These are either permanent or long-lived yet are stationary or have movement limitations, things that together encourage the player to lure monsters to specific locations. As a result, Fedhas has a tedious play-style, and this is reflected in the god's usage rate among players. This commit is the first in a set that rework the god but in a way that retains some of idea of supporting ranged combat. New Fedhas will use only summoned allies and will allow less unfettered use of allies in general. A github wiki page describing remaining and potential issues with the rework is available here: https://github.com/crawl/crawl/wiki/Fedhas-Rework Part 1 removes Fedhas' appreciation of corpse decay as well as the Fungal Bloom ability. I haven't touched the corpse violation, necromancy conducts, and species restrictions for now, although those all need addressing. -------------------------------------------------------------------------------- 3348362083 | Richard Wardin | 2019-10-01 21:41:39 -0400 Fix being able to pick out barbs while incapacitated (12065) Carefully pulling out barbs now requires that you can move (not paralyzed or petrified), aren't confused, and aren't asleep. [Committer's note: Closes #1162. Tweaked berserk message.] -------------------------------------------------------------------------------- 42da65fd27 | Edgar A. Bering IV | 2019-10-01 21:20:38 -0400 De-randomize Golden Eye confusion spellpower This random power is a legacy dating back to their creation. The commit log doesn't describe why Confusion Gaze should work this way instead of with a normal confuse spellpower and a normal MR check. Now that monster spell success chance is displayed, this randomization had the side effect of making the success chance display wrong. Confusion Gaze was the last monster spell with monster spellpower randomization; this commit cleans up some of the code, but there is a larger refactor possible that is left undone. Closes #1160 -------------------------------------------------------------------------------- f6d4cf8133 | NormalPerson7 | 2019-10-01 20:48:38 -0400 Remove troves asking for scrolls of identify Beyond the early game, once almost all the potions and scrolls in the game are identified, scrolls of identify become a convenience tool more than anything else; it is simply easier and faster for the player to identify this unknown ring on the floor using a scroll than to find something to drop, pick the ring up, put it on, decide it's useless, drop it, and pick up the other thing. This especially applies when the player has 5+ spare identify scrolls in their inventory, which is fairly common around the time of Vaults and Depths. Troves asking for identify scrolls encourages players to employ the tedious second behaviour, and to some extent take risks with wear-identifying artefacts, in order to horde the scrolls and eventually enter the trove. Additionally, being reduced to 0 identify scrolls by a trove hardly makes a significant difference to the strength of a character - rather it simply means once again that the tedious wear-identification process is required. Note that the wear-identification of artefacts that is encouraged by this isn't particularly dangerous beyond the early game anyway. The only bad effects are *Drain and *Contam, where *Drain is unlikely to have a significant impact, and *Contam may cause 1 malmutate before wearing off that the player can probably eliminate by using a mutation potion. Hence, remove troves asking for scrolls of identify, because they encouraged tedious behaviour instead of meaningful decision making. -------------------------------------------------------------------------------- 8abc067276 | theJollySin | 2019-10-01 20:36:48 -0400 Add more flavour to the Halloween welcome spam -------------------------------------------------------------------------------- 7e681d2d23 | theJollySin | 2019-10-01 20:36:48 -0400 Vary orb descriptors in the welcome text -------------------------------------------------------------------------------- ebba34edf6 | theJollySin | 2019-10-01 20:36:48 -0400 Add more random uselessness messages [Committer's note: Closes #1161. Removed messages that suggested some in-game happening or portal vault. Random uselessness is for flavor, we don't want it to intentionally confuse. Squashed and re-organized the PR into this and the next two commits.] -------------------------------------------------------------------------------- 463e120319 | theJollySin | 2019-10-01 20:36:48 -0400 Clean up Paradise Lost quote citations -------------------------------------------------------------------------------- 26e8666362 | theJollySin | 2019-10-01 20:36:48 -0400 An assortment of item and location quotations [Committer's note: Closes #1153. Squashed and revised the PR.] -------------------------------------------------------------------------------- 6aba9404ae | srvanmeter87 | 2019-10-01 19:43:01 -0400 Rephrase MP-powered wands player alert (#984) [Committer's note: Closes #984, #1133, #1143] -------------------------------------------------------------------------------- 4e6fe308c7 | Aidan Holm | 2019-10-02 04:13:04 +0800 Fix sealed-off sensed monsters stopping travel (gammafunk) Sensed monsters were handled with a separate check that did not take into account whether they were reachable. The new way uses the list of monsters returned by get_nearby_monsters, which does test reachability. -------------------------------------------------------------------------------- 323ad4e9fb | Aidan Holm | 2019-10-02 03:02:37 +0800 Fix clinging monsters breaking autoexplore (shalmezad, 11924) Clinging monsters in vaults could pathfind their way through the runed door, and were therefore marked as not safe, preventing autoexplore. This was caused by mons_traversable() sidestepping checks for runed cells and uninhabitable cells in mons_can_traverse() if the monster can cling. I've just hoisted them out here. In addition, cell_can_cling_to() only checks physical location, and so couldn't check whether a feature is passable by a given monster. Last but not least, the call to cell_is_clingable() previously passed the wrong parameter. -------------------------------------------------------------------------------- ca5e8cfc3f | Aidan Holm | 2019-10-01 16:41:10 +0800 Use quads for line drawing (advil) Line drawing with GL_LINES seems to be subject to a number of rendering bugs and limitations that vary by OS and driver. This commit renders all lines with a single quad. This removes support for arbitrary lines that are not horizontal or vertical, but we don't currently draw any such lines. -------------------------------------------------------------------------------- 940da44966 | Aidan Holm | 2019-10-01 16:34:05 +0800 Tidy up some duplication and incorrect naming -------------------------------------------------------------------------------- 6844edd79d | Aidan Holm | 2019-10-01 16:34:05 +0800 Fix difficult-to-read main menu labels on console (advil) Menu labels previously relied on libunix.cc's adjustment of identical foreground and background colours, which didn't work properly with allow_extended_colours = true, since white and lightgrey are not identical. This commit manually adjusts all button label colours on focus change, both foreground and background. This fixes a bug on the weapon selection menu on console where the background did not extend under the listed aptitudes, due to them being in a separate text widget. It also cleans up the hacky code that was previously used to recolour the buttons. You can specify the foreground colour to use when focused; the default is black. This code assumes that all text widgets have a single colour, and will not correctly restore multi-coloured text on unfocus. -------------------------------------------------------------------------------- 3ed16d2262 | Aidan Holm | 2019-10-01 16:34:05 +0800 Refactor curses colour and attr munging -------------------------------------------------------------------------------- 011b83adde | NormalPerson7 | 2019-10-01 00:59:26 -0400 Let Trog and Okawaru gift regular boomerangs and javelins Previously, when tomahawks and javelins had no innate special properties and each had about 5 different brands, it made sense that Trog and Okawaru should always gift branded tomahawks and javelins. However, there are now only two different types of javelin: plain and silver; and three different types of boomerang: plain, silver and dispersal. This behaviour led to all such ammo gifts being silver javelins, or silver or dispersal boomerangs, which seems a little unbalanced. Additionally, new javelins are equivalent to branded penetration javelins previously, and likewise with boomerangs and tomahawks of returning, so this behaviour no longer makes sense. As such, Trog and Okawaru now gift regular boomerangs and javelins, with these having weight 120. This means the chance of a javelin gift giving silver javelins is reduced from 100% to 43%, and the chance of a boomerang gift being branded is reduced from 100% to 33%. This commit preserves Trog and Okawaru only gifting curare/datura/atropa-tipped darts and not poisoned darts, and also preserves the behaviour of ISPEC_GOOD_ITEM always producing branded missiles, so as to not affect dungeon generation in any way. [Closes #1131] -------------------------------------------------------------------------------- ac2e79e1c7 | Nikolai Lavsky | 2019-10-01 00:44:13 -0400 Add descriptions for awoken autumnal and dead trees Use the same description as for regular awoken trees. -------------------------------------------------------------------------------- f61156fd2a | Nikolai Lavsky | 2019-10-01 00:44:13 -0400 Distinguish flammable and non-flammable trees Even though Summon Forest's trees cannot be burned since 0a4d0e94, their description still mentioned that mechanic. Fix this and add a way to distinguish summoned trees from regular ones in the x-mode. Also, update a comment: trees cannot be disintegrated since 85f13f00. -------------------------------------------------------------------------------- 0e0b6798f1 | Edgar A. Bering IV | 2019-10-01 00:35:02 -0400 Tiles for the staff of Battle (CanOfWorms) -------------------------------------------------------------------------------- 2f2aade273 | olowin | 2019-10-01 00:35:02 -0400 The unrand staff of Battle A staff of conjuration with. It will automatically spawn a battlesphere when monsters are in sight and automatically dismisses the battlesphere on unwield. Trog hates it; using it to spawn a battlesphere is as bad as casting a spell in Trog's eyes. Unlike an evokable this is real magic. [Committer's note: Squashed and rebased; made the staff battlesphere have the same spellpower as the player's (to avoid weird re-casting incentives); removed +4 SH, it is one-handed on normal species. Closes #1040] -------------------------------------------------------------------------------- f1a930fc54 | advil | 2019-09-30 15:38:58 -0400 Don't pull abyss terrain from the vestibule The issue is that if the player hasn't visited the vestibule, a level excursion there will trigger asserts regarding the up stairs, which haven't been set up yet. This could be made conditional on having visited the vestibule, but even for the abyss I'd rather avoid dependencies on level traversal order. -------------------------------------------------------------------------------- be6272a890 | gammafunk | 2019-09-30 14:26:34 -0500 Use no_tele_into in a Bazaar map (wizard44) The water (or lava) areas outside of the central area with shops needs `no_tele_into` in order to prevent teleports from stranding players who are amphibious or flying. -------------------------------------------------------------------------------- 3c9d5f24f3 | advil | 2019-09-30 12:59:04 -0400 Remove full_name logic from main menu These features were supposed to make typing the player name easier, but they're very hard to predict from standard text box behavior, and also buggy with names that are a partial match to another name. In addition, the behavior pre-0.24 that this logic is based on seems to have been fairly broken; at least I can't figure out the pattern from the UI in older versions for when `full_name` is set to true. Should replace this with some more of the standard text editing shortcuts, e.g. ctrl-u. -------------------------------------------------------------------------------- 261a0b2417 | advil | 2019-09-30 12:32:32 -0400 Main menu improvements and streamlining * move info about rc file off main screen -- without linewrapping this doesn't work well on either console or tiles. * don't explain arrow keys and enter * use some of the reclaimed space to improve description of [tab], add description of [ctrl-p]. This latter is mainly just so players know where to find the rc file info. Eventually the canonical place to find the rc file should be an about screen, not the startup log. -------------------------------------------------------------------------------- 5fed5919c2 | Aidan Holm | 2019-09-30 21:49:45 +0800 Reduce popup padding on small screens (alexjurkiewicz) -------------------------------------------------------------------------------- bbc45b03fd | Aidan Holm | 2019-09-30 14:23:31 +0800 Fix newgame menu highlight width on remote console On TILEWEB=y console games, the text widget was not expanding to take the full width of the box it was contained in. When its background colour was changed, only the section of the menu button with letters changed colour. This isn't a problem in pure console builds because in that case the text widget is the direct child of the MenuButton widget and so takes its full size. -------------------------------------------------------------------------------- 2d00395b2e | Aidan Holm | 2019-09-30 14:23:31 +0800 Fix memorise menu entry letter colour Previously, the entry letter was always lightgrey; now it is darkgrey if the spell is not castable, etc. -------------------------------------------------------------------------------- 828224901c | Aidan Holm | 2019-09-30 14:23:30 +0800 Refactor memorise menu entry colour code -------------------------------------------------------------------------------- 5a4ac4e04d | Aidan Holm | 2019-09-30 13:10:21 +0800 Remove debug logging -------------------------------------------------------------------------------- 2d0fce64a1 | advil | 2019-09-29 19:48:04 -0400 Don't generate unknown weapons for weapon selection I'm not sure if this is causing the windows crash (which is happening somewhere in give_items_skills), but it is definitely an odd thing that this code is doing when used before weapon selection. -------------------------------------------------------------------------------- 0b739ee41d | advil | 2019-09-29 17:47:54 -0400 One more batch of debug code see 40886de7c. -------------------------------------------------------------------------------- 40886de7c5 | advil | 2019-09-29 17:09:38 -0400 More public bisection (The reason that I'm doing this bisection in trunk like this is that we are chasing a crash that only replicates on the windows tile builds done by CDO.) -------------------------------------------------------------------------------- bfea814871 | advil | 2019-09-29 16:46:00 -0400 Apply some brute-force output debugging to the problem -------------------------------------------------------------------------------- f68d918292 | advil | 2019-09-29 15:36:51 -0400 checkwhite [skip ci] -------------------------------------------------------------------------------- 964def8651 | advil | 2019-09-29 15:36:00 -0400 Fix a compiler warning (shadowed variable) -------------------------------------------------------------------------------- 5bd470a277 | advil | 2019-09-29 14:21:12 -0400 Don't clear player name when selecting arena (12075) I agree that this behavior is unintuitive given the menu structure (especially when navigating with keyboard), even though arena doesn't use player name. -------------------------------------------------------------------------------- 2bac2fb150 | advil | 2019-09-29 14:21:12 -0400 Restore centering for the progress popup in console -------------------------------------------------------------------------------- aa951a354a | Aidan Holm | 2019-09-30 01:34:06 +0800 Fix hiscores not showing in webtiles (12077, Ge0ff) Console viewers will still get a view that adjusts to their screen size; webtiles viewers get a hardcoded size of eleven lines, which IIRC was the typical size before. -------------------------------------------------------------------------------- b6411803c1 | advil | 2019-09-29 10:41:47 -0400 Fix a crash with full pregen This was introduced in 80d7c3d5c -------------------------------------------------------------------------------- cb3158e78b | Kyle Rawlins | 2019-09-29 10:08:39 -0400 just one more windows install instructions tweak This incorporates both solutions from #1134. Thanks to amcmullan and Goratrix for figuring this out; as of Feb or so, msys2 makes python 3 the default python version for everything. Resolves #1134 [skip ci] -------------------------------------------------------------------------------- 0f4390f660 | advil | 2019-09-29 09:53:45 -0400 Replace some symbolic links with copies In order to fix windows builds. -------------------------------------------------------------------------------- 6ba659e1ad | Kyle Rawlins | 2019-09-29 09:36:27 -0400 Tweak windows install instructions again [skip ci] -------------------------------------------------------------------------------- d2de06d31d | Kyle Rawlins | 2019-09-29 09:20:59 -0400 tweak windows install instructions -------------------------------------------------------------------------------- aeb99fb3f2 | advil | 2019-09-28 18:41:54 -0400 Fix another webtiles console menu glitch These values were being interpreted as characters when rendering console, and are apparently unused for webtiles browser. So, just set them to 0. -------------------------------------------------------------------------------- 6234c29d7a | advil | 2019-09-28 18:27:05 -0400 Address an uninitialized variable This *might* be the windows crash, not sure. In any case, tileidx_t is uint64_t and so needs to be initialized to something. -------------------------------------------------------------------------------- 7b85b32444 | advil | 2019-09-28 18:07:42 -0400 Slightly improve console MenuButton highlighting code This now handles another bug by generalizing slightly from 5a66b1aa3b36: the weapon selection menu wasn't highlighting correctly in local console because those buttons on console consist of a bin with two Texts. The new version finds the first Text child (if any) and does the highlighting on it, and because of this also does away with the #ifdefs. -------------------------------------------------------------------------------- 5a66b1aa3b | advil | 2019-09-28 17:09:28 -0400 Fix(ish) for menu highlighting issues in webtiles console The problem was that webtiles console, because it can be showing complex menu items via a browser client, has a different menu structure than regular console, so the assumption that it contained a single Text child was incorrect. This fairly hacky solution also tries setting the background color of any label in position 1 in case the button is a container. There should probably be something more general here, perhaps highlighting every Text contained in the button widget (Which would get both of the currently-used cases as special cases), but I'll leave that for aidanh. -------------------------------------------------------------------------------- 60d090ba07 | advil | 2019-09-28 13:10:22 -0400 Fix a shadowed variable warning in webtiles -------------------------------------------------------------------------------- 8e49684493 | advil | 2019-09-28 12:13:11 -0400 Use MenuButton highlight color in local console This does not fix 12076; I think the dynamic_cast is not working at all for webtiles console. -------------------------------------------------------------------------------- d18775d16a | Aidan Holm | 2019-09-28 14:05:05 +0800 Reduce webtiles newgame menu height (12074, kitchen_ace) This attempts to fit the entire menu in without needing to scroll; it only takes effect on windows less than 780px high though. -------------------------------------------------------------------------------- 53c33f0441 | Aidan Holm | 2019-09-28 14:04:42 +0800 Fix webtiles newgame menu background colour -------------------------------------------------------------------------------- bbc8897137 | Aidan Holm | 2019-09-28 03:16:22 +0800 More dead code removal -------------------------------------------------------------------------------- 39a19ac0f1 | Aidan Holm | 2019-09-27 23:33:44 +0800 Remove unused smart cursor interface This also fixes a bug on win32 console where the mouse cursor was visible on the main menu. -------------------------------------------------------------------------------- 40b4c61300 | Aidan Holm | 2019-09-27 23:33:44 +0800 Add rudimentary win32 console colour adjustment libunix.cc will adjust the foreground colour when both foreground and background are indistinguishable. This commit ports a much-reduced version of that functionality to win32 console, primarily so that the main menu will be readable. -------------------------------------------------------------------------------- db4295c90e | Aidan Holm | 2019-09-27 23:33:44 +0800 Fix broken win32 console text colouring API Crawl code assumes that the terminal text and background colours can be updated independently; the win32 console backend, however, was setting the background colour from the high bits of the provided text colour. This resulted in a textcolour() call followed by a textbackground() call to function normally, but the reverse would not. -------------------------------------------------------------------------------- 17bb1006d4 | Aidan Holm | 2019-09-27 23:33:44 +0800 Refactor identical colourpair remapping code -------------------------------------------------------------------------------- 1fcc531f06 | Aidan Holm | 2019-09-27 23:33:44 +0800 Refactor MenuFreeform methods with find_if() -------------------------------------------------------------------------------- 3e190a46ec | Aidan Holm | 2019-09-27 23:33:44 +0800 Remove unused menu code -------------------------------------------------------------------------------- cd35390ea8 | Aidan Holm | 2019-09-27 23:33:44 +0800 Improve end-game hiscore list appearance -------------------------------------------------------------------------------- bb89a6cd1e | Aidan Holm | 2019-09-27 23:33:44 +0800 Improve newgame name choice prompt -------------------------------------------------------------------------------- 5dd181b815 | Aidan Holm | 2019-09-27 23:33:44 +0800 Add alignment options to Switcher widget -------------------------------------------------------------------------------- 6919a330b2 | Aidan Holm | 2019-09-27 23:33:44 +0800 Add enable_shared_from_this to Widget -------------------------------------------------------------------------------- ba565db48d | Aidan Holm | 2019-09-27 23:33:44 +0800 Fix Switcher widget handling mouse events incorrectly -------------------------------------------------------------------------------- 94b374d741 | Aidan Holm | 2019-09-27 23:33:44 +0800 Add tile to game-over screen -------------------------------------------------------------------------------- a0fde063d1 | Aidan Holm | 2019-09-27 23:33:44 +0800 Add pgup/pgdn/home/end support to OuterMenu -------------------------------------------------------------------------------- 41769e37c5 | Aidan Holm | 2019-09-27 23:33:44 +0800 Add HTML newgame menus, more tiles -------------------------------------------------------------------------------- bbc46fc816 | Aidan Holm | 2019-09-27 23:33:44 +0800 Make send_doll() public -------------------------------------------------------------------------------- e13cadf35d | Aidan Holm | 2019-09-27 23:33:44 +0800 Add operator[] accessor for container widgets -------------------------------------------------------------------------------- 77bbe519b1 | Aidan Holm | 2019-09-27 23:33:44 +0800 Respect popup child widget's preferred size -------------------------------------------------------------------------------- 94e85a77e3 | Aidan Holm | 2019-09-27 23:33:44 +0800 Add species attributes to starting weapon menu (VeryAngryFelid) -------------------------------------------------------------------------------- efe2a7dc0d | Aidan Holm | 2019-09-27 21:07:02 +0800 Let Box widgets stretch children on main axis -------------------------------------------------------------------------------- 23a3942107 | Aidan Holm | 2019-09-27 21:07:02 +0800 Add species/job tiles (CanOfWorms) -------------------------------------------------------------------------------- b661a63e8a | Aidan Holm | 2019-09-27 21:07:02 +0800 Convert newgame menus to new UI framework -------------------------------------------------------------------------------- 9f778ef799 | Aidan Holm | 2019-09-27 21:07:02 +0800 Fix ui::Image widget using uninitialized data -------------------------------------------------------------------------------- ded90f589a | Aidan Holm | 2019-09-27 21:07:01 +0800 Convert hiscores menu to new UI framework -------------------------------------------------------------------------------- 20abbd21e0 | Aidan Holm | 2019-09-27 21:07:01 +0800 convert hints menu to new UI framework -------------------------------------------------------------------------------- 3169f2527e | Aidan Holm | 2019-09-27 21:07:01 +0800 Convert startup menu to new UI framework -------------------------------------------------------------------------------- 87535eea1a | Aidan Holm | 2019-09-27 21:07:01 +0800 Add species/background newgame doll generator This adds a helper function to generate dolls for character combos. This is done in a rather ugly fashion by (partially) generating the new game character. A small segment of the character setup code in _setup_generic() that's relevant to initial equipment is duplicated, with some minor changes; this code modifies the global `you` variable, and fill_doll_equipment() is then called to generate the doll corresponding to the character in `you`. Regarding the modified character generation code, everything after give_items_skills() is removed, since that's what determines a player's starting equipment, and thus the doll appearance. An exception is the item colour randomization. Separately, _unfocus_stats() was not included, since I'm reasonably sure that this has no effect on initial item generation, and I didn't want to make it non-static. -------------------------------------------------------------------------------- 1274d92874 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add PlayerDoll widget -------------------------------------------------------------------------------- 99709490d1 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add descriptions to outer menu buttons -------------------------------------------------------------------------------- 7134dd49da | Aidan Holm | 2019-09-27 21:07:01 +0800 Add OuterMenu, MenuButton widgets -------------------------------------------------------------------------------- 72f1adce67 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add debug drawing -------------------------------------------------------------------------------- f253313b81 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add per-layer focus -------------------------------------------------------------------------------- b86fa12273 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add add_event_filter() -------------------------------------------------------------------------------- 0428708d7b | Aidan Holm | 2019-09-27 21:07:01 +0800 Add UI widget input focus -------------------------------------------------------------------------------- 50bd2e0d7e | Aidan Holm | 2019-09-27 21:07:01 +0800 Add text widget background colour (console-only) -------------------------------------------------------------------------------- 4d30056526 | Aidan Holm | 2019-09-27 21:07:01 +0800 Remove black background from high scores tile This tile is still in need of work; apart from anything else, it fills its entire 32x32 region, which makes it visually inconsistent with the other main menu entry tiles. -------------------------------------------------------------------------------- 01783e0825 | Aidan Holm | 2019-09-27 21:07:01 +0800 Add UIGrid stretch_h, stretch_v -------------------------------------------------------------------------------- 2a432842a1 | Aidan Holm | 2019-09-27 21:07:01 +0800 Fix invalid read during program shutdown Invalid memory accesses were caused by the Slot destructor freeing slots, which freed shared_ptrs, which caused remove_by_target() to access handlers, which was already partially destroyed. -------------------------------------------------------------------------------- 406b842e22 | Aidan Holm | 2019-09-27 21:06:55 +0800 Add ui_render() -------------------------------------------------------------------------------- ff19f33cdb | Alex Jurkiewicz | 2019-09-27 15:36:43 +0800 Mark trove portals as single-use Fixes #1126. -------------------------------------------------------------------------------- 80d7c3d5c1 | advil | 2019-09-26 18:27:52 -0400 Fix ungenerated branches in wizmode + pregen (12071) These were falling through the cracks of _branch_pregenerates, but not generating as part of the generation order. This commit just moves you directly to them without any pregeneration (which needless to say will break the seed, but if you're doing this you probably don't care). -------------------------------------------------------------------------------- 3936067ed8 | kitchen-ace | 2019-09-26 00:14:35 -0700 A meagre spelling correction for AUS english (#1157) -------------------------------------------------------------------------------- 46ecf6da75 | Aidan Holm | 2019-09-26 01:40:04 +0800 Remove unused function chop_tagged_string() -------------------------------------------------------------------------------- 4b16227417 | Aidan Holm | 2019-09-26 01:40:02 +0800 More refactoring of formatted_string code -------------------------------------------------------------------------------- d158fba778 | Aidan Holm | 2019-09-25 23:57:46 +0800 Fix some compile warnings (geekosaur) Returning std::move() here is fine because the parameter is an rvalue reference, so RVO is not relevant, and a move() call is required to prevent a copy. -------------------------------------------------------------------------------- 0b1efcbfd7 | Aidan Holm | 2019-09-25 23:52:45 +0800 Revert "Fix some compile warnings (geekosaur)" This reverts commit 0e779d289c517aeb1bab0ed4e172b85274d776cf. -------------------------------------------------------------------------------- eb4d282544 | Aidan Holm | 2019-09-25 23:49:37 +0800 Reduce unnecessary text widget allocations -------------------------------------------------------------------------------- 6ad10583fd | Aidan Holm | 2019-09-25 23:49:37 +0800 Remove some formatted_string functions Spell range strings don't use colour codes any more. As for explore discoveries, it's simpler to parse the tagged string and then use the dedicated width() method. -------------------------------------------------------------------------------- 0627d6e13b | Aidan Holm | 2019-09-25 23:49:37 +0800 Remove unused and rename used fs_op members -------------------------------------------------------------------------------- 0e779d289c | Aidan Holm | 2019-09-25 23:43:23 +0800 Fix some compile warnings (geekosaur) Returning std::move() here is fine because the parameter is an rvalue reference, so RVO is not relevant, and a move() call is required to prevent a copy. -------------------------------------------------------------------------------- 049a78546b | Aidan Holm | 2019-09-25 14:23:27 +0800 Simplify macro_buf_add_with_keymap We only ever add a single key at a time to the macro buffer; better to enforce that. This also asserts in remap_key() that the macro buffer is empty before remapping a key; this must be the case because ui::pump_events() first tries to get a key from the macro buf, and only remaps a new key if there is no macro key available. -------------------------------------------------------------------------------- 678ee33c32 | Aidan Holm | 2019-09-25 14:23:27 +0800 Refactor _getch_mul() -> _getch_single() While you could theoretically have multiple keys returned from _getch_mul, in practice I never managed to make it happen, and it's preferable for the code paths through the macro system to be as simple as possible. -------------------------------------------------------------------------------- 5a8975c3e2 | Aidan Holm | 2019-09-25 14:23:27 +0800 Simplify macro code This makes the difference between getchm and getch_with_command_macros slightly clearer. -------------------------------------------------------------------------------- 3ea5ddb52c | Aidan Holm | 2019-09-25 14:23:27 +0800 Remove support for multi-key macro binds Apparently it was previously possible, for some definitions of the word 'possible', to have multi-key macro binds; e.g. 'ab' -> foo. I couldn't actually get any of these to trigger, however, even when using xdotool to quickly deliver keypress events. This commit simplifies the complicated macro expansion code that resulted. Saved macros that have multi-key binds are silently truncated to the first character. This commit also slightly refactors filtering of empty macros. -------------------------------------------------------------------------------- e7cd8ce796 | Nikolai Lavsky | 2019-09-23 11:37:32 +0800 Fix a crash when cloning an almost dead monster (geekosaur) A copy created via rakshasa's Phantom Mirror has only 35% of the target's hp and max hp. If the original monster is almost dead (1-2 HP), its copy will have 0 hp, which crashes the game. Fix this by giving cloned monsters at least 1 hp. Also, it allows rakshasas to clone lurking horrors, who always spawn with only 1 hp. -------------------------------------------------------------------------------- b70a11d811 | Aidan Holm | 2019-09-20 22:30:25 +0800 Fix monster list position when re-running arena The call to expand_mlist() assumes that the monster list has its initial position and size; this is not the case if you run arena mode more than once without quitting the game in between. After this fix, the UI is still broken if you run arena then a regular game. I tried using an unwind_var, but that caused crashes, and a better fix is in the works anyway (using the widget toolkit). -------------------------------------------------------------------------------- cb9520c128 | Aidan Holm | 2019-09-20 22:30:24 +0800 Remove cprintf calls that do nothing -------------------------------------------------------------------------------- 7c97eb6acf | Aidan Holm | 2019-09-20 22:30:24 +0800 Remove explicit cursor positioning -------------------------------------------------------------------------------- 79b4920dd9 | Aidan Holm | 2019-09-20 22:30:24 +0800 Remove support for yesno outside the messge window -------------------------------------------------------------------------------- 2190daeb1e | Aidan Holm | 2019-09-20 22:30:24 +0800 Remove unused player name error messages -------------------------------------------------------------------------------- 0d320154d2 | Aidan Holm | 2019-09-20 22:30:24 +0800 Remove useless textcolour calls -------------------------------------------------------------------------------- c6fd4e6165 | Alex Jurkiewicz | 2019-09-20 20:44:35 +0800 Default show_more to false in debug builds Debug builds unsurprisingly spew large numbers of messages, so repeatedly showing a more prompt is very inconvenient. -------------------------------------------------------------------------------- 5ea6cb6c5a | Nikolai Lavsky | 2019-09-20 20:30:27 +0800 Fix HP of summons created via the Phantom Mirror spell Because of an incorrect formula added in a559921a, Mara and rakshasa clones had 200% hp of their original instead of 50%. Regular monsters copied via `cast_phantom_mirror()` had 286% hp and max hp instead of 35%. -------------------------------------------------------------------------------- 346d576932 | advil | 2019-09-19 20:06:03 -0400 Fix some issues with singing sword revealed in arena (p0a) The `get_tension` check is not well-defined without a player, and also isn't used for monster attackers. Also, the singing sword was shouting at the player's location, not the attacker (which caused another crash in arena). -------------------------------------------------------------------------------- 0d56a851f4 | Aidan Holm | 2019-09-19 01:51:59 +0800 Don't prewrap level builder logs Pre-wrapping to a given screen-width should be avoided in general because the screen can be resized. In addition, the GOTO_CRT region size is not a well-defined concept on local tiles. -------------------------------------------------------------------------------- 290c21e5aa | Aidan Holm | 2019-09-19 01:51:59 +0800 Replace line_reader use with cancellable_get_line -------------------------------------------------------------------------------- 5f7070a834 | Aidan Holm | 2019-09-19 01:51:59 +0800 Add per-text-widget fonts -------------------------------------------------------------------------------- f0453101f8 | Aidan Holm | 2019-09-19 01:51:59 +0800 Remove probably-no-longer-needed kludge The handle_terminal_resize() call in startup.cc (added in e03bc23d4eded) seems to no longer be required, since the code to determine the HUD size based on species (added in the same commit) is no longer present, and thus the HUD should not need to be resized any more. This permits some minor simplification of handle_terminal_resize(). -------------------------------------------------------------------------------- d29bdeb3b0 | Aidan Holm | 2019-09-19 01:51:59 +0800 Fix layout error for empty ellipsizable text widget m_wrapped_lines being empty caused the size request calculation to yield a natural size (0 lines) smaller than the minimum size (1 line), causing assertion failures. -------------------------------------------------------------------------------- 3da5d4e088 | Aidan Holm | 2019-09-19 01:51:59 +0800 Allow querying current scissor without UI layout Widgets may query the current scissor region to reduce render calls, e.g. by not rendering children or other elements that are not visible. During a regular layout and render cycle, the UI framework pushes a scissor region of the entire screen, so this works fine. When doing ad-hoc rendering (while we transition to full use of the UI framework), this is not the case, which caused crashes. -------------------------------------------------------------------------------- e6ffb7a55f | Aidan Holm | 2019-09-19 01:51:59 +0800 Fix menu items being unnecessarily ellipsized The menu already ellipsizes menu items as needed based on screen size. -------------------------------------------------------------------------------- 3dea98854c | Aidan Holm | 2019-09-19 01:51:59 +0800 Fix tooltips freezing local tiles window The previous implementation added a tooltip timer before blocking for the next SDL event, and removed it before returning. If resize or move events were received, however, the function would return early, and the timer would never be removed and would instead timeout periodically. Subsequent move events would add additional timers, leading to a flood of timeouts clogging up the event loop. This new implementation only ever adds a timer when the mouse is moved, and timers only fire once. remove_timer() is also changed to take an int& for convenience. -------------------------------------------------------------------------------- 94eeae6f7e | Aidan Holm | 2019-09-19 01:51:59 +0800 Add remaining tilesdl font getters -------------------------------------------------------------------------------- f19a5e4d30 | Aidan Holm | 2019-09-19 01:51:59 +0800 Tidy up tilesdl font members -------------------------------------------------------------------------------- 15dcb325b9 | Aidan Holm | 2019-09-18 21:25:34 +0800 Fix UI cutoffs not being cleared properly (vt, 12061) UI cutoffs prevent any any UI layers with index <= the cutoff index from being displayed. If there's no cutoff, the cutoff index should be -1; the old value of 0 was causing the lowest UI layer to not be unhidden. -------------------------------------------------------------------------------- b7544fd237 | 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. -------------------------------------------------------------------------------- e4662a2d14 | theJollySin | 2019-09-14 21:14:06 +0800 #1125 spellbooks are no longer 'r'ead -------------------------------------------------------------------------------- 92e081b058 | 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. -------------------------------------------------------------------------------- e2a249a6fd | advil | 2019-09-12 22:25:45 -0400 Remove throttling notification It's crashing for ., not sure why. Remove for now. -------------------------------------------------------------------------------- 751f86b5a9 | Aidan Holm | 2019-09-13 01:40:25 +0800 Fix webtiles rendering using outdated map_knowledge (Artagas, 12064) -------------------------------------------------------------------------------- eaf2f25370 | 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. -------------------------------------------------------------------------------- 1ff6aac338 | Aidan Holm | 2019-09-09 23:18:24 +0800 Fix bad comma -------------------------------------------------------------------------------- e11a5d91ad | 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. -------------------------------------------------------------------------------- fb3efd073d | 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(). -------------------------------------------------------------------------------- 9501b9e7a0 | Aidan Holm | 2019-09-09 12:34:07 +0800 Factor out describe_monsters_condensed() helper function -------------------------------------------------------------------------------- de3ff83e2e | Aidan Holm | 2019-09-09 12:34:07 +0800 Remove unused headers -------------------------------------------------------------------------------- ff1bdec7c2 | Aidan Holm | 2019-09-09 12:34:07 +0800 Fix magic mapping water colour in sewer -------------------------------------------------------------------------------- a4a55ebecd | 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. -------------------------------------------------------------------------------- ef970caa61 | 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. -------------------------------------------------------------------------------- f216e90430 | Aidan Holm | 2019-09-09 12:34:07 +0800 Fix rest_delay = -1 option -------------------------------------------------------------------------------- 4db8f8041d | Aidan Holm | 2019-09-09 12:34:07 +0800 Simplify wave overlay packing code -------------------------------------------------------------------------------- 2324e3a9ae | 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. -------------------------------------------------------------------------------- d8832a91eb | 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... -------------------------------------------------------------------------------- bdd17524c8 | Aidan Holm | 2019-09-09 12:33:37 +0800 Remove dead inscription hints code -------------------------------------------------------------------------------- 12c97a3ad0 | Aidan Holm | 2019-09-09 12:33:37 +0800 Fix bad FAQ menu entry wrapping -------------------------------------------------------------------------------- b99ddf99ac | Aidan Holm | 2019-09-09 12:33:37 +0800 Make menu colours more consistent -------------------------------------------------------------------------------- a2d57835b7 | Aidan Holm | 2019-09-09 12:33:37 +0800 Fix deck menu being easily closable -------------------------------------------------------------------------------- ac8ac2ac75 | Aidan Holm | 2019-09-09 12:33:37 +0800 Fix extra newlines in local tiles tooltip -------------------------------------------------------------------------------- 65986e55db | 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(). -------------------------------------------------------------------------------- 56e724e302 | 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. -------------------------------------------------------------------------------- e7559507c6 | Aidan Holm | 2019-09-09 12:33:37 +0800 Fix trailing empty lines on help screens -------------------------------------------------------------------------------- 2f91b30d3a | Aidan Holm | 2019-09-09 12:33:37 +0800 Fix player being off-centre on local tiles -------------------------------------------------------------------------------- 9a1d66b0e3 | 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. -------------------------------------------------------------------------------- 4bb3bc1208 | kitchen-ace | 2019-09-09 01:29:13 +0800 Give draconians their own horns tile -------------------------------------------------------------------------------- a6a8d0c736 | Alex Jurkiewicz | 2019-09-08 22:37:08 +0800 Document timed_effects / timed_effect_type link -------------------------------------------------------------------------------- 611b3b1973 | 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. -------------------------------------------------------------------------------- 8e11da7cb5 | dplusplus | 2019-09-08 22:34:47 +0800 fix mutations/vamp-attrs toggle -------------------------------------------------------------------------------- aff5e891e6 | 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. -------------------------------------------------------------------------------- 8e0e932a4c | Kate | 2019-09-06 23:44:15 +0100 Update mailmap [skip ci] -------------------------------------------------------------------------------- 5c5dc1b5cb | Kate | 2019-09-06 22:25:44 +0100 Update CREDITS.txt [skip ci] -------------------------------------------------------------------------------- 9d6b971ae4 | 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. -------------------------------------------------------------------------------- 87330a484a | 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. -------------------------------------------------------------------------------- 4d4af813a0 | Alan Malloy | 2019-08-25 12:40:14 -0700 Revert "Add attack-no-move bindings for Colemak" (#1140) This reverts commit c0fa6600bf77c549186ab8d4e74820f4ac84c170. -------------------------------------------------------------------------------- c0fa6600bf | runrin | 2019-08-21 16:15:06 -0700 Add attack-no-move bindings for Colemak -------------------------------------------------------------------------------- 6a6c3f83c1 | advil | 2019-08-20 15:26:51 -0400 Fix another misc compiler warning Also, unbrace. -------------------------------------------------------------------------------- 962dd19927 | advil | 2019-08-20 15:23:09 -0400 Fix a gcc warning Noticed while rebuilding cbro -------------------------------------------------------------------------------- f1077d3298 | 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. -------------------------------------------------------------------------------- dfe76135ef | 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. -------------------------------------------------------------------------------- 91963d7417 | 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. -------------------------------------------------------------------------------- d66451a9e9 | 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. -------------------------------------------------------------------------------- 7d3d5a44bd | advil | 2019-08-19 19:50:43 -0400 Simplify pregen options and update documentation. -------------------------------------------------------------------------------- b1ee012021 | 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. -------------------------------------------------------------------------------- 58b1be019b | 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. -------------------------------------------------------------------------------- bd264f5708 | 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. -------------------------------------------------------------------------------- b9928c7577 | 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. -------------------------------------------------------------------------------- 93dbe2d410 | 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. -------------------------------------------------------------------------------- 452b1d95ea | 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. -------------------------------------------------------------------------------- 5121451e89 | 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. -------------------------------------------------------------------------------- ad2a101408 | advil | 2019-08-19 19:50:43 -0400 Fix a sequence point issue in rng::subgenerator -------------------------------------------------------------------------------- aa2f355350 | 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. -------------------------------------------------------------------------------- 215db2b007 | 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. -------------------------------------------------------------------------------- da9c0b029a | 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. -------------------------------------------------------------------------------- 44eecae16b | 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. -------------------------------------------------------------------------------- 66c84cb112 | 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. -------------------------------------------------------------------------------- 38a37b7ff7 | 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.) -------------------------------------------------------------------------------- 7e99aecb7e | 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. -------------------------------------------------------------------------------- cbae52a9c1 | 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. -------------------------------------------------------------------------------- 82437c2fa6 | 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. -------------------------------------------------------------------------------- a46ea00baf | 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. -------------------------------------------------------------------------------- 9ece634645 | 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. -------------------------------------------------------------------------------- bc886685f7 | 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. -------------------------------------------------------------------------------- 8fead6faaf | 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. -------------------------------------------------------------------------------- 159d84b62b | 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. -------------------------------------------------------------------------------- 62a95a1fbf | 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. -------------------------------------------------------------------------------- 11bec38995 | 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. -------------------------------------------------------------------------------- 45f0056d81 | 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. -------------------------------------------------------------------------------- 0c8b59c118 | Aidan Holm | 2019-08-19 00:26:00 +0800 Revert "Speed up level traversal by 33%" This reverts commit 070f72b007c478799c7b6210fd4ce8416dc5f516. -------------------------------------------------------------------------------- 070f72b007 | 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. -------------------------------------------------------------------------------- 61eb7a8b75 | Aidan Holm | 2019-08-18 23:07:43 +0800 Fix newline at end of message log -------------------------------------------------------------------------------- d1b266bae6 | Aidan Holm | 2019-08-17 21:50:59 +0800 Fix excess padding on webtiles book spell list -------------------------------------------------------------------------------- 8077b2f243 | 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. -------------------------------------------------------------------------------- f04b0cdf28 | 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. -------------------------------------------------------------------------------- b950e110d4 | 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. -------------------------------------------------------------------------------- 4167bdcbf3 | 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. -------------------------------------------------------------------------------- fe73009c60 | 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. -------------------------------------------------------------------------------- 6aae15eeb0 | Aidan Holm | 2019-08-16 17:36:42 +0800 Fix mouse cursor on unselectable items -------------------------------------------------------------------------------- 3b46b88f1c | 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. -------------------------------------------------------------------------------- 2d01d4ab0a | 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. -------------------------------------------------------------------------------- dd4cf15266 | 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. -------------------------------------------------------------------------------- bb0d440638 | 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. -------------------------------------------------------------------------------- 42aaa33449 | gammafunk | 2019-08-08 20:48:00 -0500 Remove an unused description -------------------------------------------------------------------------------- 939521aa74 | Seve Monahan | 2019-08-08 19:10:12 -0400 Add rmcneive to CREDITS.txt -------------------------------------------------------------------------------- c9afb8a149 | 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 -------------------------------------------------------------------------------- 18ba70b503 | 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. -------------------------------------------------------------------------------- 0b98641fa2 | Seve Monahan | 2019-08-06 00:43:41 -0400 Remove extraneous Nikoli Lavsky credit -------------------------------------------------------------------------------- 98e85ec62a | Seve Monahan | 2019-08-04 11:18:03 -0400 Add Nikolai Lavsky to CREDITS.txt -------------------------------------------------------------------------------- c3251c534c | 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) -------------------------------------------------------------------------------- cb87913eb9 | 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/ -------------------------------------------------------------------------------- 9231cdcba1 | Seve Monahan | 2019-07-31 00:18:52 -0400 Don't mention Invocations skill in Drain Life spell description (#11947) -------------------------------------------------------------------------------- f43b32f898 | Seve Monahan | 2019-07-29 23:22:00 -0400 Ensure Zigsprint never fails to place guaranteed items (#12033) -------------------------------------------------------------------------------- e2f623c2b9 | 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. -------------------------------------------------------------------------------- 04f7f4e3a9 | 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". -------------------------------------------------------------------------------- bf7f94f634 | rmcneive | 2019-07-27 11:05:17 -0400 Update quotes.txt -------------------------------------------------------------------------------- 122614bf49 | Aidan Holm | 2019-07-27 17:21:15 +0800 Fix typo (runrin) -------------------------------------------------------------------------------- 8fd06ad0bc | 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. -------------------------------------------------------------------------------- 7ac07d978e | 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. -------------------------------------------------------------------------------- 9d8d8d5b78 | 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. -------------------------------------------------------------------------------- d52e2fb918 | 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. -------------------------------------------------------------------------------- 9de272bb65 | 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. -------------------------------------------------------------------------------- be7f5e2e8d | advil | 2019-07-20 15:17:44 -0400 Revert "Don't crash if redrawing a prompt triggers a flash" This reverts commit a379d5e2002d1753cc2fdd47a06dc70336d03bd7. -------------------------------------------------------------------------------- a379d5e200 | 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. -------------------------------------------------------------------------------- 284f782df5 | 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. -------------------------------------------------------------------------------- 2b48af375b | 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. -------------------------------------------------------------------------------- 71c5d99ebc | 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. -------------------------------------------------------------------------------- 9253d746ad | 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 -------------------------------------------------------------------------------- a1643a6788 | 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. -------------------------------------------------------------------------------- af07aaf802 | 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. -------------------------------------------------------------------------------- 3e8b242632 | 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. -------------------------------------------------------------------------------- 958ff8eaa0 | 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. -------------------------------------------------------------------------------- bda620ff8e | Seve Monahan | 2019-07-17 17:32:47 -0400 Fix misspelling in describe.cc comment -------------------------------------------------------------------------------- cfb02b9d07 | nlavsky | 2019-07-15 12:46:23 -0700 Update scroll of brand weapon description (#1114) As blowguns are no more. -------------------------------------------------------------------------------- b815cdf0ff | Aidan Holm | 2019-07-15 15:19:12 +0800 Fix spurious key events when adjusting map zoom -------------------------------------------------------------------------------- e6e1909c86 | 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. -------------------------------------------------------------------------------- c560d0b20c | 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. -------------------------------------------------------------------------------- 46574c2197 | 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). -------------------------------------------------------------------------------- 1074bba3cf | 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. -------------------------------------------------------------------------------- e00f04a389 | Seve Monahan | 2019-07-12 23:56:26 -0400 Extract new helper function "_player_is_gnoll()" in skills.cc -------------------------------------------------------------------------------- 5a03d68f59 | 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. -------------------------------------------------------------------------------- be733cd003 | marksg07 | 2019-07-12 13:43:31 -0700 Revert "Allow running clua from map viewing mode (#1103)" (#1107) This reverts commit 1c7b743a30f0ffe3337a8d576059ebbbcae2e84a. -------------------------------------------------------------------------------- d30f2f123c | olowin | 2019-07-12 12:03:45 -0400 Remove blood from Gozag shop description Now that vampires are hungerless. -------------------------------------------------------------------------------- 17ce2c7205 | Seve Monahan | 2019-07-12 00:37:23 -0400 Correct alphabetization in Makefile.obj -------------------------------------------------------------------------------- 7e4ddcd485 | 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. -------------------------------------------------------------------------------- df4b510d7a | 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. -------------------------------------------------------------------------------- 29c01f8b84 | 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. -------------------------------------------------------------------------------- 534e725bec | 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. -------------------------------------------------------------------------------- 1c7b743a30 | 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. -------------------------------------------------------------------------------- 33f6f7b652 | 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). -------------------------------------------------------------------------------- 57318f2ed0 | 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. -------------------------------------------------------------------------------- ed8816983f | Alan Malloy | 2019-07-08 15:43:25 -0700 Add gmarks to CREDITS and mailmap after e77e6fb -------------------------------------------------------------------------------- e77e6fb256 | marksg07 | 2019-07-08 15:35:48 -0700 Add clua function to set waypoint (#1098) -------------------------------------------------------------------------------- 962a3eeff7 | Nikolai Lavsky | 2019-07-08 15:27:22 -0400 Remove dump_book_spells option Obsolete since the introduction of the spell library. -------------------------------------------------------------------------------- 98ea13e501 | Alex Jurkiewicz | 2019-07-08 15:26:04 -0400 Simplify logic -------------------------------------------------------------------------------- e98fbd9498 | 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. -------------------------------------------------------------------------------- a9b13e7d51 | 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). -------------------------------------------------------------------------------- 7da6c1453b | Alex Jurkiewicz | 2019-07-08 09:44:34 -0400 align braces -------------------------------------------------------------------------------- 9a978d2894 | 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. -------------------------------------------------------------------------------- e3eab0557c | advil | 2019-07-05 10:29:53 -0400 Fix join_strings args (amalloy) -------------------------------------------------------------------------------- 132cf697da | 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] -------------------------------------------------------------------------------- f6c7d2a2e8 | Alex Jurkiewicz | 2019-07-05 09:44:36 -0400 Old Vampire cleanup (#1096) [committer's note: these braces are left over from b5eab8406da.] -------------------------------------------------------------------------------- 5b41c6f198 | 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. -------------------------------------------------------------------------------- 47c397e050 | advil | 2019-07-04 11:26:09 -0400 Travis: Update mingw package names for xenial -------------------------------------------------------------------------------- 7d615089e7 | advil | 2019-07-04 09:52:29 -0400 Another travis dep... -------------------------------------------------------------------------------- 7b9cff83cf | advil | 2019-07-04 08:54:58 -0400 More travis dependency updates, this time for BUILD_ALL -------------------------------------------------------------------------------- 3302cd442e | advil | 2019-07-03 22:52:46 -0400 Try xenial (travis) This apparently could happen any day now anyways. -------------------------------------------------------------------------------- c1e67f237a | advil | 2019-07-03 22:13:21 -0400 More travis tweaking for local tiles -------------------------------------------------------------------------------- 4a4e93562d | advil | 2019-07-03 21:55:50 -0400 Remove old 3rd party sdl build from travis -------------------------------------------------------------------------------- 378ef55cfb | advil | 2019-07-03 18:06:12 -0400 Add local tiles zoom to key reference -------------------------------------------------------------------------------- a9e2c0f7d0 | 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). -------------------------------------------------------------------------------- f8f69c1b1c | 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... -------------------------------------------------------------------------------- 4402b9e188 | 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. -------------------------------------------------------------------------------- 6b2be6b8c7 | 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. -------------------------------------------------------------------------------- 3510def36b | 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. -------------------------------------------------------------------------------- e24419a6ad | advil | 2019-06-30 15:56:59 -0400 Use int32_t for a size check for string marshalling -------------------------------------------------------------------------------- 720adc72dc | 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. -------------------------------------------------------------------------------- 36f2fa8efd | 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. -------------------------------------------------------------------------------- 225fefd530 | 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. -------------------------------------------------------------------------------- fcb5e6da0e | advil | 2019-06-25 21:04:25 -0400 More specific documentation about des stability and tags [skip ci] -------------------------------------------------------------------------------- aec789570c | gammafunk | 2019-06-25 19:48:37 -0500 Clean up a condition -------------------------------------------------------------------------------- 09db7996fa | 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. -------------------------------------------------------------------------------- e12f10fa2d | 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. -------------------------------------------------------------------------------- 0c6bcda037 | 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. -------------------------------------------------------------------------------- 3db0654b3e | 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*. -------------------------------------------------------------------------------- 26b8ecb3bf | 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. -------------------------------------------------------------------------------- 263dff2034 | 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. -------------------------------------------------------------------------------- 1dd085888c | 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. -------------------------------------------------------------------------------- c0fab7842f | 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. -------------------------------------------------------------------------------- 8f2d45b691 | advil | 2019-06-25 09:54:37 -0400 Sort tags_string() again This is a regression from 80c1907ebbf6. -------------------------------------------------------------------------------- e8da9206dc | 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.) -------------------------------------------------------------------------------- 87df7205b4 | 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. -------------------------------------------------------------------------------- d5110b030a | dplusplus | 2019-06-21 10:11:32 -0400 Add stop for Merfolk fake-mutation description -------------------------------------------------------------------------------- f09efd6d0b | Alex Jurkiewicz | 2019-06-21 10:11:03 -0400 Guard against out of bounds array access -------------------------------------------------------------------------------- 80245de385 | 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. -------------------------------------------------------------------------------- bf76ec32ab | 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. -------------------------------------------------------------------------------- 27f0392e16 | 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. -------------------------------------------------------------------------------- f98416c20e | 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. -------------------------------------------------------------------------------- 6dd8730de2 | Chris Campbell | 2019-06-17 03:12:29 +0100 Update CREDITS.txt -------------------------------------------------------------------------------- ec079b9e98 | 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". -------------------------------------------------------------------------------- f4a770e8ca | Chris Campbell | 2019-06-17 03:12:29 +0100 Add handling for non-ancestor monsters with they/them pronouns -------------------------------------------------------------------------------- dba641b739 | Chris Campbell | 2019-06-17 03:12:29 +0100 Refactor Hepliaklqana ancester gender choice -------------------------------------------------------------------------------- 1ba1822a90 | 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] -------------------------------------------------------------------------------- d57e52fea8 | 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. -------------------------------------------------------------------------------- be6fa4f6cc | 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. -------------------------------------------------------------------------------- 90a0943219 | 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 -------------------------------------------------------------------------------- 80c1907ebb | 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. -------------------------------------------------------------------------------- 69c6a51588 | advil | 2019-06-13 09:45:21 -0400 Fix signed/unsigned comparison (gammafunk) -------------------------------------------------------------------------------- 4608c8fa30 | 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. -------------------------------------------------------------------------------- 83a80d79a6 | gammafunk | 2019-06-12 21:45:19 -0500 Fix missing item result delimiters in some vaults -------------------------------------------------------------------------------- 19b5fbe486 | 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. -------------------------------------------------------------------------------- cdd7612e18 | 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. -------------------------------------------------------------------------------- d84787c25e | 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`. -------------------------------------------------------------------------------- 8bd77c7716 | advil | 2019-06-12 17:51:18 -0400 Remove debug code -------------------------------------------------------------------------------- 6870c0f642 | 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. -------------------------------------------------------------------------------- 9eff3895ba | 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. -------------------------------------------------------------------------------- 6863ae89ae | Chris Campbell | 2019-06-11 19:31:13 +0100 Don't allow Vehumet to extend lightning rod range (#12007) -------------------------------------------------------------------------------- 24607be9ce | dplusplus | 2019-06-10 19:45:48 -0400 Fix hint for item description Commit 2b1cce4 introduced negated logic. [Closes #1082] -------------------------------------------------------------------------------- f7c4f17b88 | NormalPerson7 | 2019-06-10 19:41:34 -0400 Fix incorrect information in Aura of Brilliance description -------------------------------------------------------------------------------- 9fa23b7c36 | Ashley Raine | 2019-06-10 19:39:23 -0400 Removed barehanded attack prompt while in treeform -------------------------------------------------------------------------------- 1cce26a4d2 | 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. -------------------------------------------------------------------------------- 56ce5178b7 | Edgar Bering | 2019-06-07 20:14:29 -0400 Update default runrest stops for tweaked shaft messaging (vt) -------------------------------------------------------------------------------- 6d73c25c48 | advil | 2019-06-06 16:47:30 -0400 parens -------------------------------------------------------------------------------- 39a2186462 | 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. -------------------------------------------------------------------------------- 536fa38985 | 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. -------------------------------------------------------------------------------- e138f7edaf | Edgar A. Bering IV | 2019-06-05 19:12:10 -0400 Update CREDITS -------------------------------------------------------------------------------- 4df2b1290f | advil | 2019-06-05 14:48:18 -0400 Fix the build -------------------------------------------------------------------------------- b853c62f84 | 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 -------------------------------------------------------------------------------- da47cbf8c3 | Ashley Raine | 2019-06-05 08:33:30 -0400 Add missing loading images to webtiles. -------------------------------------------------------------------------------- cc1054c7ca | Chris Campbell | 2019-06-04 22:48:38 +0100 Checkwhite -------------------------------------------------------------------------------- 86e7e0583b | Chris Campbell | 2019-06-04 21:16:19 +0100 Update easy_eat_chunks documentation (#12004) -------------------------------------------------------------------------------- 1d664f1849 | Chris Campbell | 2019-06-04 21:16:19 +0100 Mention noise in wand of iceblast description (#11902) -------------------------------------------------------------------------------- 6016cb4fb2 | 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. -------------------------------------------------------------------------------- d14802f61f | 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. -------------------------------------------------------------------------------- f268315891 | advil | 2019-06-04 16:05:03 -0400 Clean up some outdated comments and a few other misc fixes. -------------------------------------------------------------------------------- 581a069569 | 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. -------------------------------------------------------------------------------- 4219c681b9 | 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. -------------------------------------------------------------------------------- 86696efbda | advil | 2019-06-04 12:52:56 -0400 Add a bit more about how to run the seed explorer in comments -------------------------------------------------------------------------------- 0a26ff3fdf | 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. -------------------------------------------------------------------------------- 4edc0ab2af | Edgar A. Bering IV | 2019-06-04 09:02:12 -0400 Revise Exsanguinate's description (Yermak) -------------------------------------------------------------------------------- 73b976d855 | Edgar A. Bering IV | 2019-06-03 22:22:31 -0400 New Vampire ability icons (CanOfWorms) [Closes #1043] -------------------------------------------------------------------------------- 2bae87b6a2 | Edgar A. Bering IV | 2019-06-03 22:22:18 -0400 Update the manual for Vampires Remove references to blood bottling and blood consumption. -------------------------------------------------------------------------------- 301a641611 | 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. -------------------------------------------------------------------------------- 7fb00627a5 | 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. -------------------------------------------------------------------------------- 8336dd52f4 | 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. -------------------------------------------------------------------------------- 3edcaf6869 | 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. -------------------------------------------------------------------------------- b5eab8406d | 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] -------------------------------------------------------------------------------- 54394cd99f | 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. -------------------------------------------------------------------------------- 65887bbefe | 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) -------------------------------------------------------------------------------- b57f36d6e0 | 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. -------------------------------------------------------------------------------- d7d9f274c4 | 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.) -------------------------------------------------------------------------------- 6ad002bb79 | 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. -------------------------------------------------------------------------------- 8afd68e611 | 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. -------------------------------------------------------------------------------- 4b3246705c | 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. -------------------------------------------------------------------------------- 2b49f6db23 | 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. -------------------------------------------------------------------------------- 8e8615713e | 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. -------------------------------------------------------------------------------- 637bb3806f | advil | 2019-06-02 18:48:05 -0400 Add dungeon features to the seed explorer -------------------------------------------------------------------------------- 7ade4d1b3c | 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. -------------------------------------------------------------------------------- c0b1d33993 | 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. -------------------------------------------------------------------------------- 94936e539c | Chris Campbell | 2019-05-31 19:10:01 +0100 Fix ?amnesia reversed logic (#11998) -------------------------------------------------------------------------------- ee2287cf43 | Chris Campbell | 2019-05-30 20:45:54 +0100 Update WJC powers description (#11994) -------------------------------------------------------------------------------- c54ef59892 | Chris Campbell | 2019-05-30 20:45:54 +0100 Remove an obsolete Donald line (#11994) -------------------------------------------------------------------------------- 4de66ed42b | 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.) -------------------------------------------------------------------------------- 3ea9d24d98 | 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) -------------------------------------------------------------------------------- 39439d866b | 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 -------------------------------------------------------------------------------- 9fa3ae0aaa | 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. -------------------------------------------------------------------------------- 4cc88bcadc | NormalPerson7 | 2019-05-29 21:37:19 -0400 Update vine stalker description (11979) -------------------------------------------------------------------------------- 78e9d4e317 | 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. -------------------------------------------------------------------------------- 78adf7823c | Alan Malloy | 2019-05-29 09:57:10 -0700 Remove unused variables in random_picker::probability_at -------------------------------------------------------------------------------- 0e0cebd0f3 | 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. -------------------------------------------------------------------------------- 1748d93fb5 | advil | 2019-05-27 18:48:55 -0400 Support random seeds only in seed explorer (alexjurkiewicz) -------------------------------------------------------------------------------- c1c896e988 | 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. -------------------------------------------------------------------------------- a4d96b6e6e | Brendan Hickey | 2019-05-26 12:35:04 -0400 Checkwhite fix -------------------------------------------------------------------------------- b5a06e84e3 | Brendan Hickey | 2019-05-26 10:42:38 -0400 Fixup vampiric brand messages to remove hunger references. -------------------------------------------------------------------------------- c4ac1b27a8 | Brendan Hickey | 2019-05-26 10:37:12 -0400 Don't prompt when unwielding vampiric weapons. -------------------------------------------------------------------------------- 0f23e7d634 | 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. -------------------------------------------------------------------------------- 57161393b2 | advil | 2019-05-25 16:18:03 -0400 Some cosmetic fixes for the seed explorer -------------------------------------------------------------------------------- 0dde086dc9 | 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). -------------------------------------------------------------------------------- bc69b92bc9 | 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. -------------------------------------------------------------------------------- 53aee78b01 | Edgar A. Bering IV | 2019-05-24 14:13:09 -0400 Remove vestigal references to needles (11986) -------------------------------------------------------------------------------- 793c10c1f6 | 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. -------------------------------------------------------------------------------- 0de8e755f4 | 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. -------------------------------------------------------------------------------- be4061de67 | advil | 2019-05-23 17:17:56 -0400 Fix another abyss gozag gold detection case -------------------------------------------------------------------------------- 4488db6de0 | 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. -------------------------------------------------------------------------------- ff863c23c4 | 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. -------------------------------------------------------------------------------- 1cdb867ce8 | cut1less | 2019-05-23 10:18:09 -0400 Don't fully describe unthrowable missiles -------------------------------------------------------------------------------- 4011b8c8ab | 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. -------------------------------------------------------------------------------- 5b3daab8ba | 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. -------------------------------------------------------------------------------- b8b2abe488 | Alan Malloy | 2019-05-22 17:10:14 -0700 Make it harder to accidentally waste ?amnesia (Jarrodb, #11985) -------------------------------------------------------------------------------- 4006481e62 | Alan Malloy | 2019-05-22 17:10:14 -0700 Simplify item weights -------------------------------------------------------------------------------- 1a3e1d35ff | Alex Jurkiewicz | 2019-05-21 18:21:40 -0400 Remove vestigial duplicate wrath timer -------------------------------------------------------------------------------- e062c78e24 | Edgar A. Bering IV | 2019-05-21 16:31:06 -0400 Remove mentions to obsolete items from options_guide.txt -------------------------------------------------------------------------------- 4452427412 | 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. -------------------------------------------------------------------------------- 13fca185ac | NormalPerson7 | 2019-05-21 16:11:41 -0400 Fix a default note_messages -------------------------------------------------------------------------------- 48f6bceb67 | NormalPerson7 | 2019-05-21 16:11:41 -0400 Fix a default force_more_message This was broken by the shaft message change in 52ca42d. -------------------------------------------------------------------------------- ad4687c37d | Edgar A. Bering IV | 2019-05-20 09:54:54 -0400 Replace a missing word -------------------------------------------------------------------------------- 52ca42d3ec | 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. -------------------------------------------------------------------------------- 6f6d0e6ea3 | Doesnt | 2019-05-19 22:42:58 -0400 Fix Avatar Song displayed success rate -------------------------------------------------------------------------------- 442a7a25c4 | 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] -------------------------------------------------------------------------------- faf41a374d | 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 -------------------------------------------------------------------------------- 97e3104241 | 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] -------------------------------------------------------------------------------- fcedfb35f7 | 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