-------------------------------------------------------------------------------- f205589 | advil | 2019-03-18 18:30:55 -0400 Better newgame messaging when a game already exists Before, if a game already existed under the name, any menu option that would start a game with that name prefilled (from prefs) would just load the existing game, regardless of game type. Before seeded games, this only affected tutorial vs. regular games, but it's now even more confusing with seeded games. These menus are still a bit of a mess, so this could use some more work (it might be better to prompt for a different name from the seed menu, or do the check before opening that menu). -------------------------------------------------------------------------------- aac6ce0 | advil | 2019-03-18 18:30:55 -0400 Add version number to seed selection menu To try to more clearly cue that this is version-specific. -------------------------------------------------------------------------------- c186064 | Chris Campbell | 2019-03-18 20:22:52 +0000 Don't highlight summoners that are out of LOS Fixes a crash when the summoner is entirely off-screen. -------------------------------------------------------------------------------- 76deb67 | Chris Campbell | 2019-03-18 16:38:45 +0000 Don't highlight the summoner of rakshasa illusions And additionally don't highlight the source for perma-summons (such as Twisted Resurrection abominations), since they're not abjured by killing the summoner. -------------------------------------------------------------------------------- 62cde1d | advil | 2019-03-18 12:00:39 -0400 Fix meatsprint (11834) Meatsprint distributed monsters by placing them in a secret room, and then letting them walk into permanent teleport traps. The trap changes in 0.23 broke I think several of the assumptions this strategy made, most importantly that tele traps work out of player los (66906bf02876). This commit uses fundamentally the same approach, but instead of teleport traps, uses a dlua call to teleport monsters immediately on placement. It might be even simpler to do some kind of random placement off the bat, but using the teleport code has various nice consequences in terms of finding free spaces, etc. I also didn't put much effort into seeing if there's a simple way to do this without the secret room. It turns out that the previous implementation was letting some degree of rate-limiting via monster random movement happen (I believe placement could fail in cases where a monster didn't move off the spawn point). I have done a rough rebalancing accordingly. With two spawn points instead of 4, the overall spawn numbers are very closely matched; I would guess that there's a slight increase in some of the higher-xp categories on average, but there's plenty of variance so I'm not sure. This may need more rebalancing based on feedback from people who have more experience playing this sprint. Here are some representative spawn numbers at turn 150: 0.23 with 2 spawn points: Monsters: The Meatlord, 25 meat beasts, The Captor, The Defiler, The Servant, 20 eight-headed meat hydras, 23 observers, 13 tyrants, 16 accurseds, 67 meat berserkers, 17 large bags of meat, 16 scourges, 33 destroyers, 13 wretched souls, 20 dreads, 161 bags of meat, 36 fleshlords, and 16 sculptors of flesh. 480 monsters, 35685031 total exp value (33124737 non-uniq) (with 4 spawn points in 0.23 you hit the monster limit so it's more annoying to compile the numbers, but they are unsurprisingly about double this.) 0.22, with 4 spawn points: Monsters: The Meatlord, 21 meat beasts, The Captor, The Defiler, The Servant, 21 eight-headed meat hydras, 14 observers, 18 tyrants, 17 accurseds, 70 meat berserkers, 14 large bags of meat, 18 scourges, 37 destroyers, 21 wretched souls, 16 dreads, 170 bags of meat, 31 fleshlords, and 15 sculptors of flesh. 487 monsters, 32820392 total exp value (30260098 non-uniq) -------------------------------------------------------------------------------- 3dc15b6 | advil | 2019-03-18 10:05:10 -0400 Don't save seed pref for sprint, tutorial -------------------------------------------------------------------------------- 6c5f6a5 | advil | 2019-03-18 09:16:11 -0400 Disable seed .pref saving for DGL builds (11928 / kitchen_ace) I didn't do this before because it doesn't actually affect anything about starting a game, but I forgot that .pref reading uses regular options reading, which will trigger an error for dgl builds if game_seed is set. (There may be some harmless instances of this error remaining that will only be visible to server admins until .pref files get rewritten.) -------------------------------------------------------------------------------- 9bee6eb | advil | 2019-03-17 21:13:22 -0400 Save seed number in startup prefs on game end The effect of this change is to autofill the seed selection box with the seed from the last ended game. This saves only the seed in a kind of ad hoc way. However, the alternate behavior, which would be to repopulate the entire prefs file from the ended game, isn't trivial -- since it doesn't seem that all startup prefs are actually recoverable from a game save. (That ultimately still may be the most sensible behavior though.) -------------------------------------------------------------------------------- dbdffe5 | Edgar A. Bering IV | 2019-03-17 19:25:57 -0400 Tiles for summoner highlighting I went with cyan to match console. Closes #801 -------------------------------------------------------------------------------- 6afd290 | Edgar A. Bering IV | 2019-03-17 16:52:49 -0400 Simplify and rename a variable (aidanh) -------------------------------------------------------------------------------- f5976a5 | Martin Aigner | 2019-03-17 13:54:31 -0400 Highlight summoners when the cursor is over a summon in targeting mode As suggested by Antares on tavern. -------------------------------------------------------------------------------- 063869c | advil | 2019-03-17 13:52:06 -0400 Run dactions on entering any level, fixing gozag+pregen (Goratrix) Previously, dactions run only on re-entering a level, and not on entering a generated level. For bribe branch, this was dealt with by having the builder set the relevant monster flags when generating a new level. For pregen, this needs to be done on entering the level, and the simplest way was to just run dactions when entering any level; this seems like a cleaner approach they way dactions are thought of anyways. There might actually be a few wrath-related actions that weren't being run as well. I don't *think* there will be unexpected consequences of this, and most dactions won't do anything on a new level. But, it's not impossible that this won't have some strange side effect I missed. -------------------------------------------------------------------------------- 5d897e9 | Nikolai Lavsky | 2019-03-15 09:19:11 -0400 Prevent allied Shambling Mangroves from constricting themselves (11877) -------------------------------------------------------------------------------- 395302c | Umer Shaikh | 2019-03-15 09:03:23 -0400 Correct a comment Lua function you.contaminated returns a number, not a boolean. -------------------------------------------------------------------------------- 2784ca5 | Umer Shaikh | 2019-03-15 09:03:23 -0400 Correct a comment The comment misdescribes when the parameter auto_wield is true or false; this commit brings it in line with the code. -------------------------------------------------------------------------------- 40992d5 | Joshua Gelbard | 2019-03-15 09:02:12 -0400 Fix splash noises when dropping item into water Added a missing `!`. Behavior was reverse of intended: instead of swimming characters being the only ones exempt from item splash sounds, they were the only ones making them. -------------------------------------------------------------------------------- c02bd79 | NormalPerson7 | 2019-03-15 08:38:53 -0400 Fix cut-off ability cost description (11893) When the Sacrifice Purity ability is granted to the player with the inhibited regeneration mutation, the ability's cost description is Purity (inhibited regeneration) which is 31 characters, however the cost string was only allocated 30 characters, so the last parenthesis was being cut off. Hence, extend the string length for the ability cost description to 32 characters, and adjust the ability screen's title line accordingly. -------------------------------------------------------------------------------- cb5ae2c | Josh Gelbard | 2019-03-15 00:05:15 -0700 Start new wanderers with weapon in slot 'a' (#1006) All new characters who start with a weapon wielded will now find that weapon in slot 'a'. This was already true for all backgrounds except wanderer. -------------------------------------------------------------------------------- 8902462 | Josh Braden | 2019-03-14 19:24:02 -0700 Use & instead of equal for holiness check (11909) (#1001) -------------------------------------------------------------------------------- c7eaa07 | advil | 2019-03-14 15:20:27 -0400 Improvements to the seed selection ui * make game_seed a sticky preference. This won't override rc preferences or CLI seed selection, but makes it a lot more convenient to dispense with ever setting it in an rc. The main effect is that this autofills the text box in the seed selection sub-menu; it doesn't affect the regular game start button (in contrast to selecting a seed in the regular rc). * Fix a bug where a non-seeded game type could be started with a custom seed, if the game restarted after ending a seeded game started in the same session. * add - as a shortcut to clear the seed input -------------------------------------------------------------------------------- d121a6d | advil | 2019-03-13 14:27:20 -0400 Make search_astar more stable across platforms This function is used by slime levelgen in order to ensure level connectivity that doesn't require touching slime walls, and because of this use matters for seeding in slime (both because its behavior impacts what wall squares get removed, and because this astar implementation draws heavily on the rng. The implementation was behaving differently across platforms. Because slime is pretty independent of other branches, the instability was localized to that branch, but usually affected the entire thing. The basic problem is that the search fringe was sorted only by distance in the priority queue, so if two coordinates were the same distance, their ordering in the queue was implementation-dependent (and was differing on mac vs linux builds at least). This fix makes the sort stable in such cases by comparing coordinates as well. This won't necessarily do anything for the speed of the search (perhaps LIFO behavior would be better)... I wonder if this overall approach is really the best way to ensure connectivity in slime? And why does this algorithm need randomization (classic a-star doesn't)? But this code is complicated enough that I'm not going to mess with it further right now. -------------------------------------------------------------------------------- 654ca03 | gammafunk | 2019-03-12 23:40:16 -0500 New transporter and Golubria tiles (CanOfWorms) Transporters, transporter landing sites, and Golubria passages get tiles that better communicate how they are portals that take you to another location. -------------------------------------------------------------------------------- 7a2c91a | advil | 2019-03-12 21:12:50 -0400 Add a debugging rng call Lets you look one step ahead. -------------------------------------------------------------------------------- 5963e8c | advil | 2019-03-12 19:11:27 -0400 Convert some floating point math to better fixed point math This math was leading to instability across seeds depending on the particular way in which floating point math was done on a build and system. This uses a suggestion from |amethyst - since callers always use `percent` values that are divisible by 10, can just do the math with a single decimal point rather than two, which takes up a lot less space. This makes the calculation more accurate than what it replaces (though it still truncates, rather than rounds). For that reason, I have put in a temporary stopgap with the quirks of the previous implementation when run using the SSE version of the old floating point calculation. I will remove this at some point after 0.23.2 is tagged. (But for now, this keeps the gotm stable.) -------------------------------------------------------------------------------- 4d90231 | advil | 2019-03-12 09:17:31 -0400 Fix build try 2 -------------------------------------------------------------------------------- c3651c4 | advil | 2019-03-11 21:32:55 -0400 maybe fix the build -------------------------------------------------------------------------------- e201941 | advil | 2019-03-11 21:11:48 -0400 Un-revert a Makefile fix This was lumped in with the sse change, doesn't need to be reverted. -------------------------------------------------------------------------------- 1e70621 | Alan Malloy | 2019-03-11 16:02:37 -0700 Don't return NaN from prompt_for_float -------------------------------------------------------------------------------- c15b636 | advil | 2019-03-11 16:32:50 -0400 Revert "Build for SSE2 on all systems, including 32bit targets" No longer necessary. Results #996 (and #992 in a different way). This reverts commit 3d66cf40a65a3843061e5a6d1106f9fa5d2b0bdb. -------------------------------------------------------------------------------- c07d39d | advil | 2019-03-11 16:32:23 -0400 Revert "Add a build option to not use SSE" No longer necessary. This reverts commit fc1eed5d34c6ec5942309776f806e12eb0ccc867. -------------------------------------------------------------------------------- 9dfec57 | advil | 2019-03-11 16:17:44 -0400 Fix cross-platform lua number->int conversion the hard way Lua 5.1 doesn't distinguish integers from numbers generally, and stores numbers as doubles, but on the c++ side we very often want ints. In 3d66cf40a65a384 I discovered that, depending on where the lua library is compiled, it may use different conversion methods in its conversion calls, which have different truncation behavior, leading to seed instability across systems (where it uses a specific hack on 32bit non-sse builds, a different one in msvc, and a regular cast otherwise). This behavior is determined at compile-time in luaconf.h, and the first attempt at a fix tried to prevent contrib lua from being built with the alternate behavior, always using a cast. This didn't generalize for at least two reasons: it creates problems trying to compile on other archs (see #992, #996), and it doesn't even cover all the problem situations: linux will typically build with system lua, and then we are at the mercy of whatever arch the system lua was built on anyways. (I have replicated the problem in a 32 bit ubuntu container, for example, even with the compilation fix.) This commit moves away from using lua's default calls for converting to ints, to conversion functions that we control in crawlcode. It's overkill to convert everything, only the dungeon and related calls are really needed, but converting everything was the most robust way to do it. Note that this *doesn't* address any instances of this call in the lua lib, with the hope that they won't matter. The only alternative that I can think of to a change like this would be to require building with contrib lua, and then fix the problem there, but this would seem to go against the spirit of our current build system. -------------------------------------------------------------------------------- d8427f5 | advil | 2019-03-07 09:26:25 -0500 Add a warning for setting `game_seed` online Before, this failed silently, which in at least one case seems to have confused a player into thinking that they succesfully set the seed. -------------------------------------------------------------------------------- 71aafec | advil | 2019-03-06 22:59:38 -0500 unbrace -------------------------------------------------------------------------------- 8aad8c4 | gammafunk | 2019-03-06 19:15:38 -0600 Updates to the debian package guide Reorganize and rewrite sections to get the order of steps right and make the individual steps clearer. Also fix some typos and errors. -------------------------------------------------------------------------------- 029c7ce | advil | 2019-03-06 16:32:48 -0500 Don't change game chapter on a level excursion from abyss (11922) Level excursions can be used in the abyss to pull in ruined versions of terrain from regular connected levels. This bug didn't come up before, because if no levels have been explored (as is the case for an AK start), there is no level excursion. But with pregen, the builder can use terrain from levels the player hasn't seen yet, and if it chose to do this, the level excursion was resetting the chapter for an AK start to CHAPTER_ORB_HUNTING (for some seeds on turn 0). This generates an error message when leaving the abyss for wizards, a crash for non-wizards, and also would impact item/monster generation, because an AK character is no longer in the pocket abyss, for seeds that are affected. (But since AK starts that trigger this bug are just broken, that last part is not too big a deal.) This commit doesn't include save compat, because as far as I know this is rare, but save compat could be added if I'm wrong about this. -------------------------------------------------------------------------------- 8c2e593 | Doesnty | 2019-03-06 13:05:44 -0800 Let player ghosts be shafted (#1003) This was an artifact from when player ghosts were totally unable to leave the floor they started on by any means. Now that they don't have this trait, and don't broadcast it in their descriptions, there isn't any reason for them to be special-case immune to shafts, or for them to destroy shafts uselessly on moving over them. -------------------------------------------------------------------------------- 1b465fe | advil | 2019-03-06 00:12:07 -0500 Don't crash when there are game types from the future The save browser was crashing immediately on starting up in this case, which is triggered by the presence of seeded games from 0.23. This future-proofs a bunch of calls used by the save browser so that these games behave just like any other incompatible future-versioned save game in the main menu. (if you want to cherry-pick this to a past version, it is probably easier to use b7382820b72 from 0.22.) (cherry picked from commit b7382820b7259ae5d2ffec6fa48112b66c2509ab) -------------------------------------------------------------------------------- 56e1b8f | advil | 2019-03-05 21:53:08 -0500 Don't let explore options impact connectivity checks This was impacting seed stability: this code is called in various contexts, including stair checks / vault exit checks, plus from some lua code. The returned coordinate could be different depending on these options. The options that could potentially matter are `explore_wall_bias` and `explore_item_greed`, though I suspect the latter won't. The former I have verified to matter on seed 18127138284784505733 (UV4's game of the month seed right now), where setting it to 1 prior to this commit produces a different dungeon than the default value of 0. Thanks to u/kitchen_ace for noticing that deleting their rc file changed the dungeon, otherwise I'm not sure I would have ever found this bug. -------------------------------------------------------------------------------- 64c5a76 | Alan Malloy | 2019-03-05 14:26:30 -0800 Don't feel safe while emergency-flying (/u/StairDancer) -------------------------------------------------------------------------------- b74a2b4 | Alex Jurkiewicz | 2019-03-05 10:10:31 -0800 TAG_MAJOR_VERSION improvements (#955) The program now almost compiles with TAG_MAJOR_VERSION=35. "Almost" because there are some changes that cannot be made compatible to both the current and the upcoming version. -------------------------------------------------------------------------------- 3f7990a | advil | 2019-03-05 00:14:06 -0500 Save game seed properly This was broken in 372e6d594387f, which caused the seed to save as 0 because of the timing of the call to the `player` constructor. After initial rng setup this value isn't used for anything meaningful (since what matters is the rng state itself), so its disappearance was entirely cosmetic -- but also very confusing to players. -------------------------------------------------------------------------------- fa3a8d6 | advil | 2019-03-04 23:30:10 -0500 Add a paste option to the seed ui for local tiles This is very ad-hoc and specific to the seed menu, but it'll do for now. Needs testing on windows/linux, but it's relying on SDL code so should work if that does. Also restrict text input for the seed text box to digits. -------------------------------------------------------------------------------- f1ee1cd | advil | 2019-03-04 17:24:35 -0500 Allow debug.reset_rng to take a string for 128 bit seeds This isn't very elegant, but it gets around lua big number handling issues that I was otherwise having. -------------------------------------------------------------------------------- 7c82874 | advil | 2019-03-04 09:29:46 -0500 Add an extra digit to the seed choice input box (Siegurt) Until this is in stable, use the rc option `game_seed` or the command line option `-seed` to select a seed that needs the extra digit. -------------------------------------------------------------------------------- 36218c0 | NormalPerson7 | 2019-03-04 00:49:27 -0500 Convert `enum confirm_butcher_type` to an enum class The enum class retains the same name. It would be preferable to use something shorter, such as confirm_butcher, but this is already used as a member of Options, and changing this seems unnecessary. This change includes changing CONFIRM_AUTO to confirm_butcher_type::normal, because `auto` is a type and shouldn't be used for enum class members. [Committer's note: Closes #951] -------------------------------------------------------------------------------- b23cc65 | NormalPerson7 | 2019-03-04 00:49:06 -0500 Change `enum activity_interrupt_payload_type` to `enum class ai_payload` Significantly shorten the enum class name in the process to make identifier names a reasonable length. AIP_INT and AIP_STRING are converted to ai_payload::int_payload and ai_payload::string_payload to avoid conflicting with type names. -------------------------------------------------------------------------------- bbb2dcf | NormalPerson7 | 2019-03-04 00:49:06 -0500 Convert `enum confirm_level_type` to `enum class easy_confirm_type` -------------------------------------------------------------------------------- 5908fba | NormalPerson7 | 2019-03-04 00:49:06 -0500 Rename confirm-level-type.h to easy-confirm-type.h The following commit changes the enum to an enum class and its name to easy_confirm_type. These are done in separate commits because otherwise git pretends confirm-level-type.h and easy-confirm-type.h were deleted and created, respectively, rather than it simply being a rename. -------------------------------------------------------------------------------- 24134c8 | NormalPerson7 | 2019-03-04 00:49:06 -0500 Convert `enum tide_direction` to `enum class tide_dir` -------------------------------------------------------------------------------- c5fff3c6 | NormalPerson7 | 2019-03-04 00:49:06 -0500 Convert `enum confirm_prompt_type` to an enum class The enum class retains the same name, in line with confirm_butcher_type. -------------------------------------------------------------------------------- 176abe6 | NormalPerson7 | 2019-03-04 00:48:57 -0500 Convert `enum cleansing_flame_source_type` to an enum class Turn this enum into the enum class cleansing_flame_source. Also convert the functions cleansing_flame and setup_cleansing_flame_beam to use type cleansing_flame_source instead of type int, as this is now mandatory. -------------------------------------------------------------------------------- 6e62631 | NormalPerson7 | 2019-03-04 00:48:57 -0500 Convert `enum branch_flag_type` to `enum class brflag` The name of the enum class changes to be significantly shorter, so that references to members of the enum class are of a similar length to before. Additionally, add a new bitfield type to use for the member variable Branch::branch_flags - this type is called branch_flags_t. Convert some uses of bitwise and to use testbits, where the raw bitwise and will now fail to compile (in return statements and variable definitions). -------------------------------------------------------------------------------- 5d75ef2 | NormalPerson7 | 2019-03-04 00:48:57 -0500 Convert `enum area_centre_type` to an enum class The enum class retains this same long name. Ideally we would shorten the name of this enum class: area_centre is already taken by a struct though. -------------------------------------------------------------------------------- 1735f9d | NormalPerson7 | 2019-03-04 00:48:56 -0500 Convert `enum ac_type` to an enum class The enum class retains the same name, because anything shorter (such as `ac`) risks being used somewhere else. -------------------------------------------------------------------------------- b51ee14 | NormalPerson7 | 2019-03-04 00:48:56 -0500 Convert `enum ev_ignore_bit` to `enum class ev_ignore` ...and change a couple of bitwise ands to use the testbits method, where required. -------------------------------------------------------------------------------- 9ae989b | NormalPerson7 | 2019-03-04 00:48:41 -0500 Change `enum activity_interrupt_type` to `enum class activity_interrupt` Convert the activity_interrupt_type enum to an enum class and rename the enum class to activity_interrupt to shorten identifier names somewhat. Also define NUM_ACTIVITY_INTERRUPTS as a `constexpr int` rather than it being inside the enum class definition and thereby taking the activity_interrupt type. -------------------------------------------------------------------------------- c27245e | NormalPerson7 | 2019-03-03 19:39:15 -0500 Convert `enum menu_type` to an enum class -------------------------------------------------------------------------------- 0e0ca4a | NormalPerson7 | 2019-03-03 19:39:15 -0500 Convert `enum branch_iterator_type` to an enum class The enum class retains the same name. -------------------------------------------------------------------------------- dcab4b9 | NormalPerson7 | 2019-03-03 19:39:15 -0500 Convert `enum branch_noise_level` to `enum class branch_noise` -------------------------------------------------------------------------------- e9c4e45 | NormalPerson7 | 2019-03-03 19:39:15 -0500 Convert `enum passage_type` to an enum class The enum class has the same name as the original enum. Also split lines in the enum class definition so that each identifier gets its own line. -------------------------------------------------------------------------------- 9a4444a | NormalPerson7 | 2019-03-03 19:39:15 -0500 Convert `enum shadow_step_block_reason` to an enum class The name of this new enum class is shadow_step_blocked. -------------------------------------------------------------------------------- caa6c10 | NormalPerson7 | 2019-03-03 17:51:45 -0500 Let barachim use grand finale at range 8 (11917) The range of grand finale was hardcoded as 7 rather than using LOS_RADIUS, so when barachim were added, this wasn't updated. This commit changes the grand finale targeter to use targeter_smite's default parameters, which include range = LOS_RADIUS. -------------------------------------------------------------------------------- eb6712d | advil | 2019-02-28 22:22:17 -0500 Quiet some gcc warnings -------------------------------------------------------------------------------- b31aada | gammafunk | 2019-02-28 17:49:03 -0600 Update changelogs for 0.23.1 (cherry picked from commits eed6394480af98da628bc1a7c7918dbbe1e38c16 and d6e21ad81dcba7f7f8c15336e0e985f070ce85fb) -------------------------------------------------------------------------------- d96d3d6 | NormalPerson7 | 2019-02-28 13:29:47 -0500 Fix dancing weapon description on hover (11887) Previously the dancing weapon's name was being duplicated because there weren't proper checks for dancing weapons in the second half of get_monster_equipment_desc. This was broken in f44d0c5. -------------------------------------------------------------------------------- ad582e5 | gammafunk | 2019-02-27 19:41:00 -0600 Add Debian changelog entries for past releases Entries for bugfix releases from 0.22, 0.21, and 0.20 that are missing from the current Debian changelog. -------------------------------------------------------------------------------- ff85673 | gammafunk | 2019-02-27 19:35:56 -0600 Add the changelog for 0.22.1 -------------------------------------------------------------------------------- d0b080c | gammafunk | 2019-02-27 01:56:30 -0600 Correct a comment -------------------------------------------------------------------------------- 8d2b5ac | gammafunk | 2019-02-27 01:56:30 -0600 Lower the chance for Boris to respawn Boris has a flat 1/3 chance to respawn in relevant branches as of 4636eb8. This has effectively doubled the total rate at which Boris spawns when comparing boris kills between the 0.23 and 0.22 tournaments. This commit lowers the chance to 1/6 to bring the respawning rate closer to the previous one. -------------------------------------------------------------------------------- e4b1dce | advil | 2019-02-26 23:00:27 -0500 Change error reporting for post-place hook failures When a post-place hook tries to place a map, the main reason to set die_on_failure is just to trigger a veto in a sensible way. However, the way this was implemented inevitably printed an error message about the placement failure to the user, causing bug reports and confusion. This situation was expanded by 56b24058a9 and 091e5a18fee, after which the proper way for a post-place hook to trigger a veto when placing a map is exactly to set die_on_failure. This commit makes any lua error during a hook with a specific string indicating that it is a failure to place a subvault silent, but still vetoing. Conveniently, this will clean up the infamous "Failed to place map 'shoals_ilsuiw_ice'" errors too (10080, 10262), as this is one of the cases where previously a post-place hook correctly set die_on_failure. I should note that I don't know why it is specifically this map of the `shoal_guardian`-tagged maps that tends to fail to place, but from the debug build output when this failure happens I think it is just normal subvault placement failure; there must be *something* about it that is more likely to accrue placement failures than the others with this tag. -------------------------------------------------------------------------------- 11e5bb6 | Josh Braden | 2019-02-26 16:53:08 -0500 Remove incorrect fake_mutations from vampire (11870) -------------------------------------------------------------------------------- a3c21ff | advil | 2019-02-25 19:52:16 -0500 Improve behavior of local tiles Text, especially on hidpi displays This commit ends up doing a number of things: 1. (most important) fix a bug on retina (and other hidpi) displays where the height of Text widget contents was not calculated correctly, because the code didn't handle fractional y advances. This resulted in ctrl-p dropping several lines at the end, among other things. 2. Fix handling of fractional y advances when drawing highlights, again a potential issue in long Texts (though less important, as highlighting is almost never used right now). In the course of this, I needed to understand how the highlight code worked and this forced me to add a lot of comments and do some code formatting, as well as address the following bugs: 3. Don't highlight lines more than once in hl_line mode, this results in unreadable text. 4. Handle the case where the end of a string coincides exactly with the end of the window and is highlighted, which was leading to glitches in my testing. 5. Better handling for cases where a highlight spans multiple slices of the formatted string. I'm not 100% sure if this was really broken before my fix of 4, but it works now. I'm still not entirely sure about all this highlighting code, and it's pretty complicated and monolithic, so it could probably use some more work and refactoring. -------------------------------------------------------------------------------- db70d5e | Alex Jurkiewicz | 2019-02-25 13:29:50 -0800 Expose MR and Stealth to Lua Two new functions return the number of pips for each of these resistances. -------------------------------------------------------------------------------- 1e4b560 | Umer Shaikh | 2019-02-25 09:51:29 -0800 Clean up god gifts' interaction with delays (11825) Getting a Nemelex gift at the end of a successful passwall that revealed new cells caused the message "Your meditation is interrupted." to be printed. This is because do_god_gift interrupted running and resting in a way that interrupted and removed the passwall delay. We now call stop_running with the clear_delays parameter set to false in order to no longer clear delays. We also call stop_running instead of directly reaching down to you.running.stop. -------------------------------------------------------------------------------- fc1eed5 | advil | 2019-02-24 21:10:36 -0500 Add a build option to not use SSE This is in response to #992. To use this, do e.g. make TILES=y NOSSE=y -------------------------------------------------------------------------------- 3f76249 | gammafunk | 2019-02-24 17:12:08 -0600 Remove the trunk reminder for the 0.23 tournament This reverts commit 7d8ec5708864d2872871cd49295b12a5b291238d. -------------------------------------------------------------------------------- df02491 | Chris Campbell | 2019-02-22 19:26:12 +0000 Fix character creation highlighting in console Darkgrey doesn't function in some terminals, so instead use the same colouring as webtiles builds. -------------------------------------------------------------------------------- 2bff182 | Chris Campbell | 2019-02-22 17:06:56 +0000 Update a file path in git docs -------------------------------------------------------------------------------- a2403f3 | advil | 2019-02-19 17:35:45 -0500 Quiet a gcc warning (signed vs unsigned comparison) -------------------------------------------------------------------------------- e09df05 | advil | 2019-02-19 17:24:26 -0500 Fix PlaceInfo fixup more (11890) ... -------------------------------------------------------------------------------- ab847a3 | NormalPerson7 | 2019-02-19 14:08:39 -0800 Fix Ozocubu's Refrigeration (11885) Since fb95405, the damage of both the player and monster versions of Ozocubu's Refrigeration has been one third of what it should be, specifically 3d((5 + power/10)/3), leading to a very underwhelming level 6 spell. This was because fb95405 converted the original dice_def that was used to calculate the damage from this spell into a calcdice_calculator, without adjusting for the fact that the calc_dice function divides the number of sides on each die by the number of dice. One way to fix this would be to use a dicedef_calculator instead; however a calcdice_calculator is preferred for the fact that it randomly rounds power/N instead of always using integer division (which creates minor breakpoints). Therefore this commit instead fixes the damage by tripling the inside of the dice roll bracket, leading to a 3d((15 + 3*power/10)/3) dice roll which is equivalent to the old 3d(5 + power/10). -------------------------------------------------------------------------------- 429d40e | advil | 2019-02-18 22:36:17 -0500 Set the branch depth correctly in 107517c6e49a ... -------------------------------------------------------------------------------- 107517c | advil | 2019-02-18 22:26:53 -0500 Prevent a PlaceInfo miscalculation and fix the resulting crash The level entry code (for purposes of pregeneration) assumed that 0 turns on level = the level hasn't been entered. There are in fact at least three ways to break this assumption: wizmode movement (e.g. &u,&d), taking an escape hatch and being shafted immediately, and being banished by something fast enough to move when you first enter the level (at least, ebering says this is possible). When this happened, the PlaceInfo accounting would be run twice, and so the level would get double-counted, leading to a crash deeper in the branch. Luckily I added the level_entered code towards the end of the project, and this does what this code needs. This commit also includes some save compat since there may be ongoing games during tournament that have this crash. -------------------------------------------------------------------------------- 3d66cf4 | advil | 2019-02-18 00:09:46 -0500 Build for SSE2 on all systems, including 32bit targets Believe it or not, this is a seed stability fix. On 32 bit targets where SSE2 is not defined, Lua uses a different method for converting from numbers (doubles) to ints (see `lua_number2int` in `luaconf.h`), than what happens on other targets (which is just a regular cast). The two methods have different rounding behavior, which is leading seeds that involve layout that passes non-integer values to c++ code into trouble; for example, layout_rooms does this during its join_the_dots calls (see 11884, seed 5313719195296785585). In practice, the non-standard rounding was happening only for cross-compiled windows builds that I know of, but perhaps some linux builds are also 32bit; there's also a code path that might affect msvc. Using -msse2 should prevent lua from ever using the non-standard conversion code. This fix should have the added benefit of preventing x87 from ever being used. We'll see though if this will bring people out of the woodwork who are building on very old devices... This commit also includes an unrelated tweak to some ordering in the Makefile so that AUTO_OPT can be used. -------------------------------------------------------------------------------- 53b5160 | gammafunk | 2019-02-16 23:36:54 -0600 Tidy up a monster class method In monster::is_summoned(), remove checks for derived undead spells that no longer apply, since those use fake abjuration now, and clean up comments. -------------------------------------------------------------------------------- d3e027d | gammafunk | 2019-02-16 23:36:54 -0600 Don't let vampirism drain temporary monsters (blorx1) Temporary monsters created with a "fake abjuration" timer are considered non-summons, since they're created from some object, e.g. Sticks to Snakes, Animate Dead, and Tukima's Dance. Natural holiness monsters created this way are currently susceptible to vampirism from Vampiric Drain and vampiric melee attacks. This is a problem since these temporary monsters can be created by the player cheaply and killed with vampiric effects to restore HP and satiation (in the case of player vampires). Vampirism of temporary summoned monsters is already prevented, so this commit prevents it for these other temporary monsters as well. The main things effected are Sticks to Snakes and the Ratskin Cloak. Other differences between these temporary allies and normal summoned allies (e.g. the former allow Inner Flame) are unchanged. Durably summoned monsters are likewise unchanged, since these are not player-created. -------------------------------------------------------------------------------- d155597 | advil | 2019-02-15 10:09:00 -0500 Don't try to describe off-level orc gifts (11881) Instead just say that the orc is off-level. Better would be to describe both the item and where they are, but the the way off-level followers are implemented means that it's basically impossible to get the item information without either a level excursion or a major rewrite. One option might be to save the item string as a prop? -------------------------------------------------------------------------------- 5d539f0 | advil | 2019-02-14 23:14:02 -0500 shorten test again -------------------------------------------------------------------------------- 597dbe2 | advil | 2019-02-14 21:41:12 -0500 Fix a math error in a test -------------------------------------------------------------------------------- 3372e67 | advil | 2019-02-14 14:46:16 -0500 Uncomment an accidentally commented vault call -------------------------------------------------------------------------------- fd6172a | advil | 2019-02-14 14:16:31 -0500 Fix Beogh crash for polymorphed followers (11880 / reaverb) If an orc gets turned into something that cannot hold items (e.g. via a chaos cloud shapeshifter effect) it will drop its gift, but the gift prop does not get cleared, something the new ^ extra screen was not checking for. This commit fixes things at the point of the crash; it's possible that the prop should get cleared when the item is dropped in the first place. -------------------------------------------------------------------------------- f57072b | advil | 2019-02-14 11:49:56 -0500 Fix a couple of des cache random tag bugs Because lua code is run during des cache validation, any random decisions made during validation may be incorporated into the cache. I *think* this is mostly harmless but there are at least two problems that arise when it applies to vaults tags. First, random choices when selecting maps can be impacted by the number of tags *in the cache*, so seeds will potentially behave differently depending on choices made when first building the cache. Second, because tags are strictly additive, a tag choice made during cache building will never get removed; for example in `lemuel_altar_in_water` before this commit, if the cache rolled no_pool_fixup, this would be present in all instances of this vault regardless of rolls when actually placing the vault. It's possible that tags should be cleared when rerunning vault lua for placement, but that seems like a change that could potentially impact a lot of things and will require some testing, so I'm going to postpone it. In general it would probably be best to eliminate *all* randomization from the cache, but I'm not yet sure what the best technical solution to that is (there are quite a few vaults that use random calls like this to set SUBST or monster values, it doesn't seem ideal to impose is_validating checks on all of them). -------------------------------------------------------------------------------- 9a59f91 | advil | 2019-02-14 09:19:22 -0500 Improve a very old fixup -------------------------------------------------------------------------------- 011bc4b | NormalPerson7 | 2019-02-13 15:35:58 -0800 Fix yellow draconians' rAcid mutation not being applied (malacante) -------------------------------------------------------------------------------- 431b8d2 | advil | 2019-02-13 16:21:50 -0500 Change behavior of multiple DEPTH: lines, fixing some uniques (ebering) Previously, multiple DEPTH: lines would be interpreted as the last overriding any previous ones. This changes them to be additive, similar to how TAGS: lines work. It also removes an apparently vestigial function intended to do something with default depths that relied on the previous behavior; in fact, the `default-depth:` .des syntax is implemented in a different way using the `dgn.set_default_depth` call, not affected by this commit. This change fixes the placement of uniques touched in 402804a59a51, which accidentally have a fairly restricted placement in 0.23.0. (This fix will be in trunk and in a future point release of 0.23, but not during the tournament -- so anyone looking for Aizul etc may need to look in unexpected places!) This commit will likely affect many seeds. -------------------------------------------------------------------------------- cea5463 | Alan Malloy | 2019-02-12 09:35:40 -0800 Handle temporarily-changed terrain when asserting level validity (#11876) -------------------------------------------------------------------------------- 3d167c7 | advil | 2019-02-12 10:39:38 -0500 semicolon + checkwhite -------------------------------------------------------------------------------- e20b4fc | advil | 2019-02-12 09:38:31 -0500 Restructure PlaceInfo fixup to handle gauntlet upgrades Saves upgraded to 0.23 on windows are crashing, because you.branch_info was not correctly initialized on mingw builds (see e13aadb210) and gauntlet was saved with a global PlaceInfo. This commit handles save compat for these files. This change makes the fixup slightly more generic and removes a save version check, which I don't think is really necessary here (the desolation fixup was one of the first things I did, before even being on the devteam, so I think I was being ultra-cautious with save compat). I've left the branch check though, so this will cause crashes if a new variant of this bug appears in the future, or if something else goes wrong with PlaceInfo. -------------------------------------------------------------------------------- 372e6d5 | advil | 2019-02-12 09:11:30 -0500 Revert "Revert "Eliminate some more dependencies on globals from player::player"" On further inspection, this should be ok: I was concerned about save compat, but the save order for place_infos is entirely independent of the storage order. This reverts commit 7635c99b35658e33562b239784f4f9876285a6a8. -------------------------------------------------------------------------------- 7635c99 | advil | 2019-02-11 23:13:46 -0500 Revert "Eliminate some more dependencies on globals from player::player" bad branch order assumptions This reverts commit e13aadb210ac7751cfb85537baaca10534c22d3b. -------------------------------------------------------------------------------- e13aadb | advil | 2019-02-11 22:29:34 -0500 Eliminate some more dependencies on globals from player::player On mingw builds, branch_info was not getting initialized correctly here because branch_iterator depends on a global, `branches`, which was not initialized before the constructor is called for the global `you`. Use the enum order instead of anything fancier to initialize `branch_info`. Also don't set the seed here, it isn't need and leads to another potential order issue. -------------------------------------------------------------------------------- 3339647 | advil | 2019-02-11 21:50:13 -0500 Simplify levels_visited This was overly complicated because I didn't understand how CrawlStoreValue works; the necessary hash table is automatically created on the get_value() call. This also has the bonus of removing a dependency on a global from player::player(). -------------------------------------------------------------------------------- e52b27f | advil | 2019-02-11 11:13:18 -0500 Place AK start in abyss with pregeneration on (11871) The chapter check was basically in the wrong place; moved it up to outside the builder call. Also, just in case, unwind the chapter variable while doing pregeneration so that nothing can condition on it incorrectly. -------------------------------------------------------------------------------- 1c07cc1 | advil | 2019-02-11 10:50:30 -0500 Small tweak to vault_catalog.lua Really, really clear everything before regenerating. -------------------------------------------------------------------------------- 60e8692 | advil | 2019-02-11 10:37:54 -0500 Deprecate acquire item specs for regular dungeon generation Conditioning level generation on the player is generally now deprecated (I think there's consensus that this is bad for various reasons, but the reason I care about is that it interferes with seeding). This is the latest case of this that I have run across. These item specs directly call the acquirement code, which has a bunch of conditioning on the player to try to make the generated item more usable or appropriate. For non-pregenerated games this can affect randomization afterwards, and for pregenerated games it simply doesn't make much sense given that the player is mostly a blank slate when the acquirement is run. If you really want the player to have an item generated by this code, just drop a scroll of acquirement. In very special cases, it is possible in principle to generate an item on the fly with this item spec (several sprint maps do this). I've done somewhat arbitrary choices of replacements depending on my mood and what the vault appeared to intend, trying to get equivalently good and appropriate items, but these might need further refinement. Vault designers can consider `superb_item`, `any good_item`, and `star_item` when their intent is, place something potentially great but fairly random. There are some rarely used special cases of this syntax that are still in the code, e.g. the god syntax: there was all of one non-trove instance of this syntax left, and it was using a god (TSO) that has barely any acquirement special casing; I changed this one to something a bit more specific. Possibly this syntax should just be removed. This commit leaves only a few instances of this item spec, mainly in troves (where it is not deprecated). There are a couple calls in abyss that seemed ok, but possibly should be changed, as well as some uses in sprints as mentioned above. -------------------------------------------------------------------------------- 88f18ea | advil | 2019-02-11 10:26:51 -0500 constify a bunch of instances of PlaceInfo This didn't actually fix anything, but made me feel better. -------------------------------------------------------------------------------- 4f8aab8 | advil | 2019-02-11 10:23:25 -0500 Add a debugging hook This is kind of dumb but I can tell I'm going to need this again. This is aimed at debugging generation that may be happening deep in some test sequence: toggle this on to echo all dprfs to stderr for some window of time. (E.g. in a recent episode I used it to print all DNGN_DIAG messages while the builder was generating Lair:6 for a particular seed in vault_catalog.lua.) -------------------------------------------------------------------------------- 13aa1b5 | advil | 2019-02-11 10:19:02 -0500 Clear even more state for tests As long as `acquire` is a possible item spec, then the builder can have some dependency on what items the player has seen before, and so this needs to be cleared. In a future commit I will limit the use of `acquire` to portals, but we still want to clear this for better control in tests. Also, reorganize this function a bit, and add yet more DIAG_DNGN spam (sry). -------------------------------------------------------------------------------- e1bfdf8 | advil | 2019-02-09 15:20:53 -0500 Fix a shopping list crash This commit actually initializes the member variables for ShoppingList, most importantly `list`, and resets the global shopping_list object in _reset_game(). When a game had a shopping list and reset_after_save was true, then saving that game and opening a new one would lead to a stale pointer to the first game's deallocated shopping list prop. Having this object work by a live pointer to a member of you.props is probably not a great idea, all around... -------------------------------------------------------------------------------- 7d8ec57 | gammafunk | 2019-02-08 14:06:34 -0600 Add a trunk reminder for the 0.23 tournament [skip ci] -------------------------------------------------------------------------------- 4e4936a | advil | 2019-02-07 20:26:43 -0500 fix the fix -------------------------------------------------------------------------------- a7c8294 | advil | 2019-02-07 20:24:26 -0500 Improve save compat for visited level tracking What I had written before wouldn't work for a turn 0 save, and it appears that the default constructor isn't necessarily getting called so the fixup needs to initialize the prop. -------------------------------------------------------------------------------- ce0dbf4 | advil | 2019-02-07 12:32:31 -0500 Fix vault printing in morgues after game end (NP7) It turns out that the save is already deleted at this point, so some of the checks I was using for level existence weren't working right. -------------------------------------------------------------------------------- b3eb09e | gammafunk | 2019-02-07 11:07:09 -0600 Final changelog for 0.23 Some wording tweaks and typo corrections. [skip ci] -------------------------------------------------------------------------------- f756fb0 | gammafunk | 2019-02-07 10:17:59 -0600 Update the Debian changelog for 0.23 (cherry picked from commit 195ea7e421b6cb7e468f0b6391be23ac66777778) -------------------------------------------------------------------------------- 56b2405 | advil | 2019-02-07 10:40:41 -0500 Adjust one post_place hook After auditing the post_place calls, I see some potential issues, but not many that are made worse by 091e5a18feeb (mostly cases where persistent dungeon state is probably not handled correctly if map placement fails). This is the only vault I found that really doesn't make sense unless the map placement works, and wasn't already set up to abort on failure. I didn't adjust any serial vaults, so it's conceivable that these could now place without any post_place placements working in rare cases, so they may need tweaking if this comes up a lot. The awkward thing about die_on_failure is that it (probably) prints a lua error to the player. However, the only reason why the old code didn't print a (more cryptic) error on a veto was because the error handling code was buggy in the face of an exception. It may be that we'd want a way of having a silent die_on_failure though. -------------------------------------------------------------------------------- 091e5a1 | advil | 2019-02-07 09:29:45 -0500 Catch dgn_veto_exception when placing maps from lua When an exception is thrown across lua code, it severely messes with the lua stack and lua's use of setjmp/longjmp, at least for the way we have it configured. This was causing pretty bad crashes on post-place hooks when run from tests: the exception was thrown in c++ called from lua called from c++ called from lua called from c++, and caught in the intermediate c++ black, and basically treated as a lua error (I think), but just clobbered the lua stack, so the outer calling lua was left in an indeterminate state and any error there (which would happen immediately, as variables were shuffled) would cause a longjmp failure. This didn't go quite so badly in practice when there wasn't the outer test lua layer, but I still think it's pretty risky to allow throwing this, unless we shift lua to itself use try/catch. This commit *changes the behavior* of post-place hooks. Previously, they would implicitly veto the entire map if a post-place hook map placement call failed. Now, they will only veto if the post-place hook sets die_on_error (which none do). In practice, this probably comes up for serial vaults (e.g. serial_forest) which can place many subvaults, where some of the later tries fail on a crowded level. I have left a note in However, it may have bigger implications. The quick fix for any maps that really need the old behavior would be to call lua `error()`, though this will print an error message to the player. (cherry picked from commit 72689e85ba0b1ffd4eac588e90b4b83a4ce88d4b) -------------------------------------------------------------------------------- 25a2d9f | Edgar A. Bering IV | 2019-02-06 22:11:47 -0500 Update CREDITS.txt [skip ci] -------------------------------------------------------------------------------- f005ca4 | gammafunk | 2019-02-06 20:19:37 -0600 Decorations for 9x9 Gauntlet maps Use a consistent statue display wall motif for all four 9x9 Gauntlets. Also add various statues and lava tiles throughout the maps. This helps give these 9x9 maps a common feel, similar to how the 7x7 and mixed 7x7/9x9 map sets each have their own decorative themes. -------------------------------------------------------------------------------- cb1519b | advil | 2019-02-06 18:12:29 -0500 checkwhite -------------------------------------------------------------------------------- d227540 | advil | 2019-02-06 17:44:09 -0500 Fix progress bar webtiles behavior Not sure what happened here. -------------------------------------------------------------------------------- e8a6cd6 | advil | 2019-02-06 17:44:09 -0500 Improve webtiles support for seeding/pregen This adds a new command line option `-pregen`, as well as an argument-less version of "-seed" that triggers the seed choice menu and sets the right game type. Bothing seeding and pregen are usable from the command line in DGL builds, though rc file options that set these are still disabled in DGL builds so that server owners have some control. So calling "./crawl -name asdf -seed" will pop up the seed choice menu before starting the game, and (if a user picks a non-0 seed) will start a game of type "Seeded", and "./crawl -name asdf -seed 1 -pregen" will force pregeneration of seed 1 after character selection. This is pretty simple to set up in vanilla webtiles, I've included an example in config.py (which of course no one merges). One awkwardness (also for tutorial) is that these options will load a non-seeded game if there is one under the right name, which is logical but not very intuitive as a UI thing (you'd probably want to give an error). caveat emptor: nothing else in the crawl infrastructure (especially sequell) has been set up to handle the new game type, and I have no idea what would happen if you try to publish milestones using it. So if you are thinking about using this in a live server, test it out carefully... -------------------------------------------------------------------------------- c81a885 | advil | 2019-02-06 17:44:09 -0500 Pregenerate the vestibule I'm beginning to think that this is_valid() check isn't very good... -------------------------------------------------------------------------------- 6670cd2 | advil | 2019-02-06 17:44:09 -0500 Explicitly track visited levels My previous pregen-related commits tried to avoid this, but I don't think it can be avoided. The basic problem is that this information is also present in the turncount on a level, but that information is saved with the level chunk, and it turns out to be kind of useful to have in many cases where the player isn't on the level in question. Previously, whether a level was generated (which is tracked in a simple way in the save package) was synonymous with whether the level had been visited, so most code just used that. The new implementation uses a CrawlHashTable as a prop on the player. This commit specifically fixes three pregen bugs: (i) rune locks were broken (would always open), (ii) jiyva would eat items on all levels, not just levels you'd visited, and (iii) one of the perennial problems with pregen implementations, X] shows a blank screen. It also further cleans up the morgue vault listing code, and provides more information for a wizmode morgue. If there are any pregen games in the wild yet, this fix won't do save compat for them and they'll still have these bugs, but it will do save compat for regular games. -------------------------------------------------------------------------------- 9ff4135 | gammafunk | 2019-02-06 11:57:52 -0600 Fix some Gauntlet decorations I ended up not using flame cloud decorations on this map, but didn't replace the glyphs. Use lava to surround the statues instead. -------------------------------------------------------------------------------- 748db23 | Edgar A. Bering IV | 2019-02-06 11:42:57 -0500 Only check for adjacent friendlies with exploding ammo (11857) Commit 853fe2ed08 added a friendly fire check for portal projectile fired exploding ammo; however it did not restrict this check to exploding bolt types. -------------------------------------------------------------------------------- dd71560 | advil | 2019-02-06 09:33:30 -0500 Initialize int member variables of formatted_scroller (11838) For many scrollers, the initial position was being determined by the uninitialized m_scroll, leading to fairly random behavior (probably compiler-dependent, too). For good measure, I initialized all three. This also fixes a bug in the way FS_START_AT_END was handled for this class, where in some cases (maybe most cases) a scroller position would be set but then overrided by the uninitialized value of m_scroll. Since this value would usually be a large number, the scroller very often did start at the end. Did not track down why this behavior appears to have changed recently, since this bug is months old, but it could be to do with something about how uninitialized values are handled that we don't directly control. -------------------------------------------------------------------------------- cfe09e8 | achuah | 2019-02-06 08:36:21 -0500 Update crawl_manual.rst -------------------------------------------------------------------------------- 81bb1ad | gammafunk | 2019-02-05 23:20:50 -0600 Shorten the path of a Gauntlet exit area In gammafunk_gauntlet_one_two_three, move the landing sites leading to the minotaur's vault closer together. This way there's less walking when taking transporters in the paths on the outer edges of the map. -------------------------------------------------------------------------------- e688737 | gammafunk | 2019-02-05 23:20:50 -0600 Add more exits and statues to some Gauntlets Add a second exit to the other end of the 9x9 gauntlet maps so it's more convenient to exit as well as symmetric on the map. Also add a few statues. I'll be revamping the wall decorations in a subsequent commit to use a common motif for these 9x9 maps. That change might not be ready for release, so these changes will do for now. -------------------------------------------------------------------------------- ac12a55 | gammafunk | 2019-02-05 23:20:50 -0600 Fix loot in a Gauntlet exit vault The FeTm adventurer loot pile was missing a potential item. -------------------------------------------------------------------------------- f44d0c5 | NormalPerson7 | 2019-02-05 23:32:29 -0500 Fix dancing weapon description when multiple monsters enter LOS (11843) When multiple enemies entered line of sight at once including at least one dancing weapon, the message "There is." was being printed. This is because there was an unnecessary check for enemies not being dancing weapons in get_monster_equipment_desc. Remove this check, and add a special case to the helper function _describe_monster_weapon to prevent these messages being printed as "There is wielding a +4 trident." These messages should now properly print as e.g. "There is a +4 executioner's axe of electrocution." -------------------------------------------------------------------------------- 55f8356 | advil | 2019-02-05 16:49:14 -0500 Invalidate LOS properly for level pregeneration It turns out that monster band placement checks LOS when placing the followers, and so if LOS is not properly invalidated, the builder will use the cache for the wrong level, leading to seed divergence. This moves a few other cleanups up that I think will matter a bit less. -------------------------------------------------------------------------------- d6fbd69 | advil | 2019-02-05 12:58:11 -0500 For pregen morgues, only show visited levels (alexjurkiewicz) I did this by moving the code that saves vault names a bit later in the process, so that they only get entered into you.vault_list when the player actually enters the level, rather than during the level builder. This also unifies code for collecting vault names. For now I've also changed this to show layout names, which are useful for debugging. (cherry picked from commit 643a44d428fe4e8a720b83b0394e1465a4e5bddb) -------------------------------------------------------------------------------- a78bd38 | gammafunk | 2019-02-04 16:52:03 -0600 Merge pull request #976 from Floodkiller/gn_jiyva_fix Re-enable stat shifting for Gnolls worshipping Jiyva -------------------------------------------------------------------------------- 508cf82 | Floodkiller | 2019-02-04 17:12:22 -0500 Re-enable stat shifting for Gnolls worshipping Jiyva Re-enables the stat shifting passive for Gnolls who are worshipping Jiyva. This is a leftover fragment from the static attribute iteration of Gnolls. -------------------------------------------------------------------------------- 0956303 | Umer Shaikh | 2019-02-04 16:39:09 -0500 Make unassigned keys exit macro reassignment menu This makes the menu's behaviour more consistent with other crawl menus. [Commiter's note: Closes #974] -------------------------------------------------------------------------------- f9871eb | Umer Shaikh | 2019-02-04 16:39:02 -0500 Escape angle brackets in macro assignment Closes #687 -------------------------------------------------------------------------------- 50940db | NormalPerson7 | 2019-02-04 16:26:44 -0500 Fix message order when a player resists damage from an elemental bolt Previously, the "You resist" message (and other messages such as "You feel a terrible chill" that are to do with resistances) were being printed before the message to say the bolt had hit. Hence, fix this with a second call to check_your_resists specifically for printing these messages, and change the first call to be called with doEffects = false. In order to do this, it's necessary to save the pre-resist damage as a separate identifier. In doing so, a debug message is simplified. -------------------------------------------------------------------------------- a006759 | gammafunk | 2019-02-04 15:25:08 -0600 Fix the area grid for klown pie silence When applying silence from a Klown pie, we weren't invalidating the area grid. This meant that silence wouldn't actually apply until something else updated the area grid, which might not be until the end of the next turn. -------------------------------------------------------------------------------- 27fda53 | Edgar Bering | 2019-02-04 15:47:42 -0500 Don't target net traps through glass (NormalPerson7) -------------------------------------------------------------------------------- cf4bcd2 | advil | 2019-02-04 11:35:14 -0500 Add a hacky but functional newgame menu for seed / pregen The way I implemented this is fairly wince-inducing, but also fairly consistent with the current state of how these menus are done. This commit also adds a new game type for when a custom seed has been chosen; this game type should (I think) be basically inaccessible in DGL for now and require no save compat. Hopefully it can be used to include seeded games in sequell (similar to how sprint games are treated). -------------------------------------------------------------------------------- c4a3eeb | advil | 2019-02-04 01:31:38 -0500 Move seeded rng initialization later Previously, I was doing this at the game start. This means that setting a seed in an rc file impacts random choices at the newgame menu, and also that the gameplay rng is advanced by any randomness that happens here. Now, only initialize the rng from a chosen seed, or choose a seed, during newgame setup. -------------------------------------------------------------------------------- c8b47a3 | gammafunk | 2019-02-03 23:15:22 -0600 Tiles for the Rift unrand (CanOfWorms) Both item and doll tiles for the unrand demon trident "Rift". -------------------------------------------------------------------------------- ac335f2 | Edgar A. Bering IV | 2019-02-03 23:15:03 -0500 Display bazaar items at the top of the shopping list (11649) A player in a Bazaar might wish to comparison shop, but it is helpful for the immediately relevant information to be displayed first. This changes the comparison function used to always sort items in a Bazaar before those not in a Bazaar. -------------------------------------------------------------------------------- 8f19387 | gammafunk | 2019-02-03 18:29:01 -0600 Updates to the changelog Add release highlights, simplify wording to decrease length, reorganizing listings in each section roughly in order of importance, and give the seeded play details its own indented list. This should bring the changelog close to a state that's ready for the release. -------------------------------------------------------------------------------- 853fe2e | Edgar A. Bering IV | 2019-02-03 18:28:56 -0500 Give a friendly fire warning for exploding portal projectiles (11315) -------------------------------------------------------------------------------- 776a217 | Edgar A. Bering IV | 2019-02-03 16:33:18 -0500 Display the SEEN_RANDART hint only for randarts -------------------------------------------------------------------------------- 687177d | Edgar A. Bering IV | 2019-02-03 16:33:12 -0500 Add cost and training targets info to hints mode -------------------------------------------------------------------------------- b1230d1 | NormalPerson7 | 2019-02-03 13:40:30 -0500 Update tutorial, fix tutorial/hints mode skill menu text (11851) Update a traps message that stated traps aren't always revealed, and a berserk hunger message that stated you can't berserk while very hungry; this restriction is now limited to near starving or worse. Shorten the "Read skill descriptions" button description to "Skill descriptions" to avoid this overlapping the text on the following line. -------------------------------------------------------------------------------- a7f21a4 | advil | 2019-02-03 11:23:01 -0500 Update copyright date -------------------------------------------------------------------------------- fe1993f | advil | 2019-02-03 10:47:01 -0500 Update seeding notes on changelog -------------------------------------------------------------------------------- 542e47c | advil | 2019-02-03 10:45:19 -0500 Update the "seeded play" section of the manual -------------------------------------------------------------------------------- 0ecae65 | Edgar A. Bering IV | 2019-02-02 23:34:34 -0500 Convert mummy death curses to a fineff (11758) This ensures that when a monster is killed by Grand Finale the death curse effects all land on the killer. -------------------------------------------------------------------------------- 8d21aed | advil | 2019-02-02 22:55:59 -0500 Remove accidental debug message -------------------------------------------------------------------------------- a65fc5f | advil | 2019-02-02 22:54:09 -0500 Avoid a few cases of random tags in the .des cache These tags are set at builddb time, and saved in the cache, which probably isn't what anyone wants. They also impacts seed stability: these pan entry maps were either tagged with `luniq_hellpanabyss_threat_entry` in the cache or not depending on a random choice when the .des cache was first built, which then causes seed divergence between systems depending on what decision was initially made. This is far from the only kind of case where random decisions appear to be made during validation that might be getting saved in the cache, but it's the only one I've seen so far that's actually leading to divergence. Another kind of case is exemplified by `lemuel_altar_in_water`, where the tags are chosen randomly; but what seems to be happening for the cache is that the vault is parsed without running the lua and the initial tag set is drawn from this. I don't have a lot of confidence that what would happen with this map is correct, but at least it wouldn't lead to seed divergence. -------------------------------------------------------------------------------- a05850b | gammafunk | 2019-02-02 17:51:14 -0600 Add monsters to a Gauntlet arena Oops, forgot the monsters! -------------------------------------------------------------------------------- 0b2a0bf | gammafunk | 2019-02-02 17:23:27 -0600 Don't allow multiple placements of Gauntlet arenas The commit removes the allow_dup tag from arena subvaults so that no subvault will be used more than once in a Gauntlet. Both 7x7 and 9x9 sets have over twice the number of vaults needed for all arenas in any Gauntlet map, so it's not necessary to allow reuse. Use of allow_dup dates from earlier in development of the portal when there weren't as many vaults available. -------------------------------------------------------------------------------- 483b6fb | gammafunk | 2019-02-02 17:16:30 -0600 Incorporate net traps into Gauntlets When an arena rolls the chance to place traps, make each trap placed have a 50/50 chance between dispersal and net trap instead of 100% dispersal. -------------------------------------------------------------------------------- 330989f | gammafunk | 2019-02-02 17:15:52 -0600 Two 9x9 Gauntlet arenas One with plants arranged in an arrow pattern, and another with a double spiral having the loot at one end and the exit transporter at the other end. This brings the number of 9x9 arenas to 20, giving us a sizeable set in terms of variety. -------------------------------------------------------------------------------- f098211 | advil | 2019-02-02 22:04:18 +0000 Fix a pre-c++17 compilation issue This would be ok in c++17, but technically isn't before that. See: https://stackoverflow.com/questions/7411515/why-does-c-require-a-user-provided-d efault-constructor-to-default-construct-a http://open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#253 I guess our usual compilers aren't picky, but clang 6 on linux is. -------------------------------------------------------------------------------- d71c066 | advil | 2019-02-02 16:17:16 -0500 Shorten vault_catalog.lua test To try not to have to raise the timeout limit further. -------------------------------------------------------------------------------- 72233a7 | advil | 2019-02-02 15:42:37 -0500 Better handle player position for debug/test levelgen This is another case of a bug in the tests, but not one that impacts actual levelgen. -------------------------------------------------------------------------------- c4805aa | advil | 2019-02-02 13:37:30 -0500 Don't count gold as part of the level builder (joemaro) This was artificially inflating the prices of gozag for level pregeneration. It now runs when entering a level, if that level counts as just created (either by pregeneration or not). Resolves #972 -------------------------------------------------------------------------------- 23bff18 | advil | 2019-02-02 13:09:46 -0500 More documentation and notes on seeding Some of this might be fodder for a blog post too; writing this all down because eventually someone else might want to do some seed debugging, and there are a *lot* of blind alleys I've found while doing this. [skip ci] -------------------------------------------------------------------------------- f1fd2d0 | advil | 2019-02-02 01:27:40 -0500 Update the tags API to use sets This previously just used raw strings in rather hacky ways. The main reasons I'm updating this now are because (i) tag ordering was affecting randomness in some cases, and (ii) the lack of any uniqueness checking was causing weird effects where some lua code would just keep on adding duplicates of the same tag (which again, interacted with the random number generation because it changed the size of what was being drawn from in some cases). But, it also was a pretty creaky API with a lot of things that were strange and ad-hoc. This new version is definitely a bit heavier, but I'm not sure that will impact anything in a major way. -------------------------------------------------------------------------------- e6a5663 | advil | 2019-02-02 01:27:40 -0500 Simplify test slightly Also, increase the timeout for `make test`; possibly this means that some of these tests could be pared back a bit, but for now I'll keep them slow. -------------------------------------------------------------------------------- 59e0e63 | advil | 2019-02-02 01:27:40 -0500 Further isolate ghost generation from levelgen rng The properties of a ghost can lead to variation in the number of random draws needed when placing it; for example, if a ghost knows certain enchantments, these will be applied immediately with a random duration, leading to an extra random draw relative to ghosts without an enchantment. This can lead to seeds diverging depending on what ghosts are in the local bones file. Isolate the entire placement process from the levelgen RNG so it won't impact seeds. -------------------------------------------------------------------------------- 2941439 | advil | 2019-02-02 01:27:40 -0500 Further updates to rng development docs [skip ci] -------------------------------------------------------------------------------- b2a911e | advil | 2019-02-02 01:27:40 -0500 Print test names to stderr as they run This lets there be visible progress during `make test`. It might be slightly annoying when some tests are not running headless, but then the user can just redirect stderr somewhere. -------------------------------------------------------------------------------- 4264f9c | Edgar A. Bering IV | 2019-02-02 01:15:33 -0500 Simplify a reaching check, actually fix 11704 (gammafunk) Commit 0f9db6f4df modified the function mons_has_ranged_attack; however, this was not checked by i_feel_safe, which instead checked mons_has_known_ranged_attack. The latter function is a relic from when monster equipment was not identified on sight and has been removed. -------------------------------------------------------------------------------- 0f9db6f | Edgar A. Bering IV | 2019-02-02 00:05:22 -0500 Check for monster polearms and wands in i_feel_safe (11704, 11782) -------------------------------------------------------------------------------- 43a6aff | Edgar A. Bering IV | 2019-02-01 22:49:42 -0500 Disable mores during targeting (11717) -------------------------------------------------------------------------------- 788b6e3 | Edgar A. Bering IV | 2019-02-01 21:01:51 -0500 Extend Fedhas' protection to non-beam spells (11310) Fedhas now protects plants from LOS damaging spells that don't use beams, as well as static discharge and irradiate. Additionally, attack prompts have been adjusted to account for Fedhas' plant protection. Finally, Fedhas prevents shatter from destroying trees. "Fire-through" is not a completely coherent notion for player spells, these inconsistencies were not always accompanied by a prompt, or had an erroneous prompt. Hopefully this change will clarify the situation. -------------------------------------------------------------------------------- ca774cb | Edgar A. Bering IV | 2019-02-01 14:08:45 -0500 Give a more helpful message for 'G>' at branch end (3734) -------------------------------------------------------------------------------- 4429137 | advil | 2019-02-01 09:53:28 -0500 Fix potential iteration order issue for autofight This is unrelated to my current randomization woes, but something I noticed while auditing lua/crawl interactions for iter order issues. The iteration order for lua_next is *not* in general guaranteed, even if the table is an array, and what I have noticed is that eventually, in a long execution session, it will start diverging. So this may have been the source of some of our more obscure reported autofight bugs. I'm not sure if this solution using `map` is absolutely the best way to deal with it; lua 5.3 has much better support for doing ipairs-style iteration in C than lua 5.1, and this was the easiest fix without me actually figuring out how that's supposed to work in lua 5.1 (which is a bit tricky from everything I've read). -------------------------------------------------------------------------------- 8489be9 | advil | 2019-02-01 00:36:03 -0500 Add a new lua test for seed stability May need some adjusting so it doesn't add too much time to the travis build by default. It isn't impossible that this test will fail... -------------------------------------------------------------------------------- 12d111d | advil | 2019-02-01 00:32:47 -0500 Fix some typos and lua mistakes -------------------------------------------------------------------------------- 193e081 | advil | 2019-02-01 00:20:54 -0500 Randomness fix for swamp / pools -------------------------------------------------------------------------------- 2a401c0 | advil | 2019-01-31 23:40:22 -0500 Clear more global state for tests -------------------------------------------------------------------------------- e4bce67 | advil | 2019-01-31 23:01:03 -0500 Allow shafts in tests I'm not sure why these were disallowed, but it was 8 years ago and didn't break anything for me. Plus, disallowing this messes up seed testing. -------------------------------------------------------------------------------- 05a21ba | advil | 2019-01-31 21:49:18 -0500 Various fixes for more stable lua iteration order I ended up auditing every instance of `pairs`; these are the ones that potentially interact with dungeon generation / randomness. Basically, the use of `pairs` is now dispreferred for anything like the code being touched here. I added a few utility functions for dealing with weight tables in various ways (would have made my life easier to add these before...) -------------------------------------------------------------------------------- 0b81bb8 | advil | 2019-01-31 17:46:53 -0500 Reset temple vault tags when doing temple setup This load() call was just adding in new tags to the previously loaded list each time a game was started, leading to seed instability both in tests and when a new game was started without exiting the program for temple vaults with variable numbers of altars. (Because the length of the list of tags changed, which leads to different behavior of the random draw as the list gets longer even for the same seed.) Possibly tags should be treated as a `set` or something, rather than just a raw string that is split on demand? -------------------------------------------------------------------------------- cd3d6b9 | gammafunk | 2019-01-31 15:07:39 -0600 Update documentation of a function -------------------------------------------------------------------------------- 2c779b6 | gammafunk | 2019-01-31 15:07:39 -0600 Prevent use of Passage of Golubria in Gauntlets (Yermak) Like use of teleport, Golubria passages can bypass the Gauntlet's usual one-way structure. Players can create a passage in the starting area, enter and quickly loot a chamber, then return back to start to gain access to other areas. This commit prevents casting the spell in Gauntlets entirely. -------------------------------------------------------------------------------- 0a484b6 | gammafunk | 2019-01-31 10:20:55 -0600 Tweak the no-teleport message for Gauntlets Add a little bit more flavor in the message. The old one was mostly copied from Dungeon Sprint, which disables teleports as part of the game mode itself. -------------------------------------------------------------------------------- e63ed06 | advil | 2019-01-31 08:26:10 -0500 More RNG initialization improvements Better reset for tests, initialize item descriptions with levelgen rng. Also add a bit more fulldebug spam. -------------------------------------------------------------------------------- 542fcb7 | advil | 2019-01-31 08:26:10 -0500 Don't use ui_random for bones file choice -------------------------------------------------------------------------------- 18b6515 | advil | 2019-01-31 08:26:10 -0500 Remove crawl.random_element and replace with something more stable Because lua iteration order, including at the C level, is not stable, this was leading to seed variation in parts of the dungeon that heavily use layout code. I've replaced it with a pure lua implementation of random_choose_weighted (that parallels the C++ version); in principle one could call into the C++ version, but it wasn't clear that there was much of a point to that amount of effort. This version is stable because it uses an array of pairs for the weight table; `ipairs` gives a stable iteration order. Notationally it's not any more effortful. -------------------------------------------------------------------------------- a9077f9 | advil | 2019-01-31 08:26:10 -0500 More improvements to randomization * don't use math.random for bazaar tiles * clean up rng and early D vault tests -------------------------------------------------------------------------------- 46ee55f | Edgar A. Bering IV | 2019-01-31 00:36:45 -0500 Don't use player spell colours for monster spellbooks -------------------------------------------------------------------------------- b84795d | Edgar A. Bering IV | 2019-01-30 23:24:57 -0500 Describe tree form in potion of lignification (damerell) -------------------------------------------------------------------------------- b30acc4 | Edgar A. Bering IV | 2019-01-30 22:59:10 -0500 Prompt before using bad or dangerous consumables (11836) This covers immolation, vulnerability, noise, mutation, lignification, and degeneration, as well as torment and holy word when applicable. The new behavior can be disabled by setting an option `bad_item_prompt` to false. -------------------------------------------------------------------------------- bed441b | Edgar A. Bering IV | 2019-01-30 18:59:35 -0500 Dissapate Guardian Golem clouds out of LOS (11701) Change guardian golem's inner flame actor to MID_YOU_FAULTLESS (from nullptr), and disappate clouds owned by MID_YOU_FAULTLESSS when out of LOS. -------------------------------------------------------------------------------- 1bb0902 | advil | 2019-01-29 23:39:09 -0500 Clear unrand state for relevant tests This was impacting generation and causing a false positive for seed inconsisticies. -------------------------------------------------------------------------------- 964d818 | advil | 2019-01-29 22:18:59 -0500 Use a separate rng for ghosts The most recent set of seed instabilities I've been seeing are because the ghost loading code makes a different number of random number draws depending on whether it loads from the permastore or not, and in a clean setup it was guaranteed to draw from the permastore on the first run, but not thereafter, for some seeds. (Because even a permastore ghost gets resaved as an ephemeral ghost if a level is vetoed - something that is perhaps a bug itself.) In general, it seems risky to use levelgen rng for something that may depend on what's on a particular file system, so separate this off into its own rng for cases like this, distinct also from the gameplay rng. Also, fixed a bug in loading of ephemeral ghost files where if there was more than one ghost in the file, the wrong one would be removed after a ghost was selected for use. -------------------------------------------------------------------------------- 797c3c0 | advil | 2019-01-29 19:53:42 -0500 Fix accidental cursed slaying nerf (gammafunk) -------------------------------------------------------------------------------- 4a9ad93 | advil | 2019-01-29 19:32:52 -0500 Another batch of randomization sequence fixes mostly to do with items this time. -------------------------------------------------------------------------------- 5a19998 | advil | 2019-01-29 15:34:46 -0500 checkwhite -------------------------------------------------------------------------------- cdddf7c | advil | 2019-01-29 15:14:31 -0500 Sequence many, many random calls whose order was undefined Also add some documentation about these issues for other developers. Basically, the call order for functions that are present in an arithmetic expression or a constructor is undefined and can vary (leading to different effects of seed). It would be foolish to think that this got everything, but I hope that this did get everything for dungeon generation per se; given the complexity of this problem getting real seeding for the gameplay UI may be a bit far off. Two areas of concern: * random_var is clever and fun, but also inherently not a good fit for wanting well-sequenced rng calls, because operators inherit this undefinedness. * I didn't really try to address div_rand_round in this commit, which is all over the place and potentially hidden in many return calls. -------------------------------------------------------------------------------- 14c3f58 | advil | 2019-01-29 15:14:31 -0500 Expand out the seed vs generation test for a few more levels -------------------------------------------------------------------------------- 1e53798 | GenericPseudonym | 2019-01-29 00:49:11 -0500 Quiet confirm_action in the ability menu (11738) The confirm prompt was still being generated when _check_ability_possible was called in "quiet" mode, though it shouldn't have been. [Committer's note: Closes #969] -------------------------------------------------------------------------------- a39c873 | Edgar A. Bering IV | 2019-01-29 00:18:18 -0500 Changelog through 0.23-a0-899-gbbae0a335a -------------------------------------------------------------------------------- bbae0a3 | Martin Staffa | 2019-01-28 21:37:41 -0500 Further distinguish light skill drain This should make it easier for the player to judge how heavily he is drained in the early game, and when using Ru's powers. For monsters, the drain of a wraith is 25, and a hit from a draining wand is a minimum of 75, but currently both give you the same status. The same is true for Ru's Draw out power and Apocalypse: 30 vs 100, but both give you the same status (and have the same "skill drain" description in the god ability menu). For Ru it is quite important to manage your skill drain, and introducing a new threshold should help with that. [Committer's note: Adjusted the colour scale; Closes #963] -------------------------------------------------------------------------------- 0a62fed | NormalPerson7 | 2019-01-28 21:11:21 -0500 Use keys for paralysed_by and petrified_by player props (ebering) -------------------------------------------------------------------------------- 779a845 | NormalPerson7 | 2019-01-28 21:11:21 -0500 Include petrification information in death messages (11374) Display "Slain by X ... while petrified [by X]" on the death screen when the player was killed while petrified, in the same way as paralysis. This applies only when fully petrified, not when petrifying, and the monster that first applied the petrifying status is used in the death message, even if the player is hit again with the petrify spell by a different source on the following turn and this accelerated the petrification process. -------------------------------------------------------------------------------- 250879e | gammafunk | 2019-01-28 04:02:16 -0600 Adjustments to a runed door vault In mikee_hates_you, the runed door has a special warning text, but this isn't necessary. The vault shows what monsters you'll be facing, and the avatar's mesmerize ability can be seen through x-v. Since the runed doors are transparent now, move the loot item behind the final door instead of putting it under the merfolk with no_pickup. Adjust the windows to allow seeing the monsters as well as the loot item. The vault places an escape hatch for exit, but allows placement on D:$ where this hatch can't place. Disallow placement on D:$, allowing the vault to place one level earlier. D:12 is fine for a vault of this kind. Finally, use the default glyph for runed clear doors instead of a custom one. -------------------------------------------------------------------------------- 27a1b2c | gammafunk | 2019-01-28 03:57:26 -0600 Adjustments to a Lair end vault In cheibrodos_lair_end_hotspot, use default symbols for the runed door and simplify NSUBST statements. -------------------------------------------------------------------------------- c028996 | gammafunk | 2019-01-28 03:57:26 -0600 Adjustments to a Lair vault The vault gammafunk_lair_enchanted_lake currently has an opaque runed door with spoilery encounters behind it. Make this vault use a runed clear door and provide a couple carefully placed windows into the interior of the vault. Now that it better reveals its contents, allow it to place on Lair:1. Finally, slightly adjust the monster set to use better flying monsters and simplify some NSUBST statements. -------------------------------------------------------------------------------- 5d1f0fd | gammafunk | 2019-01-28 03:48:24 -0600 Remove a placement limitation on a Lair vault This vault is fine as a float vault for Lair:$. -------------------------------------------------------------------------------- 479ecb9 | gammafunk | 2019-01-28 03:48:24 -0600 Adjust an Okawaru altar vault In the vault okawaru_arena_lexackson, use clear runed doors instead of opaque ones. Don't use non-standard colors on lava, doors, and down hatches. Also don't use a special quality level on loot where good_item would suffice. This vault might predate the availability of that tag, but the issues described in the now-removed comments are no longer relevant. This vault in general should see a rework. It has a spoilery mechanism to release monsters and block your exit as you move into the vault. It also has a special "loot choice" mechanism that isn't necessary given the number of monsters. A transporter vault would be a good fit for the basic concept, but it would be a little plain if converted to a simple room with 4 "warrior" monsters. I'll look to rework the vault in a future commit once I have a good idea. -------------------------------------------------------------------------------- 16004d8 | NormalPerson7 | 2019-01-28 01:14:13 -0500 Make yellow draconians' rAcid a true mutation (11381) Previously, yellow draconians' rAcid was hardcoded into the game and they were given a fake mutation description in the species yaml file. This had the problem that when transforming into statue or lich form, the fake mutation description was greyed out on the A screen despite continuing to function. Therefore, add a new acid resistance mutation, MUT_ACID_RESISTANCE, and give it to yellow draconians. Remove the special-casing for yellow draconians' rAcid at the same time, and add a new minor version to manually give yellow draconians in progress their rAcid mutation. Additionally, add back "(rCorr)" to the mutation description on the A screen. This was lost when species definitions were converted to yaml files. [Committer's note: Closes #965] -------------------------------------------------------------------------------- c183402 | advil | 2019-01-27 23:49:51 -0500 swap true and false (vt) [skip ci] -------------------------------------------------------------------------------- 6b46e92 | advil | 2019-01-27 23:13:21 -0500 Actually use a function added earlier Was added to consolidate debug code with real setup code, but then only used for debug code. -------------------------------------------------------------------------------- 72c9835 | advil | 2019-01-27 23:13:21 -0500 Finish sentence (switch__) -------------------------------------------------------------------------------- 4f7982c | advil | 2019-01-27 23:13:21 -0500 Webtiles implementation for the progress bar Pregen is still disabled in DGL builds, but with this commit it now works exactly the same as tiles/console. -------------------------------------------------------------------------------- 5e79892 | advil | 2019-01-27 23:13:21 -0500 checkwhite -------------------------------------------------------------------------------- 6caef08 | advil | 2019-01-27 23:13:21 -0500 Two sanity-check fixes Both of these, I think, were leading to memory corruption. In the case of the tileweb.cc change, if you were to set the number of ui state channels to 0, and then try to push a ui update to channel 0, this could lead to memory corruption if your stdlib let it happen. In the case of the formatted_string change, what's being pushed back is really an fs_op, and so the constructor needs to be called, in which case it is really better as an emplace_back; I'm not 100% sure that this would be bad on all (or any) stdlib implementations (since it might rely on an implicit copy constructor or something), but I definitely got an lldb backtrace with a crash inside this call. -------------------------------------------------------------------------------- 568795b | advil | 2019-01-27 23:13:21 -0500 More documentation for seeding -------------------------------------------------------------------------------- 4636eb8 | advil | 2019-01-27 23:13:21 -0500 Make Boris compatible with pregeneration This (in a kind of ad-hoc way) simple regenerates Boris with a fixed probability on appropriate levels, as long as he is dead and has been killed at least once. -------------------------------------------------------------------------------- 62981b3 | advil | 2019-01-27 23:13:21 -0500 Fix some state bugs with pregeneration -------------------------------------------------------------------------------- c02791a | advil | 2019-01-27 23:13:21 -0500 Fix some mod math in the progress bar display -------------------------------------------------------------------------------- 641d409 | advil | 2019-01-27 23:13:21 -0500 Use a stable order for loading vault files It turns out that all the deterministic RNG in the world doesn't help if you are choosing among things whose initial order is at the mercy of the file system. This commit isn't necessarily a full and complete solution to this issue, more of a minimal first step; it would be nice to have an even more stable way of getting vault indices. -------------------------------------------------------------------------------- 4066ec4 | advil | 2019-01-27 23:13:21 -0500 More rng diagnostics for travis Show exact internal rng state, temple vault choice -------------------------------------------------------------------------------- 30f140d | advil | 2019-01-27 23:13:21 -0500 Print some random numbers in the rng test for diagnostic purposes Kind of stretching for anything here... -------------------------------------------------------------------------------- 31e2f47 | advil | 2019-01-27 23:13:21 -0500 Explicitly cast rng constants to uint64_t I have no idea if this will matter at all, since `unsigned long long` is apparently >64bit on some systems, this might(?) contribute to more stable behavior across builds. -------------------------------------------------------------------------------- 6050340 | advil | 2019-01-27 23:13:21 -0500 checkwhite -------------------------------------------------------------------------------- f44c623 | advil | 2019-01-27 23:13:21 -0500 Add a test that prints D:1 vaults for various seeds This is not a test that is necessarily likely to crash, but more of a way of detecting changes. (Also, this is the beginnings of one way of implementing a seed catalog a la brogue.) -------------------------------------------------------------------------------- 087f7eb | advil | 2019-01-27 23:13:21 -0500 Show seeds for dead online chars -------------------------------------------------------------------------------- 3e876b1 | advil | 2019-01-27 23:13:21 -0500 Don't do pregeneration for sprints, etc. They are all one level and the pregen code doesn't handle them anyways. -------------------------------------------------------------------------------- 424b21a | advil | 2019-01-27 23:13:21 -0500 Use correct cross-platform format specs for uint64_t since 64bits can be `long long int` or just `long int` depending on platform. Also, fix a bunch of warnings. -------------------------------------------------------------------------------- b90a470 | advil | 2019-01-27 23:13:21 -0500 Add a rudimentary progress popup to run during pregeneration Since this can take up to a minute, it's nice to show the user that something is happening. This replaces the "hit to ..." interface from bel's patch. It does not yet have a webtiles implementation, which is ok because pregeneration is disabled on webtiles. -------------------------------------------------------------------------------- 8f561c4 | advil | 2019-01-27 23:13:21 -0500 Fix a build error -------------------------------------------------------------------------------- 40d72c2 | advil | 2019-01-27 23:13:21 -0500 Add some spare RNGs before the branch ones Given the save compat implications, it would be a lot less annoying to allocate these now than later. -------------------------------------------------------------------------------- de1184c | advil | 2019-01-27 23:13:21 -0500 Document seeding options better, allow rc file seeds This change also lets offline players view their game seed, and shows it in the chardump. Yes, this can be used to "cheat" but no more so than savescumming (in fact, less-so), and based on experience with brogue and seeded games, this feature will work best if players can view it. It is impossible to access seeds in online games, and I didn't even put it in the crash dump on the grounds that this would be a pretty big information leak - to see a seed for an online game, one would need to get a save backup and load it offline. -------------------------------------------------------------------------------- 443bbbd | advil | 2019-01-27 23:13:21 -0500 Allow saving ghosts when a seed is set This check was intended to prevent test code (e.g. qw runs) from generating ghosts, but it doesn't make sense any more in the context of seeded crawl. -------------------------------------------------------------------------------- d59c169 | advil | 2019-01-27 23:13:21 -0500 Implement dungeon pregeneration (bel) In order to improve deterministic dungeons (given a seed), allow pregenerating the entire dungeon in a stable order. This is originally based on an implementation by bel, that can be found at: https://github.com/belrogue/crawl/compare/master...belrogue:seeded_crawl That approach relied on the player actually entering each level, which had a number of weird side-effects, and relied on wizmode code (not available in all builds). This commit attempts to separate out generation and entering of a level, where a non-visited level will have 0 turns spent on it. It also simplifies the generation order from bel's version. To enable this, set the option `pregen_dungeon` to true. Pregeneration is disabled for DGL builds, for two reasons: I'm assuming seeded runs won't be a thing any time soon for server play, and pregeneration is a heavy initial CPU hit that might impact server performance in any case. There are still a bunch of UI issues after this commit, and it's not super well tested. Other side effects: * Added an initialization phase for map markers that can run when a level is generated - activation happens when a player enters the level. -------------------------------------------------------------------------------- 2dd0f10 | advil | 2019-01-27 23:13:21 -0500 Use dungeon RNG for initial dungeon setup Missed this in a previous commit. -------------------------------------------------------------------------------- 236e7cc | advil | 2019-01-27 23:13:21 -0500 Move seed / version history out of ?V title This works less well as this string gets longer. -------------------------------------------------------------------------------- 7a91997 | advil | 2019-01-27 23:13:21 -0500 Up the seed size to uint64_t These is probably overkill, but it's easier to do this now than later. -------------------------------------------------------------------------------- cb93d8a | advil | 2019-01-27 23:13:21 -0500 Improve behavior of seeding Two main changes in this commit: 1. add additional per-branch RNGs with separate state, so that level gen randomization doesn't interact with gameplay RNG, and levels interact less with each other. 2. save RNG state with the player, and restore it on reload, so that the choice of seed is not just per game session. This is not a fully seeded crawl in the sense that most people would want: level generation out-of-order within a branch will still advance that branch's RNG, and dependencies on order (e.g. uniques, vaults) are still present. However, it is much closer, in that if levels are loaded in the same order, the same game seed *should* guarantee the same dungeon with a few minor caveats (things like Boris, pan lords). For some discussion of the issues, see: https://crawl.develz.org/tavern/viewtopic.php?p=306334 Right now seeds are 32 bits, and the seed initializes gameplay rng too, which may or may not be desireable. Every game is seeded (which is rather different than the old behavior - games not explicitly seeded used a pseudorandom 128 bit seed to initialize the rng states.) Per-branch RNG is perhaps overkill, but relatively simple. -------------------------------------------------------------------------------- 0c83f0c | NormalPerson7 | 2019-01-27 17:45:43 -0500 Fix AC calculation in item description with deformed body (Monsterracer) Previously, the AC granted by armour when the player has deformed body was sometimes lower than that indicated in the item description's "Wearing mundane armour of this type will grant the following:" line. This was because: - player::base_ac_from calculates the AC reduction from deformed body as `AC - baseAC / 2`; - the description called the player::base_ac_from method with scale parameter 1, resulting in the AC being rounded up; - the actual AC calculation called the method with scale parameter 100 and then performed integer division on the final result, resulting in the overall AC being rounded down. Fix this by calling base_ac_from with scale parameter 100 and then dividing by 100, so that the maths here is equivalent to that in the real AC calculation. -------------------------------------------------------------------------------- 8ff03fb | gammafunk | 2019-01-26 17:44:11 -0600 Update vaults to not overwrite a default glyph These vaults all set '=', which is a runed door by default, to some other definition. In all cases they had plenty of symbols available. Although it's fine to override default glyph meanings when more symbols are needed, it's best not to do so for commonly used symbols like '='. This commit updates many such vaults to not use '=', using 'a' or another symbol where appropriate. The remaining vaults that do this can be changed in subsequent commits. This commit also simplifies various NSUBST statements in these vaults. -------------------------------------------------------------------------------- d608b80 | gammafunk | 2019-01-26 17:44:11 -0600 Rework glyph usage in some door vaults These vaults put doors on different glyphs from '+', presumably because they apply a marker. It's not necessary to use a custom glyph, so use '+' instead. We want these vaults to be a surprise, so they should still use the classic runed opaque door for now. Use a different glyph from '=', since that is now used specifically for runed clear doors. -------------------------------------------------------------------------------- fa4f36b | gammafunk | 2019-01-26 17:44:11 -0600 Rework a loot item in a vault Replace the "acquire any" items in evilmike_wizard_prison with nice randart artefact jewelry, randart aux armour, or acquirement scrolls. The scroll is a better way to give player loot that's based on their character, since the choice aspect makes it more likely to be useful. Also fix the wrong usage of a substitution operator and simplify terms in some NSUBST. -------------------------------------------------------------------------------- a8f1c90 | gammafunk | 2019-01-26 17:37:52 -0600 Remove unneeded KFEAT from some vaults These vaults define runed doors as a KFEAT on '=' despite that glyph already having this meaning. Also simplify NSUBST syntax in one of these vaults. -------------------------------------------------------------------------------- 041552f | gammafunk | 2019-01-26 17:37:52 -0600 Rework and simplify some aspects of a vault The vault hangedman_eye_storm had a normally accessible area flagged as no_tele_into. This area has only one access out and a few eye monsters, but has no teleport closets, so the flag is not needed here. It also sometimes used runed doors in the Abyss, but is not an especially nasty vault, especially not for that branch. Use normal doors instead. -------------------------------------------------------------------------------- b3145dc | gammafunk | 2019-01-26 17:37:52 -0600 Make runed clear doors the default runed door type Rune door vaults generally work best without major spoilers. To some extent players will always have some encouragement to read vault spoilers even for vaults that are not sealed with runed doors or transporters. For unspoiled players taking on challenge vaults, however, it generally works best if they can reason about whether the risk is worth the reward. At a minimum it's good for players to know what they'll find when they first open the door. If this basic information isn't available, players need to assume the worst and will visit the vault long after they first find it. This commit makes the recently introduced runed clear door the default type of runed door used in vaults. It does this by changing the default DES mapping of the '=' glyph to runed_clear_door. Vaults that defined a special symbol for runed_clear_door have been updated to remove that definition and simply use '=' instead. Spoilery vaults that hide surprises behind opaque runed doors still have a place, provided that what they do is memorable enough. These vaults work best if they appear later in the game, so that the player has enough resources to survive or escape arbitrary threats. -------------------------------------------------------------------------------- dd7946d | Edgar A. Bering IV | 2019-01-26 17:49:32 -0500 Fix ball lightning stair behavior (11812) First, prevent ball lightnings from taking stairs. Second, disappate player ball lightnings left behind. While technically monsters, these should behave like conjurations from a gameplay point of view. -------------------------------------------------------------------------------- fe5b60b | Edgar A. Bering IV | 2019-01-26 17:13:47 -0500 Make Jiyva slime neutralising like Fedhas' (11792) Changing god conversions to run exactly once, and on first sight resulted in unkillable slimes for a Jiyva player. This moves slime conversion to run in the same place as Fedhas' plant neutralising, making it global and independent of player LOS. This has the effect of waking up slimes on a level so they start eating items sooner; however awake slimes that hadn't been converted would start eating already, so the net effect isn't that large. -------------------------------------------------------------------------------- 83ee88d | Edgar A. Bering IV | 2019-01-26 16:37:48 -0500 Use env.map_knowledge to check moveto prompts (11806) Prevent information leaks when far movement effects (shadow step, hop, etc.) have the possiblity of landing in the explore horizon. -------------------------------------------------------------------------------- 1f260a4 | Edgar A. Bering IV | 2019-01-26 16:17:29 -0500 Consistent interpunctuation for damaging spells Freeze, Airstrike, Irradiate, Static Discharge, Awoken Forest attacks, and some LRD and Shatter damage do not occur via a `struct bolt`, and need their interpunctuation set separately to consistently reflect damage done. -------------------------------------------------------------------------------- 4a3ee90 | Edgar A. Bering IV | 2019-01-26 15:31:01 -0500 Make damaging enchantments obvious effects, punctuate (11814) Pain, Dispel Undead, Agony, and Disintigration all do damage to a monster, even though they are MR checking enchantments. Every other single target damaging spell gives feedback when something is hit. The lack of feedback is especially noticable for the three of these spells that can kill: "Nothing appears to happen." is followed by "You feel a bit more experienced!" which is an oddity. This commit changes these spells to always give a message if damage is done. While adjusting the visibility of the messages, this commit also adds consistent interpunctuation to Pain, Dispel Undead, and Disintigration; bringing these spells in line with other damaging spells. -------------------------------------------------------------------------------- 0551b70 | Edgar A. Bering IV | 2019-01-26 13:58:25 -0500 Respect monster special monster polymorph rules (11840) Several polymorph effects used monster_polymorph directly, but ended up calling it on ugly things, which should instead have their colour change. These have been replaced with mons.polymorph(), which has a new signature that accepts a polymorph power type. This also ensures that these effects respect slime creature's split-then-poly mechanic. This affects Xom polymorph and Nemelex degeneration. -------------------------------------------------------------------------------- c8dc575 | Edgar A. Bering IV | 2019-01-26 12:59:53 -0500 Give Tengu permanent flight at XL 5 This was suggested on Mantis as 10707 and a patch was included, unfortunately the patch had aged poorly and couldn't cleanly apply, so this is a re-implementation. Tengu racial flight starts at XL 5, as an activated ability. The activation gives flight (with its Tengu bonuses) for 25 + random2(xl*4) + random2(xl*4) turns. In practice, this meant that a low XL Tengu effectively had permanent flight, provided they remembered to activate it. The MP cost takes at most 38 turns to recover (regen to full with 3 MP). The duration of Tengu flight averaging 45 turns when first acquired, rising to 77 at XL 13. The Tengu player with more than 3 total MP that was willing to do a lot of tedious waiting and re-casting could enter any encounter flying and with full MP. Removing the interface screw shouldn't affect optimal balance, but it might turn out to be a practical buff. If that haappens to be the case a nerf that is not an interface screw can be applied. -------------------------------------------------------------------------------- 3ad9d5a | NormalPerson7 | 2019-01-26 12:22:35 -0500 Make the polymorph targeter more informative (11706) This commit changes the polymorph targeter to display "not susceptible" for undead and nonliving monsters that cannot be polymorphed. It also now displays "will change shape" and "will change colour" instead of the chance to hex, when targeting known shapeshifters and (very) ugly things, respectively, to make this special effect somewhat better described. -------------------------------------------------------------------------------- ec06c1a | NormalPerson7 | 2019-01-26 11:32:38 -0500 Don't scale EV bonuses when a flying Te/swimming Mf/petrifying (11463) Previously, the effects of flat evasion bonuses such as rings of evasion, the amulet of the acrobat, mutations, and potions of agility, were scaled up by the effects of flying as a tengu, and swimming as a merfolk, and halved by the petrifying and held statuses. This led to weird behaviour where flying as a tengu meant acrobat actually gave 18 EV, and other oddities, which are inconsistent with how flat bonuses generally function. Therefore, this commit makes it so that the evasion bonuses are added to the post-scale evasion, rather than the pre-scale evasion. There is a remaining inconsistency in paralysis, full petrification, tree form, and most notably, dexterity stat zero, where these evasion bonuses are not accounted for at all. In the case of paralysis and full petrification this probably makes sense, whereas for clumsy and tree form, where you can still act, this behaviour is somewhat arguable, because it is not obvious here that rings of evasion etc are rendered useless. -------------------------------------------------------------------------------- 372ee70 | Nikolai Lavsky | 2019-01-26 11:20:15 -0500 Don't add unique annotations for an illusory unique (u/kitchen_ace) After commit eddfa9bf, if an illusionary unique created by phantom mirror outlives the original, the corresponding unique annotation won't be removed. Fix this by not adding annotations for illusions. -------------------------------------------------------------------------------- dc03e01 | gammafunk | 2019-01-25 18:45:35 -0600 Don't give brown as an XL7 draconian colour (blorx1, ebering) The random_draconian_colour() function merged as part of the datafiles branch didn't properly exclude base draconians as a colour to award at XL7. Rewrite this function in a way that uses random_range() for the non-base colours, but so that it can also exclude removed/unviable colours. -------------------------------------------------------------------------------- 547f200 | stenella | 2019-01-25 11:48:28 -0800 Move a MSVC property to a property file Rather than defining __STDC_LIMIT_MACROS for every single build type, move it to common.props. At the moment it's only defined in one build type, which is due to lack of completeness (on my part) in the past. -------------------------------------------------------------------------------- 739d080 | Edgar A. Bering IV | 2019-01-25 11:17:28 -0500 Update CREDITS.txt, fix an alphabetization -------------------------------------------------------------------------------- 41928f0 | dcandido | 2019-01-25 01:44:09 -0500 Add petrify to the enchantment susceptibility check (10659) [Committer's note: in addition to the mantis patch, bolt.is_harmless had a separate case for petrify, which wasn't being reached because petrify is an enchantment.] -------------------------------------------------------------------------------- df0a61e | Edgar A. Bering IV | 2019-01-25 00:22:05 -0500 Adjust spacing in x-v spell descriptions Spells that had both a hex chance and a range had an extra space between the two indicators. -------------------------------------------------------------------------------- 6d2b917 | advil | 2019-01-24 21:02:58 -0500 Don't build for checkwhite/unbrace travis tests Also, don't try both compilers, since there's no compilation needed. -------------------------------------------------------------------------------- 3073675 | stenella | 2019-01-24 11:40:54 -0800 Update gen-all.cmd Mirroring changes made earlier to generation of species-type.h -------------------------------------------------------------------------------- a3e6480 | Edgar A. Bering IV | 2019-01-23 22:33:26 -0500 Correct a typo in Sif's description (damerell) -------------------------------------------------------------------------------- 152313e | Edgar A. Bering IV | 2019-01-23 20:23:47 -0500 Two quotations (Can-ned Food) Quotes for ring of intelligence and scroll of silence. -------------------------------------------------------------------------------- ae04d92 | Edgar A. Bering IV | 2019-01-23 19:08:31 -0500 Scale net trap to-hit with absdepth Legacy net traps had a fixed to-hit chance; with the change to make them always player targeted it is readily apparent that their ability to hit falls off in the late game, making them more a free source of nets than a relevant tactical threat. They now scale with approximately the throwing abilities of a non-archer see-invisible monster with HD absdepth/3. -------------------------------------------------------------------------------- 16358f6 | Alan Malloy | 2019-01-23 15:15:38 -0800 Fix undefined behaviour when applying elec brand (Laret, #11837) -------------------------------------------------------------------------------- 31c0f47 | gammafunk | 2019-01-23 07:06:54 -0600 Prompt when entering excluded transporters Currently when entering an excluded transporter, the transporter is entered with no prompt is given. This commit adds a yes-or-no prompt similar to the one used when taking excluded stairs. -------------------------------------------------------------------------------- 2dcc7d9 | gammafunk | 2019-01-23 07:06:54 -0600 Don't travel through excluded transporters (EN0N) Currently exclusions made on transporters do nothing to limit travel. Travel handles transporters like stairs in terms of allowing the player to move onto the excluded transporter if the entire exclusion is a single square. This is good, since just as we do for single-square exclusions on stairs, we want to prevent travel from taking the transporter but allow standing on it. However travel didn't actually prevent taking the transporter, and with this commit it now does. -------------------------------------------------------------------------------- 5da158a | Umer Shaikh | 2019-01-22 22:29:07 -0500 Unify exit paths from show_terrain view We make pressing any unassigned key in the show_terrain view behave the same way as pressing |. Pressing | restores all layers and exits the layers menu; pressing an unassigned key exits the menu without restoring layers, and layers are restored on the next action. However this latter is undesirable. Currently the menu primarily acts like a way to interactively and temporarily change the view, so it is surprising that dismissing the menu should not dismiss the effect. The player is about to act, so they usually want all layers back anyway. It is a pretty baroque behaviour in an already baroque menu. (If it is desirable to allow players to act without all layers visible, then there should be some way to set a semi-permanent option to do so---the player shouldn't be required to use CMD_SHOW_TERRAIN each turn.) -------------------------------------------------------------------------------- 2495da7 | Umer Shaikh | 2019-01-22 22:29:07 -0500 Let ESC clear/toggle layers in show_terrain view (amalloy) We make it slightly more convenient to manipulate layers in show_terrain view. Escape clears all layers if any layers are active, and activates them all if none are active. -------------------------------------------------------------------------------- e13c4b7 | Alan Malloy | 2019-01-22 11:11:18 -0800 Remove comment about creating homogenous hash tables This feature was removed in 75921593c, and the remaining comment is just confusing. -------------------------------------------------------------------------------- 036b721 | gammafunk | 2019-01-22 08:28:14 -0600 Fix a debug warning message This debug message wasn't properly updated in a6713cf8 and causes a compilation warning due to implicit conversion of an enum class to unsigned int. Use a static cast and have the message attempt to also display the spell school's long name. It might be better to just use an ASSERT here, but I haven't looked at what all the callers are doing with this function. -------------------------------------------------------------------------------- 53669af | gammafunk | 2019-01-22 07:28:58 -0600 Fixes for player doll tiles Add the placeholder tiles for Rift and group together tiles for removed unrands with a comment to remove their entries upon major version change. -------------------------------------------------------------------------------- 52100fa | gammafunk | 2019-01-22 07:10:11 -0600 Generalize a check for reach attacks For the range limit, don't specifically check for the Rift unrand, but rather check the reach type directly. -------------------------------------------------------------------------------- 8c0a028 | gammafunk | 2019-01-22 06:36:43 -0600 Update the description of the Rift unrand Make it clear that Rift doesn't have the usual limitations of reach attacks. -------------------------------------------------------------------------------- 5f40c2e | gammafunk | 2019-01-22 06:32:45 -0600 Fix autofight for reach attacks Properly apply checks for the capability to use a reach attack when using a normal polearm. The implementation in #949 applied los_no_trans to every kind of reach attack, when that's only appropriate for the Rift unrand. -------------------------------------------------------------------------------- efd6b3f | gammafunk | 2019-01-22 06:32:45 -0600 Implement reach support for the Rift unrand The commit in #949 originally used the targeter_reach class with additional range and generalized the logic in _reach_weapon_attack(). These aspects were part of an earlier design of Rift and are no longer necessary. This commit implement's Rift's reach attack using targeter_smite instead. -------------------------------------------------------------------------------- 7c2441a | olowin | 2019-01-22 06:17:08 -0600 The unrand demon trident "Rift" with distortion and extended reach There are no existing distortion-based unrands and distortion is an interesting and powerful brand but the blinking effect makes it somewhat annoying to use. By extending the reach of a polearm the annoyance factor is reduced since it's unlikely the player will need to reposition just to hit their target. The extended range is defined in reach-type.h. autofight.lua changes allow extended reach tabbing, without which combat becomes quite tedious. Committer's Note: Rift is a +8 demon trident of distortion with a range 3 reach that's smite targeted. Any monsters or translocation-allowing features between the attacker and the target have no affect on the weapon's accuracy or ability to hit. In the original commit in #949, Rift had a reach range of 4, +4 enchant, and +Blink. The range reduction to 3 balances the weapon a bit and the enchant increase make it less likely that Lugonu worshipers will want to swap weapons when their target becomes adjacent. Additionally, changes to evoke.cc that were part of the original commit are not included. Those changes implemented support for extended reach that will be implemented in a simpler way in a subsequent commit. I've also added some quick placeholder art for Rift. We'll hopefully have proper tiles before the 0.23 release. Closes #949. -------------------------------------------------------------------------------- ecd3555 | Edgar A. Bering IV | 2019-01-22 00:43:36 -0500 Don't allocate extra space for a vector -------------------------------------------------------------------------------- 86364c1 | Alex Jurkiewicz | 2019-01-22 00:28:15 -0500 Revise storm card (minmay, ebering) Storm's old effect (wind blast + storm cloud ring + air elemental) didn't fit in well with the rest of the deck of desctruction, and wasn't that great anyway. Revise to be more purely about AoE electrical damage. New effects are: wind blast plus up to nine electrical explosions (depending on power). The explosion targets are chosen randomly at a distance so that they don't damage the player, firing only one explosion per cell. As a result, using this card in a corridor or near a corner will likely not hit the intended target---particularly at low power. In terms of balance, the explosions do slightly less damage than power zero conjure ball lightnings at low power, scaling to be comprable to high power CBL at high power. This isn't too out of line with the other destruction cards, considering the terrain limitations and noise; but will need some playtesting feedback to be certain. [Committer's notes: re-wrote the patch to use random sampling of targets based on a radius iterator; adjusted damage formulas; added flavour messaging. Closes #942] -------------------------------------------------------------------------------- 6debee6 | Edgar A. Bering IV | 2019-01-21 01:30:25 -0500 Really remove High Elves Their retention of starting jobs was causing them to incorrectly appear in -playable-json. -------------------------------------------------------------------------------- 00444ac | Edgar A. Bering IV | 2019-01-21 00:13:53 -0500 Tormenting allies turns them hostile Previously, allies would gladly accept player torment, though only in the form of torment and not the form of agony. It's unclear why a player would want to torment their allies, but but they're done putting up with it in any case. -------------------------------------------------------------------------------- 40270af | Edgar A. Bering IV | 2019-01-21 00:13:37 -0500 Better grammar for LOS spell attack prompts Print a sensible message instead of "Really harm near your..." when handling LOS spell prompts. Now get a more meaningful "Really refrigerate near your..." or other verb as appropriate. -------------------------------------------------------------------------------- 81dc5fd | Edgar A. Bering IV | 2019-01-21 00:13:31 -0500 Refactor scroll and sceptre of torment prompts Refactor the prompts (torment and holy word) to use the general `stop_attack_prompt` function with a los targeter. Closes #953. -------------------------------------------------------------------------------- 48644e5 | 1Hyena | 2019-01-21 00:08:29 -0500 Check and set conducts for holy word and torment (11821) Create a general purpose `_scroll_will_harm` function that can be used to determine if a particular monster would be harmed as a result of reading a certain scroll. In the `read` function for scrolls, check `god_hates_item`. Also, add warnings about regular friendly fire, and if hurting the victim of our scroll could put us under penance. The warning about penance uses "could" instead of "would" because by the time we finish reading the scroll it may not be dangerous any more (can happen with blurry vision). The friendly fire checks for torment are also extended to the sceptre of torment, using similar logic to the singing sword. God conducts are now checked when delivering a holy word or a torment effect to monsters. Previously, the good gods would give penance for using a scroll of torment, but gods with ally conducts were indifferent to torment and holy word, contrary to the conduct. [Committer's note: formatting cleanup, squashed, reworded commit message, closes #941] -------------------------------------------------------------------------------- 91b4073 | Edgar A. Bering IV | 2019-01-20 21:13:29 -0500 Remove an extra acid message, braces, and some logic Closes #952. -------------------------------------------------------------------------------- 440a6e3 | NormalPerson7 | 2019-01-20 20:59:50 -0500 Use exclamation marks to indicate damage for all brands Exclamation marks were previously only used to indicate the damage dealt by freezing, flaming and holy brands. This commit converts all brands that deal additional damage to use exclamation marks calculated by attack_strength_punctuation, with the exception of chaos, which uses beams and was therefore dealt with by the previous commit. This affects the electrocution, pain, distortion, draining and acid brands, and as a consequence of the latter, also acid splash damage from other sources. -------------------------------------------------------------------------------- 8471db9 | NormalPerson7 | 2019-01-20 20:59:50 -0500 Indicate spell damage with exclamation marks and "...but does no damage" Use varying numbers of exclamation marks to indicate the amount of damage done by direct-damage spells that pass through zapping(), in the same way as is done for melee and ranged attacks, and print " hits but does no damage." to the message log when a beam does no damage, in the same way as is done for melee attacks. This behaviour was previously inconsistent: some beam types printed "%s appears unharmed" for monsters when they were hit for no damage, others simply printed nothing, and this message was never printed when the player was hit by a beam for no damage. These inconsistent "%s appears unharmed" messages are removed in this commit. This largely eliminates a long-running inconsistency in the output of spells vs melee attacks. There are various other instances of spell damage messages scattered throughout the code that should also be converted in the future. These include torment effects, damage-over-time effects, and clouds. Also remove the "Helpless, you fail to dodge..." message for when you're paralysed, because there is no clean way to include this in the new system, it doesn't say anything especially meaningful (the player knows they're paralysed), and it also awkwardly triggered when in tree form. Finally, remove an unnecessary variable and replace it with explicit return true; / return false; statements where it was used. -------------------------------------------------------------------------------- f4b81dc | floraline | 2019-01-20 15:55:40 -0500 Add webtiles form to change user email This commit adds a form to the webtiles lobby for logged in users to change the email address associated with their account. [Committer's note: closes #791, closes #800, closes #910] -------------------------------------------------------------------------------- b20feef | floraline | 2019-01-20 15:35:29 -0500 Add option to disable gzip in webtiles -------------------------------------------------------------------------------- 5904884 | floraline | 2019-01-20 15:33:35 -0500 Use X-Forwarded-Proto header for websocket protocol If the webtiles server is running behind a proxy server which terminates SSL connections, and http is used between the proxy and webtiles, the X-Forwarded-Proto header can be set by the proxy to indicate to the webtiles server that the client is using a secure connection. This allows webtiles to generate the correct protocol wss:// even it sees http. -------------------------------------------------------------------------------- d21de94 | Edgar A. Bering IV | 2019-01-19 23:18:53 -0500 Correct yaml aptitudes and stat gains More errors than I expected. I merged datafiles without looking closely, thinking that previous reviewers had done a more thorough check. This time I didn't leave it to chance, and diffed the aptitude table as reported by crawl from 0.22 to post merge. The aptitudes are now reported faithfully. I did a hand double check on the stat-ups, flags, and mutations; I'm confident in them but not as certain. Additional eyes would be appreciated. -------------------------------------------------------------------------------- d38242e | Edgar A. Bering IV | 2019-01-19 20:00:25 -0500 Correctly choose draconian colour The initial datafiles implementation was searching for a starting species that was not base draconian and was a draconian; there are no such species, which caused an infinite loop on level up. Instead of ad-hoc methods, species.cc now includes a specific draconian colour chooser. -------------------------------------------------------------------------------- 2e5916d | Edgar A. Bering IV | 2019-01-19 19:00:00 -0500 Fix an ASSERT when generating playable-json -------------------------------------------------------------------------------- c1268f8 | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 Update control python dependency is implicit -------------------------------------------------------------------------------- 30cc324 | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 Add python deps to debian build dependencies -------------------------------------------------------------------------------- 5dd6e8c | advil | 2019-01-19 16:49:04 -0500 Fix up an error message I missed -------------------------------------------------------------------------------- 0781eb4 | advil | 2019-01-19 16:49:04 -0500 Relax python version requirements This runs safely on anything that can handle the from __future__ call, so no need to be picky. -------------------------------------------------------------------------------- a3ee95e | advil | 2019-01-19 16:49:04 -0500 Handle levelup stats in a cleaner way Now, the empty list gives you the empty list, and the default value is a string (`default`), not a list. This also changes the species levelup code to check that the iterator is safe to use. -------------------------------------------------------------------------------- 822cbb9 | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 Simplify MSYS2 pyyaml instructions (gammafunk) [skip ci] -------------------------------------------------------------------------------- eec6720 | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 Add PyYAML install instructions for MSYS2 -------------------------------------------------------------------------------- 3e18421 | Kyle Rawlins | 2019-01-19 16:49:04 -0500 Doc updates -------------------------------------------------------------------------------- 10df540 | advil | 2019-01-19 16:49:04 -0500 Warn on unknown fields in the main list of species properties This would have partially caught the undead thing, since mummy was using the wrong field name relative to the python code. This implementation is not very elegant, but it works for now. -------------------------------------------------------------------------------- 24c7ebc | advil | 2019-01-19 16:49:04 -0500 Handle demigod stats properly Also, I changed the formatting for lists to match what species-data.h currently does. I actually think the indented version looks a bit better, but keeping it this way for now makes debugging a lot easier. -------------------------------------------------------------------------------- cb8200b | advil | 2019-01-19 16:49:04 -0500 Add walk/pray verbs to SP_UNKNOWN and deprecated species A little surprised this compiled without these, but given that it did this change may be cosmetic. -------------------------------------------------------------------------------- f84f214 | advil | 2019-01-19 16:49:04 -0500 Fix undead type This was broken/incomplete for all three undead species -------------------------------------------------------------------------------- cbc76c4 | advil | 2019-01-19 16:49:04 -0500 Don't set recommended weapons for non-starting species Matches current practice in non-generate species-data.h -------------------------------------------------------------------------------- e614946 | advil | 2019-01-19 16:49:04 -0500 Add entry format description to header for species-data.h Still want this to be there for debuggin purposes -------------------------------------------------------------------------------- c13e1a1 | advil | 2019-01-19 16:49:04 -0500 Handle empty mutation lists a bit better -------------------------------------------------------------------------------- e5a3aee | advil | 2019-01-19 16:49:04 -0500 Make build dependencies more specific -------------------------------------------------------------------------------- 09c36ad | advil | 2019-01-19 16:49:04 -0500 Don't inherit from dict, use constructor instead of factory function There's various reasons why inheriting from dict can be a bad idea, but the basic issue is that you get a ton of weird internal stuff in your subclass, leading to long-term maintainability issues. Here's a useful summary: http://www.kr41.net/2016/03-23-dont_inherit_python_builtin_dict_type.html Also, especially with this change I couldn't see any reason to prefer a factory function over a constructor, and it's more pythonic to use the latter when possible. -------------------------------------------------------------------------------- 8f32865 | advil | 2019-01-19 16:49:04 -0500 Format/refactor for 80 columns Also prefer @classmethod to @staticmethod, a few other misc changes. -------------------------------------------------------------------------------- 9c501a8 | advil | 2019-01-19 16:49:04 -0500 Change species generation to python 2.7 Seems to work unchanged. May or may not force pyyaml dependency to be explicit. -------------------------------------------------------------------------------- 0008194 | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 more fixes * move filter_enum to its own file * random_species -> random_starting species (and ditto for job) * Don't pick non-starting species/jobs for random/viable selection -------------------------------------------------------------------------------- 9f4de6a | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 various bug fixes to newgame species/job selection -------------------------------------------------------------------------------- c914ae4 | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 De-duplicate VIABLE/RANDOM newgame species/job logic -------------------------------------------------------------------------------- 5865f6a | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 Use filter_enum instead of do-while loops. -------------------------------------------------------------------------------- 65b99ee | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 species: Make difficulty mandatory -------------------------------------------------------------------------------- 57a5c52 | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 Document species/jobs missing recommendations No recommendations = not available on the starting screen. -------------------------------------------------------------------------------- 3f38706 | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 Clean up random/viable character selection Simplify the selection logic and make it consistent between species and background. -------------------------------------------------------------------------------- bb98c16 | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 Generate species data from YAML files This converts the following files from hand-written to auto-generated: * aptitudes.h * species-data.h * species-groups.h (was previously hardcoded in newgame.cc) * species-type.h Species definitions are found in `source/dat/species/*.yaml`. Documentation is in the (rewritten) `docs/develop/species_creation.md`. -------------------------------------------------------------------------------- 1e5a400 | Alex Jurkiewicz | 2019-01-19 16:49:04 -0500 Simplify XL7 draconian randomisation Removes SP_FIRST/LAST_NONBASE_DRACONIAN. These are only used in two places, when a draconian species flag can serve the same purpose. -------------------------------------------------------------------------------- 30113ee | Edgar A. Bering IV | 2019-01-19 12:56:48 -0500 Nothing is not permitted in kfeat -------------------------------------------------------------------------------- 9eba094 | Edgar A. Bering IV | 2019-01-19 12:37:44 -0500 A circus upstair vault A grouping of three circular arenas, each placing a stair in the center surrounded by themed choices from the Zot monster set to suggest a circus. The theme sets are: - Firebreathers: red draconians and red draconian scorchers - Strongman and contortionists: one juggernaut and tentacled monstrosities - Magic act: an ancient lich and electric golems - Acrobats: grey draconians, grey draconian monks, and nets - Beasts: moths and dragons - Freakshow: death cobs and possibly a curse toe - Jugglers: draconian shifters and draconians (being juggled!) - Killer Klowns, what would be a circus without them -------------------------------------------------------------------------------- b55f120 | Edgar A. Bering IV | 2019-01-19 12:37:44 -0500 A klown carousel stair vault A circular vault featuring klowns, dispersal traps, and Skrybe's coloured glass. A carousel of madness, the entry is so that a mistake pulling monsters out could get the player blinked in. Inside there are places to take cover from the onslaught of pies, but the dispersal traps remain an issue for the player. The vault can place as either a downstair vault or an upstair vault. As an upstair vault the player starts in the place of one of the carousel seats. -------------------------------------------------------------------------------- 1815e75 | Edgar A. Bering IV | 2019-01-19 12:37:44 -0500 Rename a lua function -------------------------------------------------------------------------------- e8b0c57 | gammafunk | 2019-01-19 09:48:09 -0600 Rework trap placement on Tomb:3 In the large central Tomb:3 vaults, place about 12 traps on-average. This is enough to add some hindrance for the player as they move and fight through the central area without being overwhelming. Mechanical traps were removed from the treasure rooms on Tomb:3, but numbers of traps as a whole weren't changed, so alarm/dispersal/zot traps became 2.5 times as common. This commit reduces numbers of traps in the treasure rooms overall, still leaving a higher trap density compared to the central rune areas. This trap placement can now also occur in the initial hallway where the player arrives on Tomb:3. Also use normal '.' glyphs for the treasure room and refactor DES of the main map. -------------------------------------------------------------------------------- 9c7b33d | gammafunk | 2019-01-19 09:48:09 -0600 Reduce trap placement on Tomb:2 Tomb:2 currently places about 40 traps randomly in the first section of rooms that lead back to Tomb:1 and about 47 in the smaller section of rooms that lead to Tomb:3. When mechanical traps were mostly removed from Tomb:2, these numbers weren't adjusted, so the more impactful alarm/dispersal/zot trap types went from being 30% of traps to being 75% of traps. This made Tomb:2 very chaotic. This commit halves the trap placement rate in the first section, getting us down to about 20 traps on-average, and reduces it by about 55% in the second section, getting us down to about 21 on-average. These numbers give a few traps in each room and won't overwhelm all other tactical considerations. Additionally we now handle trap placement in the central ambush vault directly, placing about 8 traps on-average in these areas. These vaults are large, but have lots of monsters with exits and good cover not being close by, so relatively few traps is appropriate here. Finally, disable level trap generation on Tomb:2, since we control trap placement in all areas of the map. -------------------------------------------------------------------------------- abe354a | gammafunk | 2019-01-19 09:43:56 -0600 Add trap placement to Tomb:1 hallway end vaults The Tomb:1 hallway end vaults contain the arrival hatch into the Tomb:1 hall from Tomb:2 at one end and the exit hatch into the second section of Tomb:2 on the other end. In these vaults add small numbers of traps as appropriate for their smaller size, about 6 on average. Also reglyph the vaults to use the usual '.' for floor, as there's no need to use a special glyph. -------------------------------------------------------------------------------- cd6f52c | gammafunk | 2019-01-19 09:35:46 -0600 Rework trap placement in Tomb:1 central vaults For the center vaults on the Tomb:1 map that contain the hatches to the Tomb:2 ambush, add some limited trap placement. We add about 12 traps on-average, which is a reasonable number for the large size of these vaults. Alarm traps get lower weight, since having a lot of these traps makes it easier to empty monsters out of the vault into safer areas of the level. In tomb_1_centre_old, don't have an extra chance to block single-tile passages with traps, but put some traps in corners where they can be walked past. Also rework the placement of monsters in this vault to not use many scattered fixed locations. Randomize placement of all but the highest tier guardians, keeping the monster counts the same. -------------------------------------------------------------------------------- a5e88f8 | gammafunk | 2019-01-19 06:56:08 -0600 Add traps to the Tomb:1 hallway and reorganize This commit adds small numbers of traps to the Tomb:1 "gauntlet" reached from Tomb:2 after the ambush, about 6 on-average. Also reorganize sections and update comments for the main Tomb:1 map. -------------------------------------------------------------------------------- adbfc09 | gammafunk | 2019-01-19 06:42:30 -0600 Add organizational headers to tomb.des -------------------------------------------------------------------------------- dc19b93 | advil | 2019-01-18 15:45:42 -0500 Fix two problems in unrest.pl 1. The script didn't support non-numbered links. 2. The regex for numbered links, because it has an s flag, matched a non-numbered link that is at the end of a sentence. Very ad-hoc solution: prevent a match on _ as the first character of a link. This script goes back a long ways but really we shouldn't have our own rst "parser" in 2019... -------------------------------------------------------------------------------- 6cd010e | Alan Malloy | 2019-01-18 12:29:42 -0800 Fix typo (NormalPerson7) -------------------------------------------------------------------------------- 73c39a4 | Alan Malloy | 2019-01-18 12:14:59 -0800 Copy edit background section of the manual -------------------------------------------------------------------------------- 46380d4 | Alan Malloy | 2019-01-18 12:06:51 -0800 Copy-edit changes to species description section -------------------------------------------------------------------------------- 1fcf643 | advil | 2019-01-18 14:49:08 -0500 Editing/reorganizing pass through backgrounds This brings the background appendix to the manual in line with the order and categories in the newgame menu (in this case, the previous version was actively inconsistent with it). I also tried to ensure some minimal standard level of completeness in terms of describing starting equipment for each background. (Remaining inconsistency: starting spell isn't always made explicit, though the book is.) -------------------------------------------------------------------------------- 3cc1399 | advil | 2019-01-18 14:20:23 -0500 Editing/reordering pass for the species appendix of the manual I'm not sure what previously determined the order of species in this section, but it was kind of idiosyncratic. I have reordered the species to match the order on the newgame menu, and explicitly included the categories used in selecting a new character. I also took an editing pass over the text and made a few tweaks that hopefully will address common questions about species selection, including the misconception that order on that menu is about difficulty of winning. (An alternative would have been to simply alphabetize this section, but probably the most likely case where players will look at it, at least after the fix in 146c4415506c6f, is when hitting ? from this menu.) -------------------------------------------------------------------------------- 7db0834 | advil | 2019-01-18 13:10:25 -0500 Show sprint manual section in sprint newgame menu -------------------------------------------------------------------------------- aaf14ca | advil | 2019-01-18 12:42:43 -0500 Show version history in `?v` if a save has been upgraded Otherwise, to see this you previously needed to either crash the game, or piece together the upgrade steps from milestones. -------------------------------------------------------------------------------- a1c2b65 | advil | 2019-01-18 12:42:43 -0500 Fix a help bug that isn't triggered `show_help` takes a section argument that is supposed to basically do what hitting a key from the main help menu would accomplish. There was untested code for the special case section keys that didn't actually work, leading to a blank screen. This lets `show_help` handle these section arguments (e.g. `v`) correctly, in case someone ever wants to do this. -------------------------------------------------------------------------------- 4cc9efd | advil | 2019-01-18 12:42:43 -0500 Show item help in newgame weapon menu instead of the key quick reference? This would be better if it scrolled directly to the weapons subsection but there's no quick way to do that yet. -------------------------------------------------------------------------------- 146c441 | advil | 2019-01-18 12:42:43 -0500 Handle pre-scrolled help screens correctly This fixes the bug where help in character selection is not going to the correct help subsections (for species/background info). -------------------------------------------------------------------------------- 517b432 | mgdelmonte | 2019-01-17 22:00:02 -0500 Create a CLua function for spell targeter access This commit adds a clua function spells.path to report the path taken by a spell. Crawl's spell targeting mechanics are very complex, and without a function like this, proper Lua spell-casting assistance is hampered by the fact that it's impossible to know whether you can actually hit any given target, or what monsters will be hit by a spell. Given a spell name and target x,y in player-centered coordinates, this function returns the actual path that the spell would take, in a table of pairs { {x1, y1}, {x2, y2}, {x3, y3} } (also in player-centered coordinates). This makes it possible to know whether the spell will hit its target, and (for bolt spells) what monsters it might hit along the way. The function also takes an optional source coordinate, to assist in automating reasoning about monster spells. [Committer's note: Closes #939] -------------------------------------------------------------------------------- db21e03 | Edgar A. Bering IV | 2019-01-17 20:28:49 -0500 Reduce silence radius from Klown pies Monster silence is replaced with mute, as monster silence is full radius (5) for all but the last 3 turns of its duration. Player silence is reduced to 4+random2(7) turns, with a cap of 10. This means the player will have at most four turns with a silence radius of 1, followed by 6 turns of radius 0. The silence effect is strong, and primarily aimed at disabling the player. The monster silence effect meant that instead of being able to use a consumable or be stuck a player could be left in an awkward situation of wanting to kill an ally to break the silence. On the flip side, silence is strong against ancient liches and the draconian spellcasters in the zot monster set. The anti-synergy between klowns and these monsters hass the potential for if not abuse, at least strange incentives. Reducing the silence duration is also a nerf to the new klown pie effect; maintaining the old duration without having a large silence radius would require a new status effect. -------------------------------------------------------------------------------- f2270e3 | Edgar A. Bering IV | 2019-01-17 19:39:01 -0500 Enable god Extra in describe_god_with_join The describe_god_with_join pane has a distinct implementation from the standard describe_god ui, which assumed that there were always only 3 god panes. This is generalized to support displaying the Extra pane when kneeling at an altar if relevant. -------------------------------------------------------------------------------- 809c088 | Edgar A. Bering IV | 2019-01-17 19:39:01 -0500 Hide some god Extra panes from non-worshippers Every god Extra pane except Wu Jian's currently provides worshippers with information about their religious practice that is not helpful to a potential follower. -------------------------------------------------------------------------------- 2dd2dce | Edgar A. Bering IV | 2019-01-17 19:39:00 -0500 Only list seen branches in Gozag's Extra pane (advil) This matches the display of branches in the Overview screen. The previous behavior, of only hiding the Lair branches until they've been discovered, was a bit awkward. -------------------------------------------------------------------------------- c05403b | advil | 2019-01-17 19:39:00 -0500 Code formatting Missed some unbracing. -------------------------------------------------------------------------------- 8732018 | advil | 2019-01-17 19:39:00 -0500 Remove commented code Missed this on the earlier commit. -------------------------------------------------------------------------------- 6f75a6c | advil | 2019-01-17 19:39:00 -0500 Code formatting, wording -------------------------------------------------------------------------------- 5b2007c | advil | 2019-01-17 19:39:00 -0500 Add god extra pane to webtiles Would be nice someday to not have to hardcode every pane. -------------------------------------------------------------------------------- f2a872a | Edgar A. Bering IV | 2019-01-17 19:39:00 -0500 Add a god Extra pane for Wu Jian Move the description of martial attacks to the Extra pane. -------------------------------------------------------------------------------- 710303d | Edgar A. Bering IV | 2019-01-17 19:39:00 -0500 Add a god Extra pane for Nemelex Lists the quantity of cards in each deck plus the stack contents. -------------------------------------------------------------------------------- 550063b | Edgar A. Bering IV | 2019-01-17 19:39:00 -0500 God Extra panes for Ash, Gozag, and Hep Move information about skill boosts, bribeability, and ancestor information; previously in _get_god_specific_table and included on the Powers pane to the newly created Extra pane in the god description menu. -------------------------------------------------------------------------------- bfe4a4d | bjobae | 2019-01-17 19:39:00 -0500 Future proof Beogh gift monster props -------------------------------------------------------------------------------- 509b01f | bjobae | 2019-01-17 19:39:00 -0500 List named followers for Beogh worshippers The 'Extra' pane of Beogh's god info screen lists all named followers and those items which were gifted to them by the player. -------------------------------------------------------------------------------- 1a98732 | bjobae | 2019-01-17 19:39:00 -0500 Add support for an 'Extra' pane in religion screen For those gods for which '_god_extra_description(god_type)' returns a nonempty string, a pane called 'Extra' is made available in the religion screen, displaying the content of that string. -------------------------------------------------------------------------------- 38971ea | gammafunk | 2019-01-17 16:06:33 -0600 Change the Singing Sword's power for monsters (ebering) Don't base it on tension, since that's information about the player, and the player may not even be in LOS. Just use the first power tier instead. -------------------------------------------------------------------------------- 2dde14e | NormalPerson7 | 2019-01-17 17:05:34 -0500 Add a note to docs/obsolete/cut_spells.txt This commit adds a note to the top of the file to outline the changes made to spell definitions since the spells in this file were cut from the code - the most recent of which occurred in 2012 when TAG_MAJOR_VERSION was last incremented. -------------------------------------------------------------------------------- c3062a4 | NormalPerson7 | 2019-01-17 17:05:34 -0500 Convert `enum recall_t` to an enum class -------------------------------------------------------------------------------- 76aa57b | NormalPerson7 | 2019-01-17 17:05:34 -0500 Convert `enum miscast_source` to an enum class Convert the enum `miscast_source` to an enum class. The name of the enum is unchanged. Wrap all lines made too long, as always. -------------------------------------------------------------------------------- c88e511 | NormalPerson7 | 2019-01-17 17:05:34 -0500 Add a struct to use for MiscastEffect::special_source Create a new struct miscast_source_info to use for passing a miscast's source and if the source was miscast_source::god, the god that caused it, instead of the previous system of using one int member variable for two meanings. Update all calls to MiscastEffect, all uses of the special_source variable inside the MiscastEffect methods, and the MiscastEffect::MiscastEffect initialisation function and class declaration, to use this new struct. This should be no less obvious than in the previous implementation while ensuring type security; intentionally adding enum values of two different types as in the previous implementation is poor. This is necessary in order to convert the miscast_source enum to an enum class, since adding an int (god_type) to an enum class type causes compilation errors. This conversion takes place in the following commit. -------------------------------------------------------------------------------- b067b0d | NormalPerson7 | 2019-01-17 17:05:34 -0500 Convert `enum nothing_happens_when_type` to `enum class nothing_happens` Convert the nothing_happens_when_type enum to an enum class and shorten its name to nothing_happens. This continues the conversion of several spell-related enums to enum classes. This enum is quite small and the effect of changing it is similarly small. No change in logic was required in this commit; only a couple of line breaks were made where lines were made longer. The enum class' member names remain capitalised for this enum class because if made lowercase I am worried about `default`, a keyword in C++, being redefined. -------------------------------------------------------------------------------- a6713cf | NormalPerson7 | 2019-01-17 17:05:34 -0500 Convert `enum spschool_flag_type` to `enum class spschool` Convert spschool_flag_type to an enum class and rename it to a much shorter name `spschool`, which adequately describes the enum's contents. Note that the LAST_SCHOOL value in this enum class is capitalised as it is designed to be a constant value and so we capitalise it in accordance with other constants. Fix all errors caused by attempting to implicitly cast spschools to integers: either use static_cast or an explicit C-cast in these cases. Wrap all lines that were made too long by this commit and the lengthening of enum values from e.g. SPTYP_NONE to spschool::none by 4 characters. Realign variable definitions spanning multiple lines whose alignment was interfered with by the changing of the enum class name, and de-wrap some of these that will now fit on one line. This commit does not update SPTYP_s in crawl-ref/docs/obsolete/cut_spells.txt. In a future commit, I will add a note referring to these outdated enum values to the header of this file. -------------------------------------------------------------------------------- c3daa31 | NormalPerson7 | 2019-01-17 17:05:34 -0500 Convert `enum spflag_type` to `enum class spflag` Change spflag_type to an enum class and rename it to spflag in accordance with other such enum -> enum class changes (for example abflag_type -> abflag, spret_type -> spret). Add a new bitfield type called `spell_flags`, which is to be used for bitfields composed of the various spflags in place of the previous system which was using unsigned integers. This is a significant improvement to Crawl's type safety. Fix all issues related to implicit casting of (spell_flags & spflag) to a bool in a return statement or variable definitions, by either explicitly casting to a boolean or, more preferably, using the testbits function - these would otherwise cause compilation errors now. Wrap all spell_flags lines in spl-data.h that now exceed the line limit of 80 characters due to the additional character (caused by changing _ to :: in enum value names) per enum value. This commit does not change SPFLAG_... to spflag::... in comments referring to removed enum values in the spflag enum class definition, nor does it change SPFLAG_s in crawl-ref/docs/obsolete/cut-spells.txt. -------------------------------------------------------------------------------- e7febcc | gammafunk | 2019-01-17 06:42:07 -0600 Sometimes place the Singing Sword in a vault The classic sword_in_stone vault places a sword "sealed" in stone (actually diggable rock), with the sword being a dancing one in later levels. Have a 1/50 chance of this sword being the Singing Sword, making it dance when appropriate. -------------------------------------------------------------------------------- 5913316 | gammafunk | 2019-01-17 06:42:07 -0600 Allow monsters to use the Singing Sword It's not necessary to prevent them from using this weapon now that the spell code has been refactored. Although they'll damage other monsters in LOS with the sword's spell damage, this damages the player as well. This is still a weapon the player wouldn't want to use with Spectral Weapon, since the spectral sword's Sonic Wave will damage the player. -------------------------------------------------------------------------------- cf8a540 | gammafunk | 2019-01-17 06:42:07 -0600 Revamp the Singing Sword again The current sword has tiers derived from tension to determine the chance to cast its Sonic Wave spell. There are four tiers, with the sword's spell only being cast starting at tier 3, which corresponds to at least 40 tension. It's less common to be at tier 3 during combat, since this needs many difficult monsters to be in view. Since the sword's spell isn't cast below tier 3, its damage is equivalent to a +7 vorpal double sword in most fights. While doing the rework in 2a92f5cd, fsim lead me to overestimate the sword's damage below tier three, since it was setting high tension regardless of what was in LOS at the time. This commit changes how the tiers are calculated, how frequently Sonic Wave is cast, and increases Sonic Wave's damage. The tiers are now calculated as max(1, min(4, 1 + tension / 20)), meaning that they increase every 20 tension with tier 1 being tension less than 20 and tier 4 being tension 60 or higher. This makes tiers above 1 easier to reach in typical combat situations. Previously tier 4 could only be reach if tension was at least 40 and a random roll succeeded. Most importantly, the sword will now cast its spell below tier 3, doing so with 1/4 chance at tier 1 and 3/8 chance at tier 2. It casts 50% of the time at tiers 3 and 4, just as it was before. The damage die for Sonic Wave are increased and small bonuses are given for the sword's spell-power at each tier, instead of only at tier 4. Tier 4 receives a large additional bonus, as it did before. Collectively these changes make the sword do about -10%, +0%, +10%, and +20% damage at tiers 1 through 4, respectively, compared to a +9 double sword of speed. The noise levels at each tier are unchanged, with tier 4 being as loud as the shield of gong. -------------------------------------------------------------------------------- 0b75920 | Edgar A. Bering IV | 2019-01-16 23:09:16 -0500 checkwhite (Stenella) -------------------------------------------------------------------------------- 94ec030 | NormalPerson7 | 2019-01-16 16:14:31 -0500 Fix monsters not being woken when hit by animated trees (11819) This commit adds a call to behaviour_event to, among other things, wake sleeping monsters, when they are attacked by an animated tree from summon forest and the attack hits (regardless of any damage dealt). -------------------------------------------------------------------------------- 06a100f | NormalPerson7 | 2019-01-16 13:49:33 -0500 Don't let battlespheres be blinded (11827) Battlespheres are insubstantial magical constructs, and thus do not see with eyes. It therefore makes no sense for them to be able to be blinded. Therefore, add the M_UNBLINDABLE monster flag to their mon-data.h entry. -------------------------------------------------------------------------------- 19699f6 | NormalPerson7 | 2019-01-16 13:40:19 -0500 Fix death channel duration leak when cast at max duration (11828) Simply remove the check in cast_death_channel for returning spret::abort when at max duration. The information that the player has maxed out their duration is not given to the player for other spells, and so should not be given for death channel. -------------------------------------------------------------------------------- 9fa1570 | advil | 2019-01-15 18:30:54 -0500 Fix a bug in util.formatted_string_to_html This would appear to be a >5 year-old bug that appends an extra any time a color is correctly terminated. (Luckily it seemed to mostly be getting fixed up on append calls? I found it because the fixup will eat whitespace, potentially messing with preformatted text.) -------------------------------------------------------------------------------- 0a1bb4f | advil | 2019-01-15 18:30:54 -0500 Handle ?/ better, generalize range "key" to webtiles From previous commit messages for this change, I gather that the assumption was that if mon_owner is null, there is not an actual corresponding monster. This doesn't seem to be correct -- mon_owner is null if this codepath is called on an item (does this ever happen?). The best check for whether this mons_info corresponds to a real monster is whether the position is in bounds (and crawl_state.need_save for whether the player is in a game). I moved the text explaining the hex percent and range out of describe_spellset, so that it is visible on webtiles. I *think* that this is the only way this code path is called when showing monster spells; otherwise, describe_spellset is (or maybe isn't any more?) called on items. -------------------------------------------------------------------------------- 0b8caf7 | advil | 2019-01-15 18:30:54 -0500 Generalize range string logic for webtiles This computation got complicated enough that it should only be done in one place. -------------------------------------------------------------------------------- 4d4c92e | advil | 2019-01-15 18:30:54 -0500 Various small tweaks * explain red coloring in the key * don't show range for spells with SPFLAG_SELFENCH, which are basically not treated as ranged on monsters. In practice, this may exclude only invisibility. (N.b. all monster spells that have this flag and could in principle be cast on allies have an _OTHER counterpart anyways. SPELL_INVISIBILITY_OTHER doesn't seem to be used.) * code formatting -------------------------------------------------------------------------------- 99592df | Edgar A. Bering IV | 2019-01-15 18:30:54 -0500 Remove ranges from Haste and Might Monster AI always uses these spells as self enchants, with Haste Other and Might Other existing for monsters to affect allies. The ranges are vestigal from when these were player spells, and cause bogus displays of spell range for monsters with these spells. -------------------------------------------------------------------------------- 8ac9f62 | Edgar A. Bering IV | 2019-01-15 18:30:54 -0500 Add spell ranges to monster info in webtiles -------------------------------------------------------------------------------- 32e1316 | Edgar A. Bering IV | 2019-01-15 18:29:16 -0500 Only display ranges in monster descriptions They're not needed in book descriptions, a player who is unfamiliar with a given spell and considering a book item will want to know all about it, not just its range. -------------------------------------------------------------------------------- e15ba66 | Edgar A. Bering IV | 2019-01-15 18:29:16 -0500 Improve colour handling for spell ranges The first implementation did not parse the colours into the formatted string at the moment of adding (a gotcha with formatted_string::cprintf). Here we replace the formatted_string::cprintf call with an operator += concatenation. This makes spell displays render in webtiles again. -------------------------------------------------------------------------------- c9aa113 | Aidan Holm | 2019-01-15 18:29:16 -0500 Right-align hex-chance in monster spell list -------------------------------------------------------------------------------- d70207d | Aidan Holm | 2019-01-15 18:29:16 -0500 Use colour to differentiate in/out-of-range -------------------------------------------------------------------------------- 6d93017 | Aidan Holm | 2019-01-15 18:29:16 -0500 Add hex-chance and spell-range explanatory text -------------------------------------------------------------------------------- ab26df7 | Sandman25DCSS | 2019-01-15 18:29:16 -0500 Display range for spells in monster description (aidanh) Please see https://crawl.develz.org/tavern/viewtopic.php?f=8&t=23901 No colors yet, I am not sure how to do it properly. -------------------------------------------------------------------------------- 00c90a0 | Edgar Bering | 2019-01-15 13:01:39 -0500 Save compat for c89a89d9 (11829) -------------------------------------------------------------------------------- e59bbb1 | Edgar A. Bering IV | 2019-01-15 00:29:11 -0500 Display (immune) in monster hex chance in webtiles Commit b5b85be8 added this functionality to console and local tiles. -------------------------------------------------------------------------------- 3a644c0 | Edgar Bering | 2019-01-14 18:30:48 -0500 Remove grate traps Now that traps are revealed grate traps do less than what they previously did, in that a spoiled player knows to simply take another stair. Spoilers or not, once the grate is down a player can use the grate and a smite targeted spell to kill monsters at no risk to themselves. -------------------------------------------------------------------------------- c89a89d | Edgar Bering | 2019-01-14 18:27:38 -0500 A Klonw Kar trap for Zot Generalize the basket of spiders trap to be a monster-drop trap. Then add the trap to Zot but have it drop Killer Klowns. Also change the snake version to drop a mix of mambas and mana vipers. The basket traps work ok as tactical terrain even with traps revealed, since a monster triggering the trap will still release a player-targeting effect (more monsters). -------------------------------------------------------------------------------- aad00d0 | gammafunk | 2019-01-14 15:54:16 -0600 Changelog through 0.23-a0-709-gaefc81b7b9 -------------------------------------------------------------------------------- aefc81b | gammafunk | 2019-01-14 02:30:37 -0600 Update loot in a Gauntlet exit vault The vault nicolae_gauntlet_exit_dead_adventurers is themed as having the corpses and loot of four dead adventurers that failed to defeat the minotaur. The loot items are appropriate for the archetypes character represented by the given corpse. For example, a spriggan stabber with a short blade weapon and a hexes randbook. Unfortunately the current version of this vault doesn't place very good loot, despite placing more items on-average compared to the other Gauntlet exit vaults. It uses mostly normal quality, common items with only a few choices to represent weapons and armour, and with few consumables on-average. This commit revamps the loot to place better quality items with much more variety, but still keeping the theme of each adventurer to the best extent possible. Item quantities are randomized so that the min, max, and average numbers of items placed are very similar to the other Gauntlet exits. More consumables, jewellery, evokables, and aux armour items are also introduced. The Dwarf Earth Elementalist in heavy armour corpse became a Felid Transmuter corpse with items appropriate for Transmutations and unarmed combat, since heavy armour was already very well represented in the loot. -------------------------------------------------------------------------------- b957dac | gammafunk | 2019-01-14 02:30:37 -0600 Use runed clear doors in Gauntlets For arenas that use rune doors, make these transparent. They especially make sense in the Gauntlet, where the rune doors are meant to be used by the player to control monster movement. -------------------------------------------------------------------------------- 4e6f924 | gammafunk | 2019-01-14 02:30:37 -0600 Four 9x9 arena vaults for Gauntlets These are subvaults used as 9x9 arenas. I'm hoping to have at least 20 of these before release, and this puts us at 18. One vault with a narrowish two-way passage that has lots of corners to maneuver around, one with three porous chambers, and two mazey arenas with randomized pathways. -------------------------------------------------------------------------------- c92f3ec | gammafunk | 2019-01-14 02:02:01 -0600 Decouple chances for Gauntlet loot upgrades Make two independent chances for upgrading the aux armour and jewellery loot item slots instead of one chance used for both. Add some comments to the loot setup function. -------------------------------------------------------------------------------- 0e654d2 | Edgar A. Bering IV | 2019-01-14 02:23:19 -0500 Really remove Labyrinths (11820) Mark labyrinths as "unfinished" in the branch_is_unfinished function, joining Dwarf, Blade, and Forest on the list of removed branches. This prevents a crash when lookup-help attempts to display an entry for the removed branch. -------------------------------------------------------------------------------- 7fdf9c5 | Edgar A. Bering IV | 2019-01-13 21:36:35 -0500 Add clear doors to some Elf layouts. A longtime TODO of infiniplex's, now implemented. This commit adds them on the '~' glyph with a KFEAT; it is hoped that in the near future the KFEAT line can be deleted and '~' made to default to closed_clear_door. -------------------------------------------------------------------------------- df2d5e0 | NormalPerson7 | 2019-01-12 12:29:28 -0500 Improve text when gaining/losing god abilities and on ^ screen Improve the text printed to the message log when gaining or losing a piety level and the text displayed on the god overview screen (^) such that: - all text printed when the player gains a piety level contains the word "now", and is written either with "can", "will" or similar, or in the continuous present tense, e.g. "Kiku is now protecting you from torment"; - all text printed when the player loses a piety level contains the words "no longer", and is written with either "can" or "will" or something similar, e.g. "Kiku will no longer protect you from torment" - all text on the ^ screen uses either "can" or the present tense, e.g. "Kiku protects you from torment". This removes all poor constructions involving the use of the continuous present on the ^ screen, and the continuous present without the word "now" on gaining abilities - an example of this was "Vehumet is aiding your destructive magics", which becomes "Vehumet is now aiding ..." on gaining 2* of piety, and "Vehumet aids ..." on the ^ screen. This is done by adding a new variable "general" to the god_power struct, to differentiate between the text on the ^ screen and the text on gaining the ability, which were previously the same unless the "You can " construction was being used. Also add messages for when Trog begins granting ammunition gifts and when Jiyva begins granting corrosion resistance. Also break several lines in the definition of the god_powers vector that went beyond 80 characters because multiple parameters were placed on a single line, or that did or did not go beyond 80 characters and had more than two parameters split over two lines. This aims to improve readability. Finally, add a description of the "You can [now /no longer ]" construction used for some god abilities, that is implemented in a different way, to religion.h. -------------------------------------------------------------------------------- d214142 | gammafunk | 2019-01-11 23:31:35 -0600 Stop dragon cruelty in a vault (howmanybefore) Dragons were sealed behind clear stone walls in orc_legates. Items could generate there and it was a teleport closet. We could mask this area with no_tele_into and no_item_gen, but it's more interesting to add clear runed doors and spruce up the dragon collection a bit, so do that instead. -------------------------------------------------------------------------------- d76f34b | Edgar A. Bering IV | 2019-01-11 22:24:16 -0500 Remove an extraneous article Zap names are not expected to contain an article, so duplicate articles were appearing. -------------------------------------------------------------------------------- 01d8f91 | gammafunk | 2019-01-11 20:18:42 -0600 Increase killer klowns' club enchantment Setting the plusses of a mon_weapon_spec disables further property settings for the given weapon, so these were getting fewer enchantment than intended. Even with the usual chance for extra enchantment, it would have been a low average with a high max. Instead set the enchant range from 8 to 12 using one roll. -------------------------------------------------------------------------------- ba807d0 | gammafunk | 2019-01-11 20:18:35 -0600 Slightly more klown pies Increase the chance of a klown throwing a pie on one of its normal actions from 8% to 12%. Play-testing has shown them to be pretty stingy with pies, which, honestly...they should be more willing to share. -------------------------------------------------------------------------------- 260fa77 | gammafunk | 2019-01-11 19:21:18 -0600 Use the right spell flags for Throw Klown Pie This previously used flags appropriate for a smite targeted spell, which would have Klowns throw pies without the knowledge gained from using a tracer. -------------------------------------------------------------------------------- 39acc7a | gammafunk | 2019-01-11 18:01:36 -0600 Rework trap and monster placement on Zot:5 This commit changes the hall_of_Zot vault on Zot:5 to rework some placement distributions and logic. The monster count is unchanged and the monster distribution is very similar to before, but a lot of the placement logic is refactored. The changes to trap placement are more substantial, as described below. In general, glyph usage and DES statements have been refactored and comments have been updated. Previously, the vault placed about 36 mechanical traps on-average, additionally placing around 7 each for alarm, dispersal, teleport, and Zot traps, for an average of 64 traps in total. After this commit, the newly reworked net traps are the only mechanical traps to place in the vault, and their numbers are brought inline with the non-mechanical traps. We increase the number of traps for the remaining types to about 9 on-average for dispersal, net, teleport, and Zot, reducing the number of alarms traps to about 5.5 on-average. Alarm traps have a big effect on the vault as a whole when activated, so it's good to keep numbers of these relatively small. The total average number of traps is now about 41.5. The trap and monster placement logic has been changed to not rely on fixed locations. In the old system, traps were scattered over many fixed locations throughout the lower wings. In the upper wings, monsters sets and traps were likewise scattered over fixed locations, but these were fewer and more central. The new placement works similarly for placing monsters, just without relying on fixed locations, and traps are allowed to place in more locations in general. For the upper wing, we use a large central square over which we place the guaranteed monsters and monster sets. In each upper and lower section of both wings and in the orb chamber, we now guarantee a minimum number of traps. Previously, there was about a 33% chance to have a difficult trap (alarm, dispersal, teleport, Zot) in both single tile passages leading to the two lower wings. With the new trap placement, this chance of having both entrances blocked by such traps is reduced to about 21%. There was previously a 19% chance to get one or more orange crystal or obsidian statues on the two outermost tiles of the line of floor connecting a lower wing to its upper wing. This could only happen in one wing and was based on another random roll used to determine the trap chances for the lower wing entrances. This logic has been simplified, so there's now a lower but independent chance for generating statue monsters each wing. This makes the overall chance of seeing at least one statue monster at any of these locations be 29%. Additionally traps can now place at these locations as alternates to the statue monsters, using the same low chance. Finally, since we carefully control trap placement, I've disabled level trap generation inside the vault that would place additional traps. For the monster sets, the set for killer klowns has been updated to give them all of the extra weight, as is already done for the ancient lich and orb of fire sets. Previously some of that extra weight was given to 0 (normal level) spawns. Hence the number of klowns placed on-average in the vault is up by a bit more than one, but the overall monster count is the same. -------------------------------------------------------------------------------- f95311e | Edgar Bering | 2019-01-11 16:48:26 -0500 Remove a possible teleport closet (11823) -------------------------------------------------------------------------------- 7bcdfeb | Edgar Bering | 2019-01-11 11:58:49 -0500 Correct a typo in monster pie effects -------------------------------------------------------------------------------- 178e528 | Edgar A. Bering IV | 2019-01-11 00:35:40 -0500 Remove mechanical traps from Tomb Tomb used the '~' des glyph, one of the last places it is used regularly. All uses have been replaced with kfeats, chosing player-targeting traps (alarm, net, zot, and dispersal) exclusively. The corridor blocking traps in Tomb:1 do not include dispersal traps in their list for sanity's sake. -------------------------------------------------------------------------------- 2124650 | Edgar A. Bering IV | 2019-01-11 00:35:08 -0500 Adjust ossuary_the_hunt_dpeg This ossuary has not worked for some time: zombies can't open doors. The revelation of traps has made it even worse, as the "nasty" trap mode can just be avoided by stepping around them. The doors are removed and trap selection is revised, removing most of the mechanicals. Net traps are now player-targeting, so are the lone mechanical trap that is kept. -------------------------------------------------------------------------------- 0aaec43 | Edgar A. Bering IV | 2019-01-11 00:35:08 -0500 Adjust trap usage in some ossuaries Now that traps are known, decorative traps can be removed. Corridor mechanical traps are kept, since at the depths ossuaries generate they provide obstacles to retreat. -------------------------------------------------------------------------------- b058042 | Edgar A. Bering IV | 2019-01-11 00:31:32 -0500 Zot-ify net traps Part of an incremental push to fully phase out mechanical traps. The other mechanical trap effects don't make much sense to convert to tactical terrain (flavoured damage), but nets do. This commit does not return nets to dungeon generation, so these are currently limited to the vaults that place traps. -------------------------------------------------------------------------------- 0a1fc62 | advil | 2019-01-10 17:10:46 -0500 Prevent recursion for `viewwindow` Because this function resets a lot of display state, any recursion is potentially bad news since the lower code on the stack than the recursive call may have references that become invalid. However, it is hard to call it a bug that this function can occasionally be called recursively, since there are many ways to trigger it and they tend to be necessary for some corner case or other. (It perhaps suggests some kind of radically different approach to redraws, though.) This change was specifically provoked by a series of crashes like: https://underhound.eu/crawl/morgue/Skull/crash-Skull-20190109-202350.txt More precisely, what was happening here is the following: Preconditions: (a) the player had a custom autopickup function in their rc that had a bug (and so caused a lua error, related to trying to check if trunks were rotten in 0.22) when hungry. (b) they trigger a runrest delay, e.g. by 5. (c) there is some pickup-able item in los. (d) tiles. 1. `viewwindow` is called normally during an `_input` cycle. 2. In order to render the tile with an item during this call, the game needs to know if the object should trigger autopickup. (`_tile_place_item` calls `item_needs_autopickup`.) It gets this `item_def` from the global map (env.map_knowledge), and starts passing it around by reference. 3. The autopickup hook errors, and crawl prints the error with mprf. 4. The printing of an error (immediately) interrupts the delay, which eventually calls `runrest::stop`, which calls `viewwindow` again. 5. During this second call to `viewwindow`, `show_init` is called, which clears out the (global) map. Somewhere along the line, on the tile with the item on it, `update_tile_at` causes `map_call::clear` to be called on that tile, which deletes any cloud/monster/item info stored in that tile. 6. When flow gets back to the autopickup code, there is now an item_def reference that is invalid (because it is a reference to something that has been deleted). If this memory has been re-used, at this point, a check on the item type will fail, leading to the crash seen in the log above. (This in practice happens maybe 1 in 10 calls, and is quite random.) Morals? Side-effects are bad, and side-effects involving global state are especially bad, but this sequence of events is so complicated and involves so many core bits of crawlcode that I couldn't come up with a reasonably-scoped, principled solution. Since some version of this has potential to happen any time there is this recursion, I just prevented the recursion altogether. -------------------------------------------------------------------------------- 3016822 | advil | 2019-01-10 17:10:46 -0500 Don't chop messages at 80 chars for chardumps/crashes This probably comes up mainly for things like lua error messages. (An alternative would be to not bother with 80 chars, which would make sense for crashlogs, but not necessarily chardumps.) -------------------------------------------------------------------------------- e64fb27 | Edgar Bering | 2019-01-10 15:42:45 -0500 unbrace and checkwhite -------------------------------------------------------------------------------- b50ad93 | Jacob Meigs | 2019-01-10 13:37:28 -0500 Decouple hi-score logic from ouch (11431) Update to print logic to pull from the hi-scores already in memory. All entries are added to memory from the read when attempting to add the entry. [Committer's note: Closes #742] -------------------------------------------------------------------------------- 0964cf1 | Umer Shaikh | 2019-01-10 13:15:22 -0500 Fix information leak for invisible monsters (11815) If the player wielded certain unrands that do damage to nearby actors on attack, and had allies nearby, then they got a prompt for confirmation when attacking. This prompt happened even if the player could not see the enemy. So the location of the enemy was revealed, in no time, by the player's trying to move into the cell. This commit changes that: the player trying to move into a cell with an unseen monster will attack without a prompt. NB: now characters walking around with one of these weapons equipped and without SInv may inadvertently anger their allies or their god. -------------------------------------------------------------------------------- fe0cbb1 | Edgar A. Bering IV | 2019-01-10 08:46:44 -0500 Add Ge0ff to CREDITS -------------------------------------------------------------------------------- b3bac08 | Edgar A. Bering IV | 2019-01-10 08:45:52 -0500 More permanent MP display (Ge0ff) Adds the real max MP on the Abilities screen. This way the Cost column will have, for example, "Permanent MP (10 left)" instead of just "Permanent MP." -------------------------------------------------------------------------------- 80e34f1 | Edgar A. Bering IV | 2019-01-10 08:45:32 -0500 Fix coloring for current MP in Webtiles (Ge0ff) The mp_colour .rc option has no effect in Webtiles due to a bug in the percentage_color() function. The function wrongly assumes that the player object has the real_mp_max property and tries to calculate MP percentage using its undefined value. -------------------------------------------------------------------------------- 68c7d63 | Edgar A. Bering IV | 2019-01-10 08:44:50 -0500 Display real MP for Deep Dwarves when necessary (Ge0ff) Deep Dwarves' Heal Wounds ability is the only one that requires real MP. Even if the maximum MP is 0 because of an antimagic weapon or -MP items, the player can still use the ability. Similarly, if the player has no real magic points, but has +MP items, the ability cannot be used. Currently it is not possible to check the real MP without taking actions. Taking off items with +MP and -MP or switching weapons takes time, and unequpping some items, e.g. Maxwell's etheric cage, has side effects. This patch adds real MP to the %-screen/morgue and to the HUD (only for Deep Dwarves and only when real MP != max MP). -------------------------------------------------------------------------------- 26ad783 | Alex Jurkiewicz | 2019-01-09 20:08:09 -0500 Add unbrace and checkwhite to Travis Also improves the output of `checkwhite -n`, using `unbrace -n` as a guide. This should make it more informative for new contributors reading Travis CI failed build logs. [Closes #754] [skip ci] -------------------------------------------------------------------------------- 356c24d | Edgar A. Bering IV | 2019-01-09 18:39:57 -0500 List johnstein under contributors also Already in credits for running CBRO, give credit also for development contributions. -------------------------------------------------------------------------------- 1a62673 | John Boyle | 2019-01-09 18:28:52 -0500 Remove an unused parameter from a function. Based on some minor code archaeology, looks like there was a big refactoring of the stairs logic in commit: 09e009602f11412cbc18de77043e78e84103c371 It appears that's when 'whence' appeared, basically a rename of the 'old_feat' variable. Also appears that the closely related variable, how, also made its appearance here (renamed from 'stair_find'). Here's a helpful docstring on the diff between the two variables: * @param how The type of stair/portal tile the player is being conveyed through * @param whence The tile the player was on at the beginning of the transition * (likely the same as how, unless forced is true) Looks like when the old code was broken up into several functions, 'whence' got superflously added and didn't actually belong in _travel_destination(). [Committer's note: Closes #615] -------------------------------------------------------------------------------- 34ce6ba | John Boyle | 2019-01-09 18:27:52 -0500 Don't let confused players win by tripping Previously, confused players who tripped up the stairs could actually win, despite getting a message saying they tripped back down. This update modifies the returned travel destination after tripping if the player is standing on the dungeon exit. Before, the destination returned was the default branch with a depth of -1, which would be an invalid destination. This was ok since this invalid destination would be interpreted later to prevent going up-stairs after tripping. However, there was special casing for standing on the dungeon exit to skip being blocked from transitioning to the destination. This logic was also updated. -------------------------------------------------------------------------------- 07611c5 | gammafunk | 2019-01-08 20:37:54 -0600 Allow Vertigo status to show up in status displays This allows it to show in the '@:' listing on the status screen as well as in logfile and milestone entries. -------------------------------------------------------------------------------- 03697e9 | Edgar A. Bering IV | 2019-01-08 20:12:26 -0500 Correct a feature description to match a tile -------------------------------------------------------------------------------- 184aec9 | Edgar A. Bering IV | 2019-01-08 20:11:05 -0500 Adjust the shape of a Bailey entry -------------------------------------------------------------------------------- e8b2c15 | Edgar A. Bering IV | 2019-01-08 20:05:33 -0500 New axe and polearm statue tiles (CanOfWorms) Replacing the unobtainable axes used as decoration in Bailey entrances. -------------------------------------------------------------------------------- 3803c42 | NormalPerson7 | 2019-01-08 14:45:54 -0500 Rename spret_type to spret This shortens the name to reduce the number of lines that were made too long by the previous commit, and so that the previous enum values (e.g. SPRET_ABORT) now easily correspond to their new class values (e.g. spret::abort). -------------------------------------------------------------------------------- fb80274 | NormalPerson7 | 2019-01-08 14:45:54 -0500 Convert spret_type to an enum class This commit converts spret_type to an enum class and replaces all instances of SPRET_ABORT, SPRET_FAIL, SPRET_SUCCESS and SPRET_NONE to spret_type::abort, spret_type::fail, spret_type::success and spret_type::none, respectively, to improve the type security of spell return values. This commit also fixes some intentional but nevertheless unnecessary casting of SPRET_ABORT return values to booleans in _do_ability (ability.cc), and a clear mistake of returning SPRET_ABORT in the boolean function uskayaw_line_pass (god-abil.cc), which would now cause compile errors. -------------------------------------------------------------------------------- 42e8185 | advil | 2019-01-08 12:48:11 -0500 Use window hidden API properly This probably disabled delays altogether on servers that updated since a036e810d7e9c886. -------------------------------------------------------------------------------- edc2041 | advil | 2019-01-08 12:48:11 -0500 Don't create a new TextDecoder for each message This may have been contributing to perception of choppiness, as it seemed to be triggering periodic gc that I'm not otherwise seeing. (I wouldn't have expected the old method to have any different effect, but who knows.) -------------------------------------------------------------------------------- eb4e2cb | Edgar A. Bering IV | 2019-01-08 12:14:33 -0500 Adjust Deal Four Clearing the deck made the cost practically too high. During playtesting there was a period where the deck was not cleared (a bug at the time) but the playtesters did not report that it was too overpowered. A piety cost of zero would be too low, so deal four gains a piety cost again. -------------------------------------------------------------------------------- 079dcdc | Edgar A. Bering IV | 2019-01-08 11:48:18 -0500 Adjust deck size and card dealing Increase the size of destruction decks to 26 and change the deal frequency to favor destruction more. Compared to the effects in summoning and escape, destruction effects tend to be a single turn conjuration (Storm and top tier Pain need adjustment here) which makes them comparatively weaker; giving the player more to work with should help equalize the decks in power. Compare this to old Nemelex's higher weighting of destruction decks. -------------------------------------------------------------------------------- c184e93 | gammafunk | 2019-01-07 19:11:02 -0600 Properly handle LOS for closed clear doors The LOS test for things that block translocations previously only considered features as blocking if they were opaque or walls. Close clear doors are neither but should block these effects. All forms of closed doors should prevent both effects and actors from passing through as long as the door remains closed. Add a feat_is_closed_door() check to the relevent "no_trans" LOS testing function. -------------------------------------------------------------------------------- 28d4f2f | Edgar A. Bering IV | 2019-01-07 15:35:03 -0500 New Nemelex Draw icons (ontoclasm) -------------------------------------------------------------------------------- 376580a | Edgar A. Bering IV | 2019-01-07 15:32:24 -0500 New dispersal trap tile (CanOfWorms) -------------------------------------------------------------------------------- a036e81 | advil | 2019-01-07 09:43:23 -0500 Don't run delays for webtiles windows that are hidden (11657) at least, according to the page visibility API, which is at proposed recommendation level and widely supported. (For older browsers, this should just fall back on the older behavior.) The problem in 11657 is that most browsers throttle setTimeout to use a minimum timeout of 1000ms for non-visible windowsr. So, long travel sequences that are supposed to have a 1ms delay in between each step instead have a 1s delay in between each step, and so run extremely slowly while the window is backgrounded and pick up speed to the regular timeout length once the window gets refocused. -------------------------------------------------------------------------------- 304f35b | gammafunk | 2019-01-07 02:01:20 -0600 Rework some areas of a ghost vault For gammafunk_ghost_gnarly_gnolls, always add the pair of doors closest to the landing area, using the newly introduced clear doors. Use clear doors elsewhere in the vault, and simplify the DES glyph usage. -------------------------------------------------------------------------------- 7e67e01 | gammafunk | 2019-01-07 02:01:20 -0600 Add clear doors to some vaults (minmay) These vaults have a more pressing need for clear runed doors due to their layout or being especially spoilery. We will probably have the `=` DES glyph default to runed clear door in the future, but that will require that we go over vaults a bit more systematically. After that, some of this commit can be reverted. -------------------------------------------------------------------------------- 7832a39 | gammafunk | 2019-01-07 02:01:20 -0600 Update list of past and present server admins in CREDITS.txt -------------------------------------------------------------------------------- 5cfbae5 | gammafunk | 2019-01-07 02:01:20 -0600 Add Matthew Ludivico to CREDITS.txt Move his name properly into the credits instead of having it in various comments for vault files. His name is also credited in the names of the vaults themselves. His name was listed in comments at the top of several vaults in addition to his handle being in the names of said vaults. -------------------------------------------------------------------------------- 1cc19cd | gammafunk | 2019-01-07 02:01:20 -0600 A 9x9 Gauntlet arena using runed doors This arena can be used now that clear runed doors exist. -------------------------------------------------------------------------------- 22e01ae | gammafunk | 2019-01-07 02:01:20 -0600 Tiles and tile logic for translucent doors (minmay) This commit adds clear door tiles made by minmay and updates tile handling logic to properly show these tiles. We have tiles for single closed, open, runed, and sealed clear doors as well as gated tiles. No Crypt-specific variants for these like the opaque doors have, but those shouldn't be necessary. Crypt has no special clear wall tiles that we're trying to blend with. -------------------------------------------------------------------------------- 9cb7e94 | gammafunk | 2019-01-07 02:01:20 -0600 Door handling logic for translucent doors Update the functions that test for close, runed, and sealed doors to included the clear door types. Add feat_is_open_door() and feat_is_runed() as general functions to test for open and runed doors now that there are two kinds of each. Also add dgn_close_door() and dgn_open_door() functions to close or open a door to the right type that retains opacity. In other words, when closing a door we turn a clear open one into a clear closed one. Update door handling logic to use these new functions. -------------------------------------------------------------------------------- 546a308 | gammafunk | 2019-01-07 02:01:20 -0600 Translucent door feature types and data Translucent doors are a new door type that allows LOS visibility through the door itself. These can be referred to simply as "clear" doors, but the word "translucent" is used in the in-game descriptions. One of the main uses of clear doors will be for vaults with runed doors. Clear runed doors allow revealing vault contents without as much use of adjacent translucent walls. This is especially useful for vaults with multiple-tile doors, which is something non-runed vaults can take advantage of as well using ordinary clear doors. Having clear doors types in addition to the usual opaque ones will generally allow for more creative terrain in vaults and layouts. This commit adds the four necessary dungeon feature types for translucent doors: closed, open, runed, and sealed. Subsequent commits will add the logic to properly handle retaining the right feature types as doors are open, closed, sealed, etc. This logic will be analogous to the behaviour of current opaque doors. Runed clear doors will turn into ordinary clear doors when opened. Sealed clear doors will remain clear, allowing visibility through them, but can't be opened until they're unsealed. Translucent door console colors are: cyan for ordinary, lightcyan for runed, and white for sealed. Tiles and tile handling logic will be added in a subsequent commit. It would be good to use clear runed doors for rune door vaults whenever possible to help minimize spoilers in these vaults. It may be possible to rework all runed door vaults to use clear runed doors. For now, we keep the opaque runed doors for the occasional more spoilery vault that needs them. Closes #934. -------------------------------------------------------------------------------- 3751e1c | advil | 2019-01-06 21:32:39 -0500 Don't use `let` Not necessary here and isn't otherwise used in our codebase. -------------------------------------------------------------------------------- 63bca24 | advil | 2019-01-06 21:15:16 -0500 Fix out-of-order messages (maybe 11780) For compressed websockets, the decoding process used a FileReader to convert the output of decompression to UTF-8. However, FileReader comes with no guarantees about the order in which callbacks get attended to when there are multiple instances, and in chrome especially they could get quite out of order for messages sent at roughly the same time. This lead to the message queue being out-of-order, which various aspects of the webtiles client are not robust to. This commit uses (suggested by jilles) a TextDecoder instance instead. Because this may not be supported by some browser versions still in use, I have kept the old approach as a fallback. (An alternative would be simply to use uncompressed websockets if TextDecoder is not supported.) -------------------------------------------------------------------------------- ca735f5 | gammafunk | 2019-01-06 17:44:52 -0600 A Throw Klown Pie ability for Killer Klowns This LOS-range ability throws a damaging projectile (a pie!) that inflicts a non-resistable and temporary debilitating effect on the victim whenever it does damage. The effects are: inability to drink potions (player-only), Vertigo (player-only), stat drain (player-only), silence, fire vulnerability, and polymorph. The player version of polymorph is restricted to forms that can always move: bat, hog, and wisp. The effects are weighted evenly except for fire vulnerability, which has 12% chance, and polymorph, which has 8% chance. These effects are ones not already represented by existing Zot monsters and mostly things that are significant in combat, especially with multiple monsters involved, but don't always necessitate immediate retreat. Polymorph is the exception to this; it's a rare but scary effect where the player has to use the form to escape or use things like potions of cancellation, allies, god powers, powerful spells, etc. for safety. The pie does damage that's the same as quicksilver dragon breath, 3d20. This is enough to give it a good chance to have an effect even on characters with good AC. Additionally Klowns have a low weight for using their new ability, about 1/4 as much as Quicksilver dragon use their breath. The pie projectile tiles are taken from the April Fool's implementation of Jesters. Now all that's left is to make Killer Klowns worship Nemelex and have Xom wrath... -------------------------------------------------------------------------------- bb96f5f | gammafunk | 2019-01-06 17:44:52 -0600 Code support for restricted player polymorph Add a `allow_immobile` argument that defaults to true for actor::polymorph(). If this is false, the player won't polymorph into a form that can become immobile, like Tree or Fungus form. This will be used in an upcoming Killer Klown spell. -------------------------------------------------------------------------------- e027d9b | gammafunk | 2019-01-06 17:44:52 -0600 Initial rework of Killer Klowns Killer Klowns are fairly boring and ineffective Zot monsters right now. Their defining characteristics are their speed, their af_klown melee, and their blinking. The af_klown melee effects are mostly already represented by existing Zot monsters and are necessarily conservative to avoid a "never melee this" situation. Overall, Klowns feel like nothing more than blinking meatbags that don't really live up to their relative rarity and special use in the Hall of Zot. This commit is part of a reworks Klowns to give them a more interesting ranged attack in place of their custom melee type. The ranged attack will be a "Throw Klown Pie" ability that does damage and inflicts one of a set of temporary effects. It will be introduced in a subsequent commit. In this commit, the af_klown melee type is removed, and Klowns now get well-enchanted, usually branded clubs as melee weapons. A clubs is a poor weapon on its own, but high enchantment and use of brands combined with a Klown's decent melee damage serve a purpose similar to af_klown without needing a custom attack flavor. A club is also a funny weapon; you can't help but laugh when getting hit with a +12 club! The club brands include flaming, freezing, vorpal, elec, venom, vamp, antimagic, pain, holy wrath, and at very low weights, distortion and chaos. The last two create a "don't melee this" situation, but with a combined chance of only 3%, seeing a Klown with one of these brands will be a rare and delightful treat. This commit also removes Klowns' extra regen, something I'm sure many players (and some developers) didn't know they had! Klowns have lots of HP and like to blink around, so there's no need to help them overstay their welcome with fast regen. Klown tiles now have weapon offsets so that their clubs can be properly displayed for each tile variant. The tiles weren't designed to display a weapon, but the locations I've chosen work well enough for now. In the future, it might be good for an artist to adjust the tiles to allow better weapon display. -------------------------------------------------------------------------------- a4d50d4 | gammafunk | 2019-01-01 18:06:09 -0600 A Trog-themed ghost vault with wrathtful warriors A transporter ghost vault for D:7-15, Lair, Orc, Shoals, Snake, Swamp, Elf, Depths, and Zot. In gammafunk_ghost_wrathful_warriors, some warriors pay tribute with offerings at Trog altar. An unfortunate player tried to take the loot, but neglected to notice the moths of wrath provided by Trog to aid his champions. The only terrain are three rocky pillars arranged in a primitive henge with some randomized wall placement. Some of the warriors are armed with weapons themed as Trog gifts. In certain branches like Elf or Shoals, a couple monsters are primarily ranged attackers that pose the most threat before they berserk. All monsters are capable of being berserked and none are spell-casters. Numbers of monsters and loot scale with depth of placement, similar to other ghost vaults. The number of Trog-themed weapons gradually increases, as does their quality. -------------------------------------------------------------------------------- 5ee8fed | gammafunk | 2019-01-01 17:52:56 -0600 Update DES and monster data for a ghost vault Tweak the monster weapon definitions used by the ghost_orc_armoury vaults to make them a bit more general. Include some reasonably low weights for higher-end types for the knight set. Make the monster weapon sets available as variables for other ghost vaults. These will be used by a vault introduced in a subsequent commit. For the ghost_orc_armour vaults themselves, reindent the kmons() statements to be more readable. Also tweak NSUBST statements to put the fancier orcs earlier in the statements for clarity. -------------------------------------------------------------------------------- 2b9f6a0 | gammafunk | 2019-01-01 17:52:56 -0600 Fix loot generation in a vault In gammafunk_ghost_berserking_beasts, the loot wasn't placed properly in the Spider branch due to missing SUBST statements. -------------------------------------------------------------------------------- 3f50ca7 | gammafunk | 2019-01-01 17:52:56 -0600 Remove some ammo quantities from DES monster specs When giving ammo to a monster as part of its monster spec, the monster will be given a reasonable quantity for that ammo type if quantity isn't specified. The monster gear code doesn't correctly apply monster-specific quantity bonuses when doing this, which is something that should be fixed. However those aren't relevant for the instances changed by this commit. -------------------------------------------------------------------------------- 4b96247 | gammafunk | 2019-01-01 17:52:56 -0600 Update and comment a ghost vault loot function Have ghost_good_loot() use the lists of auxiliary armour in dat/dlua/dungeon.lua instead of having its own lists. Add comments describing how this function sets up its loot glyphs. -------------------------------------------------------------------------------- 8ec7dd4 | gammafunk | 2019-01-01 17:52:56 -0600 Fix a weapon specification function The random_item_def() function used by ghost vaults didn't properly exclude quick blades from receiving the speed ego. Also remove a check for randarts with no ego specification used by an earlier version of this function, since that's no longer needed. -------------------------------------------------------------------------------- b60d84b | NormalPerson7 | 2018-12-31 17:24:24 -0500 Improve spell description of memorised uncastable spells (11808) "You cannot memorise this spell because ..." was unsuitable when the player had already memorised an unusable spell before it was made unusable. Therefore, change this message to "You cannot cast this spell because ..." when the player had previously memorised the spell. Also convert `description` in this function from a string to an ostringstream to prevent casting to a string that would be caused by neither of the first two additions to `description` being of type string. -------------------------------------------------------------------------------- 9ccc95a | Edgar A. Bering IV | 2018-12-30 23:04:45 -0500 Changelog through 0.23-a0-642-g3120c2f5 -------------------------------------------------------------------------------- 3120c2f | gammafunk | 2018-12-29 22:44:08 -0600 A ghost vault with berserking beasts A transporter vault for D:7-15, Lair, Orc, non-Slime Lair branches, Elf, Depths, and Zot. In gammafunk_ghost_berserking_beasts, you encounter the ghost of a player who stumbled into a cave of beasts with moths of wrath lurking about. The monsters are animal-intelligence things from the branch of placement that can be berserked. Monster count and loot are progressive in the usual ghost vault fashion. An extra piece of auxiliary armor or jewellery that upgrades in quality by depth is placed under the ghost. The layout is the same used in another ghost vault for now. I'll rework it to be something more uniquely cave-like in a future commit. -------------------------------------------------------------------------------- 0a7f1ce | Edgar A. Bering IV | 2018-12-29 11:35:48 -0500 Update CREDITS -------------------------------------------------------------------------------- 5944deb | Ryan | 2018-12-29 11:33:10 -0500 Grant Qazlal cloud immunity to divine allies This fixes the non-combo circumstance where your own clouds kill your Qazlal Elementals. Qazlal still hampers other sources of allies. [Committer's note: Closees #773, restricted immunity only to Q allies] -------------------------------------------------------------------------------- a9a3373 | Umer Shaikh | 2018-12-28 14:59:07 -0600 Remove useless function declaration This function is never defined or called. -------------------------------------------------------------------------------- c52245b | bjobae | 2018-12-28 08:51:28 -0600 Adjust Amulet of the Acrobat The acrobat effect no longer works while held or constricted. Display of the EV-boost during the previous turn is improved by extending the duration of the acrobat effect for one AUT. There are no one AUT player actions, so if the player takes a non-acrobat action they will lose the status before the world_reacts(). The result is that the EV-boost received during the previous turn after doing non-actions (entering an unknown command, viewing inventory etc). [Committer's note: Closes #922, tweaked some comments and wording] -------------------------------------------------------------------------------- a828402 | Umer Shaikh | 2018-12-28 07:46:46 -0600 Make cloud duration more apparent to console players Tiles players can see when certain clouds (e.g., fire from conjure flame) are about to expire. We reveal similar information to console players by adding separate characters for (some) decaying clouds. These are distinguised by default in CSET_DEFAULT (but not CSET_ASCII) and can be set by the player by modifying the option display_char. -------------------------------------------------------------------------------- 0ff6057 | NormalPerson7 | 2018-12-27 10:15:30 -0600 Add three tile colour options to the options guide (11802) Add the options: tile_transporter_col, tile_transporter_landing_col, and tile_explore_horizon_col to options_guide.txt. Adjust whitespace to retain alignment of the other tile colour options. -------------------------------------------------------------------------------- 88ca12a | advil | 2018-12-26 16:49:16 -0500 Rename some more `require` calls These were added after the initial branch. -------------------------------------------------------------------------------- 1d98191 | advil | 2018-12-26 16:32:13 -0500 Rename `require` in tests -------------------------------------------------------------------------------- 8735bf6 | advil | 2018-12-26 16:32:13 -0500 Rename crawl's custom `require` We don't (normally) load the lua `package` lib, but this function shadows a lua `require` that would be loaded by this lib. Rename our `require` both to make it clear that this *isn't* the real lua require, and to allow the real thing to work (especially when libraries try to use it) for builds where `package` is loaded. -------------------------------------------------------------------------------- b80182b | advil | 2018-12-26 13:54:30 -0500 Improve behavior of drain life in wizmode (11801) Drain life, as a spell, is monster-only, and was crashing in wizmode because calling it as a player zap doesn't set the range correctly. This commit sets it explicitly to be monster-only; the Yred ability does use this spell type, but isn't impeded by this change because it is called there via `fire_los_attack_spell` which doesn't worry about this flag. Together with the added exception to prevent the zap from being called, this causes casting it in wizmode to use the monster cast code (i.e. create a dummy monster and cast it). This commit also adds a message when memorizing a monster-only spell via &!, not just when casting. -------------------------------------------------------------------------------- 5586149 | advil | 2018-12-26 13:03:08 -0500 Mark test statues as non-firewood 43d87f4 caused them to be firewood, which prevents tab from working (and maybe there are other side-effects no one has noticed). This commit lets them still be harmless, but also tabbable. -------------------------------------------------------------------------------- 9e4c4e9 | Edgar A. Bering IV | 2018-12-26 09:26:54 -0600 Correct a manual typo (11804) -------------------------------------------------------------------------------- ae4348f | gammafunk | 2018-12-24 14:12:57 -0600 Fix a typo in the gauntlet portal message (vt) -------------------------------------------------------------------------------- 7e7a9de | NormalPerson7 | 2018-12-24 12:20:21 -0600 Fix surge of power message order when evoking enhanced wands (11753) This commit adds functionality to deal with the "surge of power" message when zapping wands under MP-powered wands in your_spells directly, so that this message is displayed before any of the wand's effects and any world_reacts effects caused by zapping the wand are displayed. To effect the change this commit also moves the check for the player having enough MP to use the full power bonus from MP-powered wands into wand_mp_cost. [Committer's note: Closes #926, squashed and kept some Pakellas code in place since Pak is disabled but not removed] -------------------------------------------------------------------------------- f6ffe88 | gammafunk | 2018-12-24 10:23:42 -0600 Fix a typo in the INSTALL instructions (enop) -------------------------------------------------------------------------------- 6760373 | NormalPerson7 | 2018-12-24 10:22:16 -0600 Fix a typo -------------------------------------------------------------------------------- 1d2cd9b | gammafunk | 2018-12-23 18:24:49 -0600 Four Gauntlet maps using 7x7 arenas by minmay These maps use the 7x7 arena subvaults introduced in the previous commit. They have layouts ideas similar to the existing four 9x9 arena maps, introducing a couple variations and also sometimes mixing in 9x9 arenas in the same map. minmay_gauntlet_77_indecision: Six arenas total arranged in vertical pairs. The player chooses a path through two first tier pairs and one second tier pair. minmay_gauntlet_77_tree: A tree like arrangement of 7 arenas where all paths go through two tier one arenas and then a tier two arena. The first vault is mandatory, with two choices at each of the two points afterwards. minmay_gauntlet_mixed_big_or_small: Mixes 9x9 and 7x7 arenas, giving a choice of two paths, one using 9x9 and one using 7x7. Each path has two tier one arena followed by a tier two. minmay_gauntlet_mixed_oops_all_seconds: The player has three choices of paths with two arenas each, all of which are tier 2. Each path has one 9x9 and one 7x7 arena. I've tested all of these maps to make sure that they place all their subvaults properly and that all of their transporters work. -------------------------------------------------------------------------------- 52e5ff9 | gammafunk | 2018-12-23 17:57:47 -0600 Some 7x7 Gauntlet arena vaults by minmay These smaller arenas will be used in minmay's Gauntlet maps, which will be merged in an upcoming commit. The setup and glyph usage of these arenas is the same as 9x9 vaults, aside from using a different set of selection tags. The only change I've made is to simplify an NSUBST statement, but I've also verified that all vaults place the necessary numbers of glyphs, have the right tags, and call the setup function. The 7x7 arena vaults leave a lot less space for terrain given the requirement of 23 glyphs. It might be good to look at lowering the number of 3 glyphs required. The current sets use no more than six 3 glyphs, for example. Alternately we could have the monster placement code be aware of vault size limitations, allowing us to require different numbers of glyphs for different arenas. For instance, smaller arenas would never roll more than six monsters for the '3' glyph and if a set required more than six monsters as its minimum, a new set would be chosen. For now we're just requiring the same set and number of glyphs for both arena sizes. -------------------------------------------------------------------------------- e3a65f0 | gammafunk | 2018-12-23 14:02:37 -0600 Clean up some Gauntlet DES Rewrap comments and remove a stray wall glyph. -------------------------------------------------------------------------------- 59b4ea9 | gammafunk | 2018-12-22 18:18:04 -0600 A Kiku-themed ghost vault In gammafunk_ghost_crypt, the player finds a crypt housing some liches and from one to three player ghosts, with decreasing chances for each additional ghost past the first. Any ghosts that don't place are replaced with a lich, and the liches upgrade to ancient liches as appropriate for depth of placement. The vault is Kiku-themed, always placing a book that is a necro randbook, the Necronomicon, or a manual of necromancy. The other guaranteed loot are a piece of artefact auxiliary armor and a piece of randart jewellery. The remaining loot is randomized in typical ghost vault fashion. Places on D:15, and in Elf, Crypt, Vaults, Depths, and Zot. -------------------------------------------------------------------------------- 65ce32e | gammafunk | 2018-12-22 18:15:39 -0600 A trap-themed ghost vault The vault gammafunk_ghost_tricky_traps features Zot, dispersal, and alarm traps on the inside and outside. In addition to a player ghost, the vault has some in-branch monsters that can blink along with a depth-scaled number of normal level monsters. Loot also scales with depth, but always includes a piece of randart auxiliary armor. Places on D:15 and in Shoals, Spider, Elf, Vaults, Depths, and Zot. -------------------------------------------------------------------------------- 4f9fac9 | gammafunk | 2018-12-22 17:23:23 -0600 Rename a ghost vault Rename the vault ploomutoo_gammafunk_ghost_potion_laboratory to ploomutoo_gammafunk_vaults_ghost_potion_laboratory so its name is consistent with other ghost vaults. This makes vault searches and queries easier. -------------------------------------------------------------------------------- 281719c | Edgar A. Bering IV | 2018-12-21 16:35:28 -0600 Spice up the skin of Zhor Riffing on the cold theme, give it a passive Metabolic Englaciation effect. To cut down on message spam, have it only trigger when monsters are around, and give it SInv to avoid weirdness with detection. -------------------------------------------------------------------------------- 2e9d38c | advil | 2018-12-21 16:20:07 -0500 Fix some issues with build-rltiles and webtiles Ensure that libpng gets built if there is no pkg-config, so that the submake has access to it. Also a misnamed variable that crept in in a53296f351. -------------------------------------------------------------------------------- 9ead64f | gammafunk | 2018-12-21 13:53:36 -0600 A ghost vault full of gnarly gnolls A transporter ghost vault for D:3-8 that's inspired by Lemuel's infamous castle vault. In gammafunk_ghost_gnarly_gnolls, the player encounters a ghost who tried and failed to raid a well-guarded gnoll castle. Gnarly gnolls include those with branded reach weapons and possible nets, as well as gnoll artificers (just ordinary gnolls with wands). As depth increases, so does the amount of monsters and loot, with gnoll sergeants replacing some of the ordinary gnolls. On D:7-8, there's a chance for Grum and his band of wolves to replace one of these sergeants. The castle's treasure vault always places a manual (gnolls love raising skill levels!), a piece of jewelry, and some gold. The vault has mostly narrow passageways, but one or two doors may place near the entrance to give both players and monsters additional movement options. -------------------------------------------------------------------------------- 092a5d6 | gammafunk | 2018-12-21 13:37:16 -0600 Use local variables in some vault Lua Not using local in Lua functions can make certain bugs harder to find. For instance, bugs can happen when a variable is referenced by the wrong name and the incorrect name has already been defined globally, often by another function or block that should have declared the variable as local. The incorrect variable then gets used, which may lead to incorrect results without generating an error. This commits makes a bunch of ghost vault Lua variables local to their function or block. -------------------------------------------------------------------------------- 63707c9 | gammafunk | 2018-12-21 13:30:31 -0600 Fix a weapon ego designation in a vault It's 'vampirism', not 'vampiric'. This typo caused the vault to not place due to a parsing error whenever this ego was selected. -------------------------------------------------------------------------------- 6788861 | gammafunk | 2018-12-21 13:30:31 -0600 Fix a monster item definition in a vault The randomized weapon quality wasn't being correctly used, leading the quality to never upgrade from 'good_item' to 'randart'. -------------------------------------------------------------------------------- 343d861 | gammafunk | 2018-12-21 13:30:30 -0600 Fix a decoration and a comment in a ghost vault The SUBST was on the wrong glyph, never allowing withered trees to place as an alternate to withered plants. -------------------------------------------------------------------------------- cb482e9 | Edgar A. Bering IV | 2018-12-20 21:52:46 -0500 Display deck counts upon receiving a Nemelex gift -------------------------------------------------------------------------------- cf5c981 | Edgar A. Bering IV | 2018-12-20 19:23:35 -0500 Exempt Ashenzari followers from explore traps The explore trap system interacts poorly with scrying: a player walking over an explored area to scry a wall rolls traps upon the scry reveal (though only for those tiles that would grant xp), which means that the player can be trapped despite only stepping on what they believe to be safe tiles. This is an unintuitive interaction. Tracking whether a tile was revealed by scrying or by an honest look is in principle possible, but would need to be revealed in the UI and communicated to the player. Even before the trap change, piety was granted for scried tiles as if they were explored. Though it's not mentioned in the commit log the behaviour appears to be intentional, and it certainly prevents a UI headache. For this reason, and since Ash previously boosted trap searching this patch grants Ash followers immunity to explore based trap effects. -------------------------------------------------------------------------------- 21ca0c9 | Edgar A. Bering IV | 2018-12-20 19:21:19 -0500 Correct a conditional (Ge0ff) Commit 7a20e1 used the negation of the correct logic. -------------------------------------------------------------------------------- 13ba85c | Edgar A. Bering IV | 2018-12-20 19:20:05 -0500 Simplify monster trap pathing and knowledge -------------------------------------------------------------------------------- 7a20e13 | Edgar A. Bering IV | 2018-12-20 13:01:13 -0500 Don't trigger alarms through glass Breaking LOF reciprocity for this trap and not Zot and Dispersal traps led to bad interactions with scrying for little benefit. -------------------------------------------------------------------------------- 760965b | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Generalize uncancellable menus Add a flag MF_UNCANCEL that indicates to a Menu that it is uncancellable. Menus run with this flag should be run from within a run_uncancel to behave correctly under HUPs. -------------------------------------------------------------------------------- be15bf4 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Streamline the Stack Five UI Instead of repeatedly calling the deck chooser menu in a clunky fashion, implement a fancier deck chooser that displays the cards crawn so far on the bottom line. -------------------------------------------------------------------------------- 2fa7c9c | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Prompt before canceling damaging cards The player has already seen the card, so we can't put it back, but if they want to waste it that's their prerogative. If we see a hup we also cancel the card. -------------------------------------------------------------------------------- 67175e3 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Display the top of the stack in the ability menu Currently 'the Pentagram' is 13 characters, so there isn't space in the Cost column of the ability menu for the string 'A Card (the Pentagram, n more)' using a shorter string than this makes it even harder to parse. Since a player concerned about how many cards remain in their stack is probably also interested in which cards those are it doesn't seem too bad to not have the count in the ability display. -------------------------------------------------------------------------------- 80e52c9 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Default force_more for Nemelex gift messages This gives a force_more for every gift. As the gift timeout hasn't changed this is hopefully not too obtrusive. If it really is, a separate message for when a deck goes from zero to non-zero card count should be added and made the default along with the deck is full message. -------------------------------------------------------------------------------- 399e8c3 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Make the Velocity card less harmful at low power At power level zero Velocity was far more likely to be actively harmful to the player than to help. With the changes to Nemelex, this particular blind-draw downside is too harsh. The new card no longer removes haste at power zero, and has the following effects based on card level. - level chance in 2 to remove slow from the player - for each enemy in sight there is a (level + 1) chance in 3 to slow - for each ally in sight there is a level chance in 2 to haste -------------------------------------------------------------------------------- 7060c59 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Adjust Triple Draw and Deal Four The piety cost of deal four was a relic from old Nemelex, was too high (according to some) for even old Nemelex, and definitely too high for new Nemelex. The loss of cards means that deal four is piety gated in the new scheme already, so the piety cost for dealing four is now zero. Additionally, with card counts known, the punishment mechanic doesn't make sense (too flavour). Triple Draw is very good, and knowing deck counts means it can always be used on 3 cards, so its piety cost is increased. -------------------------------------------------------------------------------- 264638f | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Disable empty decks in the ability menu -------------------------------------------------------------------------------- 8f7bd25 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Display cards available in the ability menu -------------------------------------------------------------------------------- 465c976 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Descriptions for Nemelex Draw abilities These are automatically built to reflect the current state of the deck being described. -------------------------------------------------------------------------------- 96e2e8d | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Iconography and gui elements for decks Move old deck icons to UNUSED. Recolour and relocate the remaining ones to fit the colour scheme of Nemelex's other abilities. -------------------------------------------------------------------------------- 1e257c8 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Icons for the different draw abilities -------------------------------------------------------------------------------- 69d4283 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Split "Draw One" into individual draw abilities This removes an extra keypress that will add up over time. For user consistency, the deck hotkeys in the deck chooser are now the same as the ability hotkeys for drawing from them. If this behavior is undesirable for some users, an options toggle can be added. -------------------------------------------------------------------------------- 5f4ef56 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 New Nemelex Stack five The player draws five cards, one at a time, and then organizes them into a stack, which can be subsequently drawn from in draw one. Re-using this ability discards the current stack. This commit refactors an internal function to simplify displaying card descriptions. -------------------------------------------------------------------------------- 5ca2704 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 New Nemelex Triple Draw ability Reimplementation of the old ability, which is otherwise totally unchanged. -------------------------------------------------------------------------------- b66aaaf | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 New Nemelex Deal Four ability Deals four from one of the player's abstract decks, emptying the remaining cards. The player is still permitted to deal four without sufficient cards (with a prompt), if they do they get a deal from Punishment. -------------------------------------------------------------------------------- d6dedd3 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 New Nemelex Draw One ability Draws from one of the abstract decks the player has, and is the only interface to decks. -------------------------------------------------------------------------------- 453e4f2 | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 A deck choosing menu Add a menu for all Nemelex abilities to select the deck to use. Toggles to describe the decks, listing their cards. -------------------------------------------------------------------------------- e45b02a | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Abstract decks to a player property Nemelex deals cards into the player's decks on the gift timeout and empties them on wrath. -------------------------------------------------------------------------------- 7ca12cd | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Remove decks as items Subsequent commits will return decks to Nemelex worshippers without going through the legacy of having them be actual items. This commit removes the deck item type, confiscates any remaining decks on load in save-compatibility, and removes as much of the item handling code for decks as possible. Any pre-change Nemelex worshippers transferring their save get a raw deal, but that's been done once before for the evocations to invocations change. -------------------------------------------------------------------------------- 5bbfdfc | Edgar A. Bering IV | 2018-12-19 11:55:14 -0500 Remove deck rarity types Step one of abilifying decks is to remove the different rarities. All decks are now roughly ornate in power, but the exact distribution of card_level has changed somewhat, and is now card_level = x_chance_in_y(power, 900) + x_chance_in_y(power, 2700) with power a function of piety and invocations: power = (invocations * 9) + (piety * (invocations + 25)) / 27 + piety * (3/2) Further attempts at balance are not considered at this stage, since subsequent commits will further modify Nemelex significantly. -------------------------------------------------------------------------------- acb4b3f | advil | 2018-12-17 16:18:18 -0500 Don't show ghost debug messages as errors ...so that they don't force a more when doing level reloads. These will still appear on non-debug builds after wizmode commands, as long as the diagnostcis channel isn't disabled. -------------------------------------------------------------------------------- ec6e9a1 | Nikolai Lavsky | 2018-12-17 09:46:10 -0500 Fix display of rotted HP on WebTiles (11759) Commit 1406302deb reversed the meaning of the get_real_hp()'s second parameter and updated all instances of this function, except for one in tileweb.cc. -------------------------------------------------------------------------------- 44dd78f | Edgar A. Bering IV | 2018-12-16 13:15:13 -0500 Add jrmartel to CREDITS.txt -------------------------------------------------------------------------------- 50760eb | jmart | 2018-12-16 11:17:38 -0500 Fix Sif Muna dud gift bug (11791) If the player has every spell in their library, Sif Muna will still send the "Sif Muna grants you a gift!" message and trigger gift timeout. This commit corrects the bug. When the player has all spells in their library, Sif's gift timeout will no longer be triggered. The cause of the error was an incorrect check in Sif's gift logic. The return value of the acquirement(...) method was used to check success, but that method returns true even if no item was created. [Committer's note: Formatting tweaks, Closes #923] -------------------------------------------------------------------------------- 1b4a0ca | Edgar A. Bering IV | 2018-12-15 13:25:39 -0500 Elaborate in a comment (|amethyst) -------------------------------------------------------------------------------- 66906bf | Edgar A. Bering IV | 2018-12-15 12:13:01 -0500 Only trigger traps in player sight This uses LOS_SEE, so that monsters on the other side of glass trigger traps. Monsters triggering traps out of LOS is a simulationist relic of player-monster symmetry, which was for the most part not noticable other than: "distant Zot" messages, occasionally losing track of a unique down a shaft, and in hall_of_zot where a spoliled player could wait for a long time outside the vault to thin the monsters within using the permanent teleport traps. -------------------------------------------------------------------------------- f63cd86 | Edgar A. Bering IV | 2018-12-15 12:06:13 -0500 Don't place monsters on traps For dispersal traps this creates the lingering question "how did they get there"; for alarm traps and Zot traps it prevents an interface screw in console. (It can still happen that a player enters LOS and a wandering awake monster is standing on certain kinds of traps.) -------------------------------------------------------------------------------- 6f77609 | Edgar A. Bering IV | 2018-12-15 11:24:20 -0500 Adjust dispersal sequencing Always blink the triggerer last to prevent chain dispersal from a single trap. This doesn't prevent dispersal chains from two or more nearby traps, but those are rare. -------------------------------------------------------------------------------- fddc42b | Edgar A. Bering IV | 2018-12-15 11:15:04 -0500 Consider dispersal traps impassible in levelgen While this isn't technically true, dispersal traps can be passed, it is painfully annoying. -------------------------------------------------------------------------------- 2b1de94 | advil | 2018-12-13 15:11:51 -0500 Respect BFLAG_NO_SHAFTS for explore-triggered shafts (u/Hamsteri) This affects only tomb 1=>2; 2=>3 was already prevented by BFLAG_DANGEROUS_END, and no other branch has BFLAG_NO_SHAFTS set. I'm not sure what the original intent of only checking this on levelgen was, but it long precedes explore traps. I did a quick audit of code that calls this and it all seems fine; though it may have been possible for formicids to self-shaft on tomb 1 before this commit (and probably won't be now). -------------------------------------------------------------------------------- c793968 | advil | 2018-12-13 12:27:44 -0500 Clean up some oldghosts code Now that saving of ghosts is disentangled from loading of ghosts, there's no pressing reason to prevent saving of ghosts in portals, and some vault designer might come up with a clever way to design ghost maps for some portals. (That said, I'm not sure I can see a good way to make a ghost map for some of the early portals, e.g. sewer.) I've still left branches disabled where I can't envision any good way of making use of ghosts. Also, remove an old function that is now used only for wizmode testing, and adjust some documentation/naming to better represent how this code is used for newghosts. -------------------------------------------------------------------------------- 442c57a | gammafunk | 2018-12-13 09:14:05 -0600 Correctly handle LOS for dispersal traps Dispersal traps are supposed to affect actors that can see the cell of the trap without any translocation-blocking wall in the way (e.g. transparent rock or stone). This condition was correctly applied to monsters, but not to players if the trap was triggered by a monster. This commit applies the condition to player, preventing monsters on the side of transparent rock/stone walls from blinking the player with dispersal traps. -------------------------------------------------------------------------------- a53296f | advil | 2018-12-13 09:56:36 -0500 Fix cross-compiling + libpng When cross-compiling, the contrib libraries are not useful for the tilegen tool, which needs to be run as part of the build process. This prevents it from trying to use contribs; cross-compiling will therefore fail if it can't find libpng via pkg-config (this was the status quo for all builds before 409694ba0a8762, so it doesn't introduce any new requirements). -------------------------------------------------------------------------------- 25f4479 | gammafunk | 2018-12-12 23:40:13 -0600 Rework gammafunk_gauntlet_shortcut Make the longer path have four arenas instead of three so that the shortcut aspect is more emphasized. Make all four of the longer path arenas have easier difficulty instead of having the last one in the path sometimes be harder. Adjust the average amount of loot per arena so that both paths have 7 items on average, which is in line with what the other Gauntlet maps give. -------------------------------------------------------------------------------- 6ca8497 | gammafunk | 2018-12-12 23:40:13 -0600 Allow Gauntlet maps to customize extra loot This commit adds Lua support allowing Gauntlet maps to change what loot their arenas place. This customization only applies to the three extra item locations within each arena, with the arena's first item remaining guaranteed. This functionality will be used in a subsequent commit to have a Gauntlet map place a set of four arenas with the same average amount of loot as a set of two arenas in another path. -------------------------------------------------------------------------------- 1612a95 | gammafunk | 2018-12-12 23:22:01 -0600 Sometimes place traps in Gauntlet arenas This gives each arena vault a small chance to place traps using the '^' glyph, with the chance being 1/6 for tier 1 arenas and 1/4 for tier 2. If traps don't get enabled, any '^' glyphs become floor. Currently only dispersal traps are placed, since Zot traps are too dangerous for most depths where Gauntlets place, and would be especially dangerous for some vaults. It may be possible to use a limited number of Zot traps in specific vaults for Gauntlets that place late enough, but for now dispersal traps will do. -------------------------------------------------------------------------------- 53ffe6b | gammafunk | 2018-12-12 23:21:17 -0600 Add support for custom Gauntlet arena terrain This commit adds support for arena monster sets to define thematically appropriate types of liquid and plants. For instance, necromancy-themed sets might want withered plants, and demonic-themed ones might want demonic plants. Likewise a simulacra set wouldn't want deep water replaced with lava and a fire themed set would want lava instead of deep water. These preferences are defined via keys described in the comments of tier1_arena_monsters in gauntlet.lua. The monster sets have been updated to give these preferences where appropriate. Also realign the arena variables to consistent spacing. -------------------------------------------------------------------------------- fcd52a4 | gammafunk | 2018-12-12 23:16:42 -0600 Gauntlet monster set additions and updates Add entries for a necromancer with wolves for tier 1, and swamp worms for both tiers. Update the entropy weaver set to place no more than one wolf spider. Slightly increase the number of slime creatures for tier 1 (still only placing 60% of a band). Have the tier 1 sixfirhy set always place only one sixfirhy, supplementing it with ufetubus instead, since those are also fast. Fix the spectral thing entries to use the correct syntax. -------------------------------------------------------------------------------- 13ad8d5 | gammafunk | 2018-12-12 23:15:35 -0600 Remove low weighting on a Gauntlet exit vault This vault had low weight during development of the Gauntlet portal due to its small size at the time. It was changed to make it occupy the full subvault area, but the weight was never updated. -------------------------------------------------------------------------------- d6d2466 | gammafunk | 2018-12-12 23:15:35 -0600 Rename some setup functions and a variable The new function names make it clearer whether the function applies to Gauntlet arena vaults or to the overall map. -------------------------------------------------------------------------------- f2ea3f3 | gammafunk | 2018-12-12 23:15:04 -0600 A new Gauntlet entry portal tile (CanOfWorms) -------------------------------------------------------------------------------- 3e74e4c | advil | 2018-12-12 20:16:11 -0500 Remove a default argument, and convert to reference Previously, the default argument of `0` was taken to indicate the player. Now that all traps are revealed to the player, there's not much point to this. -------------------------------------------------------------------------------- 066e7ca | advil | 2018-12-12 19:53:20 -0500 Remove trap revelation from sanctuary -------------------------------------------------------------------------------- 409694b | advil | 2018-12-12 17:34:52 -0500 Use contribs if appropriate when building rltiles/ via sub-make This passes along the NO_PKGCONFIG value determined by the main Makefile to rltiles/Makefile. Previously, the sub-make process would use pkg-config libpng regardless of what the main Makefile is doing. This isn't necessarily a big deal, because the utility built with this isn't distributed, but it is breaking the build for hypothetical someone who is having pkg-config problems and wants to rely just on contribs (me), or someone who might try to build crawl in a restricted environment without pkg-config (which apparently is uncommon). -------------------------------------------------------------------------------- f2ebeb9 | Edgar A. Bering IV | 2018-12-12 09:10:32 -0500 Update credits -------------------------------------------------------------------------------- 7e78d40 | bjobae | 2018-12-12 09:08:17 -0500 Prevent a crash in god descriptions (11492) Fixed a typo which caused a crash on Lugonu's description screen if terminal size was too small. -------------------------------------------------------------------------------- bfc773d | Edgar A. Bering IV | 2018-12-12 08:54:54 -0500 Add ufshaikh to CREDITS.txt -------------------------------------------------------------------------------- cc558d2 | Umer Shaikh | 2018-12-12 08:52:44 -0500 Make giant creatures no longer tear through webs Web traps were made permanent to prevent the player from tediously stepping in and out of them to remove them. But it is still possible to remove them by luring a giant enemy (e.g., an emperor scorpion) through a web. (Less realistically, the player may also transform into a giant form, e.g., using dragon form, and then tear through them.) Since webs frequently block choke points in retreat paths, this can easily be worth doing, but is not rewarding gameplay after the first time the interaction is noticed. In the absence of compelling positive effect on gameplay from the interaction between size and web traps, the problem is solved by removing the special case. -------------------------------------------------------------------------------- 30802b1 | gammafunk | 2018-12-10 03:01:12 -0600 Message highlighting for the Gauntlet portal Add highlighting for all Gauntlet portal timer messages to default settings. -------------------------------------------------------------------------------- 8ba4ea4 | gammafunk | 2018-12-10 02:55:15 -0600 Better timer messages for the Gauntlet (mikee) Since Baileys already use the notion of the gate, use a beating drum to describe the timer of the Gauntlet. The idea being that an instrument being played calls spectators to watch the combat proceedings or perhaps calls combatants to enter the arena. -------------------------------------------------------------------------------- 351818a | Edgar A. Bering IV | 2018-12-10 00:42:41 -0500 Add a TAG_MAJOR around a conditional (gammafunk) -------------------------------------------------------------------------------- 873c05a | NormalPerson7 | 2018-12-10 00:23:12 -0500 Add dispersal traps to Zot:5 This commit creates a new function is_regular_trap in traps.cc, which returns whether a particular trap can spawn from a vault which places "any trap" (that is, a trap that can be spawned from TRAP_RANDOM). The primary purpose of this is to add dispersal traps to the hall_of_Zot, in the hope that it will create interesting and dangerous situations in Zot:5 with the player having to deal with themself and their enemies being thrown around everywhere. Regarding the forced trap locations in Zot:5, dispersal traps should be less punishing than teleport or Zot traps, since the player can get over the other side simply by repeatedly entering the trap. [Committer's note: Edited a comment. Closes #920] -------------------------------------------------------------------------------- d3cbc84 | Edgar A. Bering IV | 2018-12-09 14:49:46 -0500 Still more change log edits -------------------------------------------------------------------------------- 7a9182e | Edgar A. Bering IV | 2018-12-09 14:41:56 -0500 Further changelog edits -------------------------------------------------------------------------------- 889f499 | gammafunk | 2018-12-09 12:04:47 -0600 Some changelog tweaks -------------------------------------------------------------------------------- 35ae891 | Edgar A. Bering IV | 2018-12-09 12:36:14 -0500 Changelog through 0.23-a0-550-g7de1f8ee9f -------------------------------------------------------------------------------- 7de1f8e | gammafunk | 2018-12-07 15:43:37 -0600 Remove some SUBST for unused subvault glyphs We use exact matches for all Gauntlet subvaults, since we need to use a specific shape to guarantee proper alignment. Any glyphs that didn't get replaced by the subvault would be due to an error, and replacing these with walls increases the likelihood of said error trapping the player. So allow these glyphs to simply become floor instead. -------------------------------------------------------------------------------- e004423 | gammafunk | 2018-12-07 15:42:52 -0600 Extend and rework gammafunk_gauntlet_branching Add a final arena to both paths for this map. This brings the number of its arenas more in line with the other maps and makes it not feel like an abridged version of gammafunk_gauntlet_one_two_three. Also rework the layout to better use space and allow it to be symmetric with its new bottom half. -------------------------------------------------------------------------------- c58ec83 | gammafunk | 2018-12-07 15:15:27 -0600 A new Gauntlet map with progressively more choices In gammafunk_gauntlet_one_two_three, the first arena is mandatory and leads to two choices, after either of which the player has three arena choices. The middle set of arenas are higher difficulty 50% of the time. -------------------------------------------------------------------------------- 1e3a7e1 | gammafunk | 2018-12-07 15:12:04 -0600 Some fixes for a Gauntlet map Some of the transporter glyphs given in the setup for this map weren't actually used. Also increase area inside the shortcut path's access to the second arena. The previous area had only 4 tiles total, possibly preventing some monsters adjacent to the player from following through the transporter. -------------------------------------------------------------------------------- 807884b | gammafunk | 2018-12-07 15:12:04 -0600 A couple new Gauntlet monster sets In one set, a necromancer with death yaks that are potential bind soul targets, and in another a band of meliai. Both for higher tier difficulty. -------------------------------------------------------------------------------- 05cfe7a | gammafunk | 2018-12-07 15:12:09 -0600 Balance changes for some Gauntlet monster sets Use monster bands where the counts we want are close to the natural band size. Make the hornet set just have hornets, since bees don't do anything hornets don't already do. Add the possibility for a single, more middle-tier guardian to some sets. Less use of filler imps, more hell hounds in their place, but with fewer numbers. Break out a couple entries specified as two alternates into separate entries so we can have slightly higher counts for lowest tier monsters. -------------------------------------------------------------------------------- 9cf61d6 | gammafunk | 2018-12-07 15:12:04 -0600 Fix a Gauntlet monster set entry Will make a function that checks this data on startup in the future. -------------------------------------------------------------------------------- 2dd13d1 | Edgar Bering | 2018-12-07 15:50:05 -0500 Remove a secret dig square (Rawrakai) -------------------------------------------------------------------------------- e99ae73 | NormalPerson7 | 2018-12-07 11:59:51 -0800 Show blowgun chance on firing with F (11777) This commit makes it so that both the f and F methods of firing ammunition end up calling the _fire_choose_item_and_target function, which sets up the direction chooser with the behaviour required to get blowgun chances, net immunity descriptions and chaotic descriptions (for silver ammo) to display. Previously this function was only called when targeting through f, which meant that all three of these extra pieces of information were not provided when firing through F. -------------------------------------------------------------------------------- 48eebcd | advil | 2018-12-07 14:30:47 -0500 Create br.exit milestones for more branches The initial implementation (49588e8b9b1c) only tracked milestones for exiting branches that are of size >1 level (and the vestibule), in order to cut down on milestone spam. This commit expands this to include all branches that have enemies, because this information is useful for debugging sometimes, and it won't be that much more data. (I suspect that the concern came from a time when bots announced a lot more milestones than they do now.) If any portal vaults can ever be re-entered, this will only generate milestones for the first exit. As far as I can tell, all branches covered by this commit can generate only once outside of wizmode. -------------------------------------------------------------------------------- b4a7915 | advil | 2018-12-07 11:09:12 -0500 Save compat for 04293e54a7a0 This places an exit under the player (overwriting any features that are there, so it could overwrite a portal). It is possible for the player to ignore the exit under some circumstances and get trapped again by taking a portal, but at that point it's on them. Since the bug wasn't guaranteed to trigger in this map, this may also provide an early exit for some players. -------------------------------------------------------------------------------- 3f6f39f | Edgar Bering | 2018-12-06 23:31:27 -0500 Disable met targets after quaffing a potion of experience (11352) The potion of experience skill menu backed up the player's current skill training state to allow potion-specific skill selection. Upon restore, the backup would ignore any met targets and resume training a skill even if the skill target had been met. The skill_state object now checks to see if its cached target has been met on restore, and does not alter the current state if its training information appears to be out of date. Finally, a check is added to the potion of experience effect to prompt for new skilling if targets are met after quaffing the potion. Closes #886, using a different approach. -------------------------------------------------------------------------------- 7b100e3 | gammafunk | 2018-12-06 20:32:13 -0600 Fix a portal message typo (larvi) -------------------------------------------------------------------------------- 04293e5 | Alan Malloy | 2018-12-06 14:36:21 -0800 Don't trap player in gammafunk_gauntlet_branching (Kierst, NormalPerson7) The gauntlet_exit subvault was offset by one so all the exits were being placed upside down. -------------------------------------------------------------------------------- 5e0f5a2 | gammafunk | 2018-12-06 04:08:51 -0600 Remove additional exits from a Gauntlet map Remove the intermediate exits from gammafunk_gauntlet_branching. It's better to have maps be more consistent about the use of exits in terms of not providing many of them. A future map will require the player to exit through the minotaur if they don't wish to continue through the arenas. We might end up going the route of offering the minotaur vault exit as the only one for all maps, or we might go the route of this map and have all maps present an initial exit. This could depend on how we decide to vary the final fight. If there is no initial exit, it's important that the player know what strong monster they'll be forced to fight before entering the portal. -------------------------------------------------------------------------------- 1da068c | gammafunk | 2018-12-06 04:08:51 -0600 Add ice statue and oklob plant Gauntlet monster sets For the lower difficulty tier. These place with a couple appropriate mobile monsters. -------------------------------------------------------------------------------- 65d9dff | gammafunk | 2018-12-06 04:08:51 -0600 Some balance adjustments to Gauntlet arena monsters Give some light accompaniment with wizards. Make lower-difficulty eye sets feature either a shining eye (with mutation potion loot) or an eye of devastation and having 1-2 floating/golden eyes. Balance the entries for abominations, death scarabs, shapeshifter, and slimes. Reduce the number of ugly things that accompany the great orb of eyes so much stuff with high HP. Give the glowing orange brain a couple ugly friends, since brains are pretty flimsy. -------------------------------------------------------------------------------- f0242e9 | gammafunk | 2018-12-06 04:08:51 -0600 Some adjustments for Gauntlet subvaults Tweaks for most of the arenas to make them not have such a direct path to the transporter and loot in so many cases. Previously many potential locations for solid walls weren't added since the would obstruct view of the landing site or generally lead to too many squares not being visible from outside the arena. Use transparent stone to ensure visibility and move the landing site to locations on the other side of these new walls. Some vaults now have multiple potential landing sites that will be randomly chosen from during setup. Introduce some randomized use of iron grates in nicolae_gauntlet_arena_grate_2. Break up the walls in gammafunk_gauntlet_arena_hedges, placing more plants-as-walls and using guaranteed plants to block the path shortest path to the transporter. -------------------------------------------------------------------------------- f3a0c6f | gammafunk | 2018-12-06 04:08:51 -0600 A Gauntlet map with a long way and a short way In gammafunk_gauntlet_shortcut the player has a choice between a longer but easier path and a shorter but harder one. The first path has two easier arenas followed by a third with a 50% chance to be harder. The second path has two harder arenas. -------------------------------------------------------------------------------- 6ff5c89 | gammafunk | 2018-12-06 04:08:51 -0600 A Gauntlet map with two long paths In gammafunk_gauntlet_hard_choice, the player has a choice between two paths through three arenas. The second arena in each path has a 50% chance to be harder difficulty, and the third arena in each path is always harder difficulty. -------------------------------------------------------------------------------- 6525e13 | gammafunk | 2018-12-06 04:08:51 -0600 A Gauntlet main map This a map for the new portal with more maps to follow in subsequent commits. gammafunk_gauntlet_arena_branching gives the player a choice of two branching paths. Each possible path take the player through two arenas, the second harder than the first. -------------------------------------------------------------------------------- c8f743d | gammafunk | 2018-12-06 04:08:49 -0600 Setup Lua for Gauntlet main maps Functions to initialize global variables used by arena subvaults to match transporters to the main map as well as to determine what difficulty the main map wants them to use. The setup function also sets up all transporter features that reside on the main map. -------------------------------------------------------------------------------- 72492bc | gammafunk | 2018-12-06 04:07:55 -0600 Gauntlet exit subvaults These vaults place a final portal exit, the minotaur, and the loot pile. All are adaptations of the old lab portal exit vaults to work with the current layout. The changes I've made are to rotate all vaults to the same north-to-south orientation, make them subvaults, and to give the smaller vaults surrounding area to help isolate the minotaur's lair. This prevents noise from drawing out the minotaur to "camp" the player near the final transporter landing site. -------------------------------------------------------------------------------- 8f24ca6 | gammafunk | 2018-12-06 04:07:55 -0600 A loot function for Gauntlet exit subvaults This function places a loot pile on the minotaur's exit with an item number and composition similar to the old portal. The item count range is the same the old portal (7 to 16 items with an average of 11.5). The loot items are 1/3 on-average star_item, which is close to the original portal's 1/3 chance to have each item be normal class with quality 3 * depth (star_item is 2 * depth + 5). The other 2/3 items are a mix of superb_item together with some extra armour, and some weight for wands and scrolls, since superb_item doesn't place the latter two. The weights are chosen so that the loot items will be similar to the custom list used in the old Lab portal. Gone is the chance for ammo, and the chance for non-wand misc items and staves are higher, but in general the differences in chances for each kind of item are not drastic. The loot definitions for the old portal were likely not chosen with any particular aim in mind. Also the gauntlet arenas will give the player 4-8 items on the path to the minotaur, depending on the map. This does require defeating nasty monsters, and the old Lab portal gave vault loot along the way as well. Still, we may want to reconsider this loot composition in the future. -------------------------------------------------------------------------------- 2a91107 | gammafunk | 2018-12-06 04:07:55 -0600 Gauntlet arena subvaults These vaults give a 9x9 area for specifying an interesting feature layout as well as potential locations for monsters, loot, entry transporter landing site, and the exit transporter. DES comments describe what glyphs these vaults must have and what tags and setup functions they must use. Many of these are adapted from float vaults in the old Lab portal, and I've added a few new basic ones as well. We need more of these, including some creative variants that use special terrain with specific monsters, but this is a good initial set for play-testing. -------------------------------------------------------------------------------- 136b5b3 | gammafunk | 2018-12-06 04:07:53 -0600 Gauntlet arena subvault Lua Define functions to set up arena subvault transporters, monsters, and items. The transporter setup relies on global state variable to give each transporter a key based on the subvault number. This state variable is initialized by the main encompass map. A state variable set by the main map also sets the arena difficulty, which determines the available arena sets. The setup is broken out into functions so that vaults wanting to define special monsters and loots can call what setup they instead of calling the main setup function. -------------------------------------------------------------------------------- c6bef76 | gammafunk | 2018-12-06 03:26:04 -0600 Gauntlet arena monster sets This commit defines arena monster sets for two tiers of difficulty. The sets define one to three related monster sets and define min/max placed for each. Each set has thematically related monsters that are generally significantly weaker than the minotaur monster boss. There's an emphasis on using monsters that might make for an interesting fight for a character at depths from Lair to D:14, especially for monsters that are not encountered much in general. Some sets in the same tier are stronger than others for specific player characters, and some arenas may be too risky to take on, but this is part of the choice aspect this portal emphasizes. -------------------------------------------------------------------------------- 9a27e60 | gammafunk | 2018-12-06 03:26:04 -0600 Disable player teleportation in Gauntlets This portal's layouts have the player choose a one-way path through arenas with monsters and loot. Teleportation allows the player access to arenas not along the chosen path, largely defeating the purpose of there being a choice in the first place. Although teleport scrolls are limited, they are plentiful and even a single teleport has a high chance of granting the player access to several new arenas. Unlimited sources of teleport like the ring of teleportation and the teleportitis mutation will always let a player loot all areas. This commit disallows teleports in Gauntlets in the same way as is done for Sprint. Teleportation scrolls are marked as useless while in the portal, and attempting to use one aborts with a message. Any passive form of teleport such as that from the ring, teleportitis, or distortion is prevented. -------------------------------------------------------------------------------- 58dc622 | gammafunk | 2018-12-06 03:26:04 -0600 Gauntlet: A new portal that replaces Labyrinths Labyrinths disable autoexplore and force the player to manually solve a maze, something not related to the kind of gameplay crawl tries to provide. There are spoilery aspects to navigating the maze efficiently and to using teleport in the portal. Once these aspects are known to an experienced player, they solve the maze with very little thought and often with great annoyance at having to play this mini-game unrelated to either tactical combat or strategy. The most interesting aspect of current Labs is the fight with a single powerful monster, the minotaur. This commit is the first in a series to implement a new Gauntlet portal where the player chooses a path through several combat arenas. The player can see what monsters they'll face and what rewards they'll get before entering each arena. The portal is similar to Ziggurats in terms of having progressive rooms with thematic monster sets, but adds a distinct choice aspect. Each of the possible paths takes the player through a series of randomized arena subvaults that have one of two difficulty tiers. Each arena subvault will having a small group of thematic monsters and a small amount of loot. All possible paths that could be taken will lead to the same exit subvault that has boss fight with the minotaur and a loot pile on the exit stairs. At least one early exit will be provided at the beginning of the portal before any path is taken, with the only other exit being guarded by the minotaur. The number of arena subvaults the player completes in each path will be small, usually two but it could be three or four on some maps. The vaults will be accessed via transporters that prevent backtracking by simply walking out of the vault, and the arenas will not have diggable walls. All forms of teleportation will be disabled in this portal in a subsequent commit, but other translocations will work normally. This portal isn't designed as a maze and doesn't fit the traditional idea of a Labyrinth, so the new portal will be called a Gauntlet instead. This commit adds basic data for the new portal and renames any files being repurposed from the old Labyrinth portal. This commit also removes the C++/lua code and vaults that won't be directly used by the new portal. Some of the Lab float and exit vaults will show up in the new portal with modifications, but we remove these for now. For any games saved with an active Lab entrance, that feature is replaced with an entrance to a Gauntlet. Games saved inside a Labyrinth will load and the Lab will function normally, except that Lab shifting won't occur. Since the player is always guaranteed a viable path to the exit after the shift, the Lab will still be solvable. -------------------------------------------------------------------------------- 1d907f1 | gammafunk | 2018-12-06 02:59:43 -0600 Better documentation and ordering of population lists These population lists are in order of the branch-type enum. Update to follow the same order of branch-type when major version changes. Mention this order dependency in the comments above each list. For the zombie, water, and lava population lists, add a comment indicating which branch the entry corresponds to if the entry is otherwise ambiguous. -------------------------------------------------------------------------------- def993a | gammafunk | 2018-12-06 02:59:44 -0600 Improve branch enum and data ordering for major version change Branch data and population lists currently depend on the ordering of the branch-type enum. As long as that's the case, we should maintain a consistent ordering between this enum and those data when major version increases. -------------------------------------------------------------------------------- a799fc4 | Edgar A. Bering IV | 2018-12-05 21:29:27 -0500 checkwhite -------------------------------------------------------------------------------- 3133bb3 | Edgar A. Bering IV | 2018-12-05 21:25:51 -0500 Fix a negative chance in a targeter (hellmonk) The formula for pacification chance is correct on its domain, but had an off-by-one in bounds checking. -------------------------------------------------------------------------------- b7c0781 | Edgar Bering | 2018-12-05 16:32:16 -0500 Improve teleportitis/teleport trap effect messaging Print a "reason" string before translocating, so the player can tell whether the teleport was a trap or from teleportitis. -------------------------------------------------------------------------------- 0f8c245 | Edgar Bering | 2018-12-04 13:55:15 -0500 Do not include explore traps in sprint and tutorial The individual trap effects had appropriate checks, but this adds an explicit check to make the decision intensional, should future trap effects not check for sprint/tutorial. -------------------------------------------------------------------------------- 898447a | Edgar Bering | 2018-12-04 11:38:52 -0500 Better trap-effect sequencing Trap effects (shaft and teleport) can reveal new tiles, leading to the you.trapped variable being re-set to true. Subsequently the player can get trapped on their next turn even if they don't move and LOS doesn't change, which is unintuitive. This gives players a bit of a break post-trap. If chain-trapping in a single turn is desired, it should be implemented in a loop in _check_traps(). -------------------------------------------------------------------------------- dd405ac | Edgar A. Bering IV | 2018-12-04 10:05:32 -0500 Don't roll traps on turn 0 That was just a little much. Turn 1 is still fair game though! -------------------------------------------------------------------------------- 0b42d88 | gammafunk | 2018-12-04 05:54:57 -0600 Update trap descriptions Add a description for dispersal traps and mention in the descriptions this trap, alarm traps, and zot traps how your allies will avoid stepping on them. -------------------------------------------------------------------------------- 50a8178 | CanOfWorms | 2018-12-03 23:14:20 -0500 Fix a connectivity issue in the_grid The center of this vault could be disconnected depending on the subvault generation. This change should fix the issue. -------------------------------------------------------------------------------- 809d6d0 | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Add teleports as an explore trap effect (gammafunk) Instead of a random teleport, they are a teleportitis-type teleport. -------------------------------------------------------------------------------- c2dc926 | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Flip the dispersal trap tile (CanOfWorms) Accessiblity change for colourblind players. -------------------------------------------------------------------------------- 34af30c | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Add dispersal traps to some vaults Add dispersal traps to vaults that use teleport traps if it seems appropriate. Mostly Xom vaults. Also adds a mini_feature vault with the traps and some ziggurat furniture with them. -------------------------------------------------------------------------------- 10964a4 | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Add a tile for dispersal traps -------------------------------------------------------------------------------- f51f6a3 | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Reduce the trap rate further Based on play-testing. -------------------------------------------------------------------------------- e646171 | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Re-order some player cleanup in floor_transition The previous order could lead to invalid constriction data if the player revealed a tile and got trapped while constricting a monster (due to a cloud effect, for example). Currently clear_beholders and clear_fearmongers don't reference the monster grid, but they are properties of the level that we're leaving (and touch a vector that references the monster grid), so the call belongs before we save the old level and load the new one. -------------------------------------------------------------------------------- 53fc6d5 | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Tone down the explore trap rate It was too aggressive. Additionally, don't default to alarming if shafts are impossible. -------------------------------------------------------------------------------- ba9ec10 | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Refactor to prevent a crash Separate the calculation of trap-effect chance from firing the effect, similar to banishment. Otherwise, we might shaft the player in the middle of some other state update, leading to invalid dereferences. -------------------------------------------------------------------------------- d1cacb9 | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Derandomise num_traps_for_place Replace num_traps_for_place with trap_rate_for_place, so that it can be used appropriately in both trap-generation and explore-trap-effect formulas. -------------------------------------------------------------------------------- f44f1ef | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Lowercase a trap name in a des -------------------------------------------------------------------------------- 723c74f | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Don't make alarm traps permanent (MarvinPA) If a player found a permanent alarm trap in favorable terrain they could repeatedly become marked to clear the level. -------------------------------------------------------------------------------- e407b66 | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Keep friendlies out of traps that affect the player Previously this behavior was limited to Zot traps. It is now abstracted to is_bad_for_player, and alarm and dispersal traps are included in the list. -------------------------------------------------------------------------------- 17e7bed | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Add dispersal traps Dispersal traps are permanent, and when triggered cause everything in sight of the trap to blink, including the triggerer. The purpose of dispersal traps is to provide an alternative for known teleport traps that is more interesting tactical terrain. The effect destroys a player's positioning, so if it is good the player will want to prevent monsters from stepping on the trap. On the flip side, it can provide a positional rearrangement in a bad situation, though preserving a good result may be challenging since the trap is permanent. -------------------------------------------------------------------------------- db6bce5 | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Zot-ify alarm traps Alarm traps now only trigger when the player can see them. When they do, whether it was a monster or a player, the player gets marked. They are now permanent and considered passable terrain by the dungeon builder. -------------------------------------------------------------------------------- 0f39d50 | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Exploration based trap effects. Each tile revealed has a small chance (the chance of generating a shaft trap on that tile for that particular level) of shafting or alarm trapping (thanks gammafunk) the player. With all traps known the 'interesting situation' aspect of shaft (and other) traps was lost. This random explore effect recovers that aspect. It does mean that a player wishing to avoid traps should avoid revealing tiles. This is a better trade-off than the previous behavior. While the 'optimal' play is to not reveal more tiles than necessary, the act of revealing (instead of stepping on) has the potential benefit of giving an item or XP from an easy monster. Further, unlike tracking stepped on tiles, the UI makes it possible to reason about what moves will reveal tiles; and waypoints provide a method of charting particular routes through partially explored areas. However, as minmay has pointed out, Gnolls, Xom, and Ash all give item detection which allow a player to avoid revealing tiles that they know will give no benefit. While minmay presents this as a problem, I see it as a benefit of item detection. -------------------------------------------------------------------------------- 450027e | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Remove trap detection from wizmode Now obsolete. -------------------------------------------------------------------------------- ed22641 | Edgar A. Bering IV | 2018-12-03 22:25:24 -0500 Reveal all traps Reveal all traps, so that they can be tactically relevant terrain. This removes the "generate tension" aspect of traps, which will return in a later commit. Having all traps be known requires some shaft tweaks. Specifically: Taking a known shaft now has an equal chance of taking you 1/2/3 levels deeper. Shafts now generate on the penultimate level of a branch with a dangerous end. -------------------------------------------------------------------------------- 91793a9 | NormalPerson7 | 2018-12-02 16:24:24 -0500 Display the chance for needles to work in blowgun targeter (ebering) When targeting a blowgun with sleeping/paralysis/confusion/frenzy needles, display the chance for the needle to affect the targeted monster in the targeter, or "immune to needles" if the monster is undead or nonliving. -------------------------------------------------------------------------------- 70bc44f | Edgar A. Bering IV | 2018-12-02 16:01:16 -0500 Improve the pacification chance display (11775) Correctly report when targeting an unpacifiable monster. -------------------------------------------------------------------------------- 0f366d8 | Edgar A. Bering IV | 2018-12-02 13:37:16 -0500 Describe the restrictions on exploration piety Mention it in the Temple description. After some discussion, the current description "explore the world" is good enough, since many players already bring preconcieved notions of terrain. It would be nice to explain the specific mechanic somewhere but this is ok. -------------------------------------------------------------------------------- 3d1613b | Edgar A. Bering IV | 2018-12-02 13:37:16 -0500 Don't grant explore piety for certain terrain Granting exploration piety for deep water, lava, and "endless" features encouraged players with flight or deep water swimmers to wander around the non-threatening boundaries of shoals and certain lava vaults. Granting exploration piety in the Temple encouraged a player to autoexplore the threat-free temple. -------------------------------------------------------------------------------- e7ea69a | Alan Malloy | 2018-12-01 22:43:55 -0800 Make cheibrodos_fertilizer no_tele_into It's a pretty nasty enclosed space to get shafted into on D:2, as pointed out by /u/DeadKateAlley. -------------------------------------------------------------------------------- 205b0b6 | gammafunk | 2018-12-01 06:07:48 -0600 Fix a potion loot definition This definition had a leading '/'. -------------------------------------------------------------------------------- 5fd82c5 | Edgar A. Bering IV | 2018-11-30 19:27:16 -0500 unbrace and don't unbrace deleted files -------------------------------------------------------------------------------- c625362 | Nikolai Lavsky | 2018-11-30 17:25:47 -0500 Fix messaging when Maurice steals a weapon (Salmon, Stenella) When Maurice steals a weapon, the games says Maurice steals ... Maurice wields ... It bursts into flame!/Its appearance distorts for a moment./etc. even though the weapon always goes into his alternative weapon slot (unless Maurice's disarmed). The same happens if you give an "alt"-inscribed weapon to a monster via the xo wizard command. Fix this, and also simplify some monster equip code. Instead of passing "bool msg" into monster::equip() and, subsequently into equip_weapon(), equip_armour(), or equip_jewellery(), just don't call equip() if this value is false. Previously, all these functions did nothing unless msg was true. These functions are also renamed to be more descriptive; they do not equip the item, only print the message. [Committer's note: Closes #911] -------------------------------------------------------------------------------- b50937e | gammafunk | 2018-11-30 05:01:23 -0600 Some loot definitions for auxiliary armour It's a common to define all possible aux armour as a loot item in vaults and error-prone to type all the names each time. Make item definitions available as dgn.aux_armour, dgn.good_aux_armour, and dgn.randart_aux_armour for normal, good_item, and randart quality items of this kind. I'll modify various vaults to use these definitions in subsequent commits. -------------------------------------------------------------------------------- f9e11c5 | gammafunk | 2018-11-30 05:00:26 -0600 Fix and update a scroll loot item definition In the dgn.loot_scrolls item definition variable used by some vaults, the entry for scroll of enchant weapon was copied three times. Make this one entry with a reasonable weight. Flatten the weights somewhat to make scrolls of enchant weapon, enchant armour, and brand weapon all a bit more common. Update the comments to better describe the intent of these definitions. -------------------------------------------------------------------------------- 29ba69c | Edgar Bering | 2018-11-29 18:11:56 -0500 Further adjustments to confused monster actions Simplify some boolean checks and add confusion to one. Re-name an internal function. Re-impair confused monsters judgements so they resume stumbling into harmful clouds, deep water, lava, and other bad situations. -------------------------------------------------------------------------------- 32a748b | Alan Malloy | 2018-11-29 09:33:31 -0800 Mark some local functions as static to fix compiler warnings -------------------------------------------------------------------------------- dce9051 | Alan Malloy | 2018-11-29 09:00:09 -0800 Change inscription on Fencer's Gloves (Yermak) Previously, +Riposte was the only +Foo inscription that didn't give you an active ability (e.g., +Blink for evocable blinking). -------------------------------------------------------------------------------- 60b89c1 | Edgar A. Bering IV | 2018-11-28 23:04:20 -0500 Link the contribution guide from README Make the updated contribution guide more discoverable via github. The README also has some contribution information, these two documents could be harmonized more. -------------------------------------------------------------------------------- 1869896 | Edgar A. Bering IV | 2018-11-27 22:09:08 -0500 Don't unconfuse intrisically confused monsters Restore important lines to mon-behv to ensure that confused species wander randomly. -------------------------------------------------------------------------------- 35efe26 | Edgar A. Bering IV | 2018-11-27 21:30:28 -0500 Nerf player-to-monster confusion Confused monsters now always try to set a target. One chance in three a monster is able to move toward or attack its target; though spells, most abilities, evokables, etc. are still forbidden. Confused monsters are still stabbable. If this proves too subtle a nerf this can be upped to a coinflip. The reasons for doing this are twofold. One, Confusion as an effect is available to players at level 1 or 3 in spells, the latter in a starting book. Confusion was effectively a temporary instant kill, which is an extreme effect to provide at such a low level, even with checks. Two, the temporary instant kill was annoying to make permanent because the monster would wander away while the player attacked it. This commit also cleans up some of the mon-act code, specifically removing some dead confusion handling code from the movement handler that was not executing before this patch. -------------------------------------------------------------------------------- 22ffb11 | Edgar A. Bering IV | 2018-11-27 18:33:17 -0500 Convert Death Channel/Bind Soul to fineffs This resolves the long standing occasional "fireball/iceblast/etc." hit your newly formed spectral friend and make it hostile. -------------------------------------------------------------------------------- da178e9 | Edgar A. Bering IV | 2018-11-27 18:31:22 -0500 Remove the storm bow's rain clouds Placing occasional temporary shallow (or deep) water at random was usually flavour and occasionally very annoying. -------------------------------------------------------------------------------- 6e8b230 | Edgar A. Bering IV | 2018-11-27 18:31:22 -0500 Revise the robe of Clouds The old robe of clouds was basically a +3 {rElec +Fly} robe; it's gimmick of spawning mist and rain was almost always flavour. The new robe is now +3 {+Thunder rCloud rElec}, losing the mist gimmick in favor of evokable radius 2 storm clouds. The evocation costs 5 MP and has the same difficulty rating as evokable invis. -------------------------------------------------------------------------------- d9f91f9 | Edgar A. Bering IV | 2018-11-27 18:29:02 -0500 checkwhite -------------------------------------------------------------------------------- ee2f500 | stenella | 2018-11-27 15:00:30 -0800 MSVC support cont. Update gen-all.cmd to be up to date with the current makefile, namely adding aptitudes and crawl_manual.txt, which stops MSVC builds from crashing when they can't find the files. Add some more MSVC build outputs to gitignore Copy CREDITS.txt from the root directory to docs/CREDITS.txt to match the makefile/release versions; add it to gitignore. Change MSVC/stdint.h to match MSVC/include/stdint.h , which we changed earlier in the first MSVC compatability commits. -------------------------------------------------------------------------------- c8aadda | gammafunk | 2018-11-26 20:37:39 -0600 Update comments describing the Branch struct -------------------------------------------------------------------------------- db311f7 | gammafunk | 2018-11-26 20:37:38 -0600 Update marker info in the DES syntax guide Markers are no longer used for several of the cases mentioned. -------------------------------------------------------------------------------- 87d5157 | gammafunk | 2018-11-26 20:37:36 -0600 Fix some lua loot definitions I don't think this caused any errors, but these trailing slashes are not needed. -------------------------------------------------------------------------------- 6f7cfd9 | Edgar A. Bering IV | 2018-11-25 20:18:00 -0500 Unrelocate some on-sight logic (gammafunk) -------------------------------------------------------------------------------- b5b494a | Edgar A. Bering IV | 2018-11-25 20:00:36 -0500 Make player ghosts and pan lords immune to pacification Both player ghosts and pandemonium lords have wildly varying HP. While these numbers are revealed in the former case, player ghosts are a somewhat special monster. In the latter case the revealed HP based on monster class is a lie, and the variance in max hps is larger due to how pandemonium lord max hp is calculated. To avoid edge cases with these two monster types this commit makes both types immune. -------------------------------------------------------------------------------- 28a1794 | Edgar A. Bering IV | 2018-11-25 20:00:36 -0500 Display pacification chance in Heal Other targeter With the changes to pacification to depend only on numbers visible to the player, it is now not an information link to display pacification chance in the pacification targeter. This also changes pacification to abort when used on monsters which are truly impossible to pacify (as opposed to those whose pacification chance rounds to 0% in the display). -------------------------------------------------------------------------------- cf71bd9 | Edgar A. Bering IV | 2018-11-25 20:00:36 -0500 Simplify Heal Other formula Previously, pacification checked if 1d( int_mod * (invo + 1) * healing / holi_mod ) >= avmhp Healing depended on power by a random roll, which depended on a random division of invocation skill. The new formula checks if biased_random2( int_mod * (invo + 1) * (30 + invo) / holi_mod, 2) >= avmhp 30 + invo passes through the function as the power value, and is also used to determine how much to heal the target, which is left unchanged. biased_random2(sides, 2) does a good job of matching the old success distribution and is easier to reason about and write a chance success display for (see next commit). -------------------------------------------------------------------------------- b59e870 | Edgar A. Bering IV | 2018-11-25 20:00:36 -0500 Change pacification to depend only on monster type Pacification depending on a monster's max hp made it harder to reason about (why should one jackal be harder to pacify than another). Average HP for the monster type is displayed in monster info. -------------------------------------------------------------------------------- 8f93ed4 | Edgar A. Bering IV | 2018-11-25 20:00:00 -0500 Prevent invalid_monster messages when converting 036aa52 dismisses summoner's summons on attitude change. One place where attitude changes is on bribe or Beogh follower acquisition. If this happens on the turn the summoner comes into view and their summons are already visible those now expired summons need to be filtered out after the summoner's conversion occurs. -------------------------------------------------------------------------------- 7bc77c8 | Edgar A. Bering IV | 2018-11-25 20:00:00 -0500 Relocate some on-sight logic to the correct place -------------------------------------------------------------------------------- abef753 | gammafunk | 2018-11-25 18:14:40 -0600 Some changelog updates (now through 0.23-a0-462-g7c42f869) Mention a few items missed in the last update, reword a few items, and fix a couple typos. -------------------------------------------------------------------------------- 7c42f86 | Edgar A. Bering IV | 2018-11-25 18:06:49 -0500 Nerf the acid effect of minor destruction The formula for power / 2 (versus power for the rest) goes back to the svn initial revision. Acid was buffed in 8761da415 which intended only to buff player dracs, but also buffed Makhleb's minor destruction. This increases the power divisor significantly, to make the damage curve for acid closer to (but still to the right of) flame. The effect is still very strong (rarely resisted, chance to corrode). -------------------------------------------------------------------------------- ff60f68 | Edgar A. Bering IV | 2018-11-25 16:47:09 -0500 checkwhite INSTALL.txt -------------------------------------------------------------------------------- 9be7e05 | Edgar A. Bering IV | 2018-11-25 16:46:46 -0500 changelog through 0.23-a0-459-ge787970 -------------------------------------------------------------------------------- e787970 | stenella | 2018-11-25 10:03:44 -0600 Rest the Ancestor Add a delay interrupt that executes when the ancestor heals to full HP. This is facilitated by a new check for ancestor HP being full; this is always true if the ancestor doesn't exist or is out of sight (to avoid information leaks). Introduce a new boolean option rest_wait_ancestor to toggle whether resting should always wait until the ancestor is healed. This interacts with rest_wait_both according to the following table: | rest_wait_both | rest_wait_ancestor | expected behavior | | -------------- | ------------------ | ------------------------------ | | True | True | Rest until (HP full and MP full and Ancestor full) | | False | True | Rest until (HP full or MP full) and (Ancestor full) | | True | False | Rest until (HP full and MP full) or (Ancestor full) | | False | False | Rest until (HP full or MP full or Ancestor full) | [ Committer's notes: Closes #900. Tweaked some conditionals, adding some missing conditions or simplifying. Added some comments. Tweaked the wording of the option. Adjusted the interrupt to not leak information about the ancestor when it is out of LOS. ] -------------------------------------------------------------------------------- 93a6ea9 | stenella | 2018-11-25 11:26:50 +0800 MSVC gitignore Exclude MSVC outputs Modify vcproj exclude to include vcxproj files -------------------------------------------------------------------------------- 6f6daef | gammafunk | 2018-11-24 18:41:10 -0600 Add more checks for invalid constrictions Usually monster death handles the necessary constriction cleanup, but there are cases involving e.g. summons where a summoner's death can lead the constriction code to attempt to constrict a summoned monster that's been reset. This commit adds aliveness checks to the methods that check for invalid constrictors and constrictees to unconstrict and also requires aliveness before attempting to apply damage. -------------------------------------------------------------------------------- c514d67 | NormalPerson7 | 2018-11-24 11:28:03 -0500 Don't let Ru offer mummies the no potion heal mutation (11750) No potion heal has no real effect on mummies since they can't quaff potions anyway, so this sacrifice didn't really give up anything. -------------------------------------------------------------------------------- e12115f | NormalPerson7 | 2018-11-23 21:07:20 -0500 Don't halve the MR of magic immune creatures from AF_VULN (11754) Previously phantasmal warriors were able to halve the MR of magic immune creatures, which was announced and appeared to have an effect even though it really had no effect whatsoever. Hence, add a check to exit the case for AF_VULN early if the defender is immune to hostile enchantments. -------------------------------------------------------------------------------- ae4fabd | Edgar A. Bering IV | 2018-11-23 15:06:03 -0500 Disallow Twisted Resurrection for Enslaved Souls (Doesnty) This worked exactly like the old player spell, allowing access to permanent allies that used stairs and bypassed Yred limits. Closes #889 -------------------------------------------------------------------------------- e0e9ef7 | NormalPerson7 | 2018-11-23 12:35:20 -0500 Let the sturdy frame mutation reduce stealth/dodging penalties Previously, the sturdy frame mutation was taken into consideration only for the adjusted_armour_evasion_penalty method, not the unadjusted_armour_evasion_penalty. The latter of the two methods is used for stealth penalties, Jiyva stat shuffling, autotraining and some parts of the dodging penalty calculations, which means these things were not affected by the sturdy frame mutation. This meant the claimed ER-2 of the sturdy frame mutation did not have the full effect of reducing the ER by 2. Hence, move the sturdy frame mutation's effect to unadjusted_armour_evasion_penalty. -------------------------------------------------------------------------------- 453ed5a | Edgar A. Bering IV | 2018-11-23 12:20:01 -0500 Don't extend Ru's aura through glass (0011769) Monsters can't make attacks through glass, so they should not have their attacks redirected. -------------------------------------------------------------------------------- 1044d4c | NormalPerson7 | 2018-11-21 16:49:30 -0500 Fix a hints mode memorise menu message from extending horizontally The text from hints_target_mode was not properly broken up. -------------------------------------------------------------------------------- b6f590f | Edgar A. Bering IV | 2018-11-21 13:33:27 -0500 Buff the scythe "Finisher" Another entry in the unrand revision project. Finisher, as a speed scythe, was still not good. This commit removes Str+3 (random stat sticking) in favor of giving it an instant kill mechanic. The scythe now has a (50 - hd) / 200 chance of exploding a monster into chunks on any hit where damage is done. This translates to slightly worse than 1/4 chance against popcorn, decreasing to a 1/10 chance against an orb of fire. Compare to distortion's 3/20 odds of either banishing or instant teleporting a monster. -------------------------------------------------------------------------------- 8e4cbf7 | gammafunk | 2018-11-20 16:46:47 -0600 Disallow Sticks to Snakes under sacrifice love (Reeces) This is an ally creation spell that would only create hostile allies under sac love. Disallow use of this spell with sac love as we do for all ally-creating summon and derived undead spells. -------------------------------------------------------------------------------- 1c01f63 | gammafunk | 2018-11-18 22:40:00 -0600 Fix exclusions for stationary monsters behind solid features (paterick) Commit 57debff0 had exclusions not continue past solid features for stationary monsters, but this doesn't create a proper exclusion in all cases. In particular, such monsters can act behind solid features like grates and statues that block line of effect but not line of sight, and we want exclusions to continue past such features. The vault minmay_statue_bubble is an example of placing a statue monster behind granite statues where the current logic makes an incorrect exclusion. The opacity class we want is mostly opacity_no_trans ("no translocations"), but that rule considers half-opaque features like clouds that change quickly over time. Hence this commit makes an opacity_fully_no_trans class that ignores half-opaque features and has exclusions for stationary monsters use this class. -------------------------------------------------------------------------------- 7b583b2 | Alan Malloy | 2018-11-18 13:27:19 -0800 Update robe of vines text (Angani, #11765) -------------------------------------------------------------------------------- 036aa52 | gammafunk | 2018-11-17 13:31:44 -0600 Expire a monster's summons upon attitude change (7730) Currently, if a monster's attitude changes due to being charmed/uncharmed, pacified, or slimified, any of its active summons keep the summoner's old attitude. This is awkward in the case of slimify and pacify, since the player can't then kill the slimified/pacified monster to remove its hostile summons without incurring penance. Additionally, for neutral monsters as well as for charmed monsters (e.g. wand of enslavement), their own summons will begin to attack them upon attitude change. The player might expect summons to convert to the new attitude of their summoner. However with either that approach or the current one of no conversion, the player is encouraged to game the timing and AI of monster summon spells to either avoid danger or get easy damage on the summoner. This commit has any monster's summons abjure when its attitude changes for any reason. This includes whenever a monster is slimified, pacified, bribed with gozag, or becomes charmed/uncharmed via enslavement. Non-spell summons like the Royal Jelly Spawns and monster-created derived undead like the necromancer monster's simulacra are not affected by this change. This commit also removes code to convert a battlesphere's attitude upon attitude change of its summoner, since that's no longer needed. -------------------------------------------------------------------------------- 768d57b | gammafunk | 2018-11-16 02:03:22 -0600 Add TAG MAJOR for a shadow trap summon enum value This won't be needed after we bump the major version. -------------------------------------------------------------------------------- 76343ca | gammafunk | 2018-11-16 01:45:04 -0600 Remove an unusaged function argument -------------------------------------------------------------------------------- a32dbc5 | gammafunk | 2018-11-16 00:53:54 -0600 Some monster and loot vaults from minmay All save one early dungeon vault are 098 vaults that place monsters and loot in abstract or geometric arrangements. They are float vaults or minivaults depending on size and use of exits. One large vault has bottom orientation since it spans the entire bottom of the level. Nearly all changes from the original submission are to fix small DES errors or to reformat lua code. I did add lower weight to one vault that places a high item count. -------------------------------------------------------------------------------- db6ba40 | gammafunk | 2018-11-16 00:52:37 -0600 Some shop vaults from minmay A pre-Lair shop with 'used' weapons: good base types that have no ego and -1 to -4 enchantment. A shop that's takin' it easy with Cheibriados. It sells plate armour, crystal plate armour, or unrands that all have ponderous ego. A jewelry shop featuring enchantable jewelry types. A shop of 'mayhem' featuring weapons and spells that have AOE. Finally, a 'Mass Market' featuring weapons, armor, and ammo that could be considered heavy (rip player burden). -------------------------------------------------------------------------------- ce47f42 | gammafunk | 2018-11-16 00:48:07 -0600 Clean up tags on some shop vaults Add transparent tag for vaults missing this, using a KMASK for one vault with a disconnected decorative area. Remove no_trap_gen for vaults which don't need this. Add the extra tag for vaults that don't place any monsters or loot. -------------------------------------------------------------------------------- b1ff92d | gammafunk | 2018-11-16 00:48:08 -0600 Derandomize use of the 'transparent' tag The randomized setup function used in many of Kennysheep's vaults gives a vault the transparent tag based on a random roll. This tag should be used whenever a vault has multiple entrances running through the vault and where the vault either has no disconnected areas or these areas properly have a KMASK with the opaque tag applied. This is to help levels generate fewer vetoes, since otherwise the validator assumes a vault is impassible for connectivity purposes. Hence its use shouldn't be randomized. Have the setup function used for these vaults unconditionally place this tag. -------------------------------------------------------------------------------- b8f687f | gammafunk | 2018-11-16 00:45:50 -0600 Some Temple entry vaults from minmay Temple branch entry vaults, most of which have abstract or geometric themes. The exceptions to this are a vault that generates items (themed as an 'offering') and another with a single orc priest guarding the entrance. -------------------------------------------------------------------------------- d959f4f | gammafunk | 2018-11-16 00:14:27 -0600 Add some section markers to temple.des -------------------------------------------------------------------------------- ef876f6 | Edgar A. Bering IV | 2018-11-16 00:06:33 -0500 checkwhite and delete MSVC build byproducts -------------------------------------------------------------------------------- 57debff | stenella | 2018-11-15 23:33:19 -0500 Don't autoexclude past glass sometimes (11658) When placing an exclusion on a stationary monster don't extend the exclusion past glass. [Committer's note: Closes #892, checkedwhite and reworded] -------------------------------------------------------------------------------- 79ed067 | NormalPerson7 | 2018-11-14 22:55:50 -0500 Mention Ijyb and Maurice's wand-carrying [Committer's note: Closes #899. Tweaked some wording.] fixup! Mention Ijyb and Maurice's wand-carrying in their descriptions -------------------------------------------------------------------------------- 50e03f5 | Edgar A. Bering IV | 2018-11-14 22:13:29 -0500 Tweak a new arrival vault (gammafunk) Consistent stone usage and a no_item_gen KMASK. -------------------------------------------------------------------------------- bb43e84 | Edgar A. Bering IV | 2018-11-14 21:48:07 -0500 An early lizard minivault (WanderingBlade) -------------------------------------------------------------------------------- 7259ab3 | Edgar A. Bering IV | 2018-11-14 21:48:07 -0500 Update CREDITS -------------------------------------------------------------------------------- b76f445 | Edgar A. Bering IV | 2018-11-14 21:48:07 -0500 Some variable vaults (WanderingBlade, 11140) A decor river bridge. A guarded_unrand vault for the ratskin cloak featuring hell rats at a very early depth. An evil kobold church, from the same sect as those kennysheep sewer kobolds. -------------------------------------------------------------------------------- ed1f8b9 | Edgar A. Bering IV | 2018-11-14 21:48:07 -0500 A shower themed Vaults entry (ximxim, 10658) -------------------------------------------------------------------------------- 68ef482 | palyth | 2018-11-14 21:48:07 -0500 A winding forest swamp entry vault (11061) -------------------------------------------------------------------------------- 4de353c | Edgar A. Bering IV | 2018-11-14 21:48:07 -0500 KennySheep inspired adjustments to a sewer (10035) -------------------------------------------------------------------------------- 79c5e3b | Edgar A. Bering IV | 2018-11-14 21:48:07 -0500 Branch entry vaults (skrybe, 11232) -------------------------------------------------------------------------------- 0b3e9c9 | Edgar A. Bering IV | 2018-11-14 21:48:06 -0500 Multi-coloured glass columns for Zot (Skrybe, 11232) -------------------------------------------------------------------------------- 44191be8 | Edgar A. Bering IV | 2018-11-14 21:48:06 -0500 A decorative Xom vault for Snake (Skrybe, 11133) -------------------------------------------------------------------------------- ee0713f | Edgar A. Bering IV | 2018-11-14 21:48:06 -0500 New arrival vaults (WanderingBlade, 11132) -------------------------------------------------------------------------------- 796c40d | Edgar A. Bering IV | 2018-11-14 21:48:06 -0500 An arrival vault (Beargit, 11400) -------------------------------------------------------------------------------- 30b1108 | gammafunk | 2018-11-13 21:38:18 -0600 Describe the enchantment of dancing weapons This commit includes the enchantment in any dancing weapon description. Curse state is not included to keep the description shorter, just as we do when describing wielded weapons for other monsters. Curse info will still be revealed for the weapon when the dancing weapon is destroyed. -------------------------------------------------------------------------------- 923571c | gammafunk | 2018-11-13 21:38:18 -0600 Remove a redundant message about dancing weapons Currently when a dancing weapon comes into view, it generates a "...comes into view" message with a followup "It is a..." containing the exact same information. The second message used to be part of Ash's passive monster equipment identification, where the first message had less information and the second contained more information ("Ashenzari warns you: ..."). Now that monster equipment is always identified when the monster is first seen, we don't need the second message. -------------------------------------------------------------------------------- 8c0b414 | gammafunk | 2018-11-13 21:38:18 -0600 Reveal equipment for monsters behind glass Before this commit, monster equipment was only revealed when the monster actually generated an interrupt. Monsters behind glass don't generate interrupts, so their equipment wasn't getting identified. We now identify equipment unconditionally when a monster is seen. The equipment identification call for interrupts currently has to remain due to message ordering, since travel messages happen before seen monsters are processed. It may be good to refactor travel code so that this doesn't happen. Another possibility is to set all relevant monster equipment as identified when the monster is created, preventing the need for any equipment identification pass. -------------------------------------------------------------------------------- 0174fd8 | Aidan Holm | 2018-11-11 11:17:33 +0800 Fix menu item rendering bug The row height calculated for the last menu item did not include padding, which caused it to appear vertically cramped. -------------------------------------------------------------------------------- 8871014 | stenella | 2018-11-11 10:56:53 +0800 Fix typo/color layering bug in tutorial Due to the way strings are formatted after being read from this function, this tag was being treated as extra text. It's not needed, so remove it. Fix a grammar oopsie. -------------------------------------------------------------------------------- f02c810 | advil | 2018-11-09 08:44:38 -0500 Validate file pointer when loading help parts This might be better to handle without a crash at all, but right now there is a possible segfault in fgets if something is wrong with this file, so check it explicitly. Possibly these files should be explicitly validated on game load in addition (I think only their containing folder is right now). -------------------------------------------------------------------------------- 33f1def | gammafunk | 2018-11-08 18:48:30 -0600 Remove a vault that breaks autoexplore (minmay) Removed by request of the vault author. The vault minmay_item_behind_shaft generates a corridor with a shaft at the end in front of an item. If you recognize this vault you'll dig into it, apport, use allies to trigger the hidden shaft, or just return when the level below is cleared. If you don't recognize it, you'll autoexplore into it, always triggering the shaft. To some extent all vaults that place hidden traps are spoilery, but this is an egregious case. Consider this elf flogged. -------------------------------------------------------------------------------- 4fac8996 | advil | 2018-11-08 19:37:47 -0500 Potential fix for Mojave black screen issues Workaround based on: https://discourse.libsdl.org/t/macos-10-14-mojave-issues/25060 This may be fied in SDL2 master, in which case we should revert this workaround and update the submodule, when it gets released. -------------------------------------------------------------------------------- 0aa8dd0 | Aidan Holm | 2018-11-08 21:56:56 +0800 Limit extra Ru ability info to followers (amalloy) The Ru sacrifice ability description contains code for showing sacrifice significance and piety gain, which crashed if the player was not following Ru for some abilities. This commit simply hides that line of text, as well as mutation-specific text for sacrifices that add mutations, and re-enables using the ability description view for ?/A, which is currently the only way for non-followers to view the description. -------------------------------------------------------------------------------- 57a8110 | gammafunk | 2018-11-08 00:49:00 -0600 Refactor LOS attack spell code Use _player_hurt_monster() to apply damage and handle sanctuary checks and wound messages. Also use refs instead of pointers where possible. -------------------------------------------------------------------------------- 15b4f39 | gammafunk | 2018-11-08 00:49:00 -0600 Centralize conducts for some player damage spells For player spells that don't use a struct bolt to apply damage, have them use the now-generalized _player_hurt_monster() function. This centralizes the handling of aspects like Zin's sanctuary, god conducts (for most instances), and printing wound messages. Previously this logic was repeated throughout spl-damage.cc, with some spells not properly applying sanctuary rules or having god conducts applied in all cases. -------------------------------------------------------------------------------- 0eb21a9 | gammafunk | 2018-11-08 00:20:42 -0600 Fix and simplify god conduct code The god_conduct_trigger class currently has separate functions to enable and disable the conducts to go along with set_attack_conduct(). This is so that conducts could be conditionally enabled at a time when the relevant monster might have died, but this functionality isn't actually necessary for any current god conducts. In all cases we've ensured that the monster is alive before effects or damage happen, and in all cases we want to apply these conducts if the effect kills the monster. This commit enables the conduct at the time set_attack_conduct() is called and removes the enable/disable functions. Additionally set_attack_conduct() is refactored to take a ref instead of a pointer. This commit also fixes god conducts being applied too late for melee and ranged combat, and cleans up the god conduct code for some spells. Before this commit, melee and ranged attacks against allies would not actually apply the conduct if the attack killed the ally. It might be best to replace the use of a scoped god_conduct_trigger variable and destructor with a simple function call. Message ordering is the only thing that might complicate this. -------------------------------------------------------------------------------- 15caca4 | gammafunk | 2018-11-08 00:11:18 -0600 Don't prompt for the Arc Blade spell effect If the player triggers static discharge from this unrand when friendlies are around, they are prompted whether to cancel this effect. 3a6879684 introduced this when it reworked the unrand to cast static discharge directly. This commit prevents the prompt when the spell is triggered via the unrand, letting the prompt happen once, before the attack is made. -------------------------------------------------------------------------------- 236c270 | gammafunk | 2018-11-08 00:11:18 -0600 Better sanctuary removal for melee/ranged attacks Zin's sanctuary could sometimes fail to get removed for melee and ranged attacks when an attack doesn't continue past the hit phase. For example, if the attack killed the monster, no sanctuary removal would occur. This commit puts the sanctuary removal at an earlier location in the attack phase to prevent this. -------------------------------------------------------------------------------- 9d4b7ed | Alan Malloy | 2018-11-07 13:35:24 -0800 Don't crash when looking up Ru sacrifices (JumpingArm) This is a temporary fix, making the ?/A menu display less useful information about Ru sacrifices. This commit should be reverted once a proper solution is in place. This is in relation to https://crawl.develz.org/mantis/view.php?id=11752 -------------------------------------------------------------------------------- 92528d7 | NormalPerson7 | 2018-11-06 13:15:15 -0800 Add a prompt for attacking living things while under divine protection Killing natural monsters while under Elyvilon's divine protection causes penance. However, there is no prompt for this, and it seems natural for the player to invoke divine protection when low on HP so they don't die, then heal up, and once they've healed, try to fight the enemy causing them trouble. It was easy for players to accidentally cause penance by killing enemies while under divine protection in this way. Hence, add a prompt for attacking natural monsters while divine protection is active. Penance will not actually trigger until the monster is killed, but it's better to be safe than sorry. -------------------------------------------------------------------------------- 86cf76c | Alan Malloy | 2018-11-06 13:13:51 -0800 Remove unused code for jump attacking into a sanctuary -------------------------------------------------------------------------------- 368ce00 | NormalPerson7 | 2018-11-05 17:18:52 +0000 Don't corrode or appear to damage rAcid+++ enemies with Punk (11746) (#894) Acidic attacks, from the acidic bite mutation and Punk, previously displayed the "[Enemy] is splashed with acid" line against all targets, which suggested to the player that acid immune targets still took extra damage from these attacks even though any damage was in fact resisted. Additionally, this was able to corrode acid immune enemies, which does not seem thematically correct. Therefore, in monster::splash_with_acid, add a check at the start of the method for acid immunity, which if true, return early from without any opportunity to damage or corrode the monster. Acid resistant enemies correctly take half-damage from acid splash and resist corrosion half of the time both before and after this change. -------------------------------------------------------------------------------- 0063841 | NormalPerson7 | 2018-11-04 08:52:19 -0500 Improve spacing in a return statement This makes it so that all the code is nicely aligned, so that the logic can easily be followed by examining the indentation. Also remove all unnecessary parentheses. -------------------------------------------------------------------------------- 025b075 | NormalPerson7 | 2018-11-04 08:52:19 -0500 Give trolls the correct gourmand message, cleanup code Commit 394fb522 incorrectly assumed troll players are carnivorous, which they are not. Hence, include trolls' gourmand mutation in the logic for the carnivorous message for gourmand amulets being useless. Additionally, fix a couple of message lines too long, improve the whitespace around the ifs, and make sure everything is aligned correctly. -------------------------------------------------------------------------------- 64599a1 | stenella | 2018-11-03 12:36:09 -0400 Leave Dual-Wielders Alone Fixes #858 If a dual-wielder's primary weapon was removed by Tukima's (determined by a coin-flip in monster::weapon()) , their mcache entry would be invalided by this check, which didn't consider the valid option of an alt-hand-wielded weapon. -------------------------------------------------------------------------------- 9fa8be9 | stenella | 2018-11-03 12:34:45 -0400 Change LRD flavour text for doors https://crawl.develz.org/mantis/view.php?id=11695 LRD works on door tiles, which seem to be mostly wood. Explain to the player that the door frame itself is what is shattering, not the door. Also, make fall-through's consistent. -------------------------------------------------------------------------------- 394fb52 | Stenella | 2018-11-03 12:33:11 -0400 Properly notify non-users of Gourmand (11692) Previously, the wear message for gourmand was the same regardless of whether it would work; change it to reflect the various reasons why it might not work. Carnivorous/herbivorous mutations cover most species. `foodless` covers mummies and the extra case of lich transformations, for added lore. Vampires don't seem to fit into either of these cases, so they are checked explicitly. -------------------------------------------------------------------------------- 2bcd0a2 | stenella | 2018-11-03 12:23:31 -0400 Check for stat_zero slow before telling player they're good to go https://crawl.develz.org/mantis/view.php?id=11476 If a player is slowed in some way, then stat zero'd, when the slow runs out, they'll be told they've been sped up, despite still being slow. Check to make sure players aren't being slowed by stat zero before telling them they're fast again. -------------------------------------------------------------------------------- 8eab93f | wheals | 2018-11-02 11:11:38 +0200 Don't print god warnings about a spell you can't memorise anyway. -------------------------------------------------------------------------------- 98fffd3 | wheals | 2018-11-02 11:10:07 +0200 Allow seeing the memorise menu while confused (#11517). Checks later in the code still prevent memorisation. -------------------------------------------------------------------------------- 5214e5f | gammafunk | 2018-11-01 23:03:18 -0500 A new Ijyb splash screen from ploomutoo -------------------------------------------------------------------------------- cf17ac6 | advil | 2018-10-31 14:42:38 -0400 Add aliveness checks to some monster equipment functions Various bits of the subsequent code in these functions may rest on getting a living, valid monster. This is possibly what was causing crashes when Fennar refrigerates himself with other enemies on screen. (gammafunk/amalloy) -------------------------------------------------------------------------------- 6ce9549 | gammafunk | 2018-10-31 01:11:03 -0500 Some decorative tweaks to a Bazaar vault Don't recolor features like doors and the exit hatch, and use yellow for the transparent stone instead of white. The surrounding stone is also white, so having transparent stone be the same color is confusing in console. -------------------------------------------------------------------------------- 6e9e0f2 | stenella | 2018-10-30 13:58:41 -0700 Console support Allow the building of console DCSS in MSVC. Change a unicode character to its equivalent code Wrap tilecell and tiledgnbuf.cc in the same ifdef that their header files are wrapped in. -------------------------------------------------------------------------------- e82cdd1 | stenella | 2018-10-30 13:58:41 -0700 MSVC2017 Compatability and relocation of project files Updating submodule projects without changing the submodules themselves seems cumbersome, so move vcxproj files to a separate directory within the main repository. Fix project files so they support x64 and Debug configurations. Update INSTALL.txt to reflect current reality -------------------------------------------------------------------------------- 8c51ad5 | gammafunk | 2018-10-29 20:11:51 -0500 Don't apply negative energy effects to monsters for Drain Life This spell is only supposed to do damage and give the drained HP to the caster. The negative energy draining effects accidentally began to be applied to monsters due to fb95405b. -------------------------------------------------------------------------------- 27fa94f | gammafunk | 2018-10-29 20:11:51 -0500 Fix a crash for LOS attack spells (MeekVeins, amalloy) It's possible for a monster to die after applying damage flavour effects but before the direct damage is applied. This invalidates the monster pointer needed for god conducts, and was causing crashes with e.g. Drain Life. This commit adds a necessary check for the monster being alive before trying to apply conducts. Additionally Drain Life shouldn't actually the flavour effect of negative energy, and this will be fixed in a subsequent commit. -------------------------------------------------------------------------------- 4a5eb33 | Skrybe | 2018-10-28 22:57:25 -0400 Address a TODO in layout_concentric_octagons Adds the Snake variant of the layout to Lair. The notes didn't say that anything needed to be addressed before adding to Lair, so the layout code isn't changed. -------------------------------------------------------------------------------- 786a77d | Skrybe | 2018-10-28 22:57:25 -0400 Address a TODO in layout_cave_pools Adds the layout to D, makes decreasing amounts of rock clumps at deeper depths. -------------------------------------------------------------------------------- 141017e | gammafunk | 2018-10-28 16:43:56 -0500 Lower the average number of charges for some wand types Wand charges were lowered by the removal of scrolls of recharging, yet the average number of charges for many powerful wands is still quite high. Over 70 charges generate in a 3-rune game for paralysis and polymorph, over 50 for wands of digging, and over 40 for enslavement. For the weaker wands, wands of flame and random effects generate over 150 charges each per game. We'd like the charges for each wand type to be meaningfully limited, especially for the more powerful ones. This commit lowers the average number of charges per wand for the following wand types: | Wand | Before | After | | -------------- | ------ | ----- | | digging | 12.5 | 5 | | enslavement | 12.5 | 8 | | paralysis | 12.5 | 8 | | polymorph | 12.5 | 8 | | flame | 24.5 | 16.5 | | random effects | 24.5 | 16.5 | Digging takes the biggest relative reduction because of how powerful this wand is at enabling escape, controlling monster movement, and breaking into vaults. Wands of flame and random effect charges are still too high, but they remain as the more spammable wands until their other design issues can be addressed. Flame duplicates a spell and is something you want to carry all game due to how good steam clouds are, despite being low-level. More design work could be done with some problematic wands like polymorph, flame, and random effects, possibly combining parts of them with other evocables. -------------------------------------------------------------------------------- 9c9d49f | Edgar A. Bering IV | 2018-10-27 21:39:50 -0400 Prevent unwielding by transforming After re-introducing this bug, squash it again by further refactoring. Both this and the bug fixed by 1406302 were caused by transform() calling functions whose behavior depended on the player's transformation while a player was in a partially transformed state. This lead to fragile and unpredictable behavior. Some of it is unavoidable, which comments point out. There may be other bugs lurking with a similar cause. -------------------------------------------------------------------------------- b2d5814 | Edgar A. Bering IV | 2018-10-27 14:24:46 -0400 Update ploomutoo in CREDITS.txt -------------------------------------------------------------------------------- 3a68796 | gammafunk | 2018-10-26 22:45:34 -0500 Rework the Arc Blade (minmay) Currently this unrand effectively casts static discharge many times, but with the melee defender as the target instead of the usual random one. The multiple casting led it to have extremely high damage of over 50% more than a demon blade of speed. Doing high secondary effect damage to the primary target is already well-covered by existing unrands. A weapon that can do good damage to nearby monsters is a more interesting unrand concept. This commit reworks the arc blade melee effect to cast static discharge once with increased spell-power of 100 + random2avg(100, 2), well past the usual 100 spell-power cap. This effect still triggers with the same 1/3 chance as before. The weapon enchantment is also increased from +4 to +8, making it not so awful versus resistant monsters. Using a normal cast of static discharge allows it to arc better to monsters adjacent to the player, and the high spell-power makes this damage effective. Its damage versus a single target is still excellent, similar to a demon blades of electrocution/speed, but not as overpowered as it was prior to this commit. Finally, it now has a proper melee attack prompt for harming allies. -------------------------------------------------------------------------------- 752426d | gammafunk | 2018-10-26 22:45:34 -0500 Fixes, refactoring, and message cleanups for static discharge The safe_discharge() function for the attack prompt warnings of static discharge didn't properly consider the player as an arc location. This meant that casting it didn't give a warning in some cases where an ally could be damaged. Also refactor the main cast_discharge() spellcasting function to allow non-players to call it, then have monsters use this when casting the spell. Previously the monster casting code partially duplicated this function. Finally, simplify the messaging a bit to remove a separate message about lightning arcs, adding that to the main damage message instead. The message spam from this spell is pretty high and could probably be improved to only print wound messages after all arcing is completed. -------------------------------------------------------------------------------- dc5cae9 | gammafunk | 2018-10-26 22:45:34 -0500 Remove an unnecessary scope block -------------------------------------------------------------------------------- 8079fb2 | gammafunk | 2018-10-26 22:45:34 -0500 Refactor melee attack prompts for some unrands -------------------------------------------------------------------------------- 7ed3b4c | gammafunk | 2018-10-26 22:45:34 -0500 Apply god ally conducts for Static Discharge, Irradiate, and Shatter Previously these didn't apply god conducts when harming allies, despite their warning the player about penance for this. -------------------------------------------------------------------------------- 1903759 | gammafunk | 2018-10-26 22:45:34 -0500 Properly apply god ally conducts for LOS damage spells Previous to this commit, Ozo's Refrigeration and the Singing Sword's spell didn't apply god conducts when damaging allies, despite them warning the player about penance. Now these conducts are applied properly. -------------------------------------------------------------------------------- d7a6ca6 | Edgar A. Bering IV | 2018-10-26 21:30:35 -0400 Add Stenella to CREDITS -------------------------------------------------------------------------------- 1406302 | stenella | 2018-10-26 21:17:13 -0400 Simplify HP calculations (11728) Combine calc_hp() and recalc_and_scale_hp() into a single function. Remove the default for the rotting parameter to get_real_hp() and require it be explicit in each usage. Add a check to get_real_hp() for the presence of hp changing transmutations, and handle those through calc_hp instead of some special cases. Sequence equipment melding and HP calculation appropraitely. (This fixes 11728.) [Committer's note: Closes #875, #877. Checked whitespace, revised the commit message to reflect the final state of the patch. Simplified a check.] -------------------------------------------------------------------------------- e56fa01 | Stenella | 2018-10-26 15:55:52 -0700 MSVC 2017 Compatibility (#878) -------------------------------------------------------------------------------- 66a18ee | NormalPerson7 | 2018-10-25 18:53:14 +0100 Start Wn with a spell memorised if they have only one level 1 spell If wanderers have more than one level 1 spell, they may not have enough spell levels to memorise all of them, and so the player should get to choose which spell to memorise. If, however, wanderers have only 1 level 1 spell in their library, and they have a spell level available, it makes sense for the player to have that spell automatically memorised. Hence, in this case, memorise the player's only level 1 spell. -------------------------------------------------------------------------------- 7e0f0f3 | NormalPerson7 | 2018-10-25 18:53:14 +0100 Announce the starting items and spells for wanderers (11725) Previously, players that did not look at their M screen would not be aware of if they had spells in their spell library. Therefore, print the player's inventory and spell library to the message log at the start of the game. Also, take a note of the spell library to include in the dump. This is done by expanding the note_wanderer_items function and renaming it to note_wanderer_equipment (to be more accurate). This commit also adds support to print any spells the player begins with memorised at the start, although this currently never happens. -------------------------------------------------------------------------------- 305c090 | Alan Malloy | 2018-10-24 18:24:23 -0700 Revert "Fix transformation HP scaling with HP+ artefacts (11728)" It was allowing you to unwield cursed weapons by transforming, and triggering unwield effects without warning. Credit to Malacanter for noticing/reporting. This reverts commit 82e90586b2dc5d95895fca894a4503104906bce7. -------------------------------------------------------------------------------- 5ce4c07 | advil | 2018-10-24 15:15:34 -0400 Try again to avoid recursive crashes when loading level/save data bf5fdde8f9eef4 put the unwinds in the saving functions, not the loading functions... -------------------------------------------------------------------------------- 3bc7ea6 | Doesnt | 2018-10-24 11:36:49 -0400 Spelling -------------------------------------------------------------------------------- f497b7c | advil | 2018-10-23 23:27:42 -0400 Improve (?) filtered_vector_select This now takes the `filter` argument in a format that should be guaranteed to cast to bool (for purposes of #871), guaranteed to handle a nullptr argument, and is also just more explicit about its type. Unfortunately this prevents at least my compiler from deducing M correctly, but such is life. -------------------------------------------------------------------------------- 357f654 | Edgar A. Bering IV | 2018-10-23 20:29:16 -0400 Update CREDITS.txt -------------------------------------------------------------------------------- 82e9058 | NormalPerson7 | 2018-10-23 12:04:18 -0700 Fix transformation HP scaling with HP+ artefacts (11728) When wearing faerie dragon scales with the HP artefact property and entering or leaving a transformation that modifies HP, HP would be scaled incorrectly. This was because: - On entering a transformation, equipment was melded after the transformation took effect, which meant the new max HP was used as the finishing value for the HP change from melding the scales (resulting in a much higher than expected final value). - On exiting a transformation, equipment was unmelded before the max HP was downscaled, which meant the old max HP was used as the starting value for the HP change from unmelding the scales (resulting in a much lower than expected final HP). Hence, in transform(), meld equipment before changing the value of you.form, and in untransform(), downscale HP from the transformation ending before unmelding equipment. -------------------------------------------------------------------------------- f2e588f | Alan Malloy | 2018-10-23 11:25:39 -0700 Remove some now-unneeded sarcophagus labelling from a Tomb vault -------------------------------------------------------------------------------- f86452d | Alan Malloy | 2018-10-23 11:13:25 -0700 Turn some pointers into refs, resolving a TODO -------------------------------------------------------------------------------- d27e9dc | Alan Malloy | 2018-10-23 11:12:59 -0700 Fix a Tomb vault that was impassable (NormalPerson7, #11733) -------------------------------------------------------------------------------- bf5fdde | advil | 2018-10-23 11:28:34 -0400 Try to avoid recursive crashes when loading level/save data If the game crashes while loading items/monsters (`tag_construct_level_items` and `tag_construct_level_monsters`), it creates a situation where it is highly likely to crash debug_item_scan or debug_mons_scan respectively. Since these are called for most builds during the crash handler (basically for the detailed debug output in case of things like unlinked items, I think), this leads to recursive crashes (see e.g. 11734) and complicates diagnosing whatever the underlying problem is. This change adds yet another state variable to suppress these scans in the crash handler. It's possible that I'm missing a case where calling the scans in the face of such a crash does provide useful information; we'll see. -------------------------------------------------------------------------------- ceb43e6 | advil | 2018-10-23 11:28:34 -0400 unbrace -------------------------------------------------------------------------------- 084b3f8 | NormalPerson7 | 2018-10-23 10:15:46 -0400 Make the immune_to_hex function available to clua Add a new function to l-you.cc's clua library, called you_immune_to_hex, which takes a spell as a parameter and returns whether the player is immune to that spell. [Committer's note: added @tparam to the ldoc. Closes #868] -------------------------------------------------------------------------------- d59976b | NormalPerson7 | 2018-10-23 10:14:21 -0400 Include info about intrinsic immunity in monster spell description This commit adds the line "You cannot be affected by this spell right now" to descriptions of monster spells accessed through the monster description, in place of the "chance to beat your MR" line. -------------------------------------------------------------------------------- b5b85be | NormalPerson7 | 2018-10-23 10:13:41 -0400 Display (immune) in monster description when a player is immune to a hex When a player is intrinsically immune to a particular hex, through innate abilities, equipment, god abilities or transformations, make the chance to defeat MR indicator next to the spell on the monster description screen read "(immune)" instead. It is misleading to imply that these abilities can succeed on the player through printing the chance to defeat MR, as was the case previously. This applies to: - Paralysis and slowing as a formicid, - Confusion with clarity or under Zin's vitalisation, - Petrification as a gargoyle, in statue form or under Zin's vitalisation, - Sleep and fear as undead or nonliving, with clarity or while berserk, - Virulence when immune to poison, - Porkalator when unable to transform, - Teleport and blink as a formicid or with -Tele equipment, and - Mesmerisation with clarity or while berserk. This commit creates a new member function in the player class, immune_to_hex. This method also returns true for hex-like spells that do not have an MR check, such as paralysis gaze and blink other, however these spells do not have the MR indicator and as such also do not have the immunity indicator. (If the only reason the player cannot be affected by a hex is because they have sufficient MR to resist it always, the MR indicator will still read "(0%)", to maintain the distinction between MR and intrinsic immunity.) [Committer's note: lowercased "immune"] -------------------------------------------------------------------------------- 9beedce | gammafunk | 2018-10-22 17:48:21 -0500 Refactor and update comments. Use max() instead of assignment testing. Mnoleg no longer has chain of chaos, but has call of chaos instead, and chaos champions no longer exist. -------------------------------------------------------------------------------- 98c7a59 | gammafunk | 2018-10-21 20:02:35 -0500 Some edits and cleanups for a Bazaar vault Refactor and simplify glyph usage to use more consistent lettering and avoid overriding default glyphs. Add a full ring of edging between land and shallow water with small chance to place water on each tile to make this effect more randomized. Fix the transparent stone colored tiles by setting the TILE statements to the color variants manually. I'm not sure why setting the color alone isn't changing the tile like it does normally; some aspect of the Bazaar layout seems to be preventing this. Make the use of transparent stone in the lighthouse walls contiguous, more how a lighthouse would be. Finally, generate the ophan awake. Closes #867. -------------------------------------------------------------------------------- 9dc3cf4 | kenranunderscore | 2018-10-21 18:12:31 -0500 Add a lighthouse-themed bazaar vault Adds the vault bazaar_kenran_lighthouse. It features a circular hut built on a small island, make to resemble a lighthouse in the ocean. The shoreline, as well as the transitions from shallow to deep water, and from deep water to open sea, respectively, vary slightly in each generated map. At the moment, the centre of the lighthouse contains a trapped ophan (as to provide a source of light). Of course this is rather gimmicky, but I found it fun. It can easily be replaced by another shop or decorative interior though, should monster generation in this case be frowned upon. -------------------------------------------------------------------------------- 1757c6e | Manderson | 2018-10-20 22:50:43 -0400 Dispater Resprite Now looks spookier and more made out of metal [Committer's note: Closes #863] -------------------------------------------------------------------------------- acb38b5 | Manderson | 2018-10-20 22:50:11 -0400 Replace Tiles: H. Ghost, S. Wraith, Cob, Eid Replacing several ugly and unflavorful tiles. Hungry ghost should look hungry, rather than obese. Shadow wraith and Eidolon are all but unshaded. Death cob is a little too bright and has no discernible light source. -------------------------------------------------------------------------------- 4c2fb12 | kenranunderscore | 2018-10-20 20:04:18 -0400 Fix some old bazaar vaults Some older bazaar vaults did not work/look as originally intended due to tile randomisation. The problems were mostly due to vaults using LFLOORCOL in some way, which was then overwritten by the colour randomisation in bazaar_setup. Some of this was only noticeable in console mode, since the randomisation also sets LFLOORTILE. To fix this and thus restore the intended looks of these vaults, several steps were taken: - Extend bazaar_setup in way that makes it possible to control whether colour randomisation takes place or not. - In vaults that used RNG to set a floor colour and then checked for it, the checks now use dgn.get_floor_colour() to get the correct colour (example vault: bazaar_lake). This has to take place after the call to bazaar_setup. - In vaults that set a fixed floor colour, use the version of bazaar_setup that does not randomise the colours (example vault: bazaar_minmay_generic_d). Note: The generation of shop halos is the only thing that needs to be done in the branch epilogue; everything else can be done before that. The code now reflects this, and vaults that do not want halos "delete" the epilogue (pass a nil to set_branch_epilogue). Otherwise, if the player had entered another bazaar before, the epilogue could have been set already. [Committer's note: Closes #562. checkwhite and use luaL_optstring for set_branch_epilogue] -------------------------------------------------------------------------------- 376f016 | kenranunderscore | 2018-10-20 18:43:29 -0400 Small Lua refactoring for bazaars The colour randomisation in bazaar.des used a Lua table to pick a random colour from, then checked whether this colour was contained as a key in another Lua table. If it was, the corresponding value was picked as a tileset for the bazaar vault, otherwise there was a default tileset as a fallback. This check could only fail if - for some reason - the two Lua tables were not synchronized. This refactoring removes the need for the check and the default tileset by combining the two Lua tables into one containing all the information necessary to randomise the looks of the vaults. This shortens the code a tiny bit and makes adding new tilesets less error-prone. -------------------------------------------------------------------------------- eaabbf3 | Alex Jurkiewicz | 2018-10-20 13:31:18 -0400 Improve bear berserk Bears mostly die before they can berserk, or they berserk and then die a turn or two later. Let them cast it when in an emergency (like orc battlecry) and double the cast frequency. [Committer's note: Removed the instant from this patch. Closes 591] -------------------------------------------------------------------------------- 6ff198f | jmbjr | 2018-10-20 11:15:31 -0400 Allow setting attitude of cloned monsters (damerell, #11171) (#608) Matches the attitude of a cloned monster to the cloner. This also removes the (currently never-used) option of setting the position of the cloned monster on call. For _mons_summon_monster_illusion: By passing the cloned monster's attitude to clone_mons, we don't have to do all of the gymnastics that previously had to be done to properly set the cloned monster attitude and not adversely affect arena bookkeeping. for _phantom_mirror, we can now simply set ATT_FRIENDLY in the clone_mons call directly. -------------------------------------------------------------------------------- 6fd5563 | gammafunk | 2018-10-19 20:48:20 -0500 Some pre-Lair vaults that place manuals from minmay Minmay's comments regarding this submission: > Pre-Lair vaults with monsters guarding a manual Manuals are most > interesting early in the game when your character may not yet be > committed to a specific strategy. However, randomly generated manuals > are extremely rare and biased towards deeper levels, and existing > vaults that explicitly place manuals are all quite deep as well. So > here are some shallow vaults that place manuals! > > These all have a mean of five monsters and a minimum of two, with the > exception of minmay_manual_mares which simply has 2 centaurs. There > are currently 10 vaults, with a total weight of 50. Put these vaults in mini_monsters.des with their own section and description in the relevant areas. Only changes I made to the vaults themselves were syntax simplifications for NSUBST, like removing `1:` for single replacements or `*=` for the final replacement. Also replaced use of `:` with `=` for single replacements, since I find use of that to be less error-prone when NSUBST terms get changed around. -------------------------------------------------------------------------------- aeb629a | advil | 2018-10-19 21:02:43 -0400 Various code cleanups for ghost_demon brands Also, switch over a bunch of `int`s to `brand_type`. -------------------------------------------------------------------------------- 33639ab | advil | 2018-10-19 21:02:43 -0400 Show pan lord brand information As with spells, showing the player the randomness immediately helps smooth out some of the spikiness of just how random pan lords can be. Doing this is also more consistent with recent changes to monster equipment id. This was surprisingly hard to get right, and the wording may still be slightly odd for some brands and cases. This also improves the display of ghost brands in xv (where it wasn't previously shown at all). This commit changes SPECIAL_WEAPON_KEY to store a brand_type, not a string. -------------------------------------------------------------------------------- 6656e44 | advil | 2018-10-19 21:02:43 -0400 Show pan lord spells in xv unconditionally While random behavior can be exciting, the particular randomness involved in panlord spells is extremely spiky, and I think it's better to reveal to the player the randomness on encountering a pan lord rather than as they cast their spells. This is especially relevant on the orb run for newer players who may not have much experience with pan lords, and given that 792c6d12af should make pan lords slightly more frequent on the orb run. With this change, the only kind of hidden spell information remaining is for monsters with multiple spellbooks. -------------------------------------------------------------------------------- 4538c0e | advil | 2018-10-19 19:58:55 -0400 Make major-tag-history.md -x Not sure why it was +x. Resolves #832. -------------------------------------------------------------------------------- 28c3e8e | Kyle Rawlins | 2018-10-19 17:57:26 -0400 Update MSVC instructions to reflect current reality These directions are really too obsolete to keep up, and if someone were to get this working, I suspect they'd have to entirely rewrite anyways. -------------------------------------------------------------------------------- e122d05 | gammafunk | 2018-10-18 10:33:37 -0500 Remove an unused variable It's possible that this is related to a crash on CBRO potentially caused by the use of a function template, although that really shouldn't be the case. -------------------------------------------------------------------------------- 69db12b | Aaron Golden | 2018-10-18 09:39:30 -0500 Correctly tag branch ends in Hell vaults Having these hard coded for branch ends at level seven causes problems if branch-data.h is ever changed to make one of these branches not exactly 7 levels deep. [Closes #865] -------------------------------------------------------------------------------- 2b29b68 | Edgar A. Bering IV | 2018-10-18 09:39:30 -0500 Tweak nagdon_arrival_double_spiral The lava and deep water variations spelled death if a ranged monster spawned awake and near the vault, or wandered by as the player was departing. The transparent stone could force the player to wake up a lot of monsters while navigating out of the vault leading to death. [Closes #864] -------------------------------------------------------------------------------- 9f293ae | Edgar A. Bering IV | 2018-10-18 09:39:30 -0500 Return disablers to disabler_island This vault wasn't actually placing one of its intended monsters. -------------------------------------------------------------------------------- fd02fb7 | Andrew Minton | 2018-10-18 09:39:30 -0500 Add the "transparent" tag to more vaults, eliminate some islands This commit adds the "transparent" tag to most minivaults that have more than one possible exit. For most minivaults, this eliminates their chance of causing a veto entirely, and for the rest, it at least reduces it. Also adds the "transparent" tag to a few non-minivaults. Vaults with internally disconnected regions have either had the appropriate opaque KMASKs applied, or said disconnected regions eliminated (only in the cases where the regions contained nothing...these were mostly my vaults...). Also fixes many cases where players could become trapped in a disconnected region (again, mostly my fault), and a couple other fixes to my own vaults and misspelled tags. Large minivaults with few possible exits still have a lot of trouble generating. disabler_island is clearly not functioning as intended (it can never actually have an orange crystal statue or floating eye) but I'll leave that to its author; for now I've just made it unable to trap the player. -------------------------------------------------------------------------------- bd7f2c8 | gammafunk | 2018-10-18 00:22:13 -0500 New tiles for the Sceptre of Torment (CanOfWorms) The old tiles didn't quite match the idea of "eveningstar". These new tiles definitely look like something that you wouldn't want to be hit with. In fact I'm not sure I'd want to touch this thing at all... -------------------------------------------------------------------------------- 8ff0b24 | gammafunk | 2018-10-17 22:28:42 -0500 Fix crashes for melee attacks without a weapon This was broken in the previous commit. -------------------------------------------------------------------------------- 606f0fe | gammafunk | 2018-10-17 20:22:20 -0500 Fix attack prompts for some unrand weapons The unrand weapons the Singing Sword, the Mace of Variability, and Spellbinder can all damage allies in LOS with their secondary effects, potentially turning allies hostile and causing god penance. This commit adds an attack prompt for using these with allies nearby so that the player can have a proper warning. There is a bug where Singing Sword's spell doesn't cause Okawaru penance when it harms allies, despite it turning them hostile. This is because the necessary conduct code is missing from the LOS attack spell code and the bug likely includes Ozo's Refridge as well. This can be fixed in a subsequent commit, but for now I'll leave the warning as is. The warning also uses somewhat misleading language, since it says that the attack will cause penance. In reality, penance will only be caused if the secondary effect actually triggers and the effect hits an ally (in the case of Variability, it may not). I'm leaving the current language for now, but if there's player confusion we can tweak it. There are still two unrands that damage allies which need fixing: the Arc Blade and the Sceptre of Torment. A simple LOS hit function wouldn't correctly capture the Arc Blade's arcs, since they only travel between adjacent monsters. This unrand is probably going to get reworked to simply use a chain spell, in which case a LOS hit function would work. I'm leaving it without a prompt for now. For the Sceptre, allies don't currently care if you torment them, nor does Okawaru give penance when this happens. We need to look into fixing this logic and probably should move torment over to the LOS damage spell code. Until this situation changes, there's probably no need for a prompt, since there are no major consequences other than allies losing HP. -------------------------------------------------------------------------------- 43d87f4 | gammafunk | 2018-10-17 14:13:25 -0500 Mark test statues as harmless monsters and clean up spacing -------------------------------------------------------------------------------- ba3dfdf | gammafunk | 2018-10-17 12:56:58 -0500 Don't give a prompt for the Singing Sword's spell effect When casting its Sonic Wave spell, the player's melee attack will generate a cancellable prompt if the spell would harm an ally, which we don't want here. Prevent this prompt; a subsequent commit will add the necessary check so that this happens before the melee attack begins. -------------------------------------------------------------------------------- 0f038ff | gammafunk | 2018-10-17 12:56:58 -0500 Fix a crash when death curses torment (geekosaur) The attacker can be nullptr for some sources of torment, so properly check for that case before dereferencing the attacker. -------------------------------------------------------------------------------- 006994f | gammafunk | 2018-10-16 21:47:58 -0500 Rework the Sceptre of Torment This torment effect of this weapon makes it something only undead players want to use, and even then it's not a very good weapon due to having such low direct damage. This commit makes the torment effect not apply to the wielder, applying it on 20% of successful hits instead of 50%, changes the base type to be an eveningstar, and gives it the pain brand. It was previously an unrand one-handed staff, but we already have one of these, the Elemental Staff, and had no unrand eveningstar with the removal of the Mace of Brilliance. Now the sceptre will be a usable weapon that outclasses most branded and highly enchanted weapons for its type. It might be nice to update the tile to have spikes, so it more resembles something one could conceivably call an eveningstar. -------------------------------------------------------------------------------- 9fe5f10 | Edgar A. Bering IV | 2018-10-16 00:25:51 -0400 Remove Misfortune from some vaults The new version doesn't make sense in certain vaults. -------------------------------------------------------------------------------- 103bc38 | Edgar A. Bering IV | 2018-10-16 00:25:51 -0400 Revise the robe of Misfortune (gammafunk) The robe of "particularly bad identification trap" was not an interesting thing. This keeps the theme of an unlucky robe which frequently leads to unfortunate confluences of events, but now lets some of that bad luck fall on monsters too. Specifically, the random appearance is dropped and the robe becomes: +5 with {*Corrode *Contam *Drain Harm *Slow EV+5}. -------------------------------------------------------------------------------- 6e662b0 | Edgar A. Bering IV | 2018-10-16 00:24:58 -0400 Add Harm as an artefact property Does not generate randomly at present. Requires *Drain. Multiple sources of Harm do not stack. -------------------------------------------------------------------------------- 6f3f904 | Edgar A. Bering IV | 2018-10-15 21:58:52 -0400 A farewell to arms (Yermak) Remove some permarock and unobtainable items used decoratively in baileys. They're replaced with granite statues given flavourful descriptions. CanOfWorms is working on some custom statue tiles to use here. -------------------------------------------------------------------------------- a838e03 | advil | 2018-10-15 20:22:05 -0400 One too many validity checks -------------------------------------------------------------------------------- 28b8a26 | advil | 2018-10-15 18:14:26 -0400 Add some finiteness checks to rays ...in hopes that this would help pin down when things go wrong. -------------------------------------------------------------------------------- b49dddc | advil | 2018-10-15 14:16:50 -0400 Default `wall_jump_move` to false This change has been a long time coming. In hindsight, the movement based implementation of this causes a lot of problems by turning what is normally an interface noop (moving into a solid thing) into something that can have annoying or bad tactical consequences. The option is (for now) still there, for those who find the movement version fun. -------------------------------------------------------------------------------- 792c6d1 | Alex Jurkiewicz | 2018-10-15 19:12:17 +0100 Upgrade orb run spawns The orb run is relatively safe for players, but the difficulty is wildly variable across multiple games. Part of the reason for this is that the spawn list is so varied. An orb run spawn might be a Pandemonium lord or a crimson imp. This change aims to make the spawn list more consistent, and more dangerous. Mid-tier demons used to make up over a third of orb run spawns. Cut that down to 10% and give the excess spawn chance to orb guardians and greater demons. Other numbers are slightly shuffled to rounder figures. Also, the orb run can spawn monsters randomly, rather than near the player. Stop spawning these monsters, and slightly increase the rate of spawning near the player (presumably some of the randomly-spawned monsters found the player). [Adjusted the spawnrate slightly to only increase it a small amount over the previous rate, to focus more on reducing the heavy variability of the orbrun over increasing the difficulty - MarvinPA]. Spawn rate changes: Monster Old New ---------------+-----+---- Pan lord | 9% | 10% Tier 1/2 Demon | 12% | 25% Tier 3/4 Demon | 34% | 10% Tier 5 Demon | 4% | 0% Orb Guardian | 13% | 15% Pan spawn | 27% | 40% -------------------------------------------------------------------------------- 669764e | advil | 2018-10-15 10:01:17 -0400 Fix monster equipment wand id (Yermak) Need to ID wands at the type level, not just their plusses. This also fixes an unused variable warning. -------------------------------------------------------------------------------- c8a7481 | advil | 2018-10-15 09:39:08 -0400 Don't use popup for end() errors in mapstat/objstat This change sends them just to stderr, probably restoring older behavior. This for stuff like level description parse errors or bad command line arguments in general. (I don't think there's really a use case for being able to view the full log on such errors? Actual crashes will still just generate a crashlog.) -------------------------------------------------------------------------------- 02c3efa | gammafunk | 2018-10-15 00:16:52 -0500 Don't break player constriction through certain abilities (Vajrapani) Abilities that move the player to origin to prevent messages like Yred's Recall Servants previously had the player stop all forms of constriction. This commit fixes this to relax the player-centric conditions when the player is at origin, with the exception of Chei's two time step abilities, where it makes sense to stop constriction. -------------------------------------------------------------------------------- 6bcb69f | Edgar A. Bering IV | 2018-10-14 10:50:41 -0400 Identify monster equipment on sight Partial mosnter item identification has been increased over time to de-spoil item generation tables in favor of revealing tactical threats. Before this patch, the issue of item generation versus tacitcal threat continued to apply to wands. Further, players were encouraged to carefully observe damage exclamation points to watch out for plusses on either monster weapons or armour. Finally, mantis bugs 10903 and 10301 involve information leaks regarding armour ego. All of these issues ultimately trace to identification of monster equipment. This commit resolves them by fully identifying monster equipment. Doing so comes at the cost of further diluting Ash's ID passive and making Ash's item warning passive no longer exist, as well as simplifying the ID game slightly more. -------------------------------------------------------------------------------- e48c14c | Nikolai Lavsky | 2018-10-14 10:36:51 -0400 Remove references to loud noises breaking mesmerisation and fear Since this mechanic was removed in 74fa8348. -------------------------------------------------------------------------------- b40ba49 | gammafunk | 2018-10-13 19:56:58 -0500 Merge content from the old contrib guide and remove the old file Bring over the section on what happens after contributor content is merged, since that's still relevant. Now that the new markdown guide is mostly complete, we can remove the old text file. -------------------------------------------------------------------------------- b6e31bc | Kyle Rawlins | 2018-10-13 19:56:58 -0500 Various wording tweaks, typo fixes Seems like it's in pretty good shape for merging to me. -------------------------------------------------------------------------------- 5ecafbc | gammafunk | 2018-10-13 19:56:58 -0500 Rewrite the contributor's guide and convert to markdown (advil) WIP based on advil's rewrite with my own updates. Putting this in a branch for future edits from myself and other devs. -------------------------------------------------------------------------------- 6773f7a | Aidan Holm | 2018-10-13 23:26:57 +0800 Add new title artwork (cws) -------------------------------------------------------------------------------- a85b81c | gammafunk | 2018-10-12 21:31:42 -0500 Add dungeon feature statistics to objstat Objstat now writes statistics about dungeon features to the file objstat_Features.txt. This has counts of features by type, both in and outside of vaults, along with standard deviation, min, and max. This allows us to get answers to questions like "How often does a Jiyva altar generate in Lair?" and gives a way to compare e.g. trap generation between levels and branches. -------------------------------------------------------------------------------- f0a6af8 | gammafunk | 2018-10-12 20:48:04 -0500 Clean up spacing in objstat functions for readability -------------------------------------------------------------------------------- f30bb39 | gammafunk | 2018-10-11 23:49:44 -0500 Some fixes and tweaks to decor vaults Prevent teleport closets in chequers_garden and chequers_arboretum using a checkerboard pattern to guarantee a safe path. Remove unnecessary no_monster_gen and no_item gen tags from the latter vault. Simplify glyph and color usage in these two vaults as well as in chequers_mini_garden. Closes #569. -------------------------------------------------------------------------------- 693b09e | gammafunk | 2018-10-11 22:12:10 -0500 Some fixes and cleanups to the river serial vaults Fix various potential stranded tiles that could generate in a few of these vaults by using a checkerboard of squares guaranteed to not be deep water. For one vault, move no_tele_into from water features to the entire vault, since the player could strand themselves. Move the no_monster_gen from the entire vault to water features only for all of these vaults. This allows their floor tiles to be valid generation sites for level monsters without introducing more water monsters. Finally, remove redundant no_pool_fixup tags. -------------------------------------------------------------------------------- ab66580 | Alex Jurkiewicz | 2018-10-11 16:20:42 -0500 Add new vaults and a serial * Four new serial corridors vaults * A new serial layout, "rivers". This is a river-focused serial, similar to "bayou" (and the old, removed "ponds"), but without any plants and with more river-like (rather than pond-like) water design, along with a few waterlogged rooms. Includes thirteen vaults. * Six new minivaults. -------------------------------------------------------------------------------- dcc7a32 | gammafunk | 2018-10-11 13:45:19 -0500 A hive-themed ghost transporter vault for Dungeon and Lair Bees and, in later depths, a queen bee, hornets, and eventually meliai accompany the ghost of a player who tried to loot the treasures of a formidable hive. All internal areas of the hive are revealed through carefully placed windows. A very small number of squares may not be visible, depending on the generation of a small number of wall tiles. This won't affect ghost or loot visibility, and the player can easily ensure they've seen everything in the vault before they enter. It upgrades monsters and loot with depth, placing on average two food rations throughout the vault. The other loot is general but with the usual good loot upgrades that start from D:9. -------------------------------------------------------------------------------- e7838e6 | advil | 2018-10-10 09:41:02 -0400 Improve gozag distraction flavor vs. mechanics This is to try to more clearly cue that the distriction will last beyond the presence of the initial trigger. -------------------------------------------------------------------------------- f318fe8 | psywombats | 2018-10-10 00:10:50 -0400 A variety of new arrival vaults (psywombats) Committer's note: This merges some of the vaults from #803. I tweaked a few things (console colours, whitespace, simplify some SUBST lines, and remove clear rock in a few places). -------------------------------------------------------------------------------- c3b755d | Alex Jurkiewicz | 2018-10-09 01:17:51 -0400 Wake up the player if paralysed/petrified Chaining disables on the player isn't particularly fun. Also prevent paralysed and petrified players from being put to sleep. Flavour wise it's not a stretch that these effects interfere with sleep. [Committer's note: included the sleep immunity, closes #848] -------------------------------------------------------------------------------- c0b0c76 | gammafunk | 2018-10-08 23:56:27 -0400 Move move actions out of main.cc This resolves a longstanding TODO in main.cc. [Committer's note: fixed whitespace, edited commit message. Closes #856] -------------------------------------------------------------------------------- 7ffd15e | gammafunk | 2018-10-08 21:31:35 -0500 Replace permanent teleport traps with zot traps in a maze (Engine) The teleport trap could place immediately before the final door to the rune in this Tartarus ending. If a silent spectre generated in this room, -Tele or random teleport attempts or other more obscure techniques would be required to enter, since monsters in the room couldn't wake up and open the door. Since we don't like hard requirements for specific equipment to access rune areas, use zot traps instead of teleport. Stepping on a zot trap poses some risk, but requires no special equipment. -------------------------------------------------------------------------------- 26e74f2 | gammafunk | 2018-10-08 14:33:24 -0500 Make the gold in a loot vault more accessible (biasface) This vault used to place only fungi as a barrier around the gold, which meant it could take some players a long time to break into. Replace a few of the fungi with toadstools. These decay over time and are easy to kill even if they haven't decayed. Closes #859. -------------------------------------------------------------------------------- fcac5de | Edgar A. Bering IV | 2018-10-07 11:29:11 -0400 Allow confusing touch with a weapon The dexterity to-hit bonus made the unarmed requirement for confusing touch more an interface obstacle than a real balance effect. If the spell is too strong we should nerf the mechanic, not annoy a player trying to use it. -------------------------------------------------------------------------------- 45ed416 | Edgar A. Bering IV | 2018-10-07 10:10:27 -0400 Reactivate autopickup when using stairs (mdonais) New players sometimes miss the message about ^A to reactivate autopickup and escape an invisible monster without killing it. They subsequently get confused when they are no longer eating and grabbing items. Even more experienced players can forget to turn autopickup on. If a player does get followed up the stairs by an invisible monster there will be a double message of Reactivate/Deactivate but handling this otherwise would leak information. -------------------------------------------------------------------------------- 9da9e51 | gammafunk | 2018-10-06 20:08:01 -0500 Fix altar placement in a ghost vault (Pekkekke) -------------------------------------------------------------------------------- 6719eea | Chris Campbell | 2018-10-06 14:56:18 +0100 Remove an obsolete Wanderer message Even if it were somehow possible for a Wanderer to start with such low skill levels, skills < 1 are visible now anyway. -------------------------------------------------------------------------------- 9a66eeb | biasface | 2018-10-05 15:59:59 -0700 Change Donald's line about rPois ring to rN -------------------------------------------------------------------------------- 1df1716 | gammafunk | 2018-10-05 13:11:16 -0500 Revamp gammafunk_the_bubble Per the reasons in 24521301, add windows into this vault to reveal all monsters and loot. Also more thoroughly randomize monster placement, since placements in specific locations are rarely going to be preserved as monsters wake up and move around. Not only are there windows now, but the walls are thinner, allowing more noise to reach the vault. We also rebalance this vault to scale up monsters/loot from earlier depths. Two of the guaranteed gold piles are gone, but we introduce good quality consumables together with either jewellery or aux armor instead of using only | and * loot. This vault will present a bit less risk in earlier dungeon so it will be more often completed soon after its discovered; players encountering it in later depths are much more capable of dealing with the higher numbers of monsters the vault uses in these places. Allow this vault to place in Lair 'S' branches as well as Pan, since these places generally don't have many transporter vaults that can place there. This is a 098 monster vault, so it will work well in these branches. In the later branches that don't have well-defined out-of-depth monsters, we add some specific monsters from the branch as necessary. Finally, for the "roulette" variant, rework the portals to not use a arrival landing site and exit transporter distinct from the roulette pairs. Integrate these into the pairs, using randomization approach which ensures that the no transporter takes you to the landing site in the same pair. -------------------------------------------------------------------------------- 9f0c0e7 | gammafunk | 2018-10-05 12:27:10 -0500 Fix vault designations for boots and gloves Incorrect designations for these items was causing vaults to fail to place when boots or gloves were randomly selected. I was only able to notice this when it happened via a subvault in a debug build. Also adjust a couple item listings to include gloves as a possibility, since boots are already included. -------------------------------------------------------------------------------- a3b1b28 | Chris Campbell | 2018-10-04 18:47:02 +0100 Typo fix (JoelMarler) -------------------------------------------------------------------------------- 2e428d4 | gammafunk | 2018-10-03 18:06:29 -0500 Rework gammafunk_corrupted_shrine Per the reasons in 24521301, add windows into this vault to reveal all monsters and loot. This commit also rebalances monster and loot counts to scale more consistently and give a more reasonable ratio of monsters to loot. Add good consumable and good/artefact jewellery to replace some of the more variable | and * loot items. Adjust the monster lists to give more balanced threats at the various tiers of monsters. -------------------------------------------------------------------------------- a3f5176 | gammafunk | 2018-10-03 18:06:29 -0500 Some transporter vault balance and syntax tweaks. The monsters scaled a bit too aggressively in gammafunk_jiyva_shrine, so that the monster count got very high by Depths. Start with slightly more monsters at earliest depths and scale them up half as slowly. Replace one | or * item with either good consumable or more specific good equipment at the earliest depth in both this vault and gammafunk_beogh_shrine. This increases the chance of something usable generating when we have a lower item count. Also clean up syntax in gammafunk_beogh_shrine. -------------------------------------------------------------------------------- 65bf2d1 | advil | 2018-10-03 18:13:49 -0400 Use a real join for missing directory errors (amalloy) This also should fix the problem on CBRO: the chroot c++ lib is old enough that it apparently doesn't have a final implementation of string::pop_back. The reason that `bool found = false` triggered an issue is apparently that gcc was optimizing out the relevant code paths when `found` was uninitialized. -------------------------------------------------------------------------------- 6cc01a3 | advil | 2018-10-03 17:00:36 -0400 Revert "Fix an uninitialized variable" This reverts commit fe727ee8d20f9ef5416e00a83b350a3055196f1e. This reversion is objectively wrong, but somehow this commit appears to be causing CBRO builds to require a version of libstdc++ that isn't present in the chroot. I haven't been able to isolate why, so I'm reverting for now. (n.b. it isn't the exact details of this commit -- I tried reimplementing the check without using a bool or an assignment, and it still had issues.) -------------------------------------------------------------------------------- e5a9903 | advil | 2018-10-03 10:09:18 -0400 Fix two weapon select bugs * Dispreferred weapons were not readable while highlighted on webtiles. * The welcome text was selectable (cf. d6d8abe and a814211745). -------------------------------------------------------------------------------- 290e36d | advil | 2018-10-02 22:10:12 -0400 Various beam.cc cleanups All minor. Via #854. -------------------------------------------------------------------------------- 0b44af7 | advil | 2018-10-02 21:35:58 -0400 Comment a few weird things via #854 -------------------------------------------------------------------------------- c497677 | advil | 2018-10-02 21:22:38 -0400 Fix several minor pointer issues via #854 -------------------------------------------------------------------------------- 55accd5 | advil | 2018-10-02 21:11:58 -0400 Fix a redundant feature on Sonja via #854 -------------------------------------------------------------------------------- cae3914 | advil | 2018-10-02 16:50:00 -0400 Add a pointer check This one was strictly speaking ok as-is, because the conditions always target the player (MHITYOU), which guarantees that afoe is a pointer to the player. But this is the kind of thing that shouldn't be taken for granted in such an indirect way. via #854 -------------------------------------------------------------------------------- 51c88b6 | advil | 2018-10-02 16:45:12 -0400 Some extra pointer checks I'm not sure these are necessary, but the static checker is right that they certainly aren't verified as necessary from surrounding code, and everything else here is pretty careful about `defender`. Via #854 -------------------------------------------------------------------------------- dacbca0 | advil | 2018-10-02 16:39:09 -0400 Change a + to a += via #854 -------------------------------------------------------------------------------- 9a040af | advil | 2018-10-02 16:11:32 -0400 Remove some vacuous ASSERTs Vacuous because these are unsigned types. via #854 -------------------------------------------------------------------------------- 643b770 | advil | 2018-10-02 15:58:14 -0400 Ensure fsim file always gets closed It would remain open when fsim was aborted at the a/d prompt. via #854 -------------------------------------------------------------------------------- fe727ee | advil | 2018-10-02 15:47:46 -0400 Fix an uninitialized variable Via #854 -------------------------------------------------------------------------------- 91074bd | advil | 2018-10-02 15:42:26 -0400 Fix two iterators becoming invalidated during iteration Both of these loops, used in constructing shoals levels, can add something to the back of the supporting vector during iteration, which (per the spec, though who knows in practice) will immediately invalidate an iterator for a vector. This change is a partial revert of a7d9996df05. Found via #854. -------------------------------------------------------------------------------- 95cc579 | advil | 2018-10-02 13:32:53 -0400 Fix a bad bitwise calculation for ban_glyph in arena This incorrectly used logical negation, not bitwise negation, which would prevent the bounds check it was implementing from ever working. Found via #854. I've also cleaned up a couple of less-important stylistic things that came up. -------------------------------------------------------------------------------- 5ee874d | ICC | 2018-10-02 13:08:27 -0400 Change some dead links to relative links in new_dev_guidelines.md [Committer's note: changed commit message. Closes #855] -------------------------------------------------------------------------------- a4718cd | advil | 2018-10-02 12:18:26 -0400 Exclude bones from checkwhite and run it Also unbrace. -------------------------------------------------------------------------------- b44a8d1 | advil | 2018-10-02 11:42:31 -0400 Fix disaster area adjacency check 311b6308dd0e64a was supposed to add a constraint to disaster area that avoided adjacent spaces, but this never worked, because `victims` was never populated. I'm guessing the idea was to push used targets into `victims` during this loop, and then not use such targets if they are encountered later in the loop. (I discovered this while looking through the errors in #854.) This commit implements the idea in a somewhat different way. Rather than just failing on a new target that is adjacent to a previous target, it downweights all adjacents spaces each time it chooses a target, but never removes them. This ensures that `count` targets still get used, following the longstanding current behavior, and imposes a probabilistic bias against adjacency (with tight clusters >2 especially dispreferred). In testing this appears to result in better spread at middling invoc levels. -------------------------------------------------------------------------------- 0cf4261 | Edgar A. Bering IV | 2018-10-01 23:31:49 -0400 Revert "Check bounds for player_can_hear (#689)" This reverts commit 44fbede512ef246a858dd77d60c7d0e2e745d440. This is causing initial portal vault messages to not be displayed at all. I don't have time to investigate further so I'm reverting for now. -------------------------------------------------------------------------------- 7750573 | gammafunk | 2018-10-01 16:15:33 -0500 Don't place a ghost vault with tree walls on Swamp:$ (Pekkekke, 11700) since Lerny can knock down the trees that form the walls of this vault, thereby releasing the ghost. -------------------------------------------------------------------------------- 6129075 | gammafunk | 2018-10-01 15:26:22 -0500 Add windows to gammafunk_beogh_shrine and rebalance Per the reasons in 24521301, add windows into this vault to reveal all monsters and loot. Rebalance the loot to incorporate a couple good aux armor and consumables instead of using only highly variable | and * items. Also tweak the loot and monster distributions to scale quantities more consistently, tweaking the monster types for better balance. -------------------------------------------------------------------------------- 82784c5 | gammafunk | 2018-10-01 15:26:22 -0500 Add windows to gammafunk_jiyva_shrine and rebalance Per the reasons in 24521301, add windows into this vault to reveal all monsters and loot. Rebalance the loot to incorporate a couple good jewellery and consumables instead of using only highly variable | and * items. Also tweak the monster list to make more judicious use of eye monsters and high level jellies. -------------------------------------------------------------------------------- 2452130 | gammafunk | 2018-10-01 15:05:34 -0500 Add windows to gammafunk_sealed_library and reformat This commit modifies this vault to allow players to see what's in the vault in terms of monsters and loot. Spoilery vaults still have a place in crawl, at least for the time being, but sealed vaults generally work better when the player can reason about the risk vs reward. It's better to discourage reading vault spoilers, which is what the player would want to do for the vault before this commit. Even if the player doesn't read spoilers, it's almost never wise to attempt a transporter vault blind until long after the vault is first encountered. We'd like these vaults to relevant much of the time when they place, so allowing the player to see what they'll face is a good way to help ensure that. Add windows on all four sides, and move the landing site to the other side of the vault, where we add another level connector. Also reformat the DES statement spacing. -------------------------------------------------------------------------------- ab6feb3 | Edgar A. Bering IV | 2018-09-29 23:53:47 -0400 Give Barachi full LOS halo and umbra (11650) you.normal_vision was perpetually LOS_DEFAULT_RANGE. This changes you.normal_vision to correctly be the species LOS and then apply further mutations, spells, and effects to it. The halo and umbra calculations were using LOS_DEFAULT_RANGE. There may be other locations where LOS_DEFAULT_RANGE is used instead of you.normal_vision that give Barachi weird edge cases. -------------------------------------------------------------------------------- 65e0026 | Edgar A. Bering IV | 2018-09-29 21:14:47 -0400 Have wall jump ability respect constriction (11690) When wall jump is triggered by moving, the player first makes an escape attempt, and loses a turn if they fail to escape. This changes wall jump activated via the ability menu to behave in the same fashion. -------------------------------------------------------------------------------- ac4dfef | NormalPerson7 | 2018-09-29 19:48:43 -0400 Disallow wall jumping while stuck in a net/web (11690) When stuck in nets or webs, wall jumping via moving into a wall does not work, because attempting any movement will break out of the net first. However, the ability bypassed this check and so the player could wall jump to immediately free themselves from any net or web via the ability. Therefore, explicitly disallow wall jumping while held and give a message for when the player attempts to wall jump out of a net. Additionally, add a case to _check_ability_possible for the wall jump ability, which returns false if the player is held, in fungus form and in view of an enemy, or is not adjacent to any eligible wall. This will mean the ability is appropriately greyed out for the most general cases of when this ability is impossible. -------------------------------------------------------------------------------- c1433dc | NormalPerson7 | 2018-09-29 19:48:43 -0400 Fix the wall jump ability not being available when berserk (11687) When berserk, like all martial attacks, wall jumping can be done via moving into a wall. However, the ability screen was previously unavailable when berserk and the function _check_ability_possible unconditionally returned false early when berserk, meaning the wall jump ability could not be used. The previous commit made the ability screen open even when berserk. In this commit, add a new abflag, berserk_ok, for abilities which can be used even while berserk, and add a check for this flag at the start of the _check_ability_possible function. This means both methods for wall jump, moving into a wall and using the ability, will now work while berserk. -------------------------------------------------------------------------------- d3700a3 | NormalPerson7 | 2018-09-29 19:48:43 -0400 Don't prevent the ability menu from opening when berserk or confused Previously, three things happened depending on the player's statuses: - if the player was berserk, the ability menu would never open; - if the player was confused, the ability menu would only open if the player had one of the two conf_ok abilities (Ely's Purification and Ru's Draw Out Power), and if it did open, only conf_ok abilities would be shown. - if the player had any other restrictive statuses, the ability menu would open, and, in most cases, abilities affected by the restrictive statuses would be greyed out. It was decided that having berserk or confusion act differently to other statuses, for example silence, was inconsistent and unnecessary. Hence, we allow the ability menu to be opened even when berserk or confused, where unusable abilities will be greyed out. -------------------------------------------------------------------------------- 9c2c487 | Edgar A. Bering IV | 2018-09-29 16:19:08 -0400 Don't accept elemental colours by default (11468) The majority of uses of str_to_colour expect a terminal colour, and can crash if an elemental colour is returned. Lua and mapdef are the exceptions. 900b867fb7dce previously added an option to disallow elemental colours to fix some crashes. The option was set to default to allow elemental colours but the commit message mentions there are potentially other places where allowing elemental colours can be bad. This patch chases those down. Closes #781 -------------------------------------------------------------------------------- 7053962 | Edgar A. Bering IV | 2018-09-29 15:45:55 -0400 Fix a des syntax error -------------------------------------------------------------------------------- 4e7f3e4 | Edgar A. Bering IV | 2018-09-29 12:00:53 -0400 Revise the Spriggan's Knife description (MarvinPA) -------------------------------------------------------------------------------- a8fa5fe | Edgar A. Bering IV | 2018-09-29 10:25:11 -0400 Fix lua documentation of Item.artprops -------------------------------------------------------------------------------- 133332c | Edgar A. Bering IV | 2018-09-28 22:35:57 -0400 Revise the Spriggan's Knife (mikee) The knife now always stabs at Tier 1; specifically any stab is converted to a sleep stab, this is flavoured as cutting into the realm of dreams. Remove the Dex+4 and MR+ to de-stat-stick it a little. The Dex+4 in addition to the EV and Stealth plusses was overkill, and since the knife now always stabs at tier 1 the extra Dex seemed like too much. A separate idea discussed for the knife was to make it a Hex enhancer. There's probably room for a Hex enhancer unrand dagger also. -------------------------------------------------------------------------------- bb6edff | Edgar A. Bering IV | 2018-09-28 22:31:09 -0400 Allow tweaking more artps in wizmode &t only used 0-Z, there are now more artefact properties than that. This expands it to use a-z, then A-Z then 0-@. -------------------------------------------------------------------------------- b1a0310 | Edgar A. Bering IV | 2018-09-28 22:30:39 -0400 Allow SH specification for unrands. 685a3a753ca introduced the ARTP_SHIELDING, but did not add processing in util/art-data.pl for a keyword. This allows unrands to specify the shielding property with SH: plus. -------------------------------------------------------------------------------- 8581c8f | gammafunk | 2018-09-28 20:52:56 -0500 Fix a crash for tracers of LOS attack spells Introduced in fb95405 where an average damage value was removed. This is still needed for tracer calculations to get a scaling factor for friend info based on what proportion of damage the target would resist. This commit also refactors some of this code to remove redundant variables and better use an input argument pointer to hold the total damage. -------------------------------------------------------------------------------- ba00d9b | gammafunk | 2018-09-28 18:12:51 -0500 Use better damage dice for Drain Life The formula was changed in 2a92f5c in a way that introduced invocations breakpoints, so that damage increases were only seen on even invocation skill levels. This commit removes the spellpower divisor of two and uses one die instead of two, adjusting the adder value accordingly. We actually get the same average as before 2a92f5c, albeit with a slightly lower min and slightly higher max. -------------------------------------------------------------------------------- 2a92f5c | gammafunk | 2018-09-28 16:56:36 -0500 Revamp the Singing Sword Currently this unrand is worse than a +7 vorpal double sword, since it has no brand and its "sonic damage" effect is weak. This sonic damage is also linked to having the sword wielded instead being linked to successful attacks. This commit rebalances the sword to be more comparable to an enchanted double sword of speed at high tension. It also makes the sonic damage effect to trigger only on successful melee attacks (including ripostes). The sword now casts a "Sonic Wave" spell that uses existing LOS attack spell code, instead of duplicating some of that logic, and has a visual flash when the effect triggers. Additionally the sword has a vorpal brand, instead of being brandless, and has an inscription and updated description indicating its spell effect. The sonic wave damage is simplified from the previous multiplicative die to use a 2d(5 + pow / 10) roll with the chance for the effect lowered to 50%. When the effect triggers at high tension, the sword has a 1/10 chance to "scream", as it did before this commit, but this now gives 50% more spellpower instead of double damage, since the sonic damage is much higher now. Finally, the sword's noise has been set so that it's the same chance and 20 noise value as the *Noise property at low tension, with that noise increasing by 10 at high tension and by 10 again if the sword "screams". -------------------------------------------------------------------------------- fb95405 | gammafunk | 2018-09-28 16:56:36 -0500 Refactor LOS attack spell code This code previously had a lot of duplicated logic between functions used for the two spells that cast it, Ozo's Refrigeration and Drain Life. Instead of using function pointers to different functions doing similar things, use common functions where possible. Make zap entries for Ozo's and Drain Life to store details like the damage and color (used for flash effect). This way these details can be stored in the beam already used to store attack details. This commit changes the damage formula of Drain Life, which was previously: 3 + random2(7) + random2(pow) to be: 2d(4 + pow/2) which has a similar average as well as min/max damage compared to the old formula. -------------------------------------------------------------------------------- d8354db | gammafunk | 2018-09-28 16:55:18 -0500 Remove an unused dlua library This dlua code to have the dungeon cast LOS-acting spells is no longer used and partially non-working, so remove it. -------------------------------------------------------------------------------- 44a7aab | gammafunk | 2018-09-28 16:35:09 -0500 Make a function pointer argument into a function template -------------------------------------------------------------------------------- 069075c | Edgar Bering | 2018-09-28 17:33:26 -0400 Update ebering in the mailmap -------------------------------------------------------------------------------- 6cf3e00 | NormalPerson7 | 2018-09-28 14:14:53 -0400 Add reference to * direction as alternative to ctrl+direction (#11401) There is no way to attack down-right (south-east) using ctrl in some browsers, since ctrl-N creates a new window and ctrl-3 switches to the third tab. This commit adds a reference to * direction as an alternative, to remind players of this option when they try to use ctrl-N to attack and their browser takes over. [Committer's note: Closes #738] -------------------------------------------------------------------------------- 44fbede | Matthew Boeh | 2018-09-28 09:38:24 -0400 Check bounds for player_can_hear (#689) This PR addresses something that aidanh fixed in a different way in e27d229730f9, but the change still looks correct to me even if there's no current bug that it fixes (and bounds for p maybe also should be checked). Original commit message: Fixes https://crawl.develz.org/mantis/view.php?id=11279 You can reproduce the bug consistently by entering a floor with a portal, leaving the floor, waiting for a while, and returning to that floor. While catching the floor up to the current time, the portal message is triggered while the player is not yet on the floor. -------------------------------------------------------------------------------- 31763e9 | Doesnty | 2018-09-28 09:24:52 -0400 Fix box_level_dp loot (#851) This vault was originally supposed to put one ring of teleportation in the metal room, a random quantity of scrolls of teleportation around the perimeter of the giant box, and a single amulet of reflection. Commit cefc067 removed the rings of teleportation from this vault without updating the letters used for the other two, causing the vault to place one scroll of teleportation nowhere, a random quantity of amulets of reflection, and a single nothing. This PR restores the old and less bizarre behavior. -------------------------------------------------------------------------------- ab8d2b5 | gammafunk | 2018-09-28 08:01:50 -0500 Add ebering to the list of crawl devs gammafunk gestures. A swirling arc of seething chaos appears! The arc of chaos hits ebering!!! ebering evaporates and reforms as a dev! Welcome to the team! -------------------------------------------------------------------------------- ab8a48c | Edgar A. Bering IV | 2018-09-28 08:26:06 -0400 Simplify Beogh conversion rules The previous commit mentions that these lead to a minigame of 'don't attack this orc until you're certain its met the simulationist criteria for a conversion attempt'. This commit makes orc conversion attempts happen on sight, like Gozag and Jiyva (even if the orc is asleep, confused, paralyzed, can't see you, or has not yet selected you as their foe), removing the minigame. -------------------------------------------------------------------------------- fbe1177 | Edgar A. Bering IV | 2018-09-28 08:26:06 -0400 Attempt God conversions on sight. Currently three gods change monster attitudes on sight: Beogh, Gozag (under bribe), and Jiyva. When a player sees a monster, Gozag and Jiyva have already decided whether they will convert the monster, but prior to this patch the conversion did not happen until the player took an action with the monster in LOS. This led to an unfortunate bug in the following situation: if a bribed monster walked into LOS of a player bribing a branch with Gozag no messaging would be displayed and the player could attack the monster. This would have the effect of betraying the bribe and turn any bribed monsters in LOS hostile for what appeared to be no reason to the player. (The problem is less severe under Jiyva since not attacking slimes is part of the conduct, but it does cause the occasional 'hostile' slime to appear.) Beogh's conversion behavior is different, and requires the monster be awake, clear-headed, and targeting the player. As a result this check needs to happen every turn the orc is reacting to the player (Beogh sets a flag to make only one conversion attempt per-orc). This patch makes conversion attempts happen in both relevant code-paths using a do_conversions() function. While this causes some minor execution duplication, each conversion function handles being called multiple times on the same monster correctly, and abstracting the conversion attempts to attitude-change make it easier to keep track of them for the future (however unlikely more ally religions are). I'm fixing the bug this way and not by changing how gozag_break_bribe operates to avoid the mini-game of "I won't attack this monster that just walked into my LOS in case I'm about to bribe it". The Beogh conversion rules should probably be re-thought as their current state has a bit of this mini-game. -------------------------------------------------------------------------------- 8829680 | Edgar A. Bering IV | 2018-09-28 08:06:26 -0400 Add elemental colour support to the equip bar This commit modifies the equip bar to process elemental colours (coming from unrands) for equipment glyphs in the equip bar. By default, the colours are not animated, since a goal of the equip bar was to lower visual noise. The option "animate_equip_bar" is added to toggle this behavior, as the other goal is to show of your cool stuff. -------------------------------------------------------------------------------- 1bcb263 | Edgar A. Bering IV | 2018-09-28 07:52:29 -0400 Have butchering always leave a skeleton. Currently, if you cast animate skeleton, you get a skeleton and chunks. However, if you forget that you have animate skeleton (or have auto-butcher on or whatever), you have a one_chance_in(3) chance of being left with a skeleton to animate. This behavior gives Animate Dead an extra hidden nutritional trade-off, in exchange for an interface screw. This commit changes the behavior of butchering to always leave a skeleton, so that butchering and casting animate skeleton commute. A consequence is that Animate Dead becomes *slightly* stronger, as a player could now butcher every corpse for nutrition and then animate the skeleton, at the expense of a few HD for the undead minions. This isn't actually a buff, though, because said hypothetical player could walk to each corpse and cast animate skeleton for an almost identical effect (slightly different MP cost). -------------------------------------------------------------------------------- 1bc9708 | Edgar A. Bering IV | 2018-09-28 07:52:29 -0400 Remove an unused include -------------------------------------------------------------------------------- 2b5ca64 | NormalPerson7 | 2018-09-27 21:09:31 -0400 Add functionality to search items by handedness. (#850) When a player has a good shield and has trained a lot of shield skill, it would be nice to filter out two-handed weapons. Likewise, later in the game once a player is committed to two-handed weapons, it can would be nice to filter out one-handed weapons. However, no stash search prefix has previously existed so it was impossible to search for a particular handedness. Hence, add a stash search prefix for handedness. There is no check in the hands function defined in l-item.cc that the item searched for is actually a weapon, so we check that the item is a weapon first. Additionally, filter out throwing weapons because they don't occupy the weapon slot, therefore their handedness is not useful to search for and will instead clutter up the search results list. -------------------------------------------------------------------------------- 3b46b07 | CanOfWorms | 2018-09-25 23:23:48 -0400 Remove a runed door subvault from the_grid This specific subvault could be placed in a way that let the out of depth monsters inside escape despite having a runed door (and could also rarely be placed without any walls around it at all), which mostly confused players into thinking there was a problem with the vault generation. -------------------------------------------------------------------------------- 563e2a7 | CanOfWorms | 2018-09-25 23:14:41 -0400 Update Dithmenos's power description (Angani) Remove a leftover reference to old Shadow Step requirements. -------------------------------------------------------------------------------- 84a5ed2 | advil | 2018-09-25 15:12:45 -0400 Replace hacky allow_password_reset() with getattr calls I also added a comment in config.py documenting some of these complexities and recommending `getattr`. -------------------------------------------------------------------------------- 34886a9 | advil | 2018-09-25 15:01:40 -0400 Fix client.html Just needed a way to safely access module parameters that might not exist. -------------------------------------------------------------------------------- 8cfa994 | advil | 2018-09-25 14:47:39 -0400 Revert "Temporarily revert html side of forget password commits" This reverts commit f47f43309fcf60f96e15812b4b351e50b99c0873. -------------------------------------------------------------------------------- 5abb548 | advil | 2018-09-25 14:45:36 -0400 Handle config.pys that lack lobby_url I missed that this was a new variable also. -------------------------------------------------------------------------------- f47f433 | advil | 2018-09-25 13:47:14 -0400 Temporarily revert html side of forget password commits I think these are crashing servers that have updated but not restarted, temporarily pulling them until I figure out a better approach. -------------------------------------------------------------------------------- db1f849 | advil | 2018-09-25 11:18:52 -0400 Merge branch 'floraline-webtiles-password-reset' -------------------------------------------------------------------------------- 33f0de1 | advil | 2018-09-25 11:14:35 -0400 Handle the case where config.py lacks allow_password_reset Most servers don't keep their config.py in version control, or even merge with the git copy of config.py, so when adding new parameters to config.py one can't assume that they'll be there. (Yes, this is kind of a problem with how configuration is done in webtiles, that could use some more work.) -------------------------------------------------------------------------------- 68a31cc | advil | 2018-09-25 10:20:06 -0400 Various small tweaks * improve code style (at least relative to our guidelines), comments * handle no auth smtp configurations * small tweaks to wording, logging -------------------------------------------------------------------------------- 12a1dd4 | advil | 2018-09-25 09:01:34 -0400 Merge branch 'webtiles-password-reset' of https://github.com/floraline/crawl into floraline-webtiles-password-reset -------------------------------------------------------------------------------- b6b040f | gammafunk | 2018-09-24 00:01:08 -0500 Remove a spiral vault (11554) This vault is one of many single-tile-corridor spiral vaults. It places a set of out-of-branch air-themed monsters that aren't particularly challenging given the narrow layout. Since we already have a lot of spiral vaults that are more effective, remove this one. Closes #827. -------------------------------------------------------------------------------- 93a313e | NormalPerson7 | 2018-09-23 18:13:40 -0400 Fix teleport closets in Cigotuvi's Fleshworks (11570) This wizlab previously had eight teleport closets, designed to be terrariums of various shapeshifted monsters placed on display. They are completely disconnected from the rest of the map and visible only through their transparent walls. This commit adds the no_tele_into flag to all tiles inside these eight areas, to avoid the player teleporting/being teleported into these areas and then having no way to get out of them. We use nine new symbols to ensure that the content of the wizlab isn't changed at all. -------------------------------------------------------------------------------- 7d5962a | NormalPerson7 | 2018-09-23 18:12:22 -0400 Unify range checks between the targeter and fatal_attraction for Gell's This commit: (a) re-implements a gravitas_range function to be used by both the fatal_attraction function and the targeter for Gell's Gravitas; (b) makes this function return a value (2 or 3) solely dependent on whether the spellpower is greater than the breakpoint of 80 rather than using an overcomplicated and inaccurate formula to do this; (c) makes the fatal_attraction function check the range of an actor near to the centre of the "gravitational reorientation" using the gravitas_range function instead of checking if the calculated strength was greater than 0; and (d) calculates the strength as before in fatal_attraction, but removes the restriction that it must always be less than LOS_RADIUS - this sanity check was unnecessary and limited the damage slightly at high power for targets colliding when they are range 1 from the centre. -------------------------------------------------------------------------------- 77c8c95 | NormalPerson7 | 2018-09-23 18:12:22 -0400 Fix the spell targeter for Gell's Gravitas Previously, the formula used to calculate the targeted area was completely different to that which the spell itself used, resulting in the targeter blatantly lying to the player about the tiles which could and could not be affected. The current behaviour of Gell's Gravitas is entirely predictable based on spell power, with no randomness involved, therefore the new targeter is entirely in the darker yellow colour to indicate the certainty. The power breakpoints are: >0 power: at radius 1 from the centre, the monster is pulled 1 tile; >0 power: at radius 2, the monster is pulled 1 tile; >60 power: at radius 2, the monster is pulled 2 tiles; and >80 power: at radius 3, the monster is pulled 1 tile. The previous spell targeter suggested that, at low power levels, monsters at radius 2 could never be affected, and that at exceptionally high power levels, targets at radius 4 could be affected, both of which are incorrect. Hence, this commit changes the targeter to reflect the fact that monsters at radius 2 are always affected and monsters at radius 3 are always affected when, and only when, above 80 power. An argument could be made for having the targeted tile (the centre of the "gravitational reorientation") not appear coloured, given that this tile is not affected, however this would require significantly more work. This commit removes the gravitas_range function, which was previously only used for making the targeter, because it is no longer required. Additionally, this commit removes the player's tile being highlighted, given the player is never affected. -------------------------------------------------------------------------------- 3eb00d1 | Aidan Holm | 2018-09-24 01:14:01 +0800 Fix dry fountain tile not showing in ?/F -------------------------------------------------------------------------------- 14233b2 | Aidan Holm | 2018-09-24 00:56:45 +0800 Add list of embedded packages to simplebar.js (advil) -------------------------------------------------------------------------------- 4d241d0 | Aidan Holm | 2018-09-24 00:30:53 +0800 Add background to webtiles scrollbars -------------------------------------------------------------------------------- b82a549 | Aidan Holm | 2018-09-24 00:30:49 +0800 Fix some webtiles scrollbar update lag -------------------------------------------------------------------------------- 45387a9 | Aidan Holm | 2018-09-24 00:28:49 +0800 Fix webtiles scrollbar visibility and zoom issues The purpose of these modifications is to make the scrollbar 'stick out' from the side of the scroller window, so that it is flush with the edge of the popup. Unfortunately, using a transform is not possible here due to clipping. This commit resolves some issues reported by users where the scrollbar would not be immediately visible, and where the browser scrollbar would reappear if the zoom level was changed. -------------------------------------------------------------------------------- 1502417 | Aidan Holm | 2018-09-24 00:28:05 +0800 Update simplebar.js to 3.0.0-beta5 This commit also changes to a human-readable and more easily editable version of the simplebar.js file. -------------------------------------------------------------------------------- aba95fd | Edgar A. Bering IV | 2018-09-23 09:18:14 -0400 Clean up internal comments (aidanh) Remove '////' and '----' instances being used as dividers or in internal comments that are not intended for ldoc. -------------------------------------------------------------------------------- 039bf95 | Edgar A. Bering IV | 2018-09-23 09:18:14 -0400 Sort lua api table of contents. -------------------------------------------------------------------------------- 7bc873d | Edgar A. Bering IV | 2018-09-23 09:18:14 -0400 Document the rest of clua in ldoc Modules food, item, spells, travel, and view, you. Globals from l-global.cc. The lua option metatable, internal macro hook, and clua modules iter and util; and globals provided from loaded lua. Documents module monster and the monster.info clua class based on the source diving and pastebin by Leszczynek. Documents globals defined in clua.cc inline using ldoc syntax; clua.cc does not have any Doxygen comments in it. If they get added in the future that could casue trouble. Documents the various entry hooks into lua used throughout the codebase in dat/dlua/userbase.lua, instead of in-line, as that is the file that initializes hook tables, just to keep things in one place. -------------------------------------------------------------------------------- a34892a | Edgar A. Bering IV | 2018-09-23 09:18:14 -0400 Stubs for dlua only modules. Remove spurrious comments triggering ldoc, put in comment stubs in for modules provided only in dlua. Fixup some punctuation. -------------------------------------------------------------------------------- 49b57b5 | Edgar A. Bering IV | 2018-09-23 09:18:14 -0400 Document dlua additions to the crawl module Also fix some typos in the previous commit. -------------------------------------------------------------------------------- 96814a8 | Edgar A. Bering IV | 2018-09-23 09:18:14 -0400 Switch over and expand old luadoc This documents the dlua module colour and the clua parts of crawl, based on the old LuaDoc comments that were already present. -------------------------------------------------------------------------------- a2dadd3 | Edgar A. Bering IV | 2018-09-23 09:18:14 -0400 De-Doxygen-ify These C++ files provide the Lua api, which is documented with ldoc. The corresponding parts of the internal C++ structure should be documented at their definitions. Unfortunately ldoc and doxygen almost but not-quite get along so they are exclusive. -------------------------------------------------------------------------------- c5a9599 | Edgar A. Bering IV | 2018-09-23 09:18:14 -0400 Switch from LuaDoc to LDoc LuaDoc never had C++ support, and is now listed as obsolete, directing users to switch to LDoc, which has C++ support (if a few quirks of its own). Adds a make target api-dev to generate a developer's api documentation. This includes internal functions and hooks that the user should not touch directly. -------------------------------------------------------------------------------- dcd3064 | Aidan Holm | 2018-09-23 15:58:45 +0800 Don't include hidden spectators in count (#11691, collin38) -------------------------------------------------------------------------------- c87c613 | Aidan Holm | 2018-09-23 12:40:52 +0800 Improve monster description quote display This adds support for showing monster description quotes on webtiles, and uses a switcher widget to prevent the local tiles popup size from changing when switching between quote and description. -------------------------------------------------------------------------------- e70c5d8 | Aidan Holm | 2018-09-23 12:21:10 +0800 Const-ify some member functions -------------------------------------------------------------------------------- 904d0f5 | Aidan Holm | 2018-09-23 12:15:28 +0800 Unparent container widgets' children before destruction -------------------------------------------------------------------------------- 3217af6 | Aidan Holm | 2018-09-23 12:03:28 +0800 Fix rare text widget rendering glitch If a text widget with a maximum height has its size queried without being reallocated, its prewrapped text could be expanded beyond what would normally be shown. This fix ensures that text is wrapped to the correct size before rendering takes place, even if the widget was not reallocated (e.g. if it didn't move and wasn't resized). -------------------------------------------------------------------------------- 2f00525 | Aidan Holm | 2018-09-23 12:03:28 +0800 Fix crash when reducing popup width -------------------------------------------------------------------------------- 0ca621a | Aidan Holm | 2018-09-23 12:03:28 +0800 Add background to scrollbars -------------------------------------------------------------------------------- f37f6fb | advil | 2018-09-20 10:32:57 -0400 Add messaging when servitors skip a turn Servitors sometimes sit twiddling their thumbs even with a target, and I've long wondered why, and even if this could be a bug (since this is something very few monsters do). I've also noticed there's a bunch of lore around this e.g. you need to constantly do ta to get a servitor to do something. It turns out it is intentional, and that for balance reasons servitors have a randomized interval between casts, that is implemented by random energy loss. There's no AI problem that I can find and so there's no need to do ta, but the interface isn't very transparent about what's going on. This change simply prints a message on every turn that a servitor loses to random energy as long as it has a target, so that this random delay is flavored with "something happening". The situation might also be helped by being clearer in the UI somehow about when allies have a target. As a side note, I'm not really happy about this effect being implemented using random energy, it'd probably be better to add an extra noop action to the servitor's action set and balance the weights directly, but that's a more complicated change to get right -------------------------------------------------------------------------------- 58cdd98 | gammafunk | 2018-09-19 00:17:35 -0500 Fix a message for wand pickup (minmay) -------------------------------------------------------------------------------- 24f899a | advil | 2018-09-18 15:08:00 -0400 Revert complex bones install stuff, add dist_bones to repo As annoying as it is to have binary files in the repository, the bones installation code that this commit removes was ending up no less annoying, and considerably more complicated. This change will also make it easier for servers that reset the bones folder on incremental updates to make use of dist_bones. -------------------------------------------------------------------------------- a5275e7 | advil | 2018-09-17 16:44:49 -0400 Fix the build -------------------------------------------------------------------------------- cb8baf8 | advil | 2018-09-17 15:27:21 -0400 Don't crash when doing describe-all with a buggy net in los This also removes net_holdee, instead of relaxing the non-null assumption; it's just a wrapper on actor_at with some assertions. This is the first step towards just removing the whole implementation of net status being stored as an item on the ground. -------------------------------------------------------------------------------- 440b721 | advil | 2018-09-17 10:42:00 -0400 Add bones downloading to the `make source` step This is intended to simplify packaging on linux; since this step must be run from a repository, the downloader is more likely to succeed here than in later packaging steps. The result will be a source distribution that has the bones tarbell in place so that any build process on that source distribution defaults to using the local bones file, rather than downloading. (This could be overridden by deleting the local bones file in that source directory.) -------------------------------------------------------------------------------- dbc91a4 | advil | 2018-09-17 10:02:30 -0400 Add a way of using a local bones distribution for make install To use this, put a file named dist_bones.tar.gz containing bones files in the appropriate directory structure (in `dat/dist_bones/` in the tarbell) in `source`. You can also use a custom location by changing LOCAL_BONES_LOC. If this file exists, it will override the steps that try to download the bones file from github. This may be useful for doing things like building crawl in a chroot that doesn't have wget/curl. Also updates .gitignore. -------------------------------------------------------------------------------- 3888083 | advil | 2018-09-17 10:01:16 -0400 Clear trapping nets when a monster moves via gell's (minmay) This appears to have been intentional, but this code is inherited from singularity, so the history is a bit complicated and I'm not really sure why it was this way. This was resulting in the net being marked as trapped, but with no actor trapped in it, so it couldn't be picked up. Also do some other cleanup that seems to have been missing. -------------------------------------------------------------------------------- 97aacdb | Aidan Holm | 2018-09-15 21:49:22 +0800 Fix inventory menu obscuring some message prompts (#11645, Yermak) -------------------------------------------------------------------------------- 50e1342 | Aidan Holm | 2018-09-15 21:46:19 +0800 Hide shopping list key if shopping list is empty -------------------------------------------------------------------------------- d05d27e | Aidan Holm | 2018-09-15 20:33:38 +0800 Show correct MP after aborting spell (#11598, Siegurt) MP is deducted before casting begins, and the deducted amount is returned if casting is aborted, but the screen was not refreshed afterward, leading to player confusion. -------------------------------------------------------------------------------- 8f65603 | gammafunk | 2018-09-15 01:51:00 -0500 Properly disable Scrying when abandoning Ashenzari (guyde, salmon) -------------------------------------------------------------------------------- 5ae17c6 | CanOfWorms | 2018-09-11 23:35:06 -0400 More description updates Mention a (sometimes important) uncommon interaction of teleportation scrolls. This is already in the status description section (?/T), but there's no harm in making it more visible. -------------------------------------------------------------------------------- 07fecf4 | CanOfWorms | 2018-09-11 20:07:57 -0400 Update some scroll descriptions Clarify exactly what can (or more specifically, can't) be affected by fear. Unfortunately, this is not a perfect solution as holiness is hidden to the player, but the holiness of most monsters (especially in the early dungeon) is usually clear so it should help newer players. The Cause Fear spell should also have an updated description, but it currently uses the monster spell description, so that needs to be adjusted first. Also remove a very outdated reference to hides in the enchant armour scroll description. -------------------------------------------------------------------------------- b21e695 | gammafunk | 2018-09-10 18:34:05 -0500 Adjustments for the Lehudib's Moon Base WizLab Update the loot in this map to introduce some good loot potions and scrolls among the loot piles. Also replace the "acquire any" item with artefact jewellery or good_item aux armour and replace one superb item in the main loot pile with this. We want to save use of "acquire any" for things like troves, and there was no need for this particular item to depend on the player. Next, give the moon troll a couple randomized monster friends so that he's not stuck all by himself. Finally, slightly tweak the monster set to remove rust demons and have the random monster list (used for Shadow Creatures) more in line with the monsters on the map. For level adjustments, make some transparent stone areas to see into the moon troll's lair area. This lets the player see the loot they're after as well as where they will land when they take the transporter. It also helps reveal the artefact book in the lair area, which is something players have tended to miss. Finally, reglyph the vault DES to not use pre-defined glyphs in our custom glyph definitions. -------------------------------------------------------------------------------- 0d986b7 | gammafunk | 2018-09-10 18:24:08 -0500 Move scroll and potion loot definitions to a better location The lists formerly in ghost_loot_scrolls and ghost_loot_potions are now in dgn.loot_scrolls and dgn.loot_potions, respectively, defined in dungeon.lua. This allows them to be used outside of ghost vaults. -------------------------------------------------------------------------------- f92cf62 | advil | 2018-09-10 17:31:32 -0400 Remove glob from tar call in Makefile Gnu tar handles globs differently and they would need to be manually activated just for those versions; this change should work the same on all versions of tar (I hope). -------------------------------------------------------------------------------- 6564cf3 | advil | 2018-09-10 17:29:37 -0400 Fix some warnings (gammafunk) -------------------------------------------------------------------------------- 826d253 | advil | 2018-09-10 15:48:18 -0400 Add bones downloading to package/install targets This is not very elegant in that it will try to redownload the bones package each time these targets are called, but I did it this way so as to not make build success contingent on actually downloading this thing for these targets. Better Makefileing welcome. I believe this covers all of our packaging targets; I've tested it on mac tiles only so far. -------------------------------------------------------------------------------- 7711e57 | advil | 2018-09-08 20:25:11 -0400 Attempt to fix newgame colors on remote console (11671) I can't get this to happen locally, but it looks like an issue with only 8 colors being used in the newgame menus over ssh, even with the right options set. (Maybe unsurprising, since the options aren't read yet). This resets the highlight colors for webtiles specifically to what they were before 44136481aa11. Looks ok in webtiles, could be better. As a side note, using blue for dispreferred combos (as a fallback for darkgrey) in console looks really bad. -------------------------------------------------------------------------------- 800ba1e | advil | 2018-09-08 15:15:46 -0400 Add a build target for installing bones distributions The way this works is that it looks for a file named `dist_bones.tar.gz` as an asset attached to the most recent tag on github, and downloads any files in that tarbell that will unpack into `dat/dist_bones`. It will try either curl or wget, and fail with an error message if neither are available (or if the relevant link is 404). The tarbell needs to be manually uploaded to the tag. For now, no other build rule calls this so it will need to be done manually. -------------------------------------------------------------------------------- d0dd136 | advil | 2018-09-08 15:15:46 -0400 Add a basic deduplication command for bones files There might be a bug somewhere that is resulting in multiple copies of the same ghost? -------------------------------------------------------------------------------- 70f5b00 | advil | 2018-09-08 15:15:46 -0400 Tweak permastore sizes Branches where the store doesn't include individual levels (e.g. depths) could be a bit bigger. -------------------------------------------------------------------------------- daa33e9 | advil | 2018-09-08 15:15:46 -0400 Further tweaks to --bones commands A few formatting fixes; also, don't require case matching for rm, and show count for ls. -------------------------------------------------------------------------------- b54bf1b | advil | 2018-09-08 15:15:46 -0400 Clarify semantics of player_in_hell I would've expected that this includes the vestibule (and did, leading to a bones naming bug), but it didn't, so this change provides both options. -------------------------------------------------------------------------------- 3cb3a19 | advil | 2018-09-08 15:15:46 -0400 Command line tools for manipulating bones files These are aimed at preparing a bones collection for offline builds. -------------------------------------------------------------------------------- ee4e6b7 | advil | 2018-09-08 15:15:46 -0400 Increase MAX_GHOSTS This used to place a (very coarse) limit on how many ghosts could in principle spawn on the same level. This limit is meaningless now, because ghosts spawn only via vaults, and it was acting as an artificial constraint on how many ghosts could be in a bones file. Increase this so that permastore files can be bigger. -------------------------------------------------------------------------------- 28ba102 | advil | 2018-09-08 15:15:46 -0400 Don't use the full minor tag versioning for bones files Only use the subset that is relevant to reading and writing ghost_demons. The issue here is that upgrading a bones file on a server leads to it not being loadable by older saves, and it gets upgraded any time a new minor tag is introduced. A previous commit introduced a somewhat complicated backup system to deal with this, but that still had some corner cases, and leads to unnecessarily many bones backups on servers. The fact is that most save compat doesn't have much to do with bones files, and out of the current 199 minor tags, only 4 actually impacted bones. So, only use relevant minor tags for bones versions (which do need to be manually set). I'll leave the backup thing in place, but this change means that it only rarely will come into play. This doesn't impact ghost_demons in player saves, which inherit the versioning from the save. -------------------------------------------------------------------------------- 2c6674c | advil | 2018-09-08 15:15:46 -0400 Support for distributing bones permastore files in dat/ This doesn't yet actually finish the mechanics of distributing them, but if permastore files are put in the right subfolder of dat/, they will be copied to the player's bones folder when needed. This should even work on a server, though it's less necessary there. -------------------------------------------------------------------------------- ee7bbb8 | advil | 2018-09-08 15:15:46 -0400 Improve the new save version api a bit and use it more Encapsulates more version logic in just tag-version.h, with a cleaner interface. -------------------------------------------------------------------------------- 2e7624f | advil | 2018-09-08 15:15:46 -0400 Remove a debugging change -------------------------------------------------------------------------------- add243b | advil | 2018-09-08 15:15:46 -0400 Improve handling of upgrading bones files for online games Plus several other fixes + a bunch of streamlining. Now, when a bones file is loaded that is an old save version, a numbered backup of it will be made before upgrading so that previous versions of the game can still use the backup, rather than failing to load the updated versions. Despite all this fancy footwork, the situation still isn't all that great. For example, suppose that a player triggers a bones update for some file from 34.199 to 34.201, and then another player comes along with save version 34.200. Possibly a solution is to look for older versions at that point, but I haven't yet come up with a good implementation of that. Another possible solution is to move to a seperate versioning system for bones files (probably a subset of the minor tags); most of this is a pseudo-problem in that there is very little save compat in bones files at all. -------------------------------------------------------------------------------- f6d1ed2 | advil | 2018-09-06 22:06:40 -0400 Add cross-compiling to travis Would be nice to consistently test if the windows build is broken. This actually builds the packages, so we could consider replacing the CAO unstable builds with something like this. -------------------------------------------------------------------------------- 7664ed7 | Aidan Holm | 2018-09-06 22:09:52 +0800 Remove debugging console.log() calls -------------------------------------------------------------------------------- 21b9829 | Aidan Holm | 2018-09-06 22:09:36 +0800 Fix misaligned aptitude table highlighting (#11662, falconhit) -------------------------------------------------------------------------------- 2abc2a7 | Aidan Holm | 2018-09-06 21:56:31 +0800 Add tile for grasping roots monster spell -------------------------------------------------------------------------------- 7935be9 | gammafunk | 2018-09-06 01:05:32 -0500 Give Jorgrun the Grasping Roots spell This will give Jorgrun a way to get in damage from anywhere and hopefully give him more chances to get in range for iron shot. This commit also re-adds Jorgrun to Swamp. He now has a full-range source of damage that doesn't depend on walls, which Swamp lacks. -------------------------------------------------------------------------------- b865740 | gammafunk | 2018-09-06 01:05:32 -0500 Rework the Grasping Roots ability of Shambling Mangroves This monster ability currently applies a Roots status that lowers player EV, slows movement, and removes any flight. This is similar to a number of existing monster effects and is a mild effect overall. This commit reworks Grasping Roots to be a smite-targeted version of monster constriction, similar to the effect used by the player Borg's Vile Clutch spell. Grasping Roots now applies a non-resistable constriction effect to the player (or target monster) when cast, with similar for escape for the normal constriction used by e.g. naga monsters. The constriction damage for Grasping Roots is higher than direct constriction, using two dice instead of one. This is 2d9 for shambling mangroves at 13 HD, which is high enough to be significant when applied over several turns. Constriction impedes movement and lowers EV similarly to how the Roots status did, but adds additional escape restrictions as well as significant damage. These help Grasping Roots be a more meaningful ability without requiring players to learn the effects of yet another player debuff. -------------------------------------------------------------------------------- 12c6407 | gammafunk | 2018-09-06 01:04:34 -0500 Make a function non-static and reorder its arguments The monster spell-power calculation will be needed outside of mon-cast.cc in the future. Also use a more logical argument order that's consistent with the other global mons_ functions. -------------------------------------------------------------------------------- e4bf05c | gammafunk | 2018-09-06 01:01:22 -0500 Fix monster spell ranges for certain spells and refactor For monster spells with range varying based on spell-power, properly use monster HD as an argument for the range lookup instead of using the monster's spell-power. This was effectively giving monsters a range boost for these spells. Also refactor a range function to have a clearer name and more logical order of arguments. -------------------------------------------------------------------------------- 1adec7b | gammafunk | 2018-08-31 00:07:13 -0500 An updated tile for the Robe of Vines (ploom, ontoclasm) -------------------------------------------------------------------------------- 8eac906 | gammafunk | 2018-08-31 00:07:13 -0500 Update a Depths vault (minmay) The door for this vault was meant to contain the jellies, which can't open doors. However, after the player first comes into view of the jellies, a subsequent autoexplore will see that the jellies are sealed and proceed normally, opening the door. This commit makes the vault have a proper runed door to prevent autoexplore from opening it. We also update the threats in the vault, removing early Dungeon slimes and replacing those with slime creatures and higher level jellies. Additionally remove unnecessary no_tele_into and no_item_gen flags. There's nothing in particular about this vault that should require preventing teleports (or not generating items) compared to other runed door vaults. -------------------------------------------------------------------------------- 456867d | advil | 2018-08-30 23:23:54 -0400 Fix incorrect .. in some text popups on hidpi displays The problem was that the window preferred height was calculated including subpixel advances, but the code to actually split the string and trim it before rendering it was not. When deciding if text would fit, it was sometimes (depending on the exact math) predicting that the text was one line longer than it actual was (with subpixel advances), and it therefore would chop the last line and put `..` in place of the last two characters of the prior line. -------------------------------------------------------------------------------- 7f38390 | advil | 2018-08-30 22:10:46 -0400 Fix ?/ at the main menu This isn't very elegant, it just uses two sequential popups. It's still better than what was happening before, where the prompt text wasn't begin displaying at all. -------------------------------------------------------------------------------- a22e90c | Alan Malloy | 2018-08-29 11:08:36 -0700 Fix announcements for collecting runes in Sprints (hayenne, #11655) -------------------------------------------------------------------------------- 286b84b | advil | 2018-08-29 09:30:38 -0400 Tone down some blue/purple fog machines (hayenne) These were written assuming a spread rate of 0, I think, but this was changed in 646ff71b4c43. (Though the size parameter in sprint_mu.des just seems wrong, and maybe calibrated for gloom before a0ae0798b3ff7928?) -------------------------------------------------------------------------------- ef0ad6d | AndSDev | 2018-08-28 12:28:08 -0700 Highlighting exploring horizon behind the doors -------------------------------------------------------------------------------- 722f094 | advil | 2018-08-27 16:43:06 -0400 Tweak newgame highlighting further for console/webtiles It turns out that console has some fancy thing that automatically inverts the foreground colors when needed, but this was resulting in lightgray on lightgray highlighting in webtiles. These tweaks fix that, and also remove the darkgray on blue combo for non-preferred options that was also not so readable, replacing it with simple darkgray on lightgray, which is readable on both targets. -------------------------------------------------------------------------------- e225a8b | advil | 2018-08-27 11:23:52 -0400 Add explicit description of jelly spawning mechanic to TRJ This is one of those things that everyone knows, except when they don't yet, and it's actually fairly spoilery. This change will also hopefully make the three main corner cases a bit clearer: stabbing, poly, and (recently) grand finale. -------------------------------------------------------------------------------- 23b030f | advil | 2018-08-27 11:03:12 -0400 Fix a grammar issue with flying corrosive monster bits -------------------------------------------------------------------------------- 2ef98b0 | Aidan Holm | 2018-08-27 21:49:45 +0800 Convert some malloc/free code to std::array -------------------------------------------------------------------------------- fd4a40f | Aidan Holm | 2018-08-27 21:07:50 +0800 Fix incorrect minimap resizing (RoGGa, #11642) Placing the minimap uses the difference between m_statcol_top and m_statcol_bottom to calculate how much available space there is to show the minimap. m_statcol_bottom was being wrongly calculated because some inventory size calculations hadn't been completed. This is fixed by completing those first, if they haven't already been done. -------------------------------------------------------------------------------- 2622018 | Aidan Holm | 2018-08-27 21:07:05 +0800 Allow minimap to shrink when tile_map_pixels set (RoGGa, #11642) -------------------------------------------------------------------------------- 0e7800e | advil | 2018-08-26 18:55:25 -0400 checkwhite -------------------------------------------------------------------------------- 3b8b078 | advil | 2018-08-26 18:55:19 -0400 Spawn jellies when TRJ dies to grand finale (Doesnt) I'm pretty sure this was just an oversight, the regular jelly spawn code path is in react_to_damage but grand finale just calls monster_die. This change brings this TRJ tech in line with poly and stabbing. -------------------------------------------------------------------------------- 2d122dd | gammafunk | 2018-08-26 15:35:48 -0500 Remove the trunk reminder for the 0.22 tournament This reverts commit aa8cc03057152a697db27c544c24ec6098168342. -------------------------------------------------------------------------------- a8cb661 | advil | 2018-08-26 09:06:26 -0400 Notify player before forgetting a non-library spell (RoGGa) Applies to Vehumet gifts. With a large spell library, it's very easy to lose trick of where spells came from and not be aware that some spell has only been encountered via vehumet and won't be re-memorizable. Since the only UI doesn't display this information anywhere in the spell menus (you'd have to track it down with ?:), include this information in the new confirmation prompt. -------------------------------------------------------------------------------- 19e28b4 | Aidan Holm | 2018-08-26 02:09:27 +0800 Wrap chardump notes, overview, and messages (NormalPerson7, #11583) Notes and messages are the major contributors to overly long lines, but the chardump still contains a few tables that can reach up to 105 columns; these are more difficult to adapt to smaller screen widths. -------------------------------------------------------------------------------- 9417b5c | Aidan Holm | 2018-08-26 01:47:25 +0800 Ask for confirmation when forgetting spells (RoGGa, #11581) -------------------------------------------------------------------------------- ecc7f9d | Aidan Holm | 2018-08-26 01:34:39 +0800 Fix double-space in Ash dancing weapon warning (Pekkekke, #11603) Not sure why Ash feels the need to warn about these.. -------------------------------------------------------------------------------- b1aafca | Aidan Holm | 2018-08-26 01:08:12 +0800 Fix X> leaking location of portals (silenth. #11629) As far as I can see, is_feature() checks against the known feature in a location; this commit changes that function to return true for portal entrances and exits, allowing them to still function with > and < if they are known to be entrances/exits. _is_feature_fudged() calls is_feature(), and then checks some extra special cases; we remove checks for portal entrances/exits here, since these are checks against the actual feature, rather than the player-known feature. -------------------------------------------------------------------------------- f5ddf05 | Aidan Holm | 2018-08-25 22:23:57 +0800 Fix compilation error with TOUCH_UI=yes (sagitter, GH #833) This fixes support for clicking the menu title/more in order to switch panes. It seems quite a few menus don't specify a cycling action, howver, and there are some menus with multiple toggleable options (e.g. stash tracker menu); perhaps these should be made into explicitly clickable buttons? -------------------------------------------------------------------------------- 4413648 | advil | 2018-08-24 19:59:30 -0400 Make newgame menu highlighting less toned down in tiles Depending on the highlight color, things were pretty invisible at these alpha values, partly because tiles and console colors *really* don't match up (even though code assumes they do). This maybe goes too far in the other direction, so could use some further tweaking. I also toned down the amount of colors used in the newgame menus on local tiles, where I don't think they look good. (I have my doubts about console as well, especially the blue, but I left that as-is.) The change from WHITE to LIGHTGREY in startup.cc is mainly for local tiles to balance out the alpha change, it doesn't have an impact on console. -------------------------------------------------------------------------------- 0f769d1 | advil | 2018-08-24 19:59:30 -0400 Fix swapped blue/green in BoxMenuHighlighter highlight color -------------------------------------------------------------------------------- a86c9e7 | gammafunk | 2018-08-23 22:30:04 -0500 Updated Azrael tile (ploom, CanOfWorms) -------------------------------------------------------------------------------- 7032119 | Aidan Holm | 2018-08-23 20:09:58 +0800 Fix item description formatting, take two (NormalPerson7, #11632) Using 'pre-wrap' here instead of 'pre', which was causing some descriptions to be clipped, since their description text was unwrapped. -------------------------------------------------------------------------------- ebca68c | gammafunk | 2018-08-23 00:15:23 -0500 Updated mana viper tile (ontoclasm) -------------------------------------------------------------------------------- 4173aa6 | gammafunk | 2018-08-22 23:50:16 -0500 Updated dream sheep tile (CanOfWorms) -------------------------------------------------------------------------------- 8d3be6a | gammafunk | 2018-08-22 21:48:57 -0500 Updated shock serpent tile (ontoclasm) -------------------------------------------------------------------------------- 55e0228 | advil | 2018-08-22 15:02:08 -0400 Provide a (disabled-by-default) way to use lua require Add #define CLUA_UNRESTRICTED_LIBS to load all libs (or do it from the command line); if this is set, the original global value for "require" loaded by package will be bound to `lua_require`. (Crawl has its own `require` that shadows this.) -------------------------------------------------------------------------------- b59193a | Aidan Holm | 2018-08-23 02:27:43 +0800 Revert item description fix (silenth, #11633) -------------------------------------------------------------------------------- 497f4a5 | Aidan Holm | 2018-08-23 02:15:57 +0800 Fix require() only failing the first time (pibborn) Filenames were added to a list of already-loaded files before loading was actually attempted, which meant that only the first load failure returned an error, with subsequent require() calls returning true. -------------------------------------------------------------------------------- 6bf7575 | Aidan Holm | 2018-08-23 00:05:23 +0800 Fix god screen powers colours on webtiles (btonasse) Not proud of this... fg* are used instead of the colour_* classes because unsurprisingly, the colours are not actually the same. Separately, the match for the colour tag is optional because on Gozag everything is yellow all the time, so only the first line has a colour tag. -------------------------------------------------------------------------------- d4e5561 | Aidan Holm | 2018-08-23 00:02:39 +0800 Fix webtiles whitespace formatting (NormalPerson7, #11632) Apart from the issues described in the mantis report, this also fixes a bug where ash bondage info was not displayed on the ^ screen. -------------------------------------------------------------------------------- 5e4b187 | Floodkiller | 2018-08-21 23:26:09 +0800 Add another set of Gnoll playerdoll tiles Adds another set of Gnoll playerdoll tiles, by Metoron. -------------------------------------------------------------------------------- f7ee2ed | advil | 2018-08-20 20:50:41 -0400 Continue to work around old firefox bugs This time firefox 47 -- it appears that max-height was never inherited properly from a calc'd max-height in this version, fixed before firefox 49. This makes it explicit everywhere that it's needed (unless I missed some popup type), which fixes the issue. n.b. I can still see some broken things in firefox 47, which we may be less likely to fix. For example, the god screen panes don't work right, even though this commit makes that popup not completely unusable. -------------------------------------------------------------------------------- 46bba9c | advil | 2018-08-20 20:18:44 -0400 Avoid dith "unlinked items" for clumsy bashes (RoGGa, 11413) RoGGa noticed in 11630 that this seems to happen when your shadow mimics a clumsy bash with a ranged weapon. What is happening is that your shadow unwields the range weapon and then attacks unarmed -- I'm not even sure if clumsy attacks with a ranged weapon are implemented for monsters. This was moving the mimicked weapon into the alt slot, and it wasn't getting cleaned up. -------------------------------------------------------------------------------- 63f3d0b | advil | 2018-08-19 15:04:15 -0400 Load the lua libs correctly for Lua 5.1 It turns out that these setup functions aren't supposed to be called directly from C as of lua 5.1, but rather called like a lua function. This is documented (very briefly) in: http://www.lua.org/manual/5.1/manual.html#5 http://www.lua.org/manual/5.1/manual.html#7.3 This doesn't appear to have mattered for the libraries we were using (though who knows), but it does matter for other libraries: e.g. package will panic if not loaded the right way. A recommendation that I found on stackexchange was to see how it is done in linit.cc for the specific version of Lua one is using, and follow the practices there, so that's more or less what I've done. If we upgrade Lua to some later version, it sounds like this might change again, so this code may need to be updated. (cherry picked from commit ce2052a233ead033e2f61c92c51e49403427babb) -------------------------------------------------------------------------------- 9f8b253 | gammafunk | 2018-08-19 14:02:41 -0500 Make the Temple entrance always visible for two entry vaults (hayenne) These vaults require access from the floor below and have glass showing the Temple entrance on the current level. However the entrance is only visible from a square adjacent to the glass, and it's currently possible for that square to be a solid feature from the rest of the level. This commit includes the relevant square as normal floor in these maps. -------------------------------------------------------------------------------- 3bb9011 | advil | 2018-08-19 12:37:02 -0400 Tweak texture loading error message Make the consequences of the error more transparent to users who haven't encountered this before. -------------------------------------------------------------------------------- e8f8661 | Aidan Holm | 2018-08-18 17:00:15 +0800 Show now-monster-only spells on ?/S Spells that the player used to be able to cast, but that are now munster-only, are marked as removed by spell_removed(); but since monsters can still cast them, and the player may reach their description by other means (such as via a monster description), it's useful to show them directly in ?/S. This does not show other spells that have actually been removed (e.g. delayed fireball), presumably because lookup-help uses the descriptions database to find all candidate spells, and fully removed spells have had their descriptions removed. -------------------------------------------------------------------------------- 1b1c699 | Aidan Holm | 2018-08-18 16:57:32 +0800 Restore mass confusion tile Mass Confusion can still be cast by pan lords and ancestors. -------------------------------------------------------------------------------- 5e01147 | Aidan Holm | 2018-08-18 16:31:09 +0800 Add twisted resurrection tile (NormalPerson7, #11622) -------------------------------------------------------------------------------- 33897af | advil | 2018-08-17 21:59:30 -0400 Fix at least some Beogh unlinked item bugs (8187) The problem was with named followers who had been gifted items. What was happening was that both drop_item and take_item could fail, but beogh_gift_item() didn't check for these fail conditions and forced the gift on the follower regardless. If the follower had an old item in the relevant slot, this left the old item still associated with the follower but unlinked, and errors started showing up when the follower died and the item didn't get properly converted to a floor item. The main case where this came up was if you gifted a follower an item and the item they already had in that slot was cursed, causing drop_item to fail. The key symptom (which is rather hard to notice) is that the follower wouldn't generate a drop message for the old item. I have changed things so that Beogh removes the curse in these cases, so that the follower can drop their cursed item. Alternatively, the gift could just fail, but this harsher behavior didn't seem to me to contribute anything interesting to gameplay. I've also ensured that take_item respects drop_item's fail conditions, and that beogh_gift_item respects take_item's fail conditions with an error message. There are many variants of this out there so I can't promise this fixes all of them, but I think this will probably fix the Beogh version; all the saves I have access to are consistent with the case I have replicated and fixed here, though for many of them the only real evidence is that a named follower previously died on the level in question. To figure this out, it was crucial to get access to a tv that included the whole sequence of events; thanks to Defined for having a fairly precise description of their instance of the bug that allowed me to do this (the tv: `!lg defined game_key=Defined:cxc:20180717045212S -tv: