Viewing Issue Simple Details Jump to Notes ] Wiki ] View Advanced ] Issue History ] Print ]
ID Category Severity Reproducibility Date Submitted Last Update
0008744 [DCSS] Patches feature N/A 2014-06-27 22:11 2015-12-02 18:36
Reporter infiniplex View Status public  
Assigned To wheals
Priority normal Resolution done  
Status resolved   Product Branch 0.16 ancient branch
Summary 0008744: Improve 2 related layouts and add in more branches.
Description 4 patches that I think have to be applied in order. You might be able to get away with just the 1st and 4th ones.

1. Improves the C++-from-LUA connect_the_dots function. Adds:
  -> Limited avoiding primary vaults
  -> Attempt connections from both ends and choose the one that hits primary vaults less. In the case of a tie, the one that runs along the side of the vault less. If still tied, random.
  -> Optionally set path thickness (default 1)
  -> Choose of paths should be straight and axis-aligned or messy (as now). Default: messy
  -> Optionally enabled diagonal paths (default off)

2. Improve layout_misc_corridors
  -> Attempts to place around primary vaults.
  -> Places fewer paths on maps with primary vaults proportionately to primary vault area.
  -> Straight paths in crypt

3. Adds a Zot variant to layout_misc_corridors
  -> Straight corridors, sometimes including diagonals
  -> Corridor widths vary from 1 to 3
  -> Fewer corridors
  -> More corridors at the bottom of every branch (should have been in previous commit).

4. Adds an Elf variant to layout_rooms
  -> Straight hallways with diagonals allowed
  -> All rooms are "octagons" (which seems to include hexagons and diamonds)
  -> Octagon rooms do not appear in other branches

Note that layout_rooms has no differentiation for other branches or depth.
Additional Information
Tags No tags attached.
Attached Files ? file icon 0001-Added-options-to-join_the_dots-LUA-function.patch [^] (7,924 bytes) 2014-06-27 22:11 [Show Content]
? file icon 0002-Updated-layout_misc_corridors-for-improved-join_the_.patch [^] (2,781 bytes) 2014-06-27 22:11 [Show Content]
? file icon 0003-Added-Zot-version-to-layout_misc_corridors.patch [^] (2,227 bytes) 2014-06-27 22:11 [Show Content]
? file icon 0004-Add-Elf-variant-to-layout_rooms.patch [^] (1,994 bytes) 2014-06-27 22:11 [Show Content]
png file icon layout_misc_corridors.png [^] (32,270 bytes) 2014-06-27 22:11


png file icon layout_rooms1.png [^] (12,459 bytes) 2014-06-27 22:12

- Relationships

-  Notes
(0026963)
PleasingFungus (administrator)
2014-08-07 03:37

Patch 1 is in as 86f53c5, thanks!
(0026968)
infiniplex (reporter)
2014-08-08 01:38
edited on: 2014-08-08 01:46

Thank you.

The other 3 patches should probably wait for 0.16. I also will redo them based on changes between now and then. If someone can reclassify this issue, that would probably be good.

(0029835)
wheals (administrator)
2015-11-25 19:45

Are you still planning to redo them?
(0029841)
infiniplex (reporter)
2015-11-26 01:51

Oops. I had completely forgotten these. Probably not, as I forgot what I was going to change.
(0029849)
wheals (administrator)
2015-11-26 14:38

So should they be merged as-is, or are they in an unfinished state?
(0029888)
infiniplex (reporter)
2015-11-29 00:00

Short: Merge them.

Longer: Given I put them up here, I thought they were finished at the time. I was probably thinking that, after the new version, I would have to fiddle a bit so they could merge with the new branch. The "allow_diagonals = crawl.coinflip(3)" in the third patch should presumably not have the 3, but it will run (will no negative effects) as it is.
(0029900)
wheals (administrator)
2015-12-02 18:36

Merged in https://github.com/crawl/crawl/commit/7b3b78a6850c [^] and its two parents (with the coinflip call fixed), thanks!

- Issue History
Date Modified Username Field Change
2014-06-27 22:11 infiniplex New Issue
2014-06-27 22:11 infiniplex File Added: 0001-Added-options-to-join_the_dots-LUA-function.patch
2014-06-27 22:11 infiniplex File Added: 0002-Updated-layout_misc_corridors-for-improved-join_the_.patch
2014-06-27 22:11 infiniplex File Added: 0003-Added-Zot-version-to-layout_misc_corridors.patch
2014-06-27 22:11 infiniplex File Added: 0004-Add-Elf-variant-to-layout_rooms.patch
2014-06-27 22:11 infiniplex File Added: layout_misc_corridors.png
2014-06-27 22:12 infiniplex File Added: layout_rooms1.png
2014-08-07 03:37 PleasingFungus Note Added: 0026963
2014-08-08 01:38 infiniplex Note Added: 0026968
2014-08-08 01:46 infiniplex Note Edited: 0026968
2014-08-08 01:46 PleasingFungus Product Branch 0.15 prerelease branch => 0.16 development branch
2015-11-25 19:45 wheals Note Added: 0029835
2015-11-26 01:51 infiniplex Note Added: 0029841
2015-11-26 14:38 wheals Note Added: 0029849
2015-11-29 00:00 infiniplex Note Added: 0029888
2015-12-02 18:36 wheals Note Added: 0029900
2015-12-02 18:36 wheals Status new => resolved
2015-12-02 18:36 wheals Fixed in Branch => 0.18 development branch
2015-12-02 18:36 wheals Resolution open => done
2015-12-02 18:36 wheals Assigned To => wheals


Mantis 1.1.8[^]
Copyright © 2000 - 2009 Mantis Group
Powered by Mantis Bugtracker