From 1281b3819d8b4a32ee5f0b68b91056c58b79d8fb Mon Sep 17 00:00:00 2001
From: nhmall <nhmall@nethack.org>
Date: Fri, 8 Nov 2019 15:39:21 -0500
Subject: [PATCH] remove an unused variable warning

---
 src/dungeon.c                       |   1 -
 win/win32/vs2017/NetHack.sln        |  35 +---
 win/win32/vs2017/NetHack.vcxproj    |  37 +++-
 win/win32/vs2017/NetHackW.vcxproj   |  39 +++-
 win/win32/vs2017/afterdgncomp.proj  |  12 --
 win/win32/vs2017/afterlevcomp.proj  |  12 --
 win/win32/vs2017/aftermakedefs.proj |   1 -
 win/win32/vs2017/dgncomp.vcxproj    | 132 --------------
 win/win32/vs2017/dirs.props         |   1 +
 win/win32/vs2017/dlb.vcxproj        |   2 +-
 win/win32/vs2017/files.props        | 271 +++++++++++++---------------
 win/win32/vs2017/levcomp.vcxproj    |  95 ----------
 win/win32/vs2017/makedefs.vcxproj   |   4 +-
 win/win32/vs2017/nh340key.vcxproj   |   2 +-
 win/win32/vs2017/nhdefkey.vcxproj   |   2 +-
 win/win32/vs2017/nhraykey.vcxproj   |   2 +-
 win/win32/vs2017/recover.vcxproj    |   2 +-
 win/win32/vs2017/tile2bmp.vcxproj   |   2 +-
 win/win32/vs2017/tilemap.vcxproj    |   2 +-
 19 files changed, 205 insertions(+), 449 deletions(-)
 delete mode 100644 win/win32/vs2017/afterdgncomp.proj
 delete mode 100644 win/win32/vs2017/afterlevcomp.proj
 delete mode 100644 win/win32/vs2017/dgncomp.vcxproj
 delete mode 100644 win/win32/vs2017/levcomp.vcxproj

diff --git a/src/dungeon.c b/src/dungeon.c
index bf518faba..324e50fef 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -807,7 +807,6 @@ init_dungeons()
     register s_level *x;
     struct proto_dungeon pd;
     struct level_map *lev_map;
-    struct version_info vers_info;
 
     (void) memset(&pd, 0, sizeof(struct proto_dungeon));
     pd.n_levs = pd.n_brs = 0;
