Reenable los_maps.lua.

Add a new des file test/des/debug-diamond-los.des with adapted
maps -- compare to debug-los.des to see the differences.

2 files changed, 238 insertions, 3 deletions

diff --git a/crawl-ref/source/test/des/debug-diamond-los.des b/crawl-ref/source/test/des/debug-diamond-los.des
new file mode 100644
index 0000000000..8f0f562f55
--- /dev/null
+++ b/crawl-ref/source/test/des/debug-diamond-los.des
@@ -0,0 +1,236 @@
+# Sample maps illustrating what LOS should be like.
+# test/los_maps.lua tests losight() against these.
+#
+# For the moment, these need to be 10x10 with an @
+# in the nw corner and show one quadrant, with
+# visibility encoded as follows.
+#
+# x: visible wall
+# c: non-visible wall
+# .: visible floor
+# w: non-visible floor (water actually; could just place c's there)
+# @: center
+
+NAME: los_empty
+ORIENT: float
+TAGS: debug_los
+MAP
+@........c
+.........c
+........cc
+........cc
+........cc
+.......ccc
+......cccc
+.....ccccc
+..cccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_edge
+ORIENT: float
+TAGS: debug_los
+MAP
+@.......xc
+.......xxc
+.......xcc
+.......xcc
+......xxcc
+.....xxccc
+....xxcccc
+.xxxxccccc
+xxcccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_blocking_wall
+ORIENT: float
+TAGS: debug_los
+MAP
+@..xwwwwwc
+..xxwwwwwc
+.xxwwwwwcc
+xxwwwwwwcc
+wwwwwwwwcc
+wwwwwwwccc
+wwwwwwcccc
+wwwwwccccc
+wwcccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_corner
+ORIENT: float
+TAGS: debug_los
+MAP
+@xcccccccc
+x........c
+cxxxxxxxcc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_corner_2
+ORIENT: float
+TAGS: debug_los
+MAP
+@.xccccccc
+xx.......c
+cccxxxxxcc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_corner_3
+ORIENT: float
+TAGS: debug_los
+MAP
+@..xcccccc
+xxx......c
+cccccxxxcc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_corner_4
+ORIENT: float
+TAGS: debug_los
+MAP
+@...xccccc
+xxxx.....c
+cccccccxcc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_corner_5
+ORIENT: float
+TAGS: debug_los
+MAP
+@....xcccc
+xxxxx....c
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_corner_6
+ORIENT: float
+TAGS: debug_los
+MAP
+@.....xccc
+xxxxxx...c
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_corner_7
+ORIENT: float
+TAGS: debug_los
+MAP
+@......xcc
+xxxxxxx..c
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_corner_8
+ORIENT: float
+TAGS: debug_los
+MAP
+@.......xc
+xxxxxxxx.c
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_corner_9
+ORIENT: float
+TAGS: debug_los
+MAP
+@........c
+xxxxxxxxxw
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_gap
+ORIENT: float
+TAGS: debug_los
+MAP
+@.xccccccc
+x.xccccccc
+c...cccccc
+c.....cccc
+c.......cc
+c......ccc
+c.....cccc
+c....ccccc
+c.cccccccc
+cccccccccc
+ENDMAP
+
+NAME: los_gap2
+ORIENT: float
+TAGS: debug_los
+MAP
+@.xccccccc
+x.xccccccc
+c.xccccccc
+c..ccccccc
+c...cccccc
+c....ccccc
+c.....cccc
+c....ccccc
+c.cccccccc
+cccccccccc
+ENDMAP
diff --git a/crawl-ref/source/test/los_maps.lua b/crawl-ref/source/test/los_maps.lua
index eb16d11afa..f72a6382fd 100644
--- a/crawl-ref/source/test/los_maps.lua
+++ b/crawl-ref/source/test/los_maps.lua
@@ -52,7 +52,7 @@ local function test_los_map(map)
 end
 
 local function test_los_maps()
-  dgn.load_des_file("test/des/debug-los.des")
+  dgn.load_des_file("test/des/debug-diamond-los.des")
   local map = dgn.map_by_tag("debug_los")
   assert(map, "Could not find debug-los maps (tag 'debug_los')")
   while map do
@@ -62,6 +62,5 @@ local function test_los_maps()
   end
 end
 
--- Disable until the maps have been updated for diamond LOS model.
---test_los_maps()
+test_los_maps()