Dungeon Crawl Stone Soup Tracker - DCSS
Viewing Issue Advanced Details
8778 Patches minor always 2014-07-11 00:02 2014-07-23 10:14
mursu Both  
neil All  
normal Both  
closed 0.15 ancient branch  
done  
none    
none 0.15 ancient branch  
0008778: Minor Abyss fixes
Fixing a number of small Abyss issues (split into multiple commits each touching a couple of lines, devs please comment if you would rather have this kind of things squashed together).

1. Mostly fixes 0008625, the old map_seen information was not wiped when shifting Abyss.

2. Lua in abyss exit vaults changes part of exit portals into Abyssal stairs, but vault fixup code did not separate Abyssal from other stairs and removed all stairs.

3. Placing abyssal features (exits, altars) should avoid masked (by a bitmap) regions, but this was only working for vaults.

4. Removed unused parameter.
? file icon 0001-When-Abyss-shifts-also-shift-player-s-map_seen-infor.patch [^] (1,277 bytes) 2014-07-11 00:02 [Show Content]
? file icon 0002-Preserve-Abyssal-stairs-when-placing-exit-vaults.patch [^] (1,911 bytes) 2014-07-11 00:02 [Show Content]
? file icon 0003-Respect-level-generation-mask-when-placing-Abyss-fea.patch [^] (768 bytes) 2014-07-11 00:02 [Show Content]
? file icon 0004-Remove-unused-variable.patch [^] (1,463 bytes) 2014-07-11 00:03 [Show Content]
Issue History
2014-07-11 00:02 mursu New Issue
2014-07-11 00:02 mursu File Added: 0001-When-Abyss-shifts-also-shift-player-s-map_seen-infor.patch
2014-07-11 00:02 mursu File Added: 0002-Preserve-Abyssal-stairs-when-placing-exit-vaults.patch
2014-07-11 00:02 mursu File Added: 0003-Respect-level-generation-mask-when-placing-Abyss-fea.patch
2014-07-11 00:03 mursu File Added: 0004-Remove-unused-variable.patch
2014-07-11 04:56 neil Note Added: 0026723
2014-07-11 04:56 neil Status new => resolved
2014-07-11 04:56 neil Fixed in Branch => 0.15 development branch
2014-07-11 04:56 neil Resolution open => done
2014-07-11 04:56 neil Assigned To => neil
2014-07-11 10:40 mursu Note Added: 0026728
2014-07-19 06:43 neil Note Added: 0026779
2014-07-19 06:45 neil Note Added: 0026780
2014-07-23 10:14 mursu Status resolved => closed

Notes
(0026723)
neil   
2014-07-11 04:56   
In trunk (0.15-a0-1996-gee241d8 through 0.15-a0-1999-gcf9921f), thanks!

You say "mostly fixes 0008625": are you aware of other situations where it still happens? Basically, should we leave that bug open?

As for the commit splitting, I think it's good: I prefer seeing commits like this to huge monolithic ones. Probably I would have gone a little bit further and put the _abyss_place_map fix from the second commit into a separate commit (or folded it with the fourth as a single "Simplify" commit).

You can join multiple commits into one patch file if you want (either cat them, or use format-patch --stdout). I don't have a preference either way: it's slightly easier to download and apply one file, but it's slightly easier to cherry-pick from multiple files.
(0026728)
mursu   
2014-07-11 10:40   
Thanks for your feedback! As for 8625, there is one remaining issue that I ran into while testing: when you move and an exit comes to view, it is shown on the map, but if the Abyss happens to morph (in world_reacts) and break LOS with the exit before your next turn starts, the discovered exit is not announced until you move so that it becomes visible again. I don't know how to elegantly fix this (apart from calling check_for_interesting_features() both before and after abyss morphing), but in my opinion this is so rare event (and usually the exit is announced one turn later) that the bug could be closed.

One more related note: 0005067 sounds like a similar issue, if that is still open (I never played tiles and don't have time to look at that right now, maybe next week).
(0026779)
neil   
2014-07-19 06:43   
Thanks, closing the other bugs. I think if it gets announced one turn later that is fine.
(0026780)
neil   
2014-07-19 06:45   
The minimap thing (0005067) doesn't seem to be fixed, BTW.