diff --git a/win/win32/vs2017/NetHack.sln b/win/win32/vs2017/NetHack.sln
index 0d5df6b89..5d7fdde7a 100644
--- a/win/win32/vs2017/NetHack.sln
+++ b/win/win32/vs2017/NetHack.sln
@@ -7,28 +7,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHackW", "NetHackW.vcxpro
 	ProjectSection(ProjectDependencies) = postProject
 		{93F10526-209E-41D7-BBEA-775787876895} = {93F10526-209E-41D7-BBEA-775787876895}
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
-		{9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 		{642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42}
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
-		{8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dgncomp", "dgncomp.vcxproj", "{8A3F81C7-2968-49A8-86BF-2669412AD7DE}"
-	ProjectSection(ProjectDependencies) = postProject
-		{642BC75D-ABAF-403E-8224-7C725FD4CB42} = {642BC75D-ABAF-403E-8224-7C725FD4CB42}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlb", "dlb.vcxproj", "{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}"
 	ProjectSection(ProjectDependencies) = postProject
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
-		{9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
-		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
-		{8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "levcomp", "levcomp.vcxproj", "{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}"
-	ProjectSection(ProjectDependencies) = postProject
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 	EndProjectSection
 EndProject
@@ -38,13 +24,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "recover", "recover.vcxproj"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tile2bmp", "tile2bmp.vcxproj", "{642BC75D-ABAF-403E-8224-7C725FD4CB42}"
 	ProjectSection(ProjectDependencies) = postProject
-		{9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tilemap", "tilemap.vcxproj", "{93F10526-209E-41D7-BBEA-775787876895}"
 	ProjectSection(ProjectDependencies) = postProject
-		{8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE}
+		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uudecode", "uudecode.vcxproj", "{63F9B82B-F589-4082-ABE5-D4F0682050AB}"
@@ -55,11 +40,9 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NetHack", "NetHack.vcxproj", "{609BC774-C6F8-4B2B-AA7D-5B3D0EA95751}"
 	ProjectSection(ProjectDependencies) = postProject
 		{63F9B82B-F589-4082-ABE5-D4F0682050AB} = {63F9B82B-F589-4082-ABE5-D4F0682050AB}
-		{9DD9C52E-E8C9-4533-BD22-83C055C0AABA} = {9DD9C52E-E8C9-4533-BD22-83C055C0AABA}
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945} = {BA3DD34C-04B7-40D0-B373-9329AA9E8945}
 		{6813477F-64B6-4B97-B230-438D0D233385} = {6813477F-64B6-4B97-B230-438D0D233385}
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC} = {0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}
-		{8A3F81C7-2968-49A8-86BF-2669412AD7DE} = {8A3F81C7-2968-49A8-86BF-2669412AD7DE}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nhdefkey", "nhdefkey.vcxproj", "{6813477F-64B6-4B97-B230-438D0D233385}"
@@ -102,14 +85,6 @@ Global
 		{CEC5D360-8804-454F-8591-002184C23499}.Release|Win32.Build.0 = Release|Win32
 		{CEC5D360-8804-454F-8591-002184C23499}.Release|x64.ActiveCfg = Release|x64
 		{CEC5D360-8804-454F-8591-002184C23499}.Release|x64.Build.0 = Release|x64
-		{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Debug|Win32.Build.0 = Debug|Win32
-		{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Debug|x64.ActiveCfg = Debug|x64
-		{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Debug|x64.Build.0 = Debug|x64
-		{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|Win32.ActiveCfg = Release|Win32
-		{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|Win32.Build.0 = Release|Win32
-		{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|x64.ActiveCfg = Release|x64
-		{8A3F81C7-2968-49A8-86BF-2669412AD7DE}.Release|x64.Build.0 = Release|x64
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|Win32.Build.0 = Debug|Win32
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Debug|x64.ActiveCfg = Debug|x64
@@ -118,14 +93,6 @@ Global
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Release|Win32.Build.0 = Release|Win32
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Release|x64.ActiveCfg = Release|x64
 		{0303A585-3F83-4BB7-AF6B-1E12C8FB54AC}.Release|x64.Build.0 = Release|x64
-		{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Debug|Win32.Build.0 = Debug|Win32
-		{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Debug|x64.ActiveCfg = Debug|x64
-		{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Debug|x64.Build.0 = Debug|x64
-		{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|Win32.ActiveCfg = Release|Win32
-		{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|Win32.Build.0 = Release|Win32
-		{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|x64.ActiveCfg = Release|x64
-		{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}.Release|x64.Build.0 = Release|x64
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|Win32.Build.0 = Debug|Win32
 		{BA3DD34C-04B7-40D0-B373-9329AA9E8945}.Debug|x64.ActiveCfg = Debug|x64
diff --git a/win/win32/vs2017/NetHack.vcxproj b/win/win32/vs2017/NetHack.vcxproj
index 4b9563347..e12110c19 100644
--- a/win/win32/vs2017/NetHack.vcxproj
+++ b/win/win32/vs2017/NetHack.vcxproj
@@ -45,7 +45,7 @@
       <InlineFunctionExpansion>Default</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>TILES;WIN32CON;DLB;MSWIN_GRAPHICS;SAFEPROCS;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
@@ -53,6 +53,39 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="$(LuaDir)lapi.c" />
+    <ClCompile Include="$(LuaDir)lauxlib.c" />
+    <ClCompile Include="$(LuaDir)lbaselib.c" />
+    <ClCompile Include="$(LuaDir)lbitlib.c" />
+    <ClCompile Include="$(LuaDir)lcode.c" />
+    <ClCompile Include="$(LuaDir)lcorolib.c" />
+    <ClCompile Include="$(LuaDir)lctype.c" />
+    <ClCompile Include="$(LuaDir)ldblib.c" />
+    <ClCompile Include="$(LuaDir)ldebug.c" />
+    <ClCompile Include="$(LuaDir)ldo.c" />
+    <ClCompile Include="$(LuaDir)ldump.c" />
+    <ClCompile Include="$(LuaDir)lfunc.c" />
+    <ClCompile Include="$(LuaDir)lgc.c" />
+    <ClCompile Include="$(LuaDir)linit.c" />
+    <ClCompile Include="$(LuaDir)liolib.c" />
+    <ClCompile Include="$(LuaDir)llex.c" />
+    <ClCompile Include="$(LuaDir)lmathlib.c" />
+    <ClCompile Include="$(LuaDir)lmem.c" />
+    <ClCompile Include="$(LuaDir)loadlib.c" />
+    <ClCompile Include="$(LuaDir)lobject.c" />
+    <ClCompile Include="$(LuaDir)lopcodes.c" />
+    <ClCompile Include="$(LuaDir)loslib.c" />
+    <ClCompile Include="$(LuaDir)lparser.c" />
+    <ClCompile Include="$(LuaDir)lstate.c" />
+    <ClCompile Include="$(LuaDir)lstring.c" />
+    <ClCompile Include="$(LuaDir)lstrlib.c" />
+    <ClCompile Include="$(LuaDir)ltable.c" />
+    <ClCompile Include="$(LuaDir)ltablib.c" />
+    <ClCompile Include="$(LuaDir)ltm.c" />
+    <ClCompile Include="$(LuaDir)lundump.c" />
+    <ClCompile Include="$(LuaDir)lutf8lib.c" />
+    <ClCompile Include="$(LuaDir)lvm.c" />
+    <ClCompile Include="$(LuaDir)lzio.c" />
     <ClCompile Include="$(SrcDir)allmain.c" />
     <ClCompile Include="$(SrcDir)alloc.c" />
     <ClCompile Include="$(SrcDir)apply.c" />
@@ -111,6 +144,8 @@
     <ClCompile Include="$(SrcDir)mthrowu.c" />
     <ClCompile Include="$(SrcDir)muse.c" />
     <ClCompile Include="$(SrcDir)music.c" />
+    <ClCompile Include="$(SrcDir)nhlua.c" />
+    <ClCompile Include="$(SrcDir)nhlsel.c" />
     <ClCompile Include="$(SrcDir)objects.c" />
     <ClCompile Include="$(SrcDir)objnam.c" />
     <ClCompile Include="$(SrcDir)options.c" />
diff --git a/win/win32/vs2017/NetHackW.vcxproj b/win/win32/vs2017/NetHackW.vcxproj
index 0f577b224..12b4dbd62 100644
--- a/win/win32/vs2017/NetHackW.vcxproj
+++ b/win/win32/vs2017/NetHackW.vcxproj
@@ -31,7 +31,7 @@
       <AdditionalOptions>/Gs /Oi- %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(WinWin32Dir);$(IncDir);$(SysWinntDir);$(SysShareDir);$(WinShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>TILES;_WINDOWS;DLB;MSWIN_GRAPHICS;SAFEPROCS;NOTTYGRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
@@ -47,6 +47,39 @@
     </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="$(LuaDir)lapi.c" />
+    <ClCompile Include="$(LuaDir)lauxlib.c" />
+    <ClCompile Include="$(LuaDir)lbaselib.c" />
+    <ClCompile Include="$(LuaDir)lbitlib.c" />
+    <ClCompile Include="$(LuaDir)lcode.c" />
+    <ClCompile Include="$(LuaDir)lcorolib.c" />
+    <ClCompile Include="$(LuaDir)lctype.c" />
+    <ClCompile Include="$(LuaDir)ldblib.c" />
+    <ClCompile Include="$(LuaDir)ldebug.c" />
+    <ClCompile Include="$(LuaDir)ldo.c" />
+    <ClCompile Include="$(LuaDir)ldump.c" />
+    <ClCompile Include="$(LuaDir)lfunc.c" />
+    <ClCompile Include="$(LuaDir)lgc.c" />
+    <ClCompile Include="$(LuaDir)linit.c" />
+    <ClCompile Include="$(LuaDir)liolib.c" />
+    <ClCompile Include="$(LuaDir)llex.c" />
+    <ClCompile Include="$(LuaDir)lmathlib.c" />
+    <ClCompile Include="$(LuaDir)lmem.c" />
+    <ClCompile Include="$(LuaDir)loadlib.c" />
+    <ClCompile Include="$(LuaDir)lobject.c" />
+    <ClCompile Include="$(LuaDir)lopcodes.c" />
+    <ClCompile Include="$(LuaDir)loslib.c" />
+    <ClCompile Include="$(LuaDir)lparser.c" />
+    <ClCompile Include="$(LuaDir)lstate.c" />
+    <ClCompile Include="$(LuaDir)lstring.c" />
+    <ClCompile Include="$(LuaDir)lstrlib.c" />
+    <ClCompile Include="$(LuaDir)ltable.c" />
+    <ClCompile Include="$(LuaDir)ltablib.c" />
+    <ClCompile Include="$(LuaDir)ltm.c" />
+    <ClCompile Include="$(LuaDir)lundump.c" />
+    <ClCompile Include="$(LuaDir)lutf8lib.c" />
+    <ClCompile Include="$(LuaDir)lvm.c" />
+    <ClCompile Include="$(LuaDir)lzio.c" />
     <ClCompile Include="$(SrcDir)allmain.c" />
     <ClCompile Include="$(SrcDir)alloc.c" />
     <ClCompile Include="$(SrcDir)apply.c" />
@@ -105,6 +138,8 @@
     <ClCompile Include="$(SrcDir)mthrowu.c" />
     <ClCompile Include="$(SrcDir)muse.c" />
     <ClCompile Include="$(SrcDir)music.c" />
+    <ClCompile Include="$(SrcDir)nhlua.c" />
+    <ClCompile Include="$(SrcDir)nhlsel.c" />
     <ClCompile Include="$(SrcDir)objects.c" />
     <ClCompile Include="$(SrcDir)objnam.c" />
     <ClCompile Include="$(SrcDir)options.c" />
@@ -229,4 +264,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="afternethack.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/win/win32/vs2017/afterdgncomp.proj b/win/win32/vs2017/afterdgncomp.proj
deleted file mode 100644
index 38aee3247..000000000
--- a/win/win32/vs2017/afterdgncomp.proj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="dirs.props"/>
-  <Import Project="files.props"/>
-  <Target Name="Build"
-     Inputs="$(ToolsDir)dgncomp.exe;$(DatDir)dungeon.pdf"
-	 Outputs="$(DatDir)dungeon">
-	<Exec Command="$(ToolsDir)dgncomp.exe dungeon.pdf" WorkingDirectory="$(DatDir)"/>
-  </Target>
-  <Target Name="Clean">
-	<Delete Files="$(DatDir)dungeon"/>
-  </Target>
-</Project>
diff --git a/win/win32/vs2017/afterlevcomp.proj b/win/win32/vs2017/afterlevcomp.proj
deleted file mode 100644
index c0d8dd464..000000000
--- a/win/win32/vs2017/afterlevcomp.proj
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="dirs.props"/>
-  <Import Project="files.props"/>
-  <Target Name="Build"
-     Inputs="@(Desfiles->'$(DatDir)%(filename)%(extension)');$(BinDir)levcomp.exe"
-	 Outputs="@(Levfiles->'$(DatDir)%(filename)%(extension)')">
-	<Exec Command="$(ToolsDir)levcomp.exe @(Desfiles, ' ')" WorkingDirectory="$(DatDir)"/>
-  </Target>
-  <Target Name="Clean">
-	<Delete Files="@(Levfiles->'$(DatDir)%(filename)%(extension)')"/>
-  </Target>
-</Project>
diff --git a/win/win32/vs2017/aftermakedefs.proj b/win/win32/vs2017/aftermakedefs.proj
index 4ebea25a4..31a965de3 100644
--- a/win/win32/vs2017/aftermakedefs.proj
+++ b/win/win32/vs2017/aftermakedefs.proj
@@ -13,7 +13,6 @@
 	<Exec Command="$(ToolsDir)makedefs.exe -s" WorkingDirectory="$(DatDir)"/>
 	<Exec Command="$(ToolsDir)makedefs.exe -q" WorkingDirectory="$(DatDir)"/>
 	<Exec Command="$(ToolsDir)makedefs.exe -h" WorkingDirectory="$(DatDir)"/>
-	<Exec Command="$(ToolsDir)makedefs.exe -e" WorkingDirectory="$(DatDir)"/>
   </Target>
   <Target Name="Clean">
 	<Delete Files="@(Defs)"/>
diff --git a/win/win32/vs2017/dgncomp.vcxproj b/win/win32/vs2017/dgncomp.vcxproj
deleted file mode 100644
index cb2fc0375..000000000
--- a/win/win32/vs2017/dgncomp.vcxproj
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="config.props" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8A3F81C7-2968-49A8-86BF-2669412AD7DE}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <Import Project="console.props" />
-  <Import Project="common.props" />
-  <Import Project="dirs.props" />
-  <Import Project="files.props" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(SrcDir)alloc.c" />
-    <ClCompile Include="$(SysShareDir)\dgn_lex.c" />
-    <ClCompile Include="$(UtilDir)dgn_main.c" />
-    <ClCompile Include="$(SysShareDir)dgn_yacc.c" />
-    <ClCompile Include="$(UtilDir)panic.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(IncDir)align.h" />
-    <ClInclude Include="$(IncDir)attrib.h" />
-    <ClInclude Include="$(IncDir)color.h" />
-    <ClInclude Include="$(IncDir)config.h" />
-    <ClInclude Include="$(IncDir)config1.h" />
-    <ClInclude Include="$(IncDir)context.h" />
-    <ClInclude Include="$(IncDir)coord.h" />
-    <ClInclude Include="$(IncDir)decl.h" />
-    <ClInclude Include="$(IncDir)dgn_comp.h" />
-    <ClInclude Include="$(IncDir)dgn_file.h" />
-    <ClInclude Include="$(IncDir)display.h" />
-    <ClInclude Include="$(IncDir)dungeon.h" />
-    <ClInclude Include="$(IncDir)engrave.h" />
-    <ClInclude Include="$(IncDir)flag.h" />
-    <ClInclude Include="$(IncDir)global.h" />
-    <ClInclude Include="$(IncDir)mkroom.h" />
-    <ClInclude Include="$(IncDir)monattk.h" />
-    <ClInclude Include="$(IncDir)monst.h" />
-    <ClInclude Include="$(IncDir)monsym.h" />
-    <ClInclude Include="$(IncDir)ntconf.h" />
-    <ClInclude Include="$(IncDir)obj.h" />
-    <ClInclude Include="$(IncDir)objclass.h" />
-    <ClInclude Include="$(IncDir)onames.h" />
-    <ClInclude Include="$(IncDir)permonst.h" />
-    <ClInclude Include="$(IncDir)pm.h" />
-    <ClInclude Include="$(IncDir)prop.h" />
-    <ClInclude Include="$(IncDir)quest.h" />
-    <ClInclude Include="$(IncDir)rect.h" />
-    <ClInclude Include="$(IncDir)region.h" />
-    <ClInclude Include="$(IncDir)rm.h" />
-    <ClInclude Include="$(IncDir)skills.h" />
-    <ClInclude Include="$(IncDir)spell.h" />
-    <ClInclude Include="$(IncDir)timeout.h" />
-    <ClInclude Include="$(IncDir)tradstdc.h" />
-    <ClInclude Include="$(IncDir)trampoli.h" />
-    <ClInclude Include="$(IncDir)trap.h" />
-    <ClInclude Include="$(IncDir)vision.h" />
-    <ClInclude Include="$(IncDir)winprocs.h" />
-    <ClInclude Include="$(IncDir)wintty.h" />
-    <ClInclude Include="$(IncDir)wintype.h" />
-    <ClInclude Include="$(IncDir)you.h" />
-    <ClInclude Include="$(IncDir)youprop.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Choose>
-    <When Condition=" '$(YACC)'!='' ">
-      <PropertyGroup>
-        <BuildDependsOn>
-          Lex;
-          Yacc;
-          $(BuildDependsOn);
-        </BuildDependsOn>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <BuildDependsOn>
-          NoLex;
-          NoYacc;
-          $(BuildDependsOn);
-        </BuildDependsOn>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <Target Name="Yacc" Inputs="$(UtilDir)dgn_comp.y" Outputs="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h">
-    <Message Text="Running Yacc" Importance="high" />
-    <Exec Command="$(YACC) -d dgn_comp.y" WorkingDirectory="$(UtilDir)" />
-    <Move SourceFiles="$(UtilDir)y.tab.c;$(UtilDir)y.tab.h" DestinationFiles="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h" />
-  </Target>
-  <Target Name="Lex" Inputs="$(UtilDir)lev_comp.l" Outputs="$(UtilDir)dgn_lex.c">
-    <Message Text="Running Lex" Importance="high" />
-    <Exec Command="$(LEX) dgn_comp.l" WorkingDirectory="$(UtilDir)" />
-    <Move SourceFiles="$(UtilDir)lex.yy.c" DestinationFiles="$(UtilDir)dgn_lex.c" />
-  </Target>
-  <Target Name="NoYacc" Inputs="$(SysShareDir)dgn_yacc.c;$(SysShareDir)dgn_comp.h" Outputs="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h">
-    <Message Text="No Yacc using pre-built files" Importance="high" />
-    <Copy SourceFiles="$(SysShareDir)dgn_yacc.c;$(SysShareDir)dgn_comp.h" DestinationFiles="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h" />
-  </Target>
-  <Target Name="NoLex" Inputs="$(SysShareDir)dgn_lex.c" Outputs="$(UtilDir)dgn_lex.c">
-    <Message Text="No Lex using pre-built files" Importance="high" />
-    <Copy SourceFiles="$(SysShareDir)dgn_lex.c" DestinationFiles="$(UtilDir)dgn_lex.c" />
-  </Target>
-  <Target Name="AfterBuild">
-    <MSBuild Projects="afterdgncomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
-  </Target>
-  <Target Name="AfterClean">
-    <MSBuild Projects="afterdgncomp.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
-    <Delete Files="$(UtilDir)dgn_yacc.c;$(IncDir)dgn_comp.h;$(UtilDir)dgn_lex.c" />
-  </Target>
-  <Target Name="AfterRebuild">
-    <MSBuild Projects="afterdgncomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/win/win32/vs2017/dirs.props b/win/win32/vs2017/dirs.props
index 0ebb31a25..bd1c09da8 100644
--- a/win/win32/vs2017/dirs.props
+++ b/win/win32/vs2017/dirs.props
@@ -10,6 +10,7 @@
     <DatDir>$(RootDir)dat\</DatDir>
     <DocDir>$(RootDir)doc\</DocDir>
     <IncDir>$(RootDir)include\</IncDir>
+    <LuaDir>$(RootDir)..\LUA-5.3.5\src\</LuaDir>
     <SrcDir>$(RootDir)src\</SrcDir>
 	<SysDir>$(RootDir)sys\</SysDir>
     <UtilDir>$(RootDir)util\</UtilDir>
diff --git a/win/win32/vs2017/dlb.vcxproj b/win/win32/vs2017/dlb.vcxproj
index d189827b5..ed248279b 100644
--- a/win/win32/vs2017/dlb.vcxproj
+++ b/win/win32/vs2017/dlb.vcxproj
@@ -25,7 +25,7 @@
   <Import Project="files.props" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/win/win32/vs2017/files.props b/win/win32/vs2017/files.props
index 483ec1eb1..a88fc5bfa 100644
--- a/win/win32/vs2017/files.props
+++ b/win/win32/vs2017/files.props
@@ -23,156 +23,128 @@
     <Defs Include = "$(DatDir)quest.dat"/>
 	<!-- -h -->
     <Defs Include = "$(DatDir)oracles"/>
-	<!-- -e -->
-    <Defs Include = "$(DatDir)dungeon.pdf"/>
   </ItemGroup>
   <ItemGroup>
-    <Desfiles Include = "arch.des"/>
-    <Desfiles Include = "barb.des"/>
-    <Desfiles Include = "bigroom.des"/>
-    <Desfiles Include = "castle.des"/>
-    <Desfiles Include = "caveman.des"/>
-    <Desfiles Include = "endgame.des"/>
-    <Desfiles Include = "gehennom.des"/>
-    <Desfiles Include = "healer.des"/>
-    <Desfiles Include = "knight.des"/>
-    <Desfiles Include = "knox.des"/>
-    <Desfiles Include = "medusa.des"/>
-    <Desfiles Include = "mines.des"/>
-    <Desfiles Include = "monk.des"/>
-    <Desfiles Include = "oracle.des"/>
-    <Desfiles Include = "priest.des"/>
-    <Desfiles Include = "ranger.des"/>
-    <Desfiles Include = "rogue.des"/>
-    <Desfiles Include = "samurai.des"/>
-    <Desfiles Include = "sokoban.des"/>
-    <Desfiles Include = "tourist.des"/>
-    <Desfiles Include = "tower.des"/>
-    <Desfiles Include = "valkyrie.des"/>
-    <Desfiles Include = "wizard.des"/>	
-    <Desfiles Include = "yendor.des"/>
-  </ItemGroup>
-  <ItemGroup>
-    <Levfiles Include = "bigrm-1.lev"/>
-    <Levfiles Include = "bigrm-2.lev"/>
-    <Levfiles Include = "bigrm-3.lev"/>
-    <Levfiles Include = "bigrm-4.lev"/>
-    <Levfiles Include = "bigrm-5.lev"/>
-    <Levfiles Include = "bigrm-6.lev"/>
-    <Levfiles Include = "bigrm-7.lev"/>
-    <Levfiles Include = "bigrm-8.lev"/>
-    <Levfiles Include = "bigrm-9.lev"/>
-    <Levfiles Include = "bigrm-10.lev"/>
-    <Levfiles Include = "castle.lev"/>
-    <Levfiles Include = "air.lev"/>
-    <Levfiles Include = "astral.lev"/>
-    <Levfiles Include = "earth.lev"/>
-    <Levfiles Include = "fire.lev"/>
-    <Levfiles Include = "water.lev"/>
-    <Levfiles Include = "asmodeus.lev"/>
-    <Levfiles Include = "baalz.lev"/>
-    <Levfiles Include = "juiblex.lev"/>
-    <Levfiles Include = "orcus.lev"/>
-    <Levfiles Include = "sanctum.lev"/>
-    <Levfiles Include = "valley.lev"/>
-    <Levfiles Include = "knox.lev"/>
-    <Levfiles Include = "minefill.lev"/>
-    <Levfiles Include = "minend-1.lev"/>
-    <Levfiles Include = "minend-2.lev"/>
-    <Levfiles Include = "minend-3.lev"/>
-    <Levfiles Include = "minetn-1.lev"/>
-    <Levfiles Include = "minetn-2.lev"/>
-    <Levfiles Include = "minetn-3.lev"/>
-    <Levfiles Include = "minetn-4.lev"/>
-    <Levfiles Include = "minetn-5.lev"/>
-    <Levfiles Include = "minetn-6.lev"/>
-    <Levfiles Include = "minetn-7.lev"/>
-    <Levfiles Include = "medusa-1.lev"/>
-    <Levfiles Include = "medusa-2.lev"/>
-    <Levfiles Include = "medusa-3.lev"/>
-    <Levfiles Include = "medusa-4.lev"/>
-    <Levfiles Include = "oracle.lev"/>
-    <Levfiles Include = "soko1-1.lev"/>
-    <Levfiles Include = "soko1-2.lev"/>
-    <Levfiles Include = "soko2-1.lev"/>
-    <Levfiles Include = "soko2-2.lev"/>
-    <Levfiles Include = "soko3-1.lev"/>
-    <Levfiles Include = "soko3-2.lev"/>
-    <Levfiles Include = "soko4-1.lev"/>
-    <Levfiles Include = "soko4-2.lev"/>
-    <Levfiles Include = "tower1.lev"/>
-    <Levfiles Include = "tower2.lev"/>
-    <Levfiles Include = "tower3.lev"/>
-    <Levfiles Include = "fakewiz1.lev"/>
-    <Levfiles Include = "fakewiz2.lev"/>
-    <Levfiles Include = "wizard1.lev"/>
-    <Levfiles Include = "wizard2.lev"/>
-    <Levfiles Include = "wizard3.lev"/>
-    <Levfiles Include = "arc-fila.lev"/>
-    <Levfiles Include = "arc-filb.lev"/>
-    <Levfiles Include = "arc-goal.lev"/>
-    <Levfiles Include = "arc-loca.lev"/>
-    <Levfiles Include = "arc-strt.lev"/>
-    <Levfiles Include = "bar-fila.lev"/>
-    <Levfiles Include = "bar-filb.lev"/>
-    <Levfiles Include = "bar-goal.lev"/>
-    <Levfiles Include = "bar-loca.lev"/>
-    <Levfiles Include = "bar-strt.lev"/>
-    <Levfiles Include = "cav-fila.lev"/>
-    <Levfiles Include = "cav-filb.lev"/>
-    <Levfiles Include = "cav-goal.lev"/>
-    <Levfiles Include = "cav-loca.lev"/>
-    <Levfiles Include = "cav-strt.lev"/>
-    <Levfiles Include = "hea-fila.lev"/>
-    <Levfiles Include = "hea-filb.lev"/>
-    <Levfiles Include = "hea-goal.lev"/>
-    <Levfiles Include = "hea-loca.lev"/>
-    <Levfiles Include = "hea-strt.lev"/>
-    <Levfiles Include = "kni-fila.lev"/>
-    <Levfiles Include = "kni-filb.lev"/>
-    <Levfiles Include = "kni-goal.lev"/>
-    <Levfiles Include = "kni-loca.lev"/>
-    <Levfiles Include = "kni-strt.lev"/>
-    <Levfiles Include = "mon-fila.lev"/>
-    <Levfiles Include = "mon-filb.lev"/>
-    <Levfiles Include = "mon-goal.lev"/>
-    <Levfiles Include = "mon-loca.lev"/>
-    <Levfiles Include = "mon-strt.lev"/>
-    <Levfiles Include = "pri-fila.lev"/>
-    <Levfiles Include = "pri-filb.lev"/>
-    <Levfiles Include = "pri-goal.lev"/>
-    <Levfiles Include = "pri-loca.lev"/>
-    <Levfiles Include = "pri-strt.lev"/>
-    <Levfiles Include = "ran-fila.lev"/>
-    <Levfiles Include = "ran-filb.lev"/>
-    <Levfiles Include = "ran-goal.lev"/>
-    <Levfiles Include = "ran-loca.lev"/>
-    <Levfiles Include = "ran-strt.lev"/>
-    <Levfiles Include = "rog-fila.lev"/>
-    <Levfiles Include = "rog-filb.lev"/>
-    <Levfiles Include = "rog-goal.lev"/>
-    <Levfiles Include = "rog-loca.lev"/>
-    <Levfiles Include = "rog-strt.lev"/>
-    <Levfiles Include = "sam-fila.lev"/>
-    <Levfiles Include = "sam-filb.lev"/>
-    <Levfiles Include = "sam-goal.lev"/>
-    <Levfiles Include = "sam-loca.lev"/>
-    <Levfiles Include = "sam-strt.lev"/>
-    <Levfiles Include = "tou-fila.lev"/>
-    <Levfiles Include = "tou-filb.lev"/>
-    <Levfiles Include = "tou-goal.lev"/>
-    <Levfiles Include = "tou-loca.lev"/>
-    <Levfiles Include = "tou-strt.lev"/>
-    <Levfiles Include = "val-fila.lev"/>
-    <Levfiles Include = "val-filb.lev"/>
-    <Levfiles Include = "val-goal.lev"/>
-    <Levfiles Include = "val-loca.lev"/>
-    <Levfiles Include = "val-strt.lev"/>
-    <Levfiles Include = "wiz-fila.lev"/>
-    <Levfiles Include = "wiz-filb.lev"/>
-    <Levfiles Include = "wiz-goal.lev"/>
-    <Levfiles Include = "wiz-loca.lev"/>
-    <Levfiles Include = "wiz-strt.lev"/>
+    <Levfiles Include = "bigrm-1.lua"/>
+    <Levfiles Include = "bigrm-2.lua"/>
+    <Levfiles Include = "bigrm-3.lua"/>
+    <Levfiles Include = "bigrm-4.lua"/>
+    <Levfiles Include = "bigrm-5.lua"/>
+    <Levfiles Include = "bigrm-6.lua"/>
+    <Levfiles Include = "bigrm-7.lua"/>
+    <Levfiles Include = "bigrm-8.lua"/>
+    <Levfiles Include = "bigrm-9.lua"/>
+    <Levfiles Include = "bigrm-10.lua"/>
+    <Levfiles Include = "castle.lua"/>
+    <Levfiles Include = "air.lua"/>
+    <Levfiles Include = "astral.lua"/>
+    <Levfiles Include = "earth.lua"/>
+    <Levfiles Include = "fire.lua"/>
+    <Levfiles Include = "water.lua"/>
+    <Levfiles Include = "asmodeus.lua"/>
+    <Levfiles Include = "baalz.lua"/>
+    <Levfiles Include = "juiblex.lua"/>
+    <Levfiles Include = "orcus.lua"/>
+    <Levfiles Include = "sanctum.lua"/>
+    <Levfiles Include = "valley.lua"/>
+    <Levfiles Include = "knox.lua"/>
+    <Levfiles Include = "minefill.lua"/>
+    <Levfiles Include = "minend-1.lua"/>
+    <Levfiles Include = "minend-2.lua"/>
+    <Levfiles Include = "minend-3.lua"/>
+    <Levfiles Include = "minetn-1.lua"/>
+    <Levfiles Include = "minetn-2.lua"/>
+    <Levfiles Include = "minetn-3.lua"/>
+    <Levfiles Include = "minetn-4.lua"/>
+    <Levfiles Include = "minetn-5.lua"/>
+    <Levfiles Include = "minetn-6.lua"/>
+    <Levfiles Include = "minetn-7.lua"/>
+    <Levfiles Include = "medusa-1.lua"/>
+    <Levfiles Include = "medusa-2.lua"/>
+    <Levfiles Include = "medusa-3.lua"/>
+    <Levfiles Include = "medusa-4.lua"/>
+    <Levfiles Include = "oracle.lua"/>
+    <Levfiles Include = "soko1-1.lua"/>
+    <Levfiles Include = "soko1-2.lua"/>
+    <Levfiles Include = "soko2-1.lua"/>
+    <Levfiles Include = "soko2-2.lua"/>
+    <Levfiles Include = "soko3-1.lua"/>
+    <Levfiles Include = "soko3-2.lua"/>
+    <Levfiles Include = "soko4-1.lua"/>
+    <Levfiles Include = "soko4-2.lua"/>
+    <Levfiles Include = "tower1.lua"/>
+    <Levfiles Include = "tower2.lua"/>
+    <Levfiles Include = "tower3.lua"/>
+    <Levfiles Include = "fakewiz1.lua"/>
+    <Levfiles Include = "fakewiz2.lua"/>
+    <Levfiles Include = "wizard1.lua"/>
+    <Levfiles Include = "wizard2.lua"/>
+    <Levfiles Include = "wizard3.lua"/>
+    <Levfiles Include = "arc-fila.lua"/>
+    <Levfiles Include = "arc-filb.lua"/>
+    <Levfiles Include = "arc-goal.lua"/>
+    <Levfiles Include = "arc-loca.lua"/>
+    <Levfiles Include = "arc-strt.lua"/>
+    <Levfiles Include = "bar-fila.lua"/>
+    <Levfiles Include = "bar-filb.lua"/>
+    <Levfiles Include = "bar-goal.lua"/>
+    <Levfiles Include = "bar-loca.lua"/>
+    <Levfiles Include = "bar-strt.lua"/>
+    <Levfiles Include = "cav-fila.lua"/>
+    <Levfiles Include = "cav-filb.lua"/>
+    <Levfiles Include = "cav-goal.lua"/>
+    <Levfiles Include = "cav-loca.lua"/>
+    <Levfiles Include = "cav-strt.lua"/>
+    <Levfiles Include = "hea-fila.lua"/>
+    <Levfiles Include = "hea-filb.lua"/>
+    <Levfiles Include = "hea-goal.lua"/>
+    <Levfiles Include = "hea-loca.lua"/>
+    <Levfiles Include = "hea-strt.lua"/>
+    <Levfiles Include = "kni-fila.lua"/>
+    <Levfiles Include = "kni-filb.lua"/>
+    <Levfiles Include = "kni-goal.lua"/>
+    <Levfiles Include = "kni-loca.lua"/>
+    <Levfiles Include = "kni-strt.lua"/>
+    <Levfiles Include = "mon-fila.lua"/>
+    <Levfiles Include = "mon-filb.lua"/>
+    <Levfiles Include = "mon-goal.lua"/>
+    <Levfiles Include = "mon-loca.lua"/>
+    <Levfiles Include = "mon-strt.lua"/>
+    <Levfiles Include = "pri-fila.lua"/>
+    <Levfiles Include = "pri-filb.lua"/>
+    <Levfiles Include = "pri-goal.lua"/>
+    <Levfiles Include = "pri-loca.lua"/>
+    <Levfiles Include = "pri-strt.lua"/>
+    <Levfiles Include = "ran-fila.lua"/>
+    <Levfiles Include = "ran-filb.lua"/>
+    <Levfiles Include = "ran-goal.lua"/>
+    <Levfiles Include = "ran-loca.lua"/>
+    <Levfiles Include = "ran-strt.lua"/>
+    <Levfiles Include = "rog-fila.lua"/>
+    <Levfiles Include = "rog-filb.lua"/>
+    <Levfiles Include = "rog-goal.lua"/>
+    <Levfiles Include = "rog-loca.lua"/>
+    <Levfiles Include = "rog-strt.lua"/>
+    <Levfiles Include = "sam-fila.lua"/>
+    <Levfiles Include = "sam-filb.lua"/>
+    <Levfiles Include = "sam-goal.lua"/>
+    <Levfiles Include = "sam-loca.lua"/>
+    <Levfiles Include = "sam-strt.lua"/>
+    <Levfiles Include = "tou-fila.lua"/>
+    <Levfiles Include = "tou-filb.lua"/>
+    <Levfiles Include = "tou-goal.lua"/>
+    <Levfiles Include = "tou-loca.lua"/>
+    <Levfiles Include = "tou-strt.lua"/>
+    <Levfiles Include = "val-fila.lua"/>
+    <Levfiles Include = "val-filb.lua"/>
+    <Levfiles Include = "val-goal.lua"/>
+    <Levfiles Include = "val-loca.lua"/>
+    <Levfiles Include = "val-strt.lua"/>
+    <Levfiles Include = "wiz-fila.lua"/>
+    <Levfiles Include = "wiz-filb.lua"/>
+    <Levfiles Include = "wiz-goal.lua"/>
+    <Levfiles Include = "wiz-loca.lua"/>
+    <Levfiles Include = "wiz-strt.lua"/>
   </ItemGroup>
   <ItemGroup>
     <UUFiles Include = "$(SysWinntDir)nhico.uu"/>
@@ -220,8 +192,7 @@
     <DlbList Include = "$(DatDir)history"/>
     <DlbList Include = "$(DatDir)opthelp"/>
     <DlbList Include = "$(DatDir)wizhelp"/>
-    <DlbList Include = "$(DatDir)dungeon"/>
     <DlbList Include = "$(DatDir)license"/>
-    <DlbList Include = "$(DatDir)*.lev"/>
+    <DlbList Include = "$(DatDir)*.lua"/>
   </ItemGroup>
  </Project>
diff --git a/win/win32/vs2017/levcomp.vcxproj b/win/win32/vs2017/levcomp.vcxproj
deleted file mode 100644
index 8cb2fb75d..000000000
--- a/win/win32/vs2017/levcomp.vcxproj
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="config.props" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{9DD9C52E-E8C9-4533-BD22-83C055C0AABA}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="NetHackProperties.props" />
-  </ImportGroup>
-  <Import Project="console.props" />
-  <Import Project="common.props" />
-  <Import Project="dirs.props" />
-  <Import Project="files.props" />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;YY_NO_UNISTD_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="$(SrcDir)alloc.c" />
-    <ClCompile Include="$(SrcDir)decl.c" />
-    <ClCompile Include="$(SrcDir)drawing.c" />
-    <ClCompile Include="$(UtilDir)lev_lex.c" />
-    <ClCompile Include="$(UtilDir)lev_main.c" />
-    <ClCompile Include="$(UtilDir)lev_yacc.c" />
-    <ClCompile Include="$(SrcDir)monst.c" />
-    <ClCompile Include="$(SrcDir)objects.c" />
-    <ClCompile Include="$(UtilDir)panic.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="$(IncDir)lev_comp.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Choose>
-    <When Condition=" '$(YACC)'!='' ">
-      <PropertyGroup>
-        <BuildDependsOn>
-          Lex;
-          Yacc;
-          $(BuildDependsOn);
-        </BuildDependsOn>
-      </PropertyGroup>
-    </When>
-    <Otherwise>
-      <PropertyGroup>
-        <BuildDependsOn>
-          NoLex;
-          NoYacc;
-          $(BuildDependsOn);
-        </BuildDependsOn>
-      </PropertyGroup>
-    </Otherwise>
-  </Choose>
-  <Target Name="Yacc" Inputs="$(UtilDir)lev_comp.y" Outputs="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h">
-    <Message Text="Running Yacc" Importance="high" />
-    <Exec Command="$(YACC) -d lev_comp.y" WorkingDirectory="$(UtilDir)" />
-    <Move SourceFiles="$(UtilDir)y.tab.c;$(UtilDir)y.tab.h" DestinationFiles="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h" />
-  </Target>
-  <Target Name="Lex" Inputs="$(UtilDir)lev_comp.l" Outputs="$(UtilDir)lev_lex.c">
-    <Message Text="Running Lex" Importance="high" />
-    <Exec Command="$(LEX) lev_comp.l" WorkingDirectory="$(UtilDir)" />
-    <Move SourceFiles="$(UtilDir)lex.yy.c" DestinationFiles="$(UtilDir)lev_lex.c" />
-  </Target>
-  <Target Name="NoYacc" Inputs="$(SysShareDir)lev_yacc.c;$(SysShareDir)lev_comp.h" Outputs="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h">
-    <Message Text="No Yacc using pre-built files" Importance="high" />
-    <Copy SourceFiles="$(SysShareDir)lev_yacc.c;$(SysShareDir)lev_comp.h" DestinationFiles="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h" />
-  </Target>
-  <Target Name="NoLex" Inputs="$(SysShareDir)lev_lex.c" Outputs="$(UtilDir)lev_lex.c">
-    <Message Text="No Lex using pre-built files" Importance="high" />
-    <Copy SourceFiles="$(SysShareDir)lev_lex.c" DestinationFiles="$(UtilDir)lev_lex.c" />
-  </Target>
-  <Target Name="AfterBuild">
-    <MSBuild Projects="afterlevcomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
-  </Target>
-  <Target Name="AfterClean">
-    <MSBuild Projects="afterlevcomp.proj" Targets="Clean" Properties="Configuration=$(Configuration)" />
-    <Delete Files="$(UtilDir)lev_yacc.c;$(IncDir)lev_comp.h;$(UtilDir)lev_lex.c" />
-  </Target>
-  <Target Name="AfterRebuild">
-    <MSBuild Projects="afterlevcomp.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
-  </Target>
-</Project>
\ No newline at end of file
diff --git a/win/win32/vs2017/makedefs.vcxproj b/win/win32/vs2017/makedefs.vcxproj
index 1f6c1c49f..20b9ea338 100644
--- a/win/win32/vs2017/makedefs.vcxproj
+++ b/win/win32/vs2017/makedefs.vcxproj
@@ -25,7 +25,7 @@
   <Import Project="files.props" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;ENUM_PM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
@@ -59,4 +59,4 @@
   <Target Name="AfterRebuild">
     <MSBuild Projects="aftermakedefs.proj" Targets="Build" Properties="Configuration=$(Configuration)" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/win/win32/vs2017/nh340key.vcxproj b/win/win32/vs2017/nh340key.vcxproj
index 36278a8a3..3f54c336a 100644
--- a/win/win32/vs2017/nh340key.vcxproj
+++ b/win/win32/vs2017/nh340key.vcxproj
@@ -30,7 +30,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>
diff --git a/win/win32/vs2017/nhdefkey.vcxproj b/win/win32/vs2017/nhdefkey.vcxproj
index 71334f591..3201aa79f 100644
--- a/win/win32/vs2017/nhdefkey.vcxproj
+++ b/win/win32/vs2017/nhdefkey.vcxproj
@@ -30,7 +30,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>
diff --git a/win/win32/vs2017/nhraykey.vcxproj b/win/win32/vs2017/nhraykey.vcxproj
index 5e0e43b2d..e37c6a426 100644
--- a/win/win32/vs2017/nhraykey.vcxproj
+++ b/win/win32/vs2017/nhraykey.vcxproj
@@ -30,7 +30,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <ImportLibrary>$(ToolsDir)$(TargetName).lib</ImportLibrary>
diff --git a/win/win32/vs2017/recover.vcxproj b/win/win32/vs2017/recover.vcxproj
index f9cc6de8a..d7f593065 100644
--- a/win/win32/vs2017/recover.vcxproj
+++ b/win/win32/vs2017/recover.vcxproj
@@ -28,7 +28,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/win/win32/vs2017/tile2bmp.vcxproj b/win/win32/vs2017/tile2bmp.vcxproj
index ab1145c70..c5d14ebf2 100644
--- a/win/win32/vs2017/tile2bmp.vcxproj
+++ b/win/win32/vs2017/tile2bmp.vcxproj
@@ -25,7 +25,7 @@
   <Import Project="files.props" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
diff --git a/win/win32/vs2017/tilemap.vcxproj b/win/win32/vs2017/tilemap.vcxproj
index cb0ba0bd4..139dd17a2 100644
--- a/win/win32/vs2017/tilemap.vcxproj
+++ b/win/win32/vs2017/tilemap.vcxproj
@@ -25,7 +25,7 @@
   <Import Project="files.props" />
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(IncDir);$(SysWinntDir);$(SysShareDir);$(LuaDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32CON;DLB;MSWIN_GRAPHICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>