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