Release build squashed

.github/workflows/ci.yml

@@ -7,8 +7,7 @@
 		},
 		pull_request: {
 			branches: [ master ]
-		},
-		workflow_dispatch: {}
+		}
 	},
 
 	jobs: {
@@ -126,7 +125,7 @@
 			]
 		},
 		win-scons: {
-			runs-on: windows-2022,
+			runs-on: windows-2019,
 			env: {
 				VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 			},
@@ -165,7 +164,7 @@
 			]
 		},
 		# win-mingw: {
-		# 	runs-on: windows-2022,
+		# 	runs-on: windows-2019,
 		# 	steps: [
 		# 		{
 		# 			name: checkout,
@@ -197,7 +196,7 @@
 				},
 				{
 					name: install dependencies,
-					run: 'sudo apt-get update && sudo apt-get install scons cmake libxml2-utils zlib1g libsfml-dev libboost-all-dev zenity'
+					run: 'sudo apt-get update && sudo apt-get install scons libxml2-utils zlib1g libsfml-dev libboost-all-dev zenity'
 				},
 				{
 					name: install TGUI,

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       PROD_MACOS_NOTARIZATION_TEAM_ID: '${{ secrets.PROD_MACOS_NOTARIZATION_TEAM_ID }}'
       PROD_MACOS_NOTARIZATION_PWD: '${{ secrets.PROD_MACOS_NOTARIZATION_PWD }}'
       VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-      RELEASE_FLAG: ${{ matrix.configuration == 'Release' && 'true' || 'false' }}
+      DEBUG_FLAG: ${{ matrix.configuration == 'Debug' && 'true' || 'false' }}
       BUILD_OS: ${{ matrix.os.name }}
     strategy:
       fail-fast: false
@@ -45,7 +45,7 @@ jobs:
 #          scons-script: scons
         - name: windows
           suffix: ''
-          version: 2022
+          version: 2019
           scons-script: './.github/workflows/scripts/win/scons-build.bat'
         configuration:
         - Release
@@ -81,7 +81,7 @@ jobs:
         run: 'sudo ./.github/workflows/scripts/linux/install-tgui.sh'
         if: ${{ matrix.os.name == 'ubuntu' }}
       - name: Build
-        run: '${{ matrix.os.scons-script }} test=false release=$RELEASE_FLAG'
+        run: '${{ matrix.os.scons-script }} test=false debug=$DEBUG_FLAG'
         shell: bash
 
       - name: Download fix-rpaths.py script

.github/workflows/scripts/linux/scons-build.sh

@@ -1,4 +1,4 @@
 #!/bin/sh -ve
 
 export CCFLAGS=-fdiagnostics-color=always
-scons $@
+scons

.github/workflows/scripts/win/scons-build.bat

@@ -10,6 +10,6 @@ REM  @echo "%%i"
 REM  call "%%i" x86_amd64
 REM )
 
-call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
 
 scons bits=64 %*

.gitmodules

@@ -11,9 +11,3 @@
 [submodule "deps/fix-rpaths"]
 	path = deps/fix-rpaths
 	url = https://gist.github.com/NQNStudios/7145bcf6621891f5176c8caa165d6b93
-[submodule "deps/fmtlib"]
-	path = deps/fmtlib
-	url = http://github.com/fmtlib/fmt
-[submodule "rsrc/scenarios/custom"]
-	path = rsrc/scenarios/custom
-	url = https://github.com/NQNStudios/cboe-scenarios

README.md

@@ -85,8 +85,6 @@ For Linux builds, the following additional dependencies are required:
   - or, if cmake is available when you call `scons`, TGUI will be built from source automatically
 - zenity command-line tools
 
-For Windows builds, [7-zip](https://7-zip.org/download.html) is required.
-
 If you are using the Visual Studio toolset, we recommend installing
 [vcpkg](https://github.com/Microsoft/vcpkg) to manage these dependencies.
 
@@ -110,7 +108,7 @@ correct place to search. For example, if you installed Boost via Homebrew, you m
 add something like the following to the Project Build Settings, under Linking->Other
 Linking Flags:
 
-    -lboost_filesystem -lboost_system -lboost_locale -L/usr/local/Cellar/boost/1.57.0/lib
+    -lboost_filesystem -lboost_system -L/usr/local/Cellar/boost/1.57.0/lib
 
 Again with Homebrew, you may also need to add the following to Apple LLVM Custom
 Compiler Flags -> Other C++ Flags:

SConstruct

@@ -84,7 +84,7 @@ print('C++ compiler:', cxx)
 
 env.VariantDir('#build/obj', 'src')
 env.VariantDir('#build/obj/test', 'test')
-env.VariantDir('#build/obj/deps', 'deps')
+env.VariantDir('#build/obj/test/deps', 'deps')
 
 if not env['release']:
 	if platform in ['posix', 'darwin']:
@@ -238,7 +238,7 @@ elif platform == "win32":
 		include_paths=project_includes
 		env.Append(
 			LINKFLAGS=['/SUBSYSTEM:WINDOWS','/ENTRY:mainCRTStartup',f'/MACHINE:X{arch_short}', '/VERBOSE', '/NODEFAULTLIB:libboost_filesystem-vc142-mt-x64-1_85.lib'],
-			CXXFLAGS=['/EHsc','/MD','/FIglobal.hpp','/utf-8'],
+			CXXFLAGS=['/EHsc','/MD','/FIglobal.hpp'],
 			CPPPATH=include_paths,
 			LIBPATH=[],
 			LIBS=Split("""
@@ -384,7 +384,7 @@ if not env.GetOption('clean'):
 			Exit(1)
 
 	boost_versions = ['-1_84'] # This is a bit of a hack. :(
-	suffixes = ['-mt', f'-mt-x{env["bits"]}', f'-vc143-mt-x{env["bits"]}', f'-vc144-mt-x{env["bits"]}']
+	suffixes = ['-mt', f'-mt-x{env["bits"]}']
 
 	zlib = 'zlib' if (platform == "win32" and 'mingw' not in env["TOOLS"]) else 'z'
 	check_lib(zlib, 'zlib', ['d'], [])
@@ -397,7 +397,6 @@ if not env.GetOption('clean'):
 	check_header('boost/spirit/include/classic.hpp', 'Boost.Spirit.Classic')
 	check_lib('boost_system', 'Boost.System', suffixes, boost_versions)
 	check_lib('boost_filesystem', 'Boost.Filesystem', suffixes, boost_versions)
-	check_lib('boost_locale', 'Boost.Locale', suffixes, boost_versions)
 	sfml_suffixes = ['-d']
 	check_lib('sfml-system', 'SFML-system', sfml_suffixes)
 	check_lib('sfml-window', 'SFML-window', sfml_suffixes)
@@ -417,12 +416,6 @@ if not env.GetOption('clean'):
 
 	env.Append(CPPPATH=[path.join(os.getcwd(), 'deps/cppcodec')])
 
-	# Make sure fmtlib is cloned
-	if not path.exists('deps/fmtlib/fmt/format.h'):
-		subprocess.call(["git", "submodule", "update", "--init", "deps/fmtlib"])
-
-	env.Append(CPPPATH=[path.join(os.getcwd(), 'deps/fmtlib/include')])
-
 	# On Linux, build TGUI from the subtree if necessary
 	if platform == 'posix':
 		def check_tgui(conf, second_attempt=False):
@@ -549,11 +542,8 @@ if platform == "darwin":
 		def fix_target_rpaths():
 			if not path.exists('deps/fix-rpaths/fix-rpaths.py'):
 				subprocess.call(["git", "submodule", "update", "--init", "deps/fix-rpaths"])
-			app = f'build/Blades of Exile/{targ}.app'
-			# The build for the target may have failed, in which case, don't call fix-rpaths
-			if path.exists(app):
-				print(app)
-				subprocess.call(["deps/fix-rpaths/fix-rpaths.py", f'build/Blades of Exile/{targ}.app'])
+			print(f'build/Blades of Exile/{targ}.app')
+			subprocess.call(["deps/fix-rpaths/fix-rpaths.py", f'build/Blades of Exile/{targ}.app'])
 		if not env.GetOption('clean'):
 			atexit.register(fix_target_rpaths)
 elif platform == "win32":

doc/editor/Contents.html

@@ -6,6 +6,7 @@
 </head>
 <body>
 <h1><img src="../img/boe.gif"> <u><b>Blades Scenario Editor Instructions</b></u></h1>
+<p><i>Copyright 1998, Spiderweb Software, Inc.</i></p>
 <p>This document contains all the information you need to play use the Blades of Exile Scenario Editor and make new scenarios for Blades of Exile!</p>
 <p>This menu can also take you to the different sections of this document. To find the thing you're looking for, try the table of contents...</p>
 <h2>Table of Contents</h2>
@@ -97,5 +98,15 @@
 <li><a href="http://spiderwebforums.ipbhost.com/index.php?/forum/12-blades-of-exile/">Blades of Exile Forum at Spiderweb Software</a></li>
 <li><a href='irc://irc.freenode.net/openboe'>Blades of Exile IRC channel</a></li>
 </ul>
+<h3>Spiderweb Software</h3>
+<ul>
+<li>PO Box 85659</li>
+<li>Seattle, WA 98145-1659</li>
+<li>(206) 789-4438</li>
+<li>E-mail: <a href="mailto:spidweb@spidweb.com">SpidWeb@spidweb.com</a></li>
+<li>America Online: SpidWeb</li>
+<li>CompuServe: 76463,1521</li>
+<li>Internet: <a href="http://www.spiderwebsoftware.com">http://www.spiderwebsoftware.com</a></li>
+</ul>
 </body>
 </html>

pkg/credits/Funding.txt

@@ -10,7 +10,6 @@ Confirmed:
 - Bret Rodabaugh
 - Dylan Nugent
 - Evan Mulrooney
-- Glen Chudley
 - Jake Harrelson
 - Jared Forcinito
 - Jeff Potter
@@ -26,7 +25,6 @@ Confirmed:
 - K L
 - Laura Nelson
 - Mariann Krizsan
-- Maryanne Wachter
 - Mike Lapinsky
 - Nathan Rickey
 - Nick Chaimov

pkg/win/build-scen.bat

@@ -1,6 +1,5 @@
 
 set Zip="C:\Program Files\7-Zip\7z.exe"
-%Zip% >NUL || @echo 7-zip must be installed first. && exit /B
 
 @echo Packing scenario %2...
 if exist %2 del /F %2

pkg/win/main.nsi

@@ -76,7 +76,6 @@ Section "Blades of Exile" Section1
 	File "${RELEASE_DIR}\Blades of Exile Scenarios\stealth.boes"
 	File "${RELEASE_DIR}\Blades of Exile Scenarios\valleydy.boes"
 	File "${RELEASE_DIR}\Blades of Exile Scenarios\zakhazi.boes"
-	File "${RELEASE_DIR}\Blades of Exile Scenarios\tutorial.boes"
 	!include data.nsi
 	SetShellVarContext all
 	CreateShortCut "$DESKTOP\Blades of Exile.lnk" "$INSTDIR\Blades of Exile.exe"
@@ -244,7 +243,6 @@ Section Uninstall
 	Delete "$INSTDIR\Blades of Exile Scenarios\stealth.boes"
 	Delete "$INSTDIR\Blades of Exile Scenarios\valleydy.boes"
 	Delete "$INSTDIR\Blades of Exile Scenarios\zakhazi.boes"
-	Delete "$INSTDIR\Blades of Exile Scenarios\tutorial.boes"
 	Delete "$INSTDIR\VCRedistInstall.exe"
 	Delete "$INSTDIR\libsndfile-1.dll"
 	Delete "$INSTDIR\sfml-audio-2.dll"

proj/vs2013/Common/Common.vcxproj

@@ -192,7 +192,6 @@
     <Xml Include="..\..\..\rsrc\dialogs\welcome.xml" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\dialogxml\dialogs\btnpanel.cpp" />
     <ClCompile Include="..\..\..\src\dialogxml\keycodes.cpp" />
     <ClCompile Include="..\..\..\src\dialogxml\dialogs\3choice.cpp" />
     <ClCompile Include="..\..\..\src\dialogxml\dialogs\choicedlog.cpp" />
@@ -248,7 +247,6 @@
     <ClCompile Include="..\..\..\src\scenario\item.cpp" />
     <ClCompile Include="..\..\..\src\scenario\monster.cpp" />
     <ClCompile Include="..\..\..\src\scenario\outdoors.cpp" />
-    <ClCompile Include="..\..\..\src\scenario\quest.cpp" />
     <ClCompile Include="..\..\..\src\scenario\scenario.cpp" />
     <ClCompile Include="..\..\..\src\scenario\shop.cpp" />
     <ClCompile Include="..\..\..\src\scenario\special.cpp" />
@@ -284,13 +282,10 @@
     <ClCompile Include="..\..\..\src\universe\universe.cpp" />
     <ClCompile Include="..\..\..\src\utility.cpp" />
     <ClCompile Include="..\..\..\src\view_dialogs.cpp" />
-    <ClCompile Include="..\..\..\deps\fmtlib\src\format.cc" />
-    <ClCompile Include="..\..\..\deps\fmtlib\src\os.cc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\alchemy.hpp" />
     <ClInclude Include="..\..\..\src\damage.hpp" />
-    <ClInclude Include="..\..\..\src\dialogxml\dialogs\btnpanel.hpp" />
     <ClInclude Include="..\..\..\src\dialogxml\keycodes.hpp" />
     <ClInclude Include="..\..\..\src\dialogxml\dialogs\3choice.hpp" />
     <ClInclude Include="..\..\..\src\dialogxml\dialogs\choicedlog.hpp" />
@@ -432,9 +427,9 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>MSBUILD_GITREV;WIN32;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions);_DEBUG</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\cppcodec;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\cppcodec;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
       <DisableLanguageExtensions>false</DisableLanguageExtensions>
-      <AdditionalOptions>/FS %(AdditionalOptions) /utf-8</AdditionalOptions>
+      <AdditionalOptions>/FS %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
@@ -461,10 +456,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>MSBUILD_GITREV;WIN32;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\cppcodec;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\cppcodec;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
-      <AdditionalOptions>/utf-8</AdditionalOptions>
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
     </ClCompile>
@@ -507,11 +501,6 @@
     <Exec Command="$(SolutionDir)..\..\pkg\win\build-scen.bat $(SolutionDir)..\..\rsrc\scenarios\valleydy $(SolutionDir)..\..\rsrc\scenarios\valleydy.boes" />
     <Exec Command="$(SolutionDir)..\..\pkg\win\build-scen.bat $(SolutionDir)..\..\rsrc\scenarios\stealth $(SolutionDir)..\..\rsrc\scenarios\stealth.boes" />
     <Exec Command="$(SolutionDir)..\..\pkg\win\build-scen.bat $(SolutionDir)..\..\rsrc\scenarios\zakhazi $(SolutionDir)..\..\rsrc\scenarios\zakhazi.boes" />
-<<<<<<< HEAD
-    <Exec Command='xcopy $(SolutionDir)..\..\rsrc\scenarios\custom "$(TargetDir)\Blades of Exile Scenarios\custom\" /S /Y' />
-=======
-    <Exec Command="$(SolutionDir)..\..\pkg\win\build-scen.bat $(SolutionDir)..\..\rsrc\scenarios\tutorial $(SolutionDir)..\..\rsrc\scenarios\tutorial.boes" />
->>>>>>> 25c8de44 (Visual studio package tutorial)
   </Target>
   <!--COPY FILES TO OUTPUT DIRECTORY-->
   <Target Name="CopyFiles" AfterTargets="BuildScenarios">
@@ -574,4 +563,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\GitInfo.2.0.10\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitInfo.2.0.10\build\GitInfo.targets'))" />
   </Target>
-</Project>
+</Project>

proj/vs2013/Common/Common.vcxproj.filters

@@ -828,14 +828,6 @@
     <ClCompile Include="..\..\..\src\tools\profile.cpp">
       <Filter>Tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\scenario\quest.cpp">
-      <Filter>Scenario</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\deps\fmtlib\src\format.cc" />
-    <ClCompile Include="..\..\..\deps\fmtlib\src\os.cc" />
-    <ClCompile Include="..\..\..\src\dialogxml\dialogs\btnpanel.cpp">
-      <Filter>DialogXML\Dialogs</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\view_dialogs.hpp" />
@@ -1098,11 +1090,8 @@
     <ClInclude Include="..\..\..\src\tools\profile.hpp">
       <Filter>Tools</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\dialogxml\dialogs\btnpanel.hpp">
-      <Filter>DialogXML\Dialogs</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-</Project>
+</Project>

proj/vs2013/Game/Blades of Exile.vcxproj

@@ -56,8 +56,7 @@
       <PreprocessorDefinitions>MSBUILD_GITREV;WIN32;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions);_DEBUG</PreprocessorDefinitions>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
     </ClCompile>
@@ -78,9 +77,8 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
       <PreprocessorDefinitions>MSBUILD_GITREV;WIN32;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions);NDEBUG</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
@@ -169,4 +167,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

proj/vs2013/OBoE Tests/OBoE Tests.vcxproj

@@ -46,9 +46,8 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include;$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
     </ClCompile>
@@ -64,8 +63,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include;$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
@@ -83,7 +81,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
     </ClCompile>
@@ -99,8 +97,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
@@ -110,7 +107,6 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
       <AdditionalDependencies>opengl32.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;sfml-audio.lib;libboost_filesystem-vc120-mt-*.lib;libboost_system-vc120-mt-*.lib;libboost_thread-vc120-mt-*.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

proj/vs2013/PcEdit/Char Editor.vcxproj

@@ -58,12 +58,11 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -83,12 +82,11 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -137,4 +135,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

proj/vs2013/ScenEdit/Scen Editor.vcxproj

@@ -58,12 +58,11 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -83,12 +82,11 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
       <DisableSpecificWarnings>4800;4290;4244;4996;4018</DisableSpecificWarnings>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -114,7 +112,6 @@
     <ClCompile Include="..\..\..\src\scenedit\scen.menus.win.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.sdfpicker.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.townout.cpp" />
-    <ClCompile Include="..\..\..\src\scenedit\scen.undo.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\scenedit\scen.actions.hpp" />
@@ -129,7 +126,6 @@
     <ClInclude Include="..\..\..\src\scenedit\scen.sdfpicker.hpp" />
     <ClInclude Include="..\..\..\src\scenedit\scen.townout.hpp" />
     <ClInclude Include="..\..\..\rsrc\menus\scenresource.h" />
-    <ClInclude Include="..\..\..\src\scenedit\scen.undo.hpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\Common.vcxproj">
@@ -150,4 +146,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

proj/vs2013/ScenEdit/Scen Editor.vcxproj.filters

@@ -48,9 +48,6 @@
     <ClCompile Include="..\..\..\src\scenedit\scen.actions.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\scenedit\scen.undo.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\rsrc\menus\scenresource.h">
@@ -89,9 +86,6 @@
     <ClInclude Include="..\..\..\src\scenedit\scen.actions.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\scenedit\scen.undo.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\..\rsrc\icons\win\BOE Editor.ico">

proj/vs2013/vcpkg.json

@@ -14,7 +14,6 @@
         "boost-chrono",
         "boost-math",
         "boost-spirit",
-        "boost-process",
-        "boost-locale"
+        "boost-process"
     ]
 }

proj/vs2017/Blades of Exile.vcxproj

@@ -81,9 +81,8 @@
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
     </ClCompile>
@@ -100,9 +99,8 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -117,9 +115,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>MSBUILD_GITREV;WIN32;_WINDOWS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <OmitFramePointers>false</OmitFramePointers>
@@ -137,9 +134,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
       <OmitFramePointers>false</OmitFramePointers>
       <WarningLevel>Level3</WarningLevel>
       <PreprocessorDefinitions>MSBUILD_GITREV;WIN32;_WINDOWS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;TIXML_USE_TICPP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -222,4 +218,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>

proj/vs2017/Character Editor/Character Editor.vcxproj

@@ -82,8 +82,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -99,8 +98,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
@@ -120,8 +118,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -142,8 +139,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
@@ -188,4 +184,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>

proj/vs2017/Common/Common.vcxproj

@@ -89,10 +89,9 @@
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
       <PreprocessorDefinitions>MSBUILD_GITREV;WIN32;_WINDOWS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;TIXML_USE_TICPP;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\cppcodec;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\cppcodec;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -107,8 +106,7 @@
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <PreprocessorDefinitions>MSBUILD_GITREV;WIN32;_WINDOWS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;TIXML_USE_TICPP;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\cppcodec;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\cppcodec;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -129,10 +127,9 @@
       <DisableSpecificWarnings>
       </DisableSpecificWarnings>
       <PreprocessorDefinitions>MSBUILD_GITREV;WIN32;_WINDOWS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;TIXML_USE_TICPP;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
       <AdditionalUsingDirectories>
       </AdditionalUsingDirectories>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\cppcodec;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\cppcodec;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <TargetMachine>MachineX86</TargetMachine>
@@ -152,8 +149,7 @@
       <ConformanceMode>true</ConformanceMode>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PreprocessorDefinitions>MSBUILD_GITREV;WIN32;_WINDOWS;BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE;TIXML_USE_TICPP;%(PreprocessorDefinitions);NOMINMAX</PreprocessorDefinitions>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\cppcodec;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\cppcodec;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
     </ClCompile>
     <Link>
@@ -348,7 +344,6 @@
     <None Include="..\..\..\rsrc\dialogs\dialog.css" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\dialogxml\dialogs\btnpanel.cpp" />
     <ClCompile Include="..\..\..\src\dialogxml\keycodes.cpp" />
     <ClCompile Include="..\..\..\src\dialogxml\dialogs\3choice.cpp" />
     <ClCompile Include="..\..\..\src\dialogxml\dialogs\choicedlog.cpp" />
@@ -393,7 +388,6 @@
     <ClCompile Include="..\..\..\src\fileio\xml-parser\tinyxmlerror.cpp" />
     <ClCompile Include="..\..\..\src\fileio\xml-parser\tinyxmlparser.cpp" />
     <ClCompile Include="..\..\..\src\gfx\gfxsheets.cpp" />
-    <ClCompile Include="..\..\..\src\gfx\graphics.cpp" />
     <ClCompile Include="..\..\..\src\gfx\render_image.cpp" />
     <ClCompile Include="..\..\..\src\gfx\render_shapes.cpp" />
     <ClCompile Include="..\..\..\src\gfx\render_text.cpp" />
@@ -409,7 +403,6 @@
     <ClCompile Include="..\..\..\src\scenario\item.cpp" />
     <ClCompile Include="..\..\..\src\scenario\monster.cpp" />
     <ClCompile Include="..\..\..\src\scenario\outdoors.cpp" />
-    <ClCompile Include="..\..\..\src\scenario\quest.cpp" />
     <ClCompile Include="..\..\..\src\scenario\scenario.cpp" />
     <ClCompile Include="..\..\..\src\scenario\shop.cpp" />
     <ClCompile Include="..\..\..\src\scenario\special.cpp" />
@@ -445,12 +438,8 @@
     <ClCompile Include="..\..\..\src\universe\universe.cpp" />
     <ClCompile Include="..\..\..\src\utility.cpp" />
     <ClCompile Include="..\..\..\src\view_dialogs.cpp" />
-    <ClCompile Include="..\..\..\deps\fmtlib\src\format.cc" />
-    <ClCompile Include="..\..\..\deps\fmtlib\src\os.cc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\src\dialogxml\dialogs\btnpanel.hpp" />
-    <ClInclude Include="..\..\..\src\gfx\graphics.hpp" />
     <ClInclude Include="..\..\..\src\scenario\town_import.tpp" />
     <ClInclude Include="..\..\..\src\alchemy.hpp" />
     <ClInclude Include="..\..\..\src\damage.hpp" />
@@ -571,8 +560,6 @@
     <Exec Command="$(SolutionDir)..\..\pkg\win\build-scen.bat $(SolutionDir)..\..\rsrc\scenarios\valleydy $(SolutionDir)..\..\rsrc\scenarios\valleydy.boes" />
     <Exec Command="$(SolutionDir)..\..\pkg\win\build-scen.bat $(SolutionDir)..\..\rsrc\scenarios\stealth $(SolutionDir)..\..\rsrc\scenarios\stealth.boes" />
     <Exec Command="$(SolutionDir)..\..\pkg\win\build-scen.bat $(SolutionDir)..\..\rsrc\scenarios\zakhazi $(SolutionDir)..\..\rsrc\scenarios\zakhazi.boes" />
-    <Exec Command="$(SolutionDir)..\..\pkg\win\build-scen.bat $(SolutionDir)..\..\rsrc\scenarios\tutorial $(SolutionDir)..\..\rsrc\scenarios\tutorial.boes" />
-    <Exec Command='xcopy $(SolutionDir)..\..\rsrc\scenarios\custom "$(TargetDir)\Blades of Exile Scenarios\custom\" /S /Y' />
   </Target>
   <!--COPY FILES TO OUTPUT DIRECTORY-->
   <Target Name="CopyFiles" AfterTargets="BuildScenarios">
@@ -629,4 +616,4 @@
     </Copy>
     <Message Text="changed:@(ChangedScenarios)" Importance="high" />
   </Target>
-</Project>
+</Project>

proj/vs2017/Common/Common.vcxproj.filters

@@ -821,17 +821,6 @@
     <ClCompile Include="..\..\..\src\tools\profile.cpp">
       <Filter>Tools</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\scenario\quest.cpp">
-      <Filter>Scenario</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\deps\fmtlib\src\format.cc" />
-    <ClCompile Include="..\..\..\deps\fmtlib\src\os.cc" />
-    <ClCompile Include="..\..\..\src\dialogxml\dialogs\btnpanel.cpp">
-      <Filter>DialogXML\Dialogs</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\src\gfx\graphics.cpp">
-      <Filter>Gfx</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\scenario\town_import.tpp">
@@ -1087,11 +1076,5 @@
     <ClInclude Include="..\..\..\src\tools\profile.hpp">
       <Filter>Tools</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\dialogxml\dialogs\btnpanel.hpp">
-      <Filter>DialogXML\Dialogs</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\src\gfx\graphics.hpp">
-      <Filter>Gfx</Filter>
-    </ClInclude>
   </ItemGroup>
-</Project>
+</Project>

proj/vs2017/Scenario Editor/Scenario Editor.vcxproj

@@ -80,9 +80,8 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
@@ -98,9 +97,8 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
@@ -120,9 +118,8 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
     </ClCompile>
     <Link>
@@ -143,8 +140,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\include\external;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src;$(SolutionDir)..\..\rsrc\menus</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>$(SolutionDir)..\..\src\global.hpp</ForcedIncludeFiles>
       <ConformanceMode>true</ConformanceMode>
     </ClCompile>
@@ -171,7 +167,6 @@
     <ClCompile Include="..\..\..\src\scenedit\scen.sdfpicker.cpp" />
     <ClCompile Include="..\..\..\src\scenedit\scen.townout.cpp" />
     <ClCompile Include="..\..\..\src\fileio\fileio_party.cpp" />
-    <ClCompile Include="..\..\..\src\scenedit\scen.undo.cpp" />
     <ClCompile Include="..\..\..\src\universe\universe.cpp" />
     <ClCompile Include="..\..\..\src\universe\party.cpp" />
   </ItemGroup>
@@ -188,7 +183,6 @@
     <ClInclude Include="..\..\..\src\scenedit\scen.sdfpicker.hpp" />
     <ClInclude Include="..\..\..\src\scenedit\scen.menus.hpp" />
     <ClInclude Include="..\..\..\src\scenedit\scen.townout.hpp" />
-    <ClInclude Include="..\..\..\src\scenedit\scen.undo.hpp" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\..\..\rsrc\icons\win\BOE Editor.ico" />
@@ -205,4 +199,4 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
-</Project>
+</Project>

proj/vs2017/Tests/Tests.vcxproj

@@ -97,8 +97,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include\catch2;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include\catch2;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
       <UseFullPaths>true</UseFullPaths>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
@@ -118,8 +117,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include\catch2;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include\catch2;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
       <UseFullPaths>true</UseFullPaths>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
@@ -141,8 +139,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include\catch2;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include\catch2;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
       <UseFullPaths>true</UseFullPaths>
       <PrecompiledHeaderFile>stdafx.h</PrecompiledHeaderFile>
       <PrecompiledHeaderOutputFile>$(IntDir)$(TargetName).pch</PrecompiledHeaderOutputFile>
@@ -167,8 +164,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalOptions>/utf-8</AdditionalOptions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include\catch2;$(SolutionDir)..\..\deps\fmtlib\include;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\deps\Catch2\single_include\catch2;$(SolutionDir)..\..\src\fileio\gzstream;$(SolutionDir)..\..\src\fileio\xml-parser;$(SolutionDir)..\..\src\fileio\resmgr;$(SolutionDir)..\..\src\dialogxml\widgets;$(SolutionDir)..\..\src\dialogxml\dialogs;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\tools;$(SolutionDir)..\..\src\scenario;$(SolutionDir)..\..\src\universe;$(SolutionDir)..\..\src\fileio;$(SolutionDir)..\..\src\dialogxml;$(SolutionDir)..\..\src\gfx;$(SolutionDir)..\..\src</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <UseFullPaths>true</UseFullPaths>
       <PrecompiledHeaderFile />
@@ -231,4 +227,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

proj/vs2017/vcpkg.json

@@ -14,7 +14,6 @@
         "boost-chrono",
         "boost-math",
         "boost-spirit",
-        "boost-process",
-        "boost-locale"
+        "boost-process"
     ]
 }

proj/vscode/.gitignore

@@ -1,5 +1,3 @@
 # Folder local settings are ignored.
 # Settings that should be checked in should go in the workspace file.
 .vscode/settings.json
-# This is needed to make the build system machine-independent.
-vswhere.exe

proj/vscode/Invoke-CmdScript.ps1

@@ -1,62 +0,0 @@
-##############################################################################
-##
-## Invoke-CmdScript
-##
-## From PowerShell Cookbook (O'Reilly)
-## by Lee Holmes (http://www.leeholmes.com/guide)
-## <https://powershellcookbook.com/recipe/WqHr/program-retain-changes-to-environment-variables-set-by-a-batch-file>
-##
-##############################################################################
-
-<#
-
-.SYNOPSIS
-
-Invoke the specified batch file (and parameters), but also propagate any
-environment variable changes back to the PowerShell environment that
-called it.
-
-.EXAMPLE
-
-PS > type foo-that-sets-the-FOO-env-variable.cmd
-@set FOO=%*
-echo FOO set to %FOO%.
-
-PS > $env:FOO
-PS > Invoke-CmdScript "foo-that-sets-the-FOO-env-variable.cmd" Test
-
-C:\Temp>echo FOO set to Test.
-FOO set to Test.
-
-PS > $env:FOO
-Test
-
-#>
-
-param(
-    ## The path to the script to run
-    [Parameter(Mandatory = $true)]
-    [string] $Path,
-
-    ## The arguments to the script
-    [string] $ArgumentList
-)
-
-Set-StrictMode -Version 3
-
-$tempFile = [IO.Path]::GetTempFileName()
-
-## Store the output of cmd.exe.  We also ask cmd.exe to output
-## the environment table after the batch file completes
-cmd /c " `"$Path`" $argumentList && set > `"$tempFile`" "
-
-## Go through the environment variables in the temp file.
-## For each of them, set the variable in our local environment.
-Get-Content $tempFile | Foreach-Object {
-    if($_ -match "^(.*?)=(.*)$")
-    {
-        Set-Content "env:\$($matches[1])" $matches[2]
-    }
-}
-
-Remove-Item $tempFile

proj/vscode/build.ps1

@@ -1,25 +0,0 @@
-
-Set-Location proj\vscode
-
-$vswhere_path = "vswhere.exe"
-
-if(-not(Test-Path -path $vswhere_path)) {
-	(New-Object Net.WebClient).DownloadFile('https://github.com/microsoft/vswhere/releases/latest/download/vswhere.exe', $vswhere_path)
-	if(-not(Test-Path -path $vswhere_path)) {
-		Write-Output 'Failed to download vswhere.exe'
-		exit 1
-	}
-}
-
-# $msbuild_path = .\proj\vscode\vswhere -latest -products * -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe | select-object -first 1
-$vars_path = .\vswhere -latest -products * -requires Microsoft.Component.MSBuild -find **\VC\Auxiliary\Build\vcvars64.bat
-if($vars_path) {
-	.\Invoke-CmdScript $vars_path
-	# Write-Output $msbuild_path @args
-	# & "$msbuild_path\..\..\..\..\VC\Auxiliary\Build\vcvars64.bat"
-	# Write-Output $env:PATH
-	MSBuild @args
-} else {
-	Write-Output 'Could not find MSBuild.exe'
-	exit 1
-}

proj/vscode/oboe.code-workspace

@@ -10,62 +10,6 @@
 			"ms-vscode.cpptools",
 		]
 	},
-	"tasks": {
-		"version": "2.0.0",
-		"tasks": [
-			{
-				"label": "Build (Debug)",
-				"windows": {
-					"type": "process",
-					"command": "powershell",
-					"args": [
-						"${workspaceFolder}/proj/vscode/build.ps1",
-						"/property:GenerateFullPaths=true",
-						"/property:VcpkgConfiguration=Debug",
-						"/t:build",
-						"\"${workspaceRoot}\\proj\\vs2017\\Blades of Exile.sln\""
-					],
-					"problemMatcher": "$msCompile",
-				},
-				"group": "build"
-			},
-			{
-				"label": "Build (Release)",
-				"windows": {
-					"type": "process",
-					"command": "powershell",
-					"args": [
-						"${workspaceFolder}/proj/vscode/build.ps1",
-						"/property:GenerateFullPaths=true",
-						"/property:VcpkgConfiguration=Release",
-						"/t:build",
-						"${workspaceRoot}\\proj\\vs2013\\Blades of Exile.sln"
-					],
-					"problemMatcher": "$msCompile",
-				},
-				"group": "build"
-			},
-			{
-				"label": "Run tests",
-				"windows": {
-					"type": "process",
-					"command": "${workspaceRoot}\\proj\\vs2013\\Release\\OBoE Tests.exe",
-					"problemMatcher": {
-						"fileLocation": ["relative", "${workspaceRoot}"],
-						"pattern": {
-							"regexp": "^\\.(.*)\\((\\d+)\\): FAILED$",
-							"file": 1,
-							"line": 2
-						}
-					},
-				},
-				"options": {
-					"cwd": "${workspaceRoot}/test"
-				},
-				"group": "test"
-			}
-		]
-	},
 	"settings": {
 		"xml.fileAssociations": [
 			{
@@ -104,89 +48,6 @@
 				"pattern": "rsrc/scenarios/*/dialogs/*.xml",
 				"systemId": "${workspaceFolder}/rsrc/schemas/dialog.xsd"
 			}
-		],
-		"files.associations": {
-			"__bit_reference": "cpp",
-			"__config": "cpp",
-			"__debug": "cpp",
-			"__errc": "cpp",
-			"__functional_base": "cpp",
-			"__hash_table": "cpp",
-			"__locale": "cpp",
-			"__mutex_base": "cpp",
-			"__node_handle": "cpp",
-			"__nullptr": "cpp",
-			"__split_buffer": "cpp",
-			"__string": "cpp",
-			"__threading_support": "cpp",
-			"__tree": "cpp",
-			"__tuple": "cpp",
-			"algorithm": "cpp",
-			"any": "cpp",
-			"array": "cpp",
-			"atomic": "cpp",
-			"bit": "cpp",
-			"bitset": "cpp",
-			"cctype": "cpp",
-			"cfenv": "cpp",
-			"charconv": "cpp",
-			"chrono": "cpp",
-			"cmath": "cpp",
-			"codecvt": "cpp",
-			"complex": "cpp",
-			"condition_variable": "cpp",
-			"cstdarg": "cpp",
-			"cstddef": "cpp",
-			"cstdint": "cpp",
-			"cstdio": "cpp",
-			"cstdlib": "cpp",
-			"cstring": "cpp",
-			"ctime": "cpp",
-			"cwchar": "cpp",
-			"cwctype": "cpp",
-			"deque": "cpp",
-			"exception": "cpp",
-			"fstream": "cpp",
-			"functional": "cpp",
-			"future": "cpp",
-			"initializer_list": "cpp",
-			"iomanip": "cpp",
-			"ios": "cpp",
-			"iosfwd": "cpp",
-			"iostream": "cpp",
-			"istream": "cpp",
-			"iterator": "cpp",
-			"limits": "cpp",
-			"list": "cpp",
-			"locale": "cpp",
-			"map": "cpp",
-			"memory": "cpp",
-			"mutex": "cpp",
-			"new": "cpp",
-			"numeric": "cpp",
-			"optional": "cpp",
-			"ostream": "cpp",
-			"queue": "cpp",
-			"random": "cpp",
-			"ratio": "cpp",
-			"regex": "cpp",
-			"set": "cpp",
-			"sstream": "cpp",
-			"stack": "cpp",
-			"stdexcept": "cpp",
-			"streambuf": "cpp",
-			"string_view": "cpp",
-			"string": "cpp",
-			"system_error": "cpp",
-			"tuple": "cpp",
-			"type_traits": "cpp",
-			"typeindex": "cpp",
-			"typeinfo": "cpp",
-			"unordered_map": "cpp",
-			"unordered_set": "cpp",
-			"utility": "cpp",
-			"variant": "cpp",
-			"vector": "cpp"
-		}
+		]
 	}
 }

proj/xc12/BoE.xcodeproj/project.pbxproj

@@ -56,7 +56,6 @@
 		2BF04B2E0BF51924006C0831 /* boe.town.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2BF04B090BF51924006C0831 /* boe.town.cpp */; };
 		410CEEE82D84618C00FFF8CD /* profile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 410CEEE62D84618C00FFF8CD /* profile.cpp */; };
 		410CEEE92D84618C00FFF8CD /* profile.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 410CEEE72D84618C00FFF8CD /* profile.hpp */; };
-		41342CEA2DFB872400E66BEB /* quest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41342CE92DFB872400E66BEB /* quest.cpp */; };
 		413AAF612D389F94002E9BF1 /* fileio_party.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91E30F2A1A74819B0057C54A /* fileio_party.cpp */; };
 		413AAF622D38A076002E9BF1 /* universe.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91AC61C50FA2729900EEAE67 /* universe.cpp */; };
 		413AAF632D38A1B8002E9BF1 /* party.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 913D05B50FA1E9E300184C18 /* party.cpp */; };
@@ -66,9 +65,6 @@
 		413AAF672D38A4A5002E9BF1 /* living.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 914698FB1A7362D900F20F5E /* living.cpp */; };
 		413FE08F2CECFAFF000D97DC /* winutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 413FE08E2CECFAFF000D97DC /* winutil.cpp */; };
 		415EEEB02D5534A500B47408 /* prefs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 415EEEAF2D5534A500B47408 /* prefs.cpp */; };
-		419889802E4541D10080B0FE /* btnpanel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4198897F2E4541D10080B0FE /* btnpanel.cpp */; };
-		419889812E4541D10080B0FE /* btnpanel.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 4198897E2E4541D10080B0FE /* btnpanel.hpp */; };
-		41E550542DEB8C2A00A7DF52 /* scen.undo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41E550532DEB8C2A00A7DF52 /* scen.undo.cpp */; };
 		91034D211B225E4A008F01C1 /* scen.appleevents.mm in Sources */ = {isa = PBXBuildFile; fileRef = 91034D201B225E49008F01C1 /* scen.appleevents.mm */; };
 		911A14031B8FAFC600900FD9 /* town_read.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91C2A6EC1B8FA91400346948 /* town_read.cpp */; };
 		911A14041B8FB00300900FD9 /* talk_read.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 91C2A6EE1B8FAA8E00346948 /* talk_read.cpp */; };
@@ -163,8 +159,6 @@
 		917823821B2F33F5007F3444 /* FLAC.framework in Copy Libraries and Frameworks */ = {isa = PBXBuildFile; fileRef = 9178237C1B2F33E9007F3444 /* FLAC.framework */; };
 		91870F84190C90980081C150 /* scenedit.xib in Resources */ = {isa = PBXBuildFile; fileRef = 914CA49F190C4E9200B6ADD1 /* scenedit.xib */; };
 		919145FC18E3AB1B005CF3A4 /* boe.appleevents.mm in Sources */ = {isa = PBXBuildFile; fileRef = 919145FB18E3A32F005CF3A4 /* boe.appleevents.mm */; };
-		9191E3B12D8AFD5800AF6D01 /* os.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9191E3AE2D8AFD5800AF6D01 /* os.cc */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
-		9191E3B32D8AFD5800AF6D01 /* format.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9191E3B02D8AFD5800AF6D01 /* format.cc */; settings = {COMPILER_FLAGS = "-w -Xanalyzer -analyzer-disable-all-checks"; }; };
 		9192C12018F2745C0088A580 /* game.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9192C11E18F271920088A580 /* game.xib */; };
 		919B13A21BBCDF14009905A4 /* monst_legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 919B13A11BBCDE18009905A4 /* monst_legacy.cpp */; };
 		919B13A41BBD8854009905A4 /* item_legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 919B13A31BBD8849009905A4 /* item_legacy.cpp */; };
@@ -639,13 +633,8 @@
 		2BF04B0A0BF51924006C0831 /* boe.town.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = boe.town.hpp; sourceTree = "<group>"; };
 		410CEEE62D84618C00FFF8CD /* profile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = profile.cpp; sourceTree = "<group>"; };
 		410CEEE72D84618C00FFF8CD /* profile.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = profile.hpp; sourceTree = "<group>"; };
-		41342CE92DFB872400E66BEB /* quest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = quest.cpp; sourceTree = "<group>"; };
 		413FE08E2CECFAFF000D97DC /* winutil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winutil.cpp; sourceTree = "<group>"; };
 		415EEEAF2D5534A500B47408 /* prefs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = prefs.cpp; sourceTree = "<group>"; };
-		4198897E2E4541D10080B0FE /* btnpanel.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = btnpanel.hpp; sourceTree = "<group>"; };
-		4198897F2E4541D10080B0FE /* btnpanel.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = btnpanel.cpp; sourceTree = "<group>"; };
-		41E550522DEB8C1400A7DF52 /* scen.undo.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = scen.undo.hpp; sourceTree = "<group>"; };
-		41E550532DEB8C2A00A7DF52 /* scen.undo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scen.undo.cpp; sourceTree = "<group>"; };
 		91034D201B225E49008F01C1 /* scen.appleevents.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = scen.appleevents.mm; sourceTree = "<group>"; };
 		9103DC652C6A406600849E60 /* cli.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = cli.hpp; sourceTree = "<group>"; };
 		910BBA170FB8BECA001E34EA /* dialog.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = dialog.hpp; sourceTree = "<group>"; };
@@ -797,8 +786,6 @@
 		919145FF18E63B70005CF3A4 /* winutil.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = winutil.mac.mm; sourceTree = "<group>"; };
 		9191460018E63D8E005CF3A4 /* scrollbar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = scrollbar.cpp; sourceTree = "<group>"; };
 		9191460118E6591F005CF3A4 /* boe.menus.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = boe.menus.hpp; sourceTree = "<group>"; };
-		9191E3AE2D8AFD5800AF6D01 /* os.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = os.cc; sourceTree = "<group>"; };
-		9191E3B02D8AFD5800AF6D01 /* format.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = format.cc; sourceTree = "<group>"; };
 		9192C11E18F271920088A580 /* game.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = game.xib; path = ../rsrc/menus/game.xib; sourceTree = "<group>"; };
 		919B13A11BBCDE18009905A4 /* monst_legacy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = monst_legacy.cpp; sourceTree = "<group>"; };
 		919B13A31BBD8849009905A4 /* item_legacy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = item_legacy.cpp; sourceTree = "<group>"; };
@@ -1163,8 +1150,6 @@
 				91E128F41BC2077700C8BE1D /* pictchoice.hpp */,
 				91E128F51BC2077700C8BE1D /* strchoice.hpp */,
 				91E128F61BC2077700C8BE1D /* strdlog.hpp */,
-				4198897E2E4541D10080B0FE /* btnpanel.hpp */,
-				4198897F2E4541D10080B0FE /* btnpanel.cpp */,
 			);
 			path = dialogs;
 			sourceTree = "<group>";
@@ -1298,7 +1283,6 @@
 		9185BD941EA01BCC0027C346 /* scenario */ = {
 			isa = PBXGroup;
 			children = (
-				41342CE92DFB872400E66BEB /* quest.cpp */,
 				91279D3D0F9D1D6A007B0D52 /* item.cpp */,
 				91279CC10F9D19DA007B0D52 /* monster.cpp */,
 				91E5C79D0F9F60FA00C21460 /* outdoors.cpp */,
@@ -1410,7 +1394,6 @@
 				91F06E8F1A2EBEE70038E902 /* special_parse.hpp */,
 				919F2E72287E4E0500F47750 /* tagfile.hpp */,
 				91BFA3D91902ADD5001686E4 /* tarball.hpp */,
-				9191E3A82D8AFCF000AF6D01 /* fmtlib */,
 				91BFA3DC19033E00001686E4 /* gzstream */,
 				912DFE8718E24B0B00B00D75 /* resmgr */,
 				910BBA190FB8C43E001E34EA /* xml-parser */,
@@ -1455,16 +1438,6 @@
 			path = ../../src;
 			sourceTree = "<group>";
 		};
-		9191E3A82D8AFCF000AF6D01 /* fmtlib */ = {
-			isa = PBXGroup;
-			children = (
-				9191E3B02D8AFD5800AF6D01 /* format.cc */,
-				9191E3AE2D8AFD5800AF6D01 /* os.cc */,
-			);
-			name = fmtlib;
-			path = ../../deps/fmtlib/src;
-			sourceTree = "<group>";
-		};
 		91B3EECD0F969B7000BF5B67 /* ScenEd */ = {
 			isa = PBXGroup;
 			children = (
@@ -1495,7 +1468,6 @@
 				91B3EEE70F969BA700BF5B67 /* scen.btnmg.hpp */,
 				91B3EEE10F969BA700BF5B67 /* scen.core.hpp */,
 				91B3EEE40F969BA700BF5B67 /* scen.fileio.hpp */,
-				41E550522DEB8C1400A7DF52 /* scen.undo.hpp */,
 				91B3EEDE0F969BA700BF5B67 /* scen.global.hpp */,
 				91B3EEE50F969BA700BF5B67 /* scen.graphics.hpp */,
 				91B3EEE00F969BA700BF5B67 /* scen.keydlgs.hpp */,
@@ -1510,7 +1482,6 @@
 		91B3EEEA0F969BA700BF5B67 /* src */ = {
 			isa = PBXGroup;
 			children = (
-				41E550532DEB8C2A00A7DF52 /* scen.undo.cpp */,
 				91B3EEF10F969BA700BF5B67 /* scen.actions.cpp */,
 				91034D201B225E49008F01C1 /* scen.appleevents.mm */,
 				91B3EEF50F969BA700BF5B67 /* scen.btnmg.cpp */,
@@ -1772,7 +1743,6 @@
 				9149924C25913E3F00B5BE97 /* container.hpp in Headers */,
 				9149924E25913E3F00B5BE97 /* led.hpp in Headers */,
 				9170C5102D717F24009B6E7C /* scen.locpicker.hpp in Headers */,
-				419889812E4541D10080B0FE /* btnpanel.hpp in Headers */,
 				9143044B2970EDC1003A3967 /* keymods.hpp in Headers */,
 				9149925025913E3F00B5BE97 /* ledgroup.hpp in Headers */,
 				915473CE2C800AB000EB1C94 /* enchant.hpp in Headers */,
@@ -2088,7 +2058,6 @@
 				"$(SRCROOT)/../../rsrc/scenarios/valleydy",
 				"$(SRCROOT)/../../rsrc/scenarios/stealth",
 				"$(SRCROOT)/../../rsrc/scenarios/zakhazi",
-				"$(SRCROOT)/../../rsrc/scenarios/tutorial",
 				"$(SRCROOT)/../../rsrc/bases/cavebase",
 			);
 			name = "Pack Scenarios";
@@ -2098,7 +2067,6 @@
 				"$(BUILT_PRODUCTS_DIR)/Blades of Exile Scenarios/valleydy.boes",
 				"$(BUILT_PRODUCTS_DIR)/Blades of Exile Scenarios/stealth.boes",
 				"$(BUILT_PRODUCTS_DIR)/Blades of Exile Scenarios/zakhazi.boes",
-				"$(BUILT_PRODUCTS_DIR)/Blades of Exile Scenarios/tutorial.boes",
 				"$(BUILT_PRODUCTS_DIR)/Blades of Exile Base/cavebase.boes",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2221,12 +2189,10 @@
 				9143044A2970EDC1003A3967 /* keymods.cpp in Sources */,
 				919BE8B32D6776A8000C64C6 /* special-outdoor.cpp in Sources */,
 				91E128EF1BC2076B00C8BE1D /* pictchoice.cpp in Sources */,
-				41342CEA2DFB872400E66BEB /* quest.cpp in Sources */,
 				91E128F01BC2076B00C8BE1D /* strchoice.cpp in Sources */,
 				91E128F11BC2076B00C8BE1D /* strdlog.cpp in Sources */,
 				91CE248A1EA12866005BDCE4 /* utility.cpp in Sources */,
 				91CE248C1EA12A96005BDCE4 /* render_text.cpp in Sources */,
-				419889802E4541D10080B0FE /* btnpanel.cpp in Sources */,
 				91CE248E1EA12AA3005BDCE4 /* render_shapes.cpp in Sources */,
 				91A2480E2969CFD200B8D90F /* res_dialog.cpp in Sources */,
 				91CE24921EA12ABD005BDCE4 /* gfxsheets.cpp in Sources */,
@@ -2236,8 +2202,6 @@
 				91EC1F0523DDFF9D00271891 /* res_font.cpp in Sources */,
 				91EC1F0623DDFF9D00271891 /* res_image.cpp in Sources */,
 				91EC1F0723DDFF9D00271891 /* res_sound.cpp in Sources */,
-				9191E3B32D8AFD5800AF6D01 /* format.cc in Sources */,
-				9191E3B12D8AFD5800AF6D01 /* os.cc in Sources */,
 				91EC1F0823DDFF9D00271891 /* res_strings.cpp in Sources */,
 				91F3205023E65EA3009650AF /* framerate_limiter.cpp in Sources */,
 				91FE0E3823F084B70084CA6B /* drawable_manager.cpp in Sources */,
@@ -2286,7 +2250,6 @@
 				914CA45819074E0100B6ADD1 /* scen.menus.mac.mm in Sources */,
 				91034D211B225E4A008F01C1 /* scen.appleevents.mm in Sources */,
 				91B0D5D21E344300002BE4DA /* view_dialogs.cpp in Sources */,
-				41E550542DEB8C2A00A7DF52 /* scen.undo.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2488,7 +2451,6 @@
 					"$(PROJECT_DIR)/../../src/fileio/xml-parser",
 					"$(PROJECT_DIR)/../../src/tools",
 					"$(PROJECT_DIR)/../../deps/Catch2/include/external",
-					"$(PROJECT_DIR)/../../deps/fmtlib/include",
 				);
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -2526,7 +2488,7 @@
 					"-Wno-quoted-include-in-framework-header",
 					"-Wno-shorten-64-to-32",
 					"-Wno-comma",
-					"-Wimplicit-fallthrough",
+					"-Werror=implicit-fallthrough",
 				);
 			};
 			name = Debug;
@@ -2605,7 +2567,6 @@
 					"$(PROJECT_DIR)/../../src/tools",
 					"$(PROJECT_DIR)/../../deps/Catch2/include/external",
 					"/usr/local/opt/boost@1.85/include",
-					"$(PROJECT_DIR)/../../deps/fmtlib/include",
 				);
 				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks";
 				LIBRARY_SEARCH_PATHS = (
@@ -2641,7 +2602,7 @@
 					"-Wno-quoted-include-in-framework-header",
 					"-Wno-shorten-64-to-32",
 					"-Wno-comma",
-					"-Wimplicit-fallthrough",
+					"-Werror=implicit-fallthrough",
 				);
 			};
 			name = Release;

proj/xc4/BoE.xcodeproj/project.pbxproj

@@ -1884,7 +1884,6 @@
 				"$(SRCROOT)/../../rsrc/scenarios/valleydy",
 				"$(SRCROOT)/../../rsrc/scenarios/stealth",
 				"$(SRCROOT)/../../rsrc/scenarios/zakhazi",
-				"$(SRCROOT)/../../rsrc/scenarios/tutorial",
 			);
 			name = "Pack Scenarios";
 			outputPaths = (
@@ -1893,7 +1892,6 @@
 				"$(BUILT_PRODUCTS_DIR)/Blades of Exile Scenarios/valleydy.boes",
 				"$(BUILT_PRODUCTS_DIR)/Blades of Exile Scenarios/stealth.boes",
 				"$(BUILT_PRODUCTS_DIR)/Blades of Exile Scenarios/zakhazi.boes",
-				"$(BUILT_PRODUCTS_DIR)/Blades of Exile Scenarios/tutorial.boes",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;

rsrc/SConscript

@@ -55,10 +55,8 @@ scen_env.BuildScenario('#build/rsrc/scenarios/busywork.boes', 'scenarios/busywor
 scen_env.BuildScenario('#build/rsrc/scenarios/valleydy.boes', 'scenarios/valleydy/header.exs')
 scen_env.BuildScenario('#build/rsrc/scenarios/stealth.boes', 'scenarios/stealth/header.exs')
 scen_env.BuildScenario('#build/rsrc/scenarios/zakhazi.boes', 'scenarios/zakhazi/header.exs')
-scen_env.BuildScenario('#build/rsrc/scenarios/tutorial.boes', 'scenarios/tutorial/header.exs')
 
 env.Install(path.join(install_dir, "Blades of Exile Scenarios"), Glob("#build/rsrc/scenarios/*.boes"))
-env.Install(path.join(install_dir, "Blades of Exile Scenarios"), "scenarios/custom")
 env.Install(path.join(install_dir, "Blades of Exile Base"), Glob("#build/rsrc/bases/*.boes"))
 
 # Validate dialogs

rsrc/dialogs/1str-lg.xml

@@ -2,7 +2,7 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='done' escbtn='done'>
-	<pict name='pict' type='dlog' size='large' num='0' top='10' left='10'/>
+	<pict name='pict' type='dlog' size='large' num='0' top='9' left='9'/>
 	<text name='str1' framed='true' top='8' left='91' width='257' height='90'/>
 	<button name='done' type='done' top='107' left='287'/>
 	<button name='record' type='regular' def-key='r' top='107' left='8'>Record</button>

rsrc/dialogs/1str-title-lg.xml

@@ -2,7 +2,7 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='done' escbtn='done'>
-	<pict name='pict' type='dlog' size='large' num='0' top='10' left='10'/>
+	<pict name='pict' type='dlog' size='large' num='0' top='9' left='9'/>
 	<text name='title' framed='true' top='9' left='91' width='257' height='19'/>
 	<text name='str1' framed='true' top='39' left='91' width='257' height='87'/>
 	<button name='done' type='done' top='140' left='287'/>

rsrc/dialogs/1str-title.xml

@@ -2,7 +2,7 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='done' escbtn='done'>
-	<pict name='pict' type='dlog' num='8' top='10' left='10'/>
+	<pict name='pict' type='dlog' num='8' top='9' left='9'/>
 	<text name='title' framed='true' top='9' left='55' width='257' height='19'/>
 	<text name='str1' framed='true' top='39' left='55' width='257' height='87'/>
 	<button name='done' type='done' top='140' left='251'/>

rsrc/dialogs/1str.xml

@@ -2,7 +2,7 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='done' escbtn='done'>
-	<pict name='pict' type='dlog' num='8' top='10' left='10'/>
+	<pict name='pict' type='dlog' num='8' top='9' left='9'/>
 	<text name='str1' framed='true' top='8' left='55' width='257' height='90'/>
 	<button name='done' type='done' top='107' left='251'/>
 	<button name='record' type='regular' def-key='r' top='107' left='8'>Record</button>

rsrc/dialogs/2str-lg.xml

@@ -2,7 +2,7 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='done' escbtn='done'>
-	<pict name='pict' type='dlog' size='large' num='0' top='10' left='10'/>
+	<pict name='pict' type='dlog' size='large' num='0' top='9' left='9'/>
 	<text name='str1' framed='true' top='8' left='91' width='257' height='90'/>
 	<text name='str2' framed='true' top='107' left='91' width='257' height='98'/>
 	<button name='done' type='done' top='212' left='287'/>

rsrc/dialogs/2str-title-lg.xml

@@ -2,7 +2,7 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='done' escbtn='done'>
-	<pict name='pict' type='dlog' size='large' num='0' top='10' left='10'/>
+	<pict name='pict' type='dlog' size='large' num='0' top='9' left='9'/>
 	<text name='title' framed='true' top='9' left='91' width='257' height='19'/>
 	<text name='str1' framed='true' top='39' left='91' width='257' height='87'/>
 	<text name='str2' framed='true' top='136' left='91' width='257' height='93'/>

rsrc/dialogs/2str-title.xml

@@ -2,7 +2,7 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='done' escbtn='done'>
-	<pict name='pict' type='dlog' num='8' top='10' left='10'/>
+	<pict name='pict' type='dlog' num='8' top='9' left='9'/>
 	<text name='title' framed='true' top='9' left='55' width='257' height='19'/>
 	<text name='str1' framed='true' top='39' left='55' width='257' height='87'/>
 	<text name='str2' framed='true' top='136' left='55' width='257' height='93'/>

rsrc/dialogs/2str.xml

@@ -2,7 +2,7 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='done' escbtn='done'>
-	<pict name='pict' type='dlog' num='8' top='10' left='10'/>
+	<pict name='pict' type='dlog' num='8' top='9' left='9'/>
 	<text name='str1' framed='true' top='8' left='55' width='257' height='90'/>
 	<text name='str2' framed='true' top='107' left='55' width='257' height='98'/>
 	<button name='done' type='done' top='212' left='251'/>

rsrc/dialogs/about-boe.xml

@@ -18,11 +18,11 @@
 		<!-- The height of this text needs to be 10 times the number of lines. -->
 		<text top='52' left='50' width='400' height='240'>
 			ORIGINAL GAME: <br/><br/><br/><br/><br/><br/>
-			OPEN SOURCE CREDITS: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
+			OPEN SOURCE CREDITS: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
 			SCENARIO FIXES AND UPDATES: <br/><br/>
 		</text>
 		<!-- This text is right-aligned and fills out the above text with sub-headings -->
-		<text top='52' left='40' width='190' height='860' align='right'>
+		<text top='52' left='40' width='190' height='840' align='right'>
 			<br/>
 			Concept, Design, Programming: <br/>
 			Graphics: <br/>
@@ -34,11 +34,11 @@
 			Graphics: <br/><br/><br/><br/><br/><br/><br/>
 			Consulting: <br/><br/><br/><br/>
 			Testing and Troubleshooting: <br/><br/>
-			Funding: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
+			Funding: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
 			<br/><br/>
 			Bandit Busywork: <br/>
 		</text>
-		<text top='52' left='250' width='230' height='860'>
+		<text top='52' left='250' width='230' height='840'>
 			<!-- ORIGINAL GAME --><br/>
 			<!-- Concept, Design, Programming -->Jeff Vogel <br/>
 			<!-- Graphics -->Andrew Hunter <br/>
@@ -84,7 +84,6 @@
 							Bret Rodabaugh <br/>
 							Dylan Nugent <br/>
 							Evan Mulrooney <br/>
-							Glen Chudley <br/>
 							Jake Harrelson <br/>
 							Jared Forcinito <br/>
 							Jeff Potter <br/>
@@ -100,7 +99,6 @@
 							K L <br/>
 							Laura Nelson <br/>
 							Mariann Krizsan <br/>
-							Maryanne Wachter <br/>
 							Mike Lapinsky <br/>
 							Nathan Rickey <br/>
 							Nick Chaimov <br/>

rsrc/dialogs/adventure-notes.xml

@@ -4,22 +4,16 @@
 <dialog defbtn='done' escbtn='done'>
 	<button name='done' type='done' top='341' left='319'/>
 	<pict type='dlog' num='8' top='9' left='9'/>
-	<pane name='pane1' framed='true' top='37' left='53' width='257' height='92'>
-		<text name='str1' framed='true' top='37' left='53' width='257'/>
-	</pane>
-	<pane name='pane2' framed='true' top='136' left='53' width='257' height='92'>
-		<text name='str2' framed='true' top='136' left='53' width='257'/>
-	</pane>
-	<pane name='pane3' framed='true' top='235' left='53' width='257' height='92'>
-		<text name='str3' framed='true' top='235' left='53' width='257'/>
-	</pane>
+	<text name='str1' framed='true' top='37' left='53' width='257' height='92'/>
+	<text name='str2' framed='true' top='136' left='53' width='257' height='92'/>
+	<text name='str3' framed='true' top='235' left='53' width='257' height='92'/>
 	<text size='large' top='9' left='53' width='257' height='19'>Encounter Notes:</text>
 	<button name='left' type='left' def-key='left' top='340' left='48'/>
 	<button name='right' type='right' def-key='right' top='340' left='111'/>
 	<!--
 	 TODO: I like the idea of assigning the delete key to this...
 	 -->
-	<button name='del1' type='regular' top='109' left='329'>Delete</button>
-	<button name='del2' type='regular' top='208' left='329'>Delete</button>
-	<button name='del3' type='regular' top='307' left='329'>Delete</button>
+	<button name='del1' type='regular' top='109' left='319'>Delete</button>
+	<button name='del2' type='regular' top='208' left='319'>Delete</button>
+	<button name='del3' type='regular' top='307' left='319'>Delete</button>
 </dialog>

rsrc/dialogs/choose-pict-labeled.xml

@@ -1,38 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done' escbtn='cancel'>
-	<pict name='mainpic' type='dlog' num='16' top='6' left='6'/>
-	<text name='prompt' size='large' top='6' left='50' width='248' height='14'>Select a graphic:</text>
-	<group name='group'>
-		<led name='led1' state='off' top='29' left='55' width='57' height='36'/>
-		<led name='led2' state='off' top='74' left='55' width='57' height='36'/>
-		<led name='led3' state='off' top='119' left='55' width='57' height='36'/>
-		<led name='led4' state='off' top='164' left='55' width='57' height='36'/>
-		<led name='led5' state='off' top='209' left='55' width='57' height='36'/>
-		<led name='led6' state='off' top='254' left='55' width='57' height='36'/>
-		<led name='led7' state='off' top='29' left='251' width='57' height='36'/>
-		<led name='led8' state='off' top='74' left='251' width='57' height='36'/>
-		<led name='led9' state='off' top='119' left='251' width='57' height='36'/>
-		<led name='led10' state='off' top='164' left='251' width='57' height='36'/>
-		<led name='led11' state='off' top='209' left='251' width='57' height='36'/>
-		<led name='led12' state='off' top='254' left='251' width='57' height='36'/>
-	</group>
-	<pict name='pic1' type='ter' num='0' top='29' left='76'/>
-	<pict name='pic2' type='ter' num='1' top='74' left='76'/>
-	<pict name='pic3' type='ter' num='2' top='119' left='76'/>
-	<pict name='pic4' type='ter' num='3' top='164' left='76'/>
-	<pict name='pic5' type='ter' num='4' top='209' left='76'/>
-	<pict name='pic6' type='ter' num='5' top='254' left='76'/>
-	<pict name='pic7' type='ter' num='18' top='29' left='272'/>
-	<pict name='pic8' type='ter' num='19' top='74' left='272'/>
-	<pict name='pic9' type='ter' num='20' top='119' left='272'/>
-	<pict name='pic10' type='ter' num='21' top='164' left='272'/>
-	<pict name='pic11' type='ter' num='22' top='209' left='272'/>
-	<pict name='pic12' type='ter' num='23' top='254' left='272'/>
-	<text name='help' top='294' left='6' width='422' height='16'>Click button to left of graphic to select. Use arrows to change pages.</text>
-	<button name='left' type='left' top='314' left='6' def-key='left'/>
-	<button name='right' type='right' top='314' left='69' def-key='right'/>
-	<button name='done' type='done' top='314' left='393'/>
-	<button name='cancel' type='regular' top='314' left='322'>Cancel</button>
-</dialog>

rsrc/dialogs/confirm-edit-item.xml

@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='keep' escbtn='cancel'>
-	<pict type='dlog' num='7' top='6' left='6'/>
-	<text name='keep-msg' top='6' left='49' width='256' height='32'>
-		Keep changes to {{item}} before editing another item?
-	</text>
-	<button name='cancel' type='regular' top='43' left='109'>Cancel</button>
-	<button name='revert' type='regular' top='43' left='175'>Discard</button>
-	<button name='keep' type='regular' top='43' left='240'>Keep</button>
-</dialog>

rsrc/dialogs/confirm-edit-monst.xml

@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='keep' escbtn='cancel'>
-	<pict type='dlog' num='7' top='6' left='6'/>
-	<text name='keep-msg' top='6' left='49' width='256' height='32'>
-		Keep changes to {{monst}} before editing another monster?
-	</text>
-	<button name='cancel' type='regular' top='43' left='109'>Cancel</button>
-	<button name='revert' type='regular' top='43' left='175'>Discard</button>
-	<button name='keep' type='regular' top='43' left='240'>Keep</button>
-</dialog>

rsrc/dialogs/confirm-edit-out-wand.xml

@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='keep' escbtn='cancel'>
-	<pict type='dlog' num='7' top='6' left='6'/>
-	<text name='keep-msg' top='6' left='49' width='256' height='32'>
-		Keep changes to {{enc-type}} {{num}} before editing another encounter?
-	</text>
-	<button name='cancel' type='regular' top='43' left='109'>Cancel</button>
-	<button name='revert' type='regular' top='43' left='175'>Discard</button>
-	<button name='keep' type='regular' top='43' left='240'>Keep</button>
-</dialog>

rsrc/dialogs/confirm-edit-personality.xml

@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='keep' escbtn='cancel'>
-	<pict type='dlog' num='7' top='6' left='6'/>
-	<text name='keep-msg' top='6' left='49' width='256' height='32'>
-		Keep changes to {{name}} before editing another personality?
-	</text>
-	<button name='cancel' type='regular' top='43' left='109'>Cancel</button>
-	<button name='revert' type='regular' top='43' left='175'>Discard</button>
-	<button name='keep' type='regular' top='43' left='240'>Keep</button>
-</dialog>

rsrc/dialogs/confirm-edit-quest.xml

@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='keep' escbtn='cancel'>
-	<pict type='dlog' num='7' top='6' left='6'/>
-	<text name='keep-msg' top='6' left='49' width='256' height='32'>
-		Keep changes to {{quest}} before editing another quest?
-	</text>
-	<button name='cancel' type='regular' top='43' left='109'>Cancel</button>
-	<button name='revert' type='regular' top='43' left='175'>Discard</button>
-	<button name='keep' type='regular' top='43' left='240'>Keep</button>
-</dialog>

rsrc/dialogs/confirm-edit-shop.xml

@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='keep' escbtn='cancel'>
-	<pict type='dlog' num='7' top='6' left='6'/>
-	<text name='keep-msg' top='6' left='49' width='256' height='32'>
-		Keep changes to {{shop}} before editing another shop?
-	</text>
-	<button name='cancel' type='regular' top='43' left='109'>Cancel</button>
-	<button name='revert' type='regular' top='43' left='175'>Discard</button>
-	<button name='keep' type='regular' top='43' left='240'>Keep</button>
-</dialog>

rsrc/dialogs/confirm-edit-spec-item.xml

@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='keep' escbtn='cancel'>
-	<pict type='dlog' num='7' top='6' left='6'/>
-	<text name='keep-msg' top='6' left='49' width='256' height='32'>
-		Keep changes to {{spec-item}} before editing another special item?
-	</text>
-	<button name='cancel' type='regular' top='43' left='109'>Cancel</button>
-	<button name='revert' type='regular' top='43' left='175'>Discard</button>
-	<button name='keep' type='regular' top='43' left='240'>Keep</button>
-</dialog>

rsrc/dialogs/confirm-edit-spells.xml

@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='keep' escbtn='cancel'>
-	<pict type='dlog' num='7' top='6' left='6'/>
-	<text name='keep-msg' top='6' left='49' width='256' height='32'>
-		Keep changes to {{PC}}'s spells before editing someone else?
-	</text>
-	<button name='cancel' type='regular' top='43' left='109'>Cancel</button>
-	<button name='revert' type='regular' top='43' left='175'>Discard</button>
-	<button name='keep' type='regular' top='43' left='240'>Keep</button>
-</dialog>

rsrc/dialogs/confirm-edit-terrain.xml

@@ -1,12 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='keep' escbtn='cancel'>
-	<pict type='dlog' num='7' top='6' left='6'/>
-	<text name='keep-msg' top='6' left='49' width='256' height='32'>
-		Keep changes to {{ter}} before editing another terrain?
-	</text>
-	<button name='cancel' type='regular' top='43' left='109'>Cancel</button>
-	<button name='revert' type='regular' top='43' left='175'>Discard</button>
-	<button name='keep' type='regular' top='43' left='240'>Keep</button>
-</dialog>

rsrc/dialogs/confirm-reset-help.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='yes' escbtn='no'>
+<dialog defbtn='no'>
 	<button name='no' type='regular' def-key='n' top='39' left='178'>No</button>
 	<button name='yes' type='regular' def-key='y' top='39' left='244'>Yes</button>
 	<pict type='dlog' num='11' top='9' left='9'/>

rsrc/dialogs/delete-town-confirm.xml

@@ -8,11 +8,12 @@
 	<text top='6' left='49' width='271' height='66'>
 		You are about to delete the last town in your scenario's town list
 		(so if you have 10 towns in your scenario, the tenth will disappear).
+		This change will immediately be saved, and can't be undone.
 	</text>
+	<text top='127' left='49' width='268' height='14'>Are you sure you want to do this?</text>
 	<text top='73' left='49' width='276' height='53'>
 		Make sure to remove all outdoor entrances to the deleted town,
 		as well as all references to it in special encounters.
 		Failure to do so will result in scenario run-time errors.
 	</text>
-	<text top='127' left='49' width='268' height='14'>Are you sure you want to do this?</text>
 </dialog>

rsrc/dialogs/edit-item-abils.xml

@@ -13,12 +13,11 @@
 	
 	<text rel-anchor='prev' relative='abs pos' size='large' top='8' left='8' width='142' height='13'>Item special ability:</text>
 	<text name='abilname' rel-anchor='prev' relative='pos pos-in' framed='true' top='0' left='11' width='250' height='13'/>
-	<!-- These fields are called str1 and str2 but I think they can only be for numbers? -->
 	<text name='str1-title' rel-anchor='prev' relative='abs pos' framed='true' top='8' left='8' width='185' height='16'/>
-	<field name='str1' type='int' rel-anchor='prev' relative='pos pos-in' top='0' left='7' width='77' height='16'/>
+	<field name='str1' rel-anchor='prev' relative='pos pos-in' top='0' left='7' width='77' height='16'/>
 	<button name='str1-choose' rel-anchor='prev' relative='pos pos-in' type='large' top='-4' left='13'>Create/Edit</button>
 	<text name='str2-title' rel-anchor='prev' relative='abs pos' framed='true' top='3' left='8' width='185' height='16'/>
-	<field name='str2' type='int' rel-anchor='prev' relative='pos pos-in' top='0' left='7' width='77' height='16'/>
+	<field name='str2' rel-anchor='prev' relative='pos pos-in' top='0' left='7' width='77' height='16'/>
 	<button name='str2-choose1' rel-anchor='prev' relative='pos pos-in' type='regular' top='-4' left='13'>Choose</button>
 	<button name='str2-choose2' rel-anchor='prev' relative='pos pos-in' type='regular' top='0' left='5'>Priest</button>
 	

rsrc/dialogs/edit-item-shortcut.xml

@@ -29,7 +29,6 @@
 	<button name='left' type='left' top='334' left='10' def-key='left'/>
 	<text name='num' top='115' left='211' width=' 46' height='14'/>
 	<pict type='dlog' num='16' top='8' left='8'/>
-	<pict name='ter-pic' type='ter' num='0' top='70' left='458'/>
 	<text size='large' top='6' left='50' width='256' height='20'>Item Placement Shortcuts</text>
 	<text top='25' left='50' width='439' height='40'>
 		You can design shortcuts for automatic placement of items in towns.
@@ -39,7 +38,7 @@
 	<text top='66' left='50' width='439' height='41'>
 		Enter the terrain type to get the items,
 		the numbers of the items to place,
-		and the percentage chance (0-100) that the item is placed there.
+		and the percentage chance (0-100) that the item is places there.
 		For more details, see the documentation.
 	</text>
 	<text top='115' left='50' width='155' height='14'>Item shortcut number:</text>

rsrc/dialogs/edit-item.xml

@@ -2,18 +2,21 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
+	<!--
+	 TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
+	 -->
 	<field name='full' top='30' left='163' width='226' height='16'/>
 	<field name="short" top='54' left='163' width='125' height='16'/>
-	<field name='picnum' type='uint' top='82' left='140' width='52' height='16'/>
-	<field name='level' type='uint' top='219' left='161' width='52' height='16'/>
-	<field name='awkward' type='uint' top='243' left='161' width='52' height='16'/>
-	<field name='bonus' type='uint' top='267' left='161' width='52' height='16'/>
-	<field name='prot' type='int' top='291' left='161' width='52' height='16'/>
-	<field name='charges' type='uint' top='315' left='161' width='52' height='16'/>
-	<field name='flag' type='uint' top='219' left='366' width='52' height='16'/>
-	<field name='value' type='uint' top='243' left='366' width='52' height='16'/>
-	<field name='weight' type='uint' top='267' left='366' width='52' height='16'/>
-	<field name='class' type='uint' top='291' left='366' width='52' height='16'/>
+	<field name='picnum' top='82' left='140' width='52' height='16'/>
+	<field name='level' top='219' left='161' width='52' height='16'/>
+	<field name='awkward' top='243' left='161' width='52' height='16'/>
+	<field name='bonus' top='267' left='161' width='52' height='16'/>
+	<field name='prot' top='291' left='161' width='52' height='16'/>
+	<field name='charges' top='315' left='161' width='52' height='16'/>
+	<field name='flag' top='219' left='366' width='52' height='16'/>
+	<field name='value' top='243' left='366' width='52' height='16'/>
+	<field name='weight' top='267' left='366' width='52' height='16'/>
+	<field name='class' top='291' left='366' width='52' height='16'/>
 	<button name='okay' type='regular' top='357' left='509'>OK</button>
 	<button name='cancel' type='regular' top='357' left='434'>Cancel</button>
 	<button name='prev' type='left' top='357' left='13'/>
@@ -79,7 +82,7 @@
 	<pict name='missile-pic' type='missile' num='3' top='243' left='440'/>
 	<button name='choosemiss' type='regular' top='240' left='521'>Choose</button>
 	<text name='skill-title' top='270' left='440' width='140' height='16'>Weapon key skill:</text>
-	<field name='weap-type' type='uint' top='291' left='440' width='73' height='16'/>
+	<field name='weap-type' top='291' left='440' width='73' height='16'/>
 	<button name='choosetp' type='regular' top='288' left='521'>Choose</button>
 	<text top='313' left='221' width='363' height='40'>
 		Enter properties for this item type. 

rsrc/dialogs/edit-mabil-general.xml

@@ -18,23 +18,23 @@
 	<button name='pick-subtype' type='regular' top='161' left='330'>Choose</button>
 	
 	<text top='192' left='10' width='100' height='16'>Missile:</text>
-	<field name='missile' type='uint' top='190' left='120' width='50' height='16'/>
+	<field name='missile' top='190' left='120' width='50' height='16'/>
 	<text name='missile-touch' framed='true' top='192' left='120' width='50' height='16'>None</text>
 	<button name='pick-missile' type='regular' top='187' left='180'>Choose</button>
 	<pict name='missile-pic' type='missile' num='0' top='192' left='253'/>
 	
 	<text top='220' left='10' width='100' height='16'>Ability Range:</text>
-	<field name='range' type='uint' top='218' left='120' width='50' height='16'/>
+	<field name='range' top='218' left='120' width='50' height='16'/>
 	<text name='range-touch' framed='true' top='220' left='120' width='50' height='16'>Touch</text>
 	<text top='220' left='180' width='100' height='16'>Chance of Using:</text>
-	<field name='odds' type='uint' top='218' left='290' width='50' height='16'/>
+	<field name='odds' top='218' left='290' width='50' height='16'/>
 	
 	<text top='248' left='10' width='100' height='16'>Ability Strength:</text>
-	<field name='strength' type='uint' top='246' left='120' width='70' height='16'/>
+	<field name='strength' top='246' left='120' width='70' height='16'/>
 	<button name='pick-strength' type='regular' top='245' left='200'>Choose</button>
 	
 	<text name='extra-title' top='276' left='10' width='100' height='16'>Extra:</text>
-	<field name='extra' type='int' top='274' left='120' width='70' height='16'/>
+	<field name='extra' top='274' left='120' width='70' height='16'/>
 	<button name='pick-extra' type='regular' top='271' left='200'>Choose</button>
 	
 	<button name='okay' type='regular' top='300' left='330'>OK</button>

rsrc/dialogs/edit-mabil-missile.xml

@@ -18,14 +18,14 @@
 	<button name='pick-subtype' type='regular' top='161' left='330'>Choose</button>
 	
 	<text top='192' left='10' width='100' height='16'>Missile:</text>
-	<field name='missile' type='uint' top='190' left='120' width='50' height='16'/>
+	<field name='missile' top='190' left='120' width='50' height='16'/>
 	<button name='pick-missile' type='regular' top='187' left='180'>Choose</button>
 	<pict name='missile-pic' type='missile' num='0' top='192' left='253'/>
 	
 	<text top='220' left='10' width='100' height='16'>Number of Dice:</text>
-	<field name='dice' type='uint' top='218' left='120' width='50' height='16'/>
+	<field name='dice' top='218' left='120' width='50' height='16'/>
 	<text top='220' left='180' width='100' height='16'>Sides per Die:</text>
-	<field name='sides' type='uint' top='218' left='290' width='50' height='16'/>
+	<field name='sides' top='218' left='290' width='50' height='16'/>
 	
 	<text top='248' left='10' width='100' height='16'>Ability Range:</text>
 	<field name='range' top='246' left='120' width='50' height='16'/>
@@ -33,7 +33,7 @@
 	<field name='odds' top='246' left='290' width='50' height='16'/>
 	
 	<text top='276' left='10' width='100' height='16'>Skill Level:</text>
-	<field name='skill' type='uint' top='274' left='120' width='70' height='16'/>
+	<field name='skill' top='274' left='120' width='70' height='16'/>
 	
 	<button name='okay' type='regular' top='300' left='330'>OK</button>
 	<button name='cancel' type='regular' top='300' left='265'>Cancel</button>

rsrc/dialogs/edit-mabil-overwrite.xml

@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay' escbtn='cancel'>
-	<pict type='dlog' num='7' top='8' left='8'/>
-	<text name='warning' top='2' left='48' width='248' height='33'>
-		This ability will be overwritten: <br/>
-		<br/>
-		{{abil}}
-	</text>
-	<button name='cancel' type='regular' top='42' left='169'>Cancel</button>
-	<button name='okay' type='regular' top='42' left='238'>OK</button>
-</dialog>

rsrc/dialogs/edit-mabil-radiate.xml

@@ -12,14 +12,14 @@
 	<text name='type' framed='true' top='108' left='120' width='200' height='16'/>
 	
 	<text top='136' left='10' width='100' height='16'>Field Type:</text>
-	<field name='field' type='uint' top='134' left='120' width='70' height='16'/>
+	<field name='field' top='134' left='120' width='70' height='16'/>
 	<button name='pick-field' type='regular' top='133' left='200'>Choose</button>
 	
 	<text top='164' left='10' width='120' height='16'>Radiate Chance:</text>
-	<field name='odds' type='uint' top='162' left='120' width='50' height='16'/>
+	<field name='odds' top='162' left='120' width='50' height='16'/>
 	
 	<text top='192' left='10' width='100' height='16'>Area Affected:</text>
-	<field name='pat' type='uint' top='190' left='120' width='50' height='16'/>
+	<field name='pat' top='190' left='120' width='50' height='16'/>
 	<button name='pick-pat' type='regular' top='187' left='180'>Choose</button>
 	
 	<button name='okay' type='regular' top='216' left='330'>OK</button>

rsrc/dialogs/edit-mabil-special.xml

@@ -14,14 +14,14 @@
 	<text name='ap' framed='true' top='136' left='120' width='200' height='16'/>
 	
 	<text name='extra1-title' framed='true' top='164' left='10' width='200' height='16'>Extra 1</text>
-	<field name='extra1' type='uint' top='162' left='220' width='70' height='16'/>
+	<field name='extra1' top='162' left='220' width='70' height='16'/>
 	<button name='pick-extra1' type='large' top='161' left='300'>Create/Edit</button>
 	
 	<text name='extra2-title' framed='true' top='192' left='10' width='200' height='16'>Extra 2</text>
-	<field name='extra2' type='uint' top='190' left='220' width='70' height='16'/>
+	<field name='extra2' top='190' left='220' width='70' height='16'/>
 	
 	<text name='extra3-title' framed='true' top='220' left='10' width='200' height='16'>Extra 3</text>
-	<field name='extra3' type='uint' top='218' left='220' width='70' height='16'/>
+	<field name='extra3' top='218' left='220' width='70' height='16'/>
 	
 	<button name='okay' type='regular' top='244' left='339'>OK</button>
 	<button name='cancel' type='regular' top='244' left='274'>Cancel</button>

rsrc/dialogs/edit-mabil-summon.xml

@@ -20,14 +20,14 @@
 	<button name='pick-summon' type='regular' top='161' left='330'>Choose</button>
 	
 	<text top='192' left='10' width='100' height='16'>Minimum number:</text>
-	<field name='min' type='uint' top='190' left='120' width='50' height='16'/>
+	<field name='min' top='190' left='120' width='50' height='16'/>
 	<text top='192' left='180' width='100' height='16'>Maximum number:</text>
-	<field name='max' type='uint' top='190' left='290' width='50' height='16'/>
+	<field name='max' top='190' left='290' width='50' height='16'/>
 	
 	<text top='220' left='10' width='100' height='16'>Summon duration:</text>
-	<field name='len' type='uint' top='218' left='120' width='50' height='16'/>
+	<field name='len' top='218' left='120' width='50' height='16'/>
 	<text top='220' left='180' width='100' height='16'>Chance of Using:</text>
-	<field name='odds' type='uint' top='218' left='290' width='50' height='16'/>
+	<field name='odds' top='218' left='290' width='50' height='16'/>
 	
 	<button name='okay' type='regular' top='244' left='330'>OK</button>
 	<button name='cancel' type='regular' top='244' left='265'>Cancel</button>

rsrc/dialogs/edit-monster-abils.xml

@@ -2,14 +2,30 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
-	<pict name='icon' type='monst' num='0' top='8' left='8'/>
+	<!--
+	 TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
+	 -->
+	<field name='loot-item' top='178' left='194' width='64' height='16'/>
+	<field name='loot-chance' top='178' left='464' width='64' height='16'/>
+	<text top='216' left='120' width='40' height='16'>Magic:</text>
+	<field name='magic-res' top='215' left='167' width='80' height='16'/>
+	<text top='246' left='120' width='40' height='16'>Fire:</text>
+	<field name='fire-res' top='245' left='167' width='80' height='16'/>
+	<text top='216' left='273' width='40' height='16'>Cold:</text>
+	<field name='cold-res' top='215' left='320' width='80' height='16'/>
+	<text top='246' left='273' width='40' height='16'>Poison:</text>
+	<field name='poison-res' top='245' left='320' width='80' height='16'/>
+	<led name='mindless' top='215' left='415'>Mindless</led>
+	<led name='amorph' top='230' left='415'>Amorphous</led>
+	<led name='invuln' top='245' left='415'>Invulnerable</led>
+	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='6' left='50' width='158' height='16'>Edit Monster Abilities</text>
-	<text name='info' framed='true' top='6' left='222' width='170' height='14'>Monster {{num}}: {{name}}</text>
+	<text framed='true' top='6' left='222' width='111' height='14'>Monster number:</text>
+	<text name='num' framed='true' top='8' left='340' width='37' height='14'/>
 	<text top='2' left='408' width='184' height='54'>
 		Enter properties for this monster type. For a detailed
 		description of the fields, see the documentation.
 	</text>
-
 	<text size='large' top='54' left='7' width='110' height='14'>Special abilities:</text>
 	<stack name='abils'>
 		<text name='abil-name1' framed='true' top='54' left='124' width='183' height='14'/>
@@ -23,7 +39,13 @@
 	</stack>
 	<button name='abil-up' type='up' top='82' left='30'/>
 	<button name='abil-down' type='down' top='107' left='30'/>
-
+	<text size='large' top='160' left='7' width='158' height='16'>Special treasure:</text>
+	<text top='179' left='23' width='162' height='14'>Item to drop when killed:</text>
+	<text top='179' left='270' width='186' height='14'>Chance of dropping: (0-100)</text>
+	<text top='211' left='9' width='108' height='112'>Monster resistances:<br/><br/>
+		This is the % of full damage the monster takes when of this type.<br/>
+		e.g. 0 - no damage, 100 - normal, 200 - double
+	</text>
 	<text top='81' left='420' width='94' height='14'>Summon type:</text>
 	<group name='summon'>
 		<led name='s0' state='off' top='85' left='505'>Weak (no summon)</led>
@@ -32,47 +54,18 @@
 		<led name='s3' state='off' top='130' left='505'>Type 3</led>
 		<led name='s4' state='off' top='145' left='505'>Unique (no summon)</led>
 	</group>
-
-	<text size='large' top='160' left='7' width='158' height='16'>Special treasure:</text>
-	<text top='179' left='23' width='162' height='14'>Item to drop when killed:</text>
-	<field name='loot-item' top='178' left='164' width='64' height='16' type='uint'/>
-	<button name='pick-item' type='regular' top='175' left='238'>Choose</button>
-
-	<text top='179' left='320' width='186' height='14'>Chance of dropping: (0-100)</text>
-	<field name='loot-chance' top='178' left='484' width='64' height='16' type='uint'/>
-
-	<text top='211' left='9' width='108' height='112'>Monster resistances:<br/><br/>
-		This is the % of full damage the monster takes when of this type.<br/>
-		e.g. 0 - no damage, 100 - normal, 200 - double
-	</text>
-	<text top='216' left='120' width='40' height='16'>Magic:</text>
-	<field name='magic-res' top='215' left='167' width='80' height='16' type='uint' />
-	<text top='246' left='120' width='40' height='16'>Fire:</text>
-	<field name='fire-res' top='245' left='167' width='80' height='16' type='uint' />
-	<text top='216' left='273' width='40' height='16'>Cold:</text>
-	<field name='cold-res' top='215' left='320' width='80' height='16' type='uint' />
-	<text top='246' left='273' width='40' height='16'>Poison:</text>
-	<field name='poison-res' top='245' left='320' width='80' height='16' type='uint' />
-
-	<led name='mindless' top='215' left='415'>Mindless</led>
-	<led name='amorph' top='230' left='415'>Amorphous</led>
-	<led name='invuln' top='245' left='415'>Invulnerable</led>
-
 	<led name='invis' size='small' top='280' left='120'>
 		This monster is naturally and permanently invisible.
 	</led>
 	<led name='guard' size='small' top='296' left='120'>
 		This monster is a guard - when the town goes hostile, it will hunt the party down.
 	</led>
-
 	<text top='331' left='10' width='250' height='16'>Special node to call when monster first seen</text>
-	<field name='onsee' top='330' left='270' width='50' height='16' type='uint' />
+	<field name='onsee' top='330' left='270' width='50' height='16'/>
 	<button name='edit-see' type='large' top='327' left='330'>Create/Edit</button>
-
 	<text top='361' left='10' width='250' height='16'>Monster vocalization sound</text>
-	<field name='snd' top='360' left='270' width='50' height='16' type='uint' />
+	<field name='snd' top='360' left='270' width='50' height='16'/>
 	<button name='pick-snd' type='regular' top='357' left='330'>Choose</button>
-
 	<button name='okay' type='regular' top='385' left='572'>OK</button>
 	<button name='cancel' type='regular' top='385' left='506'>Cancel</button>
 </dialog>

rsrc/dialogs/edit-monster.xml

@@ -2,6 +2,9 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
+	<!--
+	 TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
+	 -->
 	<pict name='icon' type='monst' num='0' top='8' left='8'/>
 	<text size='large' top='6' left='44' width='158' height='16'>Edit Monster Statistics</text>
 	
@@ -12,31 +15,31 @@
 	<field name='name' top='30' left='180' width='186' height='16'/>
 	
 	<text top='58' left='8' width='120' height='14'>Monster picture:</text>
-	<field name='pic' type='uint' top='57' left='140' width='52' height='16'/>
+	<field name='pic' top='57' left='140' width='52' height='16'/>
 	<button name='pickicon' type='large' top='53' left='201'>Select Icon</button>
 	<text name='w' top='59' left='334' width='86' height='14'>Width = </text>
 	<text name='h' top='59' left='426' width='86' height='14'>Height = </text>
 	
 	<text top='83' left='8' width='179' height='14'>Monster level: (0 - 40)</text>
-	<field name='level' type='uint' top='82' left='206' width='52' height='16'/>
+	<field name='level' top='82' left='206' width='52' height='16'/>
 	
 	<text top='107' left='8' width='179' height='14'>Monster health: (0 - 2500)</text>
-	<field name='health' type='uint' top='106' left='206' width='52' height='16'/>
+	<field name='health' top='106' left='206' width='52' height='16'/>
 	
 	<text top='131' left='8' width='179' height='14'>Monster armor: (0 - 50)</text>
-	<field name='armor' type='uint' top='130' left='206' width='52' height='16'/>
+	<field name='armor' top='130' left='206' width='52' height='16'/>
 	
 	<text top='155' left='8' width='179' height='14'>Monster skill: (0 - 40)</text>
-	<field name='skill' type='uint' top='154' left='206' width='52' height='16'/>
+	<field name='skill' top='154' left='206' width='52' height='16'/>
 	
 	<text top='179' left='8' width='179' height='14'>Monster speed: (1-12)</text>
-	<field name='speed' type='uint' top='178' left='206' width='52' height='16'/>
+	<field name='speed' top='178' left='206' width='52' height='16'/>
 	
 	<text top='203' left='8' width='179' height='14'>Monster magic spells: (0 - 7)</text>
-	<field name='mage' type='uint' top='202' left='206' width='51' height='16'/>
+	<field name='mage' top='202' left='206' width='51' height='16'/>
 	
 	<text top='227' left='8' width='179' height='14'>Monster priest spells: (0 - 7)</text>
-	<field name='priest' type='uint' top='226' left='206' width='51' height='16'/>
+	<field name='priest' top='226' left='206' width='51' height='16'/>
 	
 	<text size='large' top='82' left='273' width='158' height='16'>Hand to hand combat:</text>
 	<text top='102' left='343' width='72' height='40'>Number of dice:<br/>(0 - 20)</text>
@@ -44,20 +47,20 @@
 	<text top='128' left='470' width='56' height='14'>Type</text>
 	
 	<text top='150' left='283' width='50' height='14'>Attack 1:</text>
-	<field name='dice1' type='uint' top='149' left='350' width='52' height='16'/>
-	<field name='sides1' type='uint' top='149' left='410' width='52' height='16'/>
+	<field name='dice1' top='149' left='350' width='52' height='16'/>
+	<field name='sides1' top='149' left='410' width='52' height='16'/>
 	<text name='type1' top='150' left='470' width='120' height='14'/>
 	<button name='picktype1' type='regular' top='146' left='525'>Choose</button>
 	
 	<text top='174' left='283' width='50' height='14'>Attack 2:</text>
-	<field name='dice2' type='uint' top='173' left='350' width='52' height='16'/>
-	<field name='sides2' type='uint' top='173' left='410' width='52' height='16'/>
+	<field name='dice2' top='173' left='350' width='52' height='16'/>
+	<field name='sides2' top='173' left='410' width='52' height='16'/>
 	<text name='type2' top='174' left='470' width='120' height='14'/>
 	<button name='picktype2' type='regular' top='170' left='525'>Choose</button>
 	
 	<text top='198' left='283' width='50' height='14'>Attack 3:</text>
-	<field name='dice3' type='uint' top='197' left='350' width='52' height='16'/>
-	<field name='sides3' type='uint' top='197' left='410' width='52' height='16'/>
+	<field name='dice3' top='197' left='350' width='52' height='16'/>
+	<field name='sides3' top='197' left='410' width='52' height='16'/>
 	<text name='type3' top='198' left='470' width='120' height='14'/>
 	<button name='picktype3' type='regular' top='194' left='525'>Choose</button>
 	
@@ -66,12 +69,12 @@
 	<button name='picktype' type='regular' top='250' left='264'>Choose</button>
 	
 	<text top='278' left='8' width='120' height='14'>Default talking picture:</text>
-	<field name='talk' type='uint' top='276' left='138' width='77' height='16'/>
+	<field name='talk' top='276' left='138' width='77' height='16'/>
 	<pict name='talkpic' type='talk' num='0' top='276' left='226'/>
 	<button name='picktalk' type='regular' top='275' left='264'>Choose</button>
 	
 	<text top='250' left='343' width='162' height='14'>Monster treasure: (0-4)</text>
-	<field name='treas' type='uint' top='248' left='513' width='55' height='16'/>
+	<field name='treas' top='248' left='513' width='55' height='16'/>
 	
 	<text top='275' left='343' width='302' height='14'>Default attitude:<br/>
 		(attitude creature has when you place it)

rsrc/dialogs/edit-outdoor-details.xml

@@ -18,16 +18,16 @@
 		<led name='snd4' top='85' left='350'>Custom</led>
 	</group>
 	<text top='106' left='50' width='190' height='16'>Background: (-1 = scenario default)</text>
-	<field name='bg-out' type='int' top='104' left='250' width='80' height='16'/>
+	<field name='bg-out' top='104' left='250' width='80' height='16'/>
 	<button name='pick-out' type='regular' top='101' left='340'>Choose</button>
 	<text top='130' left='50' width='190' height='16'>Combat Background:</text>
-	<field name='bg-fight' type='int' top='128' left='250' width='80' height='16'/>
+	<field name='bg-fight' top='128' left='250' width='80' height='16'/>
 	<button name='pick-fight' type='regular' top='125' left='340'>Choose</button>
 	<text top='154' left='50' width='190' height='16'>Default Town Background:</text>
-	<field name='bg-town' type='int' top='152' left='250' width='80' height='16'/>
+	<field name='bg-town' top='152' left='250' width='80' height='16'/>
 	<button name='pick-town' type='regular' top='149' left='340'>Choose</button>
 	<text top='178' left='50' width='190' height='16'>Default Dungeon Background:</text>
-	<field name='bg-dungeon' type='int' top='176' left='250' width='80' height='16'/>
+	<field name='bg-dungeon' top='176' left='250' width='80' height='16'/>
 	<button name='pick-dungeon' type='regular' top='173' left='340'>Choose</button>
 	<text top='204' left='50' width='101' height='90'>Comment:<br/><br/>
 		You can put useful notes for yourself here. It's not used by the game for anything.

rsrc/dialogs/edit-outdoor-encounter.xml

@@ -2,11 +2,12 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
-	<field name='onmeet' type='int' top='189' left='361' width='46' height='16'/>
+	<!-- OK button -->
+	<field name='onmeet' top='189' left='361' width='46' height='16'/>
 	<field name='onwin' top='231' left='361' width='46' height='16'/>
-	<field name='onflee' type='int' top='275' left='361' width='46' height='16'/>
-	<field name='endy' type='int' top='309' left='460' width='39' height='16'/>
-	<field name='endx' type='int' top='309' left='508' width='39' height='16'/>
+	<field name='onflee' top='275' left='361' width='46' height='16'/>
+	<field name='endy' top='309' left='460' width='39' height='16'/>
+	<field name='endx' top='309' left='508' width='39' height='16'/>
 	<text name='foe1' framed='true' top='135' left='129' width='145' height='14'/>
 	<text name='foe2' framed='true' top='159' left='129' width='145' height='14'/>
 	<text name='foe3' framed='true' top='183' left='129' width='145' height='14'/>
@@ -17,6 +18,10 @@
 	<text name='ally1' framed='true' top='303' left='129' width='145' height='14'/>
 	<text name='ally2' framed='true' top='327' left='129' width='145' height='14'/>
 	<text name='ally3' framed='true' top='351' left='129' width='145' height='14'/>
+	<button name='okay' type='regular' top='370' left='489'>OK</button>
+	<button name='cancel' type='regular' top='370' left='423'>Cancel</button>
+	<button name='left' type='left' def-key='left' top='370' left='11'/>
+	<button name='right' type='right' def-key='right' top='370' left='74'/>
 	<button name='choose-foe1' type='regular' top='130' left='280'>Choose</button>
 	<button name='choose-foe2' type='regular' top='154' left='280'>Choose</button>
 	<button name='choose-foe3' type='regular' top='178' left='280'>Choose</button>
@@ -64,23 +69,4 @@
 	<text top='213' left='352' width='194' height='14'>Special called when party wins</text>
 	<text top='256' left='352' width='194' height='14'>Special called if party flees</text>
 	<text top='299' left='352' width='103' height='33'>Stuff done flag to eliminate encounter</text>
-
-
-	<text name='loc-label' size='large' top='380' left='11' width='113' height='14'>Locations</text>
-	<text name='loc-label2' top='394' left='11' width='113' height='14'>(Any group can appear at any location.)</text>
-
-	<text name='loc1' framed='true' top='380' left='129' width='55' height='14'/>
-	<button name='choose-loc1' type='tiny' relative='pos abs' rel-anchor='prev' top='381' left='7'/>
-	<text name='loc2' framed='true' relative='pos abs' rel-anchor='prev' top='380' left='10' width='55' height='14'/>
-	<button name='choose-loc2' type='tiny' relative='pos abs' rel-anchor='prev' top='381' left='7'/>
-	<text name='loc3' framed='true' relative='pos abs' rel-anchor='prev' top='380' left='10' width='55' height='14'/>
-	<button name='choose-loc3' type='tiny' relative='pos abs' rel-anchor='prev' top='381' left='7'/>
-	<text name='loc4' framed='true' top='380' relative='pos abs' rel-anchor='prev' left='10' width='55' height='14'/>
-	<button name='choose-loc4' type='tiny' relative='pos abs' rel-anchor='prev' top='381' left='7'/>
-
-	<button name='left' type='left' def-key='left' top='412' left='11'/>
-	<button name='right' type='right' def-key='right' top='412' left='74'/>
-	<!-- OK button -->
-	<button name='okay' type='regular' top='412' left='489'>OK</button>
-	<button name='cancel' type='regular' top='412' left='423'>Cancel</button>
 </dialog>

rsrc/dialogs/edit-personality.xml

@@ -2,11 +2,14 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
+	<!-- OK button -->
 	<field name='title' top='42' left='174' width='189' height='16'/>
 	<field name='dunno' top='66' left='254' width='246' height='43'/>
 	<field name='look' top='123' left='73' width='427' height='68'/>
 	<field name='name' top='215' left='73' width='427' height='67'/>
 	<field name='job' top='308' left='73' width='427' height='67'/>
+	<button name='okay' type='regular' top='381' left='441'>OK</button>
+	<button name='cancel' type='regular' top='381' left='375'>Cancel</button>
 	<button name='left' type='left' top='381' left='47'/>
 	<button name='right' type='right' top='381' left='110'/>
 	<pict type='dlog' num='16' top='8' left='8'/>
@@ -18,8 +21,4 @@
 	<text top='103' left='50' width='160' height='14'>Response to 'look'</text>
 	<text top='196' left='50' width='165' height='14'>Response to 'name'</text>
 	<text top='288' left='52' width='170' height='14'>Response to 'job'</text>
-
-	<!-- OK button -->
-	<button name='okay' type='regular' top='381' left='441'>OK</button>
-	<button name='cancel' type='regular' top='381' left='375'>Cancel</button>
 </dialog>

rsrc/dialogs/edit-placed-item.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay' escbtn='cancel'>
+<dialog defbtn='okay'>
 	<!-- OK button -->
 	<button name='okay' type='regular' top='195' left='316'>OK</button>
 	<pict name='pic' type='dlog' num='16' top='8' left='12'/>
@@ -11,9 +11,9 @@
 		Charges:<br/>
 		(-1 = default)
 	</text>
-	<field name='charges' type='int' top='73' left='135' width='52' height='16'/>
+	<field name='charges' top='73' left='135' width='52' height='16'/>
 	<text name='abil-lbl' top='101' left='50' width='80' height='16'>Ability:</text>
-	<field name='abil' type='int' top='101' left='135' width='52' height='16'/>
+	<field name='abil' top='101' left='135' width='52' height='16'/>
 	<button name='abil-choose' type='regular' top='98' left='200'>Choose</button>
 	<text top='120' left='50' width='80' height='14'>Special Flags:</text>
 	<led name='always' font='bold' top='138' left='84' height='14'>Always here</led>
@@ -26,6 +26,5 @@
 	<button name='del' type='regular' top='195' left='8'>Delete</button>
 	<button name='cancel' type='regular' top='195' left='248'>Cancel</button>
 	<text top='28' left='196' width='70' height='14'>Location:</text>
-	<text name='loc' top='28' left='257' width='90' height='14'/>
-	<button name='pick-loc' type='regular' relative='pos neg' rel-anchor='prev' top='4' left='5'>Move</button>
+	<text name='loc' top='28' left='272' width='116' height='14'/>
 </dialog>

rsrc/dialogs/edit-quest.xml

@@ -11,26 +11,24 @@
 	<field name='name' top='57' left='205' width='252' height='16'/>
 	<field name='descr' top='84' left='205' width='252' height='104'/>
 	<text top='209' left='50' width='170' height='28'>Must be completed by day:<br/>(-1 for no deadline)</text>
-	<field name='chop' type='int' top='208' left='205' width='110' height='16'/>
+	<field name='chop' top='208' left='205' width='110' height='16'/>
 	<text top='247' left='50' width='170' height='28'>Event to waive deadline:<br/>(-1 for none)</text>
-	<field name='evt' type='int' top='246' left='205' width='60' height='16'/>
+	<field name='evt' top='246' left='205' width='60' height='16'/>
 	<button name='choose-evt' type='regular' anchor='evt' relative='pos pos-in' top='-4' left='8'>Choose</button>
 	<text size='large' top='280' left='50' width='220' height='17'>Reward for completing:</text>
 	<text top='307' left='50' width='150' height='16'>Experience Points:</text>
-	<field name='xp' type='uint' top='306' left='205' width='110' height='16'/>
+	<field name='xp' top='306' left='205' width='110' height='16'/>
 	<text top='333' left='50' width='150' height='16'>Gold:</text>
-	<field name='gold' type='uint' top='332' left='205' width='110' height='16'/>
+	<field name='gold' top='332' left='205' width='110' height='16'/>
 	<led name='rel' wrap='true' top='208' left='345'>Deadline is relative to start day</led>
 	<led name='start' wrap='true' top='246' left='345'>Player is given quest when scenario starts</led>
 	<led name='inbank' top='285' left='345'>Include in a job bank:</led>
-	<field name='bank1' type='int' top='306' left='359' width='110' height='16'/>
+	<field name='bank1' top='306' left='359' width='110' height='16'/>
 	<button name='choose-bank1' type='regular' anchor='bank1' relative='pos pos-in' top='-4' left='8'>Choose</button>
-	<field name='bank2' type='int' top='332' left='359' width='110' height='16'/>
+	<field name='bank2' top='332' left='359' width='110' height='16'/>
 	<button name='choose-bank2' type='regular' anchor='bank2' relative='pos pos-in' top='-4' left='8'>Choose</button>
-
-	<button name='preview' type='regular' top='358' left='387'>Preview</button>
-	<button name='left' type='left' def-key='left' top='382' left='50'/>
-	<button name='right' type='right' def-key='right' top='382' left='115'/>
-	<button name='cancel' type='regular' top='382' left='322'>Cancel</button>
-	<button name='okay' type='regular' top='382' left='387'>OK</button>
+	<button name='left' type='left' def-key='left' top='358' left='50'/>
+	<button name='right' type='right' def-key='right' top='358' left='115'/>
+	<button name='cancel' type='regular' top='358' left='322'>Cancel</button>
+	<button name='okay' type='regular' top='358' left='387'>OK</button>
 </dialog>

rsrc/dialogs/edit-scenario-advanced.xml

@@ -12,7 +12,7 @@
 	<led name='adjust' top='56' left='50' size='small'>Adjust difficulty if played by a party stronger than recommended</led>
 
 	<text top='79' left='50' width='120' height='14'>Special on Start:</text>
-	<field name='oninit' type='int' top='78' left='181' width='100' height='16'/>
+	<field name='oninit' top='78' left='181' width='100' height='16'/>
 	<button name='pickinit' type='large' top='74' left='290'>Create/Edit</button>
 
 	<text top='107' left='50' width='120' height='14'>Campaign ID:</text>

rsrc/dialogs/edit-scenario-events.xml

@@ -3,26 +3,26 @@
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
 	<stack name='list' pages='2'>
-		<field name='time1' type='uint' top='133' left='130' width='67' height='16'/>
-		<field name='time2' type='uint' top='161' left='130' width='67' height='16'/>
-		<field name='time3' type='uint' top='189' left='130' width='67' height='16'/>
-		<field name='time4' type='uint' top='217' left='130' width='67' height='16'/>
-		<field name='time5' type='uint' top='245' left='130' width='67' height='16'/>
-		<field name='time6' type='uint' top='273' left='130' width='67' height='16'/>
-		<field name='time7' type='uint' top='301' left='130' width='67' height='16'/>
-		<field name='time8' type='uint' top='329' left='130' width='67' height='16'/>
-		<field name='time9' type='uint' top='357' left='130' width='67' height='16'/>
-		<field name='time10' type='uint' top='385' left='130' width='67' height='16'/>
-		<field name='node1' type='int' top='133' left='270' width='39' height='16'/>
-		<field name='node2' type='int' top='161' left='270' width='39' height='16'/>
-		<field name='node3' type='int' top='189' left='270' width='39' height='16'/>
-		<field name='node4' type='int' top='217' left='270' width='39' height='16'/>
-		<field name='node5' type='int' top='245' left='270' width='39' height='16'/>
-		<field name='node6' type='int' top='273' left='270' width='39' height='16'/>
-		<field name='node7' type='int' top='301' left='270' width='39' height='16'/>
-		<field name='node8' type='int' top='329' left='270' width='39' height='16'/>
-		<field name='node9' type='int' top='357' left='270' width='39' height='16'/>
-		<field name='node10' type='int' top='385' left='270' width='39' height='16'/>
+		<field name='time1' top='133' left='130' width='67' height='16'/>
+		<field name='time2' top='161' left='130' width='67' height='16'/>
+		<field name='time3' top='189' left='130' width='67' height='16'/>
+		<field name='time4' top='217' left='130' width='67' height='16'/>
+		<field name='time5' top='245' left='130' width='67' height='16'/>
+		<field name='time6' top='273' left='130' width='67' height='16'/>
+		<field name='time7' top='301' left='130' width='67' height='16'/>
+		<field name='time8' top='329' left='130' width='67' height='16'/>
+		<field name='time9' top='357' left='130' width='67' height='16'/>
+		<field name='time10' top='385' left='130' width='67' height='16'/>
+		<field name='node1' top='133' left='270' width='39' height='16'/>
+		<field name='node2' top='161' left='270' width='39' height='16'/>
+		<field name='node3' top='189' left='270' width='39' height='16'/>
+		<field name='node4' top='217' left='270' width='39' height='16'/>
+		<field name='node5' top='245' left='270' width='39' height='16'/>
+		<field name='node6' top='273' left='270' width='39' height='16'/>
+		<field name='node7' top='301' left='270' width='39' height='16'/>
+		<field name='node8' top='329' left='270' width='39' height='16'/>
+		<field name='node9' top='357' left='270' width='39' height='16'/>
+		<field name='node10' top='385' left='270' width='39' height='16'/>
 	</stack>
 	<button name='edit1' type='large' top='131' left='324'>Create/Edit</button>
 	<button name='edit2' type='large' top='159' left='324'>Create/Edit</button>

rsrc/dialogs/edit-shop-special.xml

@@ -7,7 +7,7 @@
 	<text top='50' left='10' width='100' height='16'>Name:</text>
 	<field name='name' top='48' left='110' width='200' height='16'/>
 	<text top='75' left='10' width='100' height='16'>Special Node:</text>
-	<field name='node' type='int' top='74' left='110' width='80' height='16'/>
+	<field name='node' top='74' left='110' width='80' height='16'/>
 	<button name='edit' type='large' top='71' left='200'>Create/Edit</button>
 	<text top='100' left='10' width='100' height='16'>Quantity:</text>
 	<field name='amount' type='uint' top='98' left='110' width='80' height='16'/>

rsrc/dialogs/edit-special-assign.xml

@@ -2,16 +2,13 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
+	<field name='num' type='uint' top='64' left='209' width='75' height='16'/>
 	<pict type='dlog' num='16' top='8' left='8'/>
+	<button name='okay' type='regular' top='87' left='311'>OK</button>
 	<text size='large' top='6' left='50' width='256' height='17'>Set Special Number:</text>
-	<text name='prompt' top='25' left='50' width='323' height='27'>
-		Which special node should be called when this space is entered/examined? (0-{{max-num}} for existing, {{next-num}} for new.)
+	<text top='25' left='50' width='323' height='27'>
+		Which special node should be called when this space is entered/examined?
 	</text>
 	<text top='64' left='120' width='84' height='16'>Special node:</text>
-	<field name='num' type='uint' top='64' left='209' width='75' height='16'/>
-	<!--TODO add a picker-->
-
-	<button name='cancel' type='regular' top='87' left='5'>Cancel</button>
-	<button name='edit' type='large' top='87' left='180'>Create/Edit</button>
-	<button name='okay' type='regular' top='87' left='286'>OK</button>
+	<button name='cancel' type='regular' top='87' left='246'>Cancel</button>
 </dialog>

rsrc/dialogs/edit-special-item.xml

@@ -5,20 +5,19 @@
 	<field name='name' top='57' left='195' width='252' height='16'/>
 	<field name='descr' top='84' left='195' width='252' height='104'/>
 	<field name='spec' type='int' top='249' left='268' width='87' height='16'/>
+	<button name='okay' type='regular' top='288' left='397'>OK</button>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='6' left='50' width='256' height='17'>Edit Special Items</text>
 	<text top='58' left='50' width='132' height='14'>Name of Special Item:</text>
 	<text top='85' left='50' width='118' height='27'>Special Item Description:</text>
 	<text top='243' left='51' width='208' height='28'>Scenario special node to be called when item is used:</text>
+	<button name='cancel' type='regular' top='288' left='332'>Cancel</button>
 	<button name='clear' type='large' top='15' left='329'>Clear Special</button>
 	<button name='edit-spec' type='large' top='246' left='363'>Create/Edit</button>
 	<led name='start-with' state='off' top='198' left='50'>Party starts scen. with item</led>
 	<led name='usable' state='off' top='218' left='50'>Special item can be used</led>
 	<text top='29' left='50' width='136' height='14'>Editing special item:</text>
 	<text name='num' top='29' left='190' width='39' height='14'/>
-	<button name='preview' type='regular' top='288' left='397'>Preview</button>
-	<button name='left' type='left' top='312' left='9'/>
-	<button name='right' type='right' top='312' left='72'/>
-	<button name='cancel' type='regular' top='312' left='332'>Cancel</button>
-	<button name='okay' type='regular' top='312' left='397'>OK</button>
+	<button name='left' type='left' top='288' left='9'/>
+	<button name='right' type='right' top='288' left='72'/>
 </dialog>

rsrc/dialogs/edit-special-node.xml

@@ -2,11 +2,14 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
+	<!--
+	 TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
+	 -->
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text name='title' size='large' top='6' left='50' width='158' height='16'>Edit Special Node</text>
 	<text top='8' left='222' width='90' height='14'>Node number:</text>
 	<text name='num' top='8' left='314' width='38' height='14'/>
-	<text name='tip' top='147' left='519' width='125'>
+	<text top='147' left='469' width='125' height='124'>
 		Enter properties for this special encounter node.
 		For a detailed description of how this window works, see the documentation.
 	</text>
@@ -18,7 +21,6 @@
 	<button name='town' type='large' top='49' left='356'>Town Specs</button>
 	<button name='out' type='large' top='73' left='356'>Out Specs</button>
 	<button name='rect' type='large' top='49' left='483'>Rect Specs</button>
-	<button name='all' type='large' top='73' left='483'>All</button>
 	
 	
 	<text size='large' top='28' left='50' width='158' height='16'>Special Type:</text>
@@ -28,95 +30,81 @@
 	
 	<text size='large' top='102' left='8' width='158' height='16'>Stuff Done Flags:</text>
 	<text name='sdf1-lbl' framed='true' top='121' left='22' width='220' height='15'/>
-	<field name='sdf1' type='int' top='120' left='254' width='51' height='16'/>
+	<field name='sdf1' top='120' left='254' width='51' height='16'/>
 	<button name='sdf1-edit' type='tiny' top='106' left='272'/>
-	<button name='sdf1-edit2' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='sdf1-toggle' top='106' left='272'/>
 	
 	<text name='sdf2-lbl' framed='true' top='121' left='317' width='176' height='16'/>
-	<field name='sdf2' type='int' top='120' left='510' width='51' height='16'/>
+	<field name='sdf2' top='120' left='510' width='51' height='16'/>
 	<button name='sdf2-edit' type='tiny' top='106' left='528'/>
-	<button name='sdf2-edit2' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='sdf2-toggle' top='106' left='528'/>
 	
 	
 	<text size='large' top='141' left='8' width='176' height='16'>Message, Pict:</text>
 	<text name='msg1-lbl' framed='true' top='164' left='22' width='238' height='15'/>
-	<field name='msg1' type='int' top='163' left='270' width='51' height='16'/>
+	<field name='msg1' top='163' left='270' width='51' height='16'/>
 	<button name='msg1-edit' type='large' top='161' left='329'>Create/Edit</button>
-	<button name='msg1-edit2' type='regular' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='msg1-toggle' top='167' left='329'/>
 	
 	<text name='msg2-lbl' framed='true' top='188' left='22' width='238' height='15'/>
-	<field name='msg2' type='int' top='187' left='270' width='51' height='16'/>
+	<field name='msg2' top='187' left='270' width='51' height='16'/>
 	<button name='msg2-edit' type='large' top='185' left='329'>Create/Edit</button>
-	<button name='msg2-edit2' type='regular' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='msg2-toggle' top='191' left='329'/>
 	
 	<text name='msg3-lbl' framed='true' top='212' left='22' width='238' height='15'/>
-	<field name='msg3' type='int' top='211' left='270' width='51' height='16'/>
+	<field name='msg3' top='211' left='270' width='51' height='16'/>
 	<button name='msg3-edit' type='large' top='209' left='329'>Create/Edit</button>
-	<button name='msg3-edit2' type='regular' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='msg3-toggle' top='215' left='329'/>
 	
 	<text name='pict-lbl' framed='true' top='236' left='22' width='238' height='15'/>
-	<field name='pict' type='int' top='235' left='270' width='51' height='16'/>
+	<field name='pict' top='235' left='270' width='51' height='16'/>
 	<button name='pict-edit' type='large' top='233' left='329'>Choose</button>
-	<button name='pict-edit2' type='regular' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='pict-toggle' top='239' left='329'/>
 	
 	<text name='pictype-lbl' framed='true' top='260' left='22' width='238' height='15'/>
-	<field name='pictype' type='int' top='259' left='270' width='51' height='16'/>
+	<field name='pictype' top='259' left='270' width='51' height='16'/>
 	<button name='pictype-edit' type='large' top='257' left='329'>Choose</button>
-	<button name='pictype-edit2' type='regular' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='pictype-toggle' top='263' left='329'/>
 	
 	
 	<text size='large' top='281' left='8' width='158' height='16'>Extra 1:</text>
 	<text name='x1a-lbl' framed='true' top='302' left='22' width='238' height='15'/>
-	<field name='x1a' type='int' top='301' left='270' width='51' height='16'/>
+	<field name='x1a' top='301' left='270' width='51' height='16'/>
 	<button name='x1a-edit' type='large' top='298' left='330'>Choose</button>
-	<button name='x1a-edit2' type='regular' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='x1a-toggle' top='304' left='330'/>
 	
 	<text name='x1b-lbl' framed='true' top='326' left='22' width='238' height='15'/>
-	<field name='x1b' type='int' top='325' left='270' width='51' height='16'/>
+	<field name='x1b' top='325' left='270' width='51' height='16'/>
 	<button name='x1b-edit' type='large' top='322' left='330'>Create/Edit</button>
-	<button name='x1b-edit2' type='regular' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='x1b-toggle' top='328' left='330'/>
 	
 	<text name='x1c-lbl' framed='true' top='350' left='22' width='238' height='15'/>
-	<field name='x1c' type='int' top='349' left='270' width='51' height='16'/>
+	<field name='x1c' top='349' left='270' width='51' height='16'/>
 	<button name='x1c-edit' type='large' top='346' left='330'>Create/Edit</button>
-	<button name='x1c-edit2' type='regular' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='x1c-toggle' top='352' left='330'/>
 	
 	
 	<text size='large' top='372' left='8' width='158' height='16'>Extra 2:</text>
 	<text name='x2a-lbl' framed='true' top='394' left='22' width='238' height='15'/>
-	<field name='x2a' type='int' top='394' left='270' width='51' height='16'/>
+	<field name='x2a' top='394' left='270' width='51' height='16'/>
 	<button name='x2a-edit' type='large' top='391' left='330'>Choose</button>
-	<button name='x2a-edit2' type='regular' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='x2a-toggle' top='397' left='330'/>
 	
 	<text name='x2b-lbl' framed='true' top='419' left='22' width='238' height='15'/>
-	<field name='x2b' type='int' top='418' left='270' width='51' height='16'/>
+	<field name='x2b' top='418' left='270' width='51' height='16'/>
 	<button name='x2b-edit' type='large' top='416' left='330'>Create/Edit</button>
-	<button name='x2b-edit2' type='regular' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='x2b-toggle' top='422' left='330'/>
 	
 	<text name='x2c-lbl' framed='true' top='443' left='22' width='238' height='15'/>
-	<field name='x2c' type='int' top='442' left='270' width='51' height='16'/>
+	<field name='x2c' top='442' left='270' width='51' height='16'/>
 	<button name='x2c-edit' type='large' top='440' left='330'>Create/Edit</button>
-	<button name='x2c-edit2' type='regular' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='x2c-toggle' top='446' left='330'/>
 	
 	
 	<text size='large' top='471' left='8' width='87' height='16'>Jump To:</text>
 	<text name='jump-lbl' framed='true' top='472' left='99' width='182' height='14'/>
-	<field name='jump' type='int' top='471' left='291' width='52' height='15'/>
+	<field name='jump' top='471' left='291' width='52' height='15'/>
 	<button name='jump-edit' type='large' top='468' left='349'>Create/Edit</button>
-	<button name='jump-edit2' type='regular' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Choose</button>
 	<led name='jump-toggle' top='474' left='349'/>
 	
 	<button name='preview-dialog' type='regular' top='470' left='522'>Preview</button>
@@ -124,31 +112,4 @@
 	<button name='okay' type='regular' top='494' left='522'>OK</button>
 	<button name='cancel' type='regular' top='494' left='456'>Cancel</button>
 	<button name='back' type='large' top='494' left='10'>Go Back</button>
-
-	<text name='cb' relative='pos-in pos' anchor='tip' top='8' left='0'>Called By</text>
-	<text relative='pos-in pos' anchor='tip' top='8' left='100'>Calls</text>
-	<!-- There is NO limit to how many things could call a node. Only the designor's sanity.
-			But let's hope this is enough for most cases. -->
-	<button name='calledby0' type='tiny' relative='pos-in pos' anchor='cb' top='2' left='0'/>
-	<button name='calledby1' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calledby2' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calledby3' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calledby4' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calledby5' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calledby6' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calledby7' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calledby8' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calledby9' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calledby10' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calledby11' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calledby12' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calledby13' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<!-- There is a limit to how many nodes a node can call. I think it's 3, for the
-			if-elseif-else conditionals. -->
-	<button name='calls0' type='tiny' relative='pos-in pos' anchor='cb' top='2' left='100'/>
-	<button name='calls1' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calls2' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-	<button name='calls3' type='tiny' relative='pos-in pos' rel-anchor='prev' top='4' left='0'/>
-
-	<text name='tooltip' framed='true' ellipsis='true' width='260' height='16' relative='neg pos' anchor='calledby13' top='4' left='20'></text>
 </dialog>

rsrc/dialogs/edit-talk-node.xml

@@ -2,18 +2,20 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
-	<field name='who' type='int' top='26' left='186' width='64' height='16'/>
+	<!-- OK button -->
+	<field name='who' top='26' left='186' width='64' height='16'/>
 	<field name='key1' top='54' left='165' width='52' height='16' max-chars='4'/>
 	<field name='key2' top='54' left='285' width='52' height='16' max-chars='4'/>
 	<text top='6' left='350' width='160' height='48'>The in-game "Buy" button checks for these response keys, in order: purc, sale, heal, iden, trai, ench</text>
 	<text relative='pos-in pos' rel-anchor='prev' top='0' left='0' width='160' height='50'>The "Sell" button checks for sell.</text>
-	<field name='extra1' type='int' top='114' left='344' width='64' height='16'/>
-	<field name='extra2' type='int' top='137' left='344' width='64' height='16'/>
-	<field name='extra3' type='int' top='160' left='344' width='64' height='16'/>
-	<field name='extra4' type='int' top='183' left='344' width='64' height='16'/>
+	<field name='extra1' top='114' left='344' width='64' height='16'/>
+	<field name='extra2' top='137' left='344' width='64' height='16'/>
+	<field name='extra3' top='160' left='344' width='64' height='16'/>
+	<field name='extra4' top='183' left='344' width='64' height='16'/>
 	<field name='str1' top='223' left='72' width='430' height='80'/>
 	<field name='str2' top='328' left='72' width='434' height='80'/>
-
+	<button name='okay' type='regular' top='415' left='445'>OK</button>
+	<button name='cancel' type='regular' top='415' left='380'>Cancel</button>
 	<button name='back' type='large' top='415' left='49'>Go Back</button>
 	<button name='new' type='large' top='415' left='155'>Create New</button>
 	<text name='type' framed='true' top='79' left='135' width='160' height='14'/>
@@ -42,8 +44,4 @@
 	<button name='chooseC' type='regular' top='158' left='414'>Choose</button>
 	<button name='chooseB' type='regular' top='135' left='414'>Choose</button>
 	<button name='chooseA' type='regular' top='112' left='414'>Choose</button>
-
-	<!-- OK button -->
-	<button name='okay' type='regular' top='415' left='445'>OK</button>
-	<button name='cancel' type='regular' top='415' left='380'>Cancel</button>
 </dialog>

rsrc/dialogs/edit-terrain.xml

@@ -2,6 +2,9 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='done' escbtn='cancel'>
+	<!--
+	 TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
+	 -->
 	<pict name='graphic' type='ter' num='0' top='8' left='8'/>
 	<text size='large' top='6' left='50' height='17' width='138'>Edit Terrain Type</text>
 	
@@ -17,12 +20,12 @@
 	<field name='name' top='30'  left='186' height='16' width='186'/>
 	
 	<text top='63' left='9' height='14' width='120'>Terrain picture:</text>
-	<field name='pict' type='uint' top='62'  left='141' height='16' width='52' />
+	<field name='pict' top='62'  left='141' height='16' width='52' />
 	<button name='pickpict' type='large' top='59' left='205'>Pick Picture</button>
 	<button name='pickanim' type='large' top='59' left='319'>Animated</button>
 	
 	<text top='63' left='430' width='60' height='14'>Map icon:</text>
-	<field name='map' type='uint' top='62' left='495' width='80' height='16'/>
+	<field name='map' top='62' left='495' width='80' height='16'/>
 	<pict name='seemap' top='86' left='465' type='map' num='0'/>
 	<button name='pickmap' type='regular' top='86' left='495'>Choose</button>
 	<text top='115' left='431' height='32' width='157'>(Enter -1 to scale down the large picture)</text>
@@ -52,19 +55,19 @@
 	</group>
 	
 	<text top='194' left='8' height='14' width='91'>Shortcut key:</text>
-	<field name='key' top='193' left='109' height='16' width='52' max-chars='1' />
+	<field name='key' top='193' left='109' height='16' width='52' />
 	<text top='194' left='171' height='14' width='91'>Light radius:</text>
-	<field name='light' type='uint' top='193' left='271' height='16' width='52' />
+	<field name='light' top='193' left='271' height='16' width='52' />
 	<text top='193' left='333' height='14' width='128'>Transform to what?</text>
-	<field name='trans' type='uint' top='193' left='467' height='16' width='52' />
+	<field name='trans' top='193' left='467' height='16' width='52' />
 	<button name='picktrans' top='190' left='530' type='regular'>Choose</button>
 	
 	<text top='217' left='8' height='14' width='91'>Ground type:</text>
-	<field name='ground' type='uint' top='216' left='109' height='16' width='52' />
+	<field name='ground' top='216' left='109' height='16' width='52' />
 	<text top='217' left='171' height='14' width='91'>Trim terrain:</text>
-	<field name='trimter' type='int' top='216' left='271' height='16' width='52' />
+	<field name='trimter' top='216' left='271' height='16' width='52' />
 	<text top='217' left='333' height='14' width='128'>Trim type:</text>
-	<field name='trim' type='uint' top='216' left='467' height='16' width='52' />
+	<field name='trim' top='216' left='467' height='16' width='52' />
 	<button name='picktrim' top='213' left='530' type='regular'>Choose</button>
 	
 	<text size='large' top='238' left='8' height='14' width='175'>Special properties:</text>
@@ -96,21 +99,21 @@
 	</group>
 	
 	<text top='254' left='467' height='14' width='100'>Combat Arena:</text>
-	<field name='arena' type='uint' top='275' left='467' height='16' width='64'/>
+	<field name='arena' top='275' left='467' height='16' width='64'/>
 	<button name='pickarena' type='regular' top='299' left='467'>Choose</button>
 	<button name='picktown' type='regular' top='299' left='532'>Custom</button>
 	<button name='object' top='344' left='467' type='large'>Object Detail</button>
 	
 	<text top='385' left='9' height='14' width='91'>Extra values:</text>
 	<text name='flag1text' framed='true' top='385' left='109' height='14' width='209'>*flag1</text>
-	<field name='flag1' type='int' top='384' left='329' height='16' width='64' />
+	<field name='flag1' top='384' left='329' height='16' width='64' />
 	<button name='pickflag1' top='381' left='404' type='regular'>Choose</button>
 	<button name='editspec' top='381' left='404' type='large'>Create/Edit</button>
 	<text name='flag2text' framed='true' top='410' left='109' height='14' width='209'>*flag2</text>
-	<field name='flag2' type='int' top='409' left='329' height='16' width='64' />
+	<field name='flag2' top='409' left='329' height='16' width='64' />
 	<button name='pickflag2' top='406' left='404' type='regular'>Choose</button>
 	<text name='flag3text' framed='true' top='435' left='109' height='14' width='209'>*flag3</text>
-	<field name='flag3' type='int' top='434' left='329' height='16' width='64' />
+	<field name='flag3' top='434' left='329' height='16' width='64' />
 	<button name='pickflag3' top='431' left='404' type='regular'>Choose</button>
 	
 	<button name='done' type='regular' top='455' left='517'>OK</button>

rsrc/dialogs/edit-town-advanced.xml

@@ -12,23 +12,23 @@
 	<text name='exit-specials' relative='pos-in pos' rel-anchor='prev' top='0' left='-2' width='302' height='64' framed='true'/>
 	<text relative='pos-in' anchor='exit-specials' top='3' left='3' width='197' height='15'>Exit town specials:</text>
 	<button name='edit-onexit1' relative='pos-in pos' rel-anchor='prev' type='tiny' top='6' left='0' height='15' text-size='10'>Top</button>
-	<field name='onexit1' type='int' relative='pos-in' rel-anchor='prev' top='-4' left='75' width='67' height='16'/>
+	<field name='onexit1' relative='pos-in' rel-anchor='prev' top='-4' left='75' width='67' height='16'/>
 	<button relative='pos-in pos' anchor='edit-onexit1' name='edit-onexit2' type='tiny' top='8' left='0' height='15' text-size='10'>Left</button>
-	<field name='onexit2' type='int' relative='pos-in' rel-anchor='prev' top='-4' left='75' width='67' height='16'/>
+	<field name='onexit2' relative='pos-in' rel-anchor='prev' top='-4' left='75' width='67' height='16'/>
 	<button name='edit-onexit3' relative='pos pos-in' anchor='onexit1' type='tiny' top='4' left='8' height='15' text-size='10'>Bottom</button>
-	<field name='onexit3' type='int' relative='pos-in' rel-anchor='prev' top='-4' left='75' width='67' height='16'/>
+	<field name='onexit3' relative='pos-in' rel-anchor='prev' top='-4' left='75' width='67' height='16'/>
 	<button name='edit-onexit4' relative='pos-in pos' anchor='edit-onexit3' type='tiny' top='8' left='0' height='15' text-size='10'>Right</button>
-	<field name='onexit4' type='int' relative='pos-in' rel-anchor='prev' top='-4' left='75' width='67' height='16'/>
+	<field name='onexit4' relative='pos-in' rel-anchor='prev' top='-4' left='75' width='67' height='16'/>
 	<button name='exit-special-help' type='help' relative='neg-in pos-in' anchor='exit-specials' top='2' left='18'/>
 	
 	<text name='specials' relative='pos-in pos' anchor='exit-specials' top='10' left='0' width='302' height='90' framed='true'/>
 	<text relative='pos-in' anchor='specials' top='3' left='3' width='202' height='15'>Town entry special node:</text>
 	<button name='edit-onenter' relative='pos-in pos' rel-anchor='prev' type='tiny' top='8' left='0' height='15' text-size='10'>Still alive</button>
-	<field name='onenter' type='int' relative='pos-in' rel-anchor='prev' top='-4' left='146' width='67' height='16'/>
+	<field name='onenter' relative='pos-in' rel-anchor='prev' top='-4' left='146' width='67' height='16'/>
 	<button name='edit-onenterdead' relative='pos-in pos' anchor='edit-onenter' type='tiny' top='8' left='0' height='15' text-size='10'>Been abandoned</button>
-	<field name='onenterdead' type='int' relative='pos-in' rel-anchor='prev' top='-4' left='146' width='67' height='16'/>
+	<field name='onenterdead' relative='pos-in' rel-anchor='prev' top='-4' left='146' width='67' height='16'/>
 	<button name='edit-onhostile' relative='pos-in pos' anchor='edit-onenterdead' type='tiny' top='8' left='0' height='15' text-size='10'>When Goes Hostile</button>
-	<field name='onhostile' type='int' relative='pos-in' rel-anchor='prev' top='-4' left='146' width='67' height='16'/>
+	<field name='onhostile' relative='pos-in' rel-anchor='prev' top='-4' left='146' width='67' height='16'/>
 	<button name='special-help' type='help' relative='neg-in pos-in' anchor='specials' top='2' left='18'/>
 	
 	<text name='exits' relative='pos pos-in' anchor='exit-specials' top='0' left='10' width='185' height='164' framed='true'/>
@@ -36,25 +36,25 @@
 	<text name='exit-x' relative='pos-in pos' rel-anchor='prev' top='4' left='100' width='35' height='15'>X</text>
 	<text name='exit-y' relative='pos pos-in' rel-anchor='prev' top='0' left='12' width='35' height='15'>Y</text>
 	<button name='exit1' relative='pos-in pos' anchor='exit-x' type='tiny' top='4' left='-100' width='96' height='15' text-size='10'>Top</button>
-	<field name='exit1-x' type='int' relative='pos-in pos' anchor='exit-x' top='4' left='-8' width='39' height='16'/>
-	<field name='exit1-y' type='int' relative='pos-in pos' anchor='exit-y' top='4' left='-8' width='39' height='16'/>
+	<field name='exit1-x' relative='pos-in pos' anchor='exit-x' top='4' left='-8' width='39' height='16'/>
+	<field name='exit1-y' relative='pos-in pos' anchor='exit-y' top='4' left='-8' width='39' height='16'/>
 	<button name='exit2' relative='pos-in pos' anchor='exit1' type='tiny' top='9' left='0' width='96' height='15' text-size='10'>Left</button>
-	<field name='exit2-x' type='int' relative='pos-in pos' anchor='exit1-x' top='8' left='0' width='39' height='16'/>
-	<field name='exit2-y' type='int' relative='pos-in pos' anchor='exit1-y' top='8' left='0' width='39' height='16'/>
+	<field name='exit2-x' relative='pos-in pos' anchor='exit1-x' top='8' left='0' width='39' height='16'/>
+	<field name='exit2-y' relative='pos-in pos' anchor='exit1-y' top='8' left='0' width='39' height='16'/>
 	<button name='exit3' relative='pos-in pos' anchor='exit2' type='tiny' top='9' left='0' width='96' height='15' text-size='10'>Bottom</button>
-	<field name='exit3-x' type='int' relative='pos-in pos' anchor='exit2-x' top='8' left='0' width='39' height='16'/>
-	<field name='exit3-y' type='int' relative='pos-in pos' anchor='exit2-y' top='8' left='0' width='39' height='16'/>
+	<field name='exit3-x' relative='pos-in pos' anchor='exit2-x' top='8' left='0' width='39' height='16'/>
+	<field name='exit3-y' relative='pos-in pos' anchor='exit2-y' top='8' left='0' width='39' height='16'/>
 	<button name='exit4' relative='pos-in pos' anchor='exit3' type='tiny' top='9' left='0' width='96' height='15' text-size='10'>Right</button>
-	<field name='exit4-x' type='int' relative='pos-in pos' anchor='exit3-x' top='8' left='0' width='39' height='16'/>
-	<field name='exit4-y' type='int' relative='pos-in pos' anchor='exit3-y' top='8' left='0' width='39' height='16'/>
+	<field name='exit4-x' relative='pos-in pos' anchor='exit3-x' top='8' left='0' width='39' height='16'/>
+	<field name='exit4-y' relative='pos-in pos' anchor='exit3-y' top='8' left='0' width='39' height='16'/>
 	<button name='exit-help' type='help' relative='neg-in pos-in' anchor='exits' top='2' left='18'/>
 	
 	<text name='bg' relative='pos pos-in' anchor='props' top='0' left='10' width='166' height='100' framed='true'/>
 	<text relative='pos-in' anchor='bg' top='3' left='3' width='100' height='15'>Backgrounds:</text>
 	<button name='pick-town' relative='pos-in pos' rel-anchor='prev' type='tiny' top='8' left='0' text-size='10'>Town:</button>
-	<field name='bg-town' type='int' relative='pos-in' rel-anchor='prev' top='-4' left='80' width='80' height='16'/>
+	<field name='bg-town' relative='pos-in' rel-anchor='prev' top='-4' left='80' width='80' height='16'/>
 	<button name='pick-fight' relative='pos-in pos' anchor='pick-town' type='tiny' top='15' left='0' text-size='10'>Combat:</button>
-	<field name='bg-fight' type='int' relative='pos-in' rel-anchor='prev' top='-4' left='80' width='80' height='16'/>
+	<field name='bg-fight' relative='pos-in' rel-anchor='prev' top='-4' left='80' width='80' height='16'/>
 	<button name='bg-help' type='help' relative='neg-in pos-in' anchor='bg' top='2' left='18'/>
 	
 	<text name='props' relative='pos-in pos' anchor='specials' top='10' left='0' width='126' height='100' framed='true'/>

rsrc/dialogs/edit-town-details.xml

@@ -11,17 +11,17 @@
 	<text top='58' left='50' width='130' height='14'>Town timing:</text>
 
 	<text top='78' left='59' width='242' height='14'>Day when town dies: (if -1, it doesn't)</text>
-	<field name='chop' type='int' top='77' left='327' width='43' height='16'/>
+	<field name='chop' top='77' left='327' width='43' height='16'/>
 
 	<text top='98' left='59' width='261' height='41'>Number of event which prevents town death (if -1 or 0, none) - see chapter in documentation on time for more details.</text>
-	<field name='key' type='int' top='101' left='327' width='43' height='16'/>
+	<field name='key' top='101' left='327' width='43' height='16'/>
 	<button name='choose-key' type='regular' relative='pos neg' rel-anchor='prev' top='4' left='4'>Choose</button>
 
 	<text top='216' left='50' width='234' height='42'>
 		Maximum number of monsters:
 		(When this many monsters are killed, the dungeon will be abandoned)
 	</text>
-	<field name='population' type='uint'  top='219' left='294' width='54' height='16'/>
+	<field name='population' top='219' left='294' width='54' height='16'/>
 	<text name='population-hint' relative='pos neg' rel-anchor='prev' top='4' left='4' width='90'>
 		This town has {{num}} hostile creatures.
 	</text>
@@ -30,7 +30,7 @@
 		Town difficulty (0-10):
 		(Determines how fast wandering monsters appear, how nasty traps are, and how hard it is to unlock doors.)
 	</text>
-	<field name='difficulty' type='uint' top='265' left='294' width='54' height='16'/>
+	<field name='difficulty' top='265' left='294' width='54' height='16'/>
 
 	<text top='143' left='50' width='63' height='14'>Lighting:</text>
 	<group name='lighting'>

rsrc/dialogs/edit-town-events.xml

@@ -2,23 +2,22 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
-	<field name='time1' type='uint' top='122' left='146' width='67' height='16'/>
-	<field name='time2' type='uint' top='150' left='146' width='67' height='16'/>
-	<field name='time3' type='uint' top='178' left='146' width='67' height='16'/>
-	<field name='time4' type='uint' top='206' left='146' width='67' height='16'/>
-	<field name='time5' type='uint' top='234' left='146' width='67' height='16'/>
-	<field name='time6' type='uint' top='262' left='146' width='67' height='16'/>
-	<field name='time7' type='uint' top='290' left='146' width='67' height='16'/>
-	<field name='time8' type='uint' top='318' left='146' width='67' height='16'/>
-	<!-- Unsigned because you don't use -1 for none, you just set the interval to 0: -->
-	<field name='spec1' type='uint' top='122' left='270' width='39' height='16'/>
-	<field name='spec2' type='uint' top='150' left='270' width='39' height='16'/>
-	<field name='spec3' type='uint' top='178' left='270' width='39' height='16'/>
-	<field name='spec4' type='uint' top='206' left='270' width='39' height='16'/>
-	<field name='spec5' type='uint' top='234' left='270' width='39' height='16'/>
-	<field name='spec6' type='uint' top='262' left='270' width='39' height='16'/>
-	<field name='spec7' type='uint' top='290' left='270' width='39' height='16'/>
-	<field name='spec8' type='uint' top='318' left='270' width='39' height='16'/>
+	<field name='time1' top='122' left='146' width='67' height='16'/>
+	<field name='time2' top='150' left='146' width='67' height='16'/>
+	<field name='time3' top='178' left='146' width='67' height='16'/>
+	<field name='time4' top='206' left='146' width='67' height='16'/>
+	<field name='time5' top='234' left='146' width='67' height='16'/>
+	<field name='time6' top='262' left='146' width='67' height='16'/>
+	<field name='time7' top='290' left='146' width='67' height='16'/>
+	<field name='time8' top='318' left='146' width='67' height='16'/>
+	<field name='spec1' top='122' left='270' width='39' height='16'/>
+	<field name='spec2' top='150' left='270' width='39' height='16'/>
+	<field name='spec3' top='178' left='270' width='39' height='16'/>
+	<field name='spec4' top='206' left='270' width='39' height='16'/>
+	<field name='spec5' top='234' left='270' width='39' height='16'/>
+	<field name='spec6' top='262' left='270' width='39' height='16'/>
+	<field name='spec7' top='290' left='270' width='39' height='16'/>
+	<field name='spec8' top='318' left='270' width='39' height='16'/>
 	<button name='okay' type='regular' top='343' left='411'>OK</button>
 	<button name='cancel' type='regular' relative='neg pos-in' rel-anchor='prev' top='0' left='71'>Cancel</button>
 	<pict type='dlog' num='16' top='8' left='8'/>

rsrc/dialogs/edit-town-wandering.xml

@@ -2,30 +2,29 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
-	<field name='group1-monst1' type='uint' top='137' left='174' width='39' height='16'/><button name='pick1-monst1' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group1-monst2' type='uint' top='165' left='174' width='39' height='16'/><button name='pick1-monst2' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group1-monst3' type='uint' top='193' left='174' width='39' height='16'/><button name='pick1-monst3' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group1-monst4' type='uint' top='221' left='174' width='39' height='16'/><button name='pick1-monst4' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group2-monst1' type='uint' top='137' left='239' width='39' height='16'/><button name='pick2-monst1' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group2-monst2' type='uint' top='165' left='239' width='39' height='16'/><button name='pick2-monst2' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group2-monst3' type='uint' top='193' left='239' width='39' height='16'/><button name='pick2-monst3' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group2-monst4' type='uint' top='221' left='239' width='39' height='16'/><button name='pick2-monst4' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group3-monst1' type='uint' top='137' left='304' width='39' height='16'/><button name='pick3-monst1' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group3-monst2' type='uint' top='165' left='304' width='39' height='16'/><button name='pick3-monst2' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group3-monst3' type='uint' top='193' left='304' width='39' height='16'/><button name='pick3-monst3' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group3-monst4' type='uint' top='221' left='304' width='39' height='16'/><button name='pick3-monst4' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group4-monst1' type='uint' top='137' left='369' width='39' height='16'/><button name='pick4-monst1' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group4-monst2' type='uint' top='165' left='369' width='39' height='16'/><button name='pick4-monst2' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group4-monst3' type='uint' top='193' left='369' width='39' height='16'/><button name='pick4-monst3' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<field name='group4-monst4' type='uint' top='221' left='369' width='39' height='16'/><button name='pick4-monst4' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<button name='okay' type='regular' top='283' left='436'>OK</button>
+	<field name='group1-monst1' top='137' left='174' width='39' height='16'/>
+	<field name='group1-monst2' top='165' left='174' width='39' height='16'/>
+	<field name='group1-monst3' top='193' left='174' width='39' height='16'/>
+	<field name='group1-monst4' top='221' left='174' width='39' height='16'/>
+	<field name='group2-monst1' top='137' left='239' width='39' height='16'/>
+	<field name='group2-monst2' top='165' left='239' width='39' height='16'/>
+	<field name='group2-monst3' top='193' left='239' width='39' height='16'/>
+	<field name='group2-monst4' top='221' left='239' width='39' height='16'/>
+	<field name='group3-monst1' top='137' left='304' width='39' height='16'/>
+	<field name='group3-monst2' top='165' left='304' width='39' height='16'/>
+	<field name='group3-monst3' top='193' left='304' width='39' height='16'/>
+	<field name='group3-monst4' top='221' left='304' width='39' height='16'/>
+	<field name='group4-monst1' top='137' left='369' width='39' height='16'/>
+	<field name='group4-monst2' top='165' left='369' width='39' height='16'/>
+	<field name='group4-monst3' top='193' left='369' width='39' height='16'/>
+	<field name='group4-monst4' top='221' left='369' width='39' height='16'/>
+	<button name='okay' type='regular' top='273' left='436'>OK</button>
 	<button name='cancel' type='regular' relative='neg pos-in' rel-anchor='prev' top='0' left='71'>Cancel</button>
 	<text top='6' left='50' width='256' height='17'>Town wandering monsters</text>
 	<text top='25' left='50' width='439' height='40'>
 		Wandering monsters in towns appear in groups of up to 5.
 		Enter the numbers of the wandering monsters in each group type,
-		or press the small button next to each field to choose the appearing
-		monsters from a list.
+		or press the Choose button to select the appearing monsters from a list.
 	</text>
 	<text top='68' left='50' width='437' height='40'>
 		A group of wandering monsters contains one each of the first three monsters, and 1 or 2 of the fourth.
@@ -36,14 +35,12 @@
 	<text top='115' left='231' width='58' height='14'>Group 2</text>
 	<text top='115' left='294' width='58' height='14'>Group 3</text>
 	<text top='115' left='357' width='58' height='14'>Group 4</text>
+	<button name='choose1' type='regular' top='243' left='162'>Choose</button>
+	<button name='choose2' type='regular' top='243' left='227'>Choose</button>
+	<button name='choose3' type='regular' top='243' left='292'>Choose</button>
+	<button name='choose4' type='regular' top='243' left='357'>Choose</button>
 	<text top='138' left='8' width='150' height='14'>Monster 1 (1 appears)</text>
 	<text top='166' left='8' width='150' height='14'>Monster 2 (1 appears)</text>
 	<text top='194' left='8' width='150' height='14'>Monster 3 (1 appears)</text>
 	<text top='222' left='8' width='150' height='14'>Monster 4 (1-2 appears)</text>
-
-	<text top='250' left='8' width='150' height='30'>Locations<br/>(Any group can appear at any location)</text>
-	<text name='loc1' top='258' left='174' width='39' height='16'/><button name='pick-loc1' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<text name='loc2' top='258' left='239' width='39' height='16'/><button name='pick-loc2' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<text name='loc3' top='258' left='304' width='39' height='16'/><button name='pick-loc3' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
-	<text name='loc4' top='258' left='369' width='39' height='16'/><button name='pick-loc4' type='tiny' relative='neg pos-in' rel-anchor='prev' top='2' left='20'></button>
 </dialog>

rsrc/dialogs/edit-townperson-advanced.xml

@@ -2,11 +2,14 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
-	<field name='extra1' type='int' top='126' left='221' width='67' height='16'/>
-	<field name='extra2' type='int' top='153' left='221' width='67' height='16'/>
-	<field name='death' type='int' top='298' left='285' width='67' height='16'/>
-	<field name='sdfy' type='int' top='362' left='262' width='39' height='16'/>
-	<field name='sdfx' type='int' top='362' left='310' width='39' height='16'/>
+	<!--
+	 TODO: Assign numeric types (type = 'int' or 'uint') to fields as appropriate
+	 -->
+	<field name='extra1' top='126' left='221' width='67' height='16'/>
+	<field name='extra2' top='153' left='221' width='67' height='16'/>
+	<field name='death' top='298' left='285' width='67' height='16'/>
+	<field name='sdfy' top='362' left='262' width='39' height='16'/>
+	<field name='sdfx' top='362' left='310' width='39' height='16'/>
 	<text size='large' top='6' left='50' width='256' height='17'>Townsperson/monster advanced</text>
 	<text top='28' left='62' width='97' height='15'>Creature type:</text>
 	<text name='type' top='28' left='162' width='195' height='15'/>
@@ -22,7 +25,7 @@
 		Number of town special node to call before talking to creature:
 		(-1 for none)
 	</text>
-	<field name='hail' type='int' top='326' left='285' width='67' height='16'/>
+	<field name='hail' top='326' left='285' width='67' height='16'/>
 	<button name='edithail' type='large' top='322' left='360'>Create/Edit</button>
 	<text top='350' left='25' width='230' height='40'>
 		Stuff done flag creature's life is linked to:

rsrc/dialogs/edit-townperson.xml

@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay' escbtn='cancel'>
-	<field name='talk' type='int' top='189' left='149' width='67' height='16'/>
+<dialog defbtn='okay'>
+	<field name='talk' top='189' left='149' width='67' height='16'/>
 	<button name='talk-edit' type='regular' top='186' left='228'>Choose</button>
 	<text name='picnum' top='189' left='375' width='40' height='16'/>
 	<text size='large' top='71' left='51' width='115' height='15'>Creature type:</text>
@@ -25,9 +25,13 @@
 		<led name='mob1' top='133' left='224'>No</led>
 		<led name='mob2' top='133' left='282'>Yes</led>
 	</group>
+	<button name='okay' type='regular' top='224' left='471'>OK</button>
+	<button name='cancel' type='regular' top='224' left='405'>Cancel</button>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text top='7' left='313' width='126' height='15'>Creature number:</text>
 	<text name='num' top='7' left='450' width='50' height='15'/>
+	<button name='more' type='large' top='224' left='51'>Advanced</button>
+	<button name='del' type='regular' top='224' left='155'>Delete</button>
 	<text top='24' left='50' width='476' height='40'>
 		Enter the information for this monster/townsperson.
 		You only need to worry about the talking section if this is not a hostile monster.
@@ -35,13 +39,4 @@
 	</text>
 	<text size='large' top='160' left='51' width='256' height='17'>Talking to this creature:</text>
 	<text top='205' left='295' width='101' height='26'>Leave at -1 for no pic.</text>
-
-	<text top='224' left='51' width='70' height='14'>Location:</text>
-	<text name='loc' top='224' left='122' width='90' height='14'/>
-	<button name='pick-loc' type='regular' relative='pos neg' rel-anchor='prev' top='4' left='5'>Move</button>
-
-	<button name='more' type='large' top='249' left='51'>Advanced</button>
-	<button name='del' type='regular' top='249' left='155'>Delete</button>
-	<button name='cancel' type='regular' top='249' left='405'>Cancel</button>
-	<button name='okay' type='regular' top='249' left='471'>OK</button>
 </dialog>

rsrc/dialogs/edit-vehicle.xml

@@ -5,14 +5,13 @@
 	<text name='title' size='large' rel-anchor='prev' relative='pos pos-in' top='-2' left='6' width='256' height='17'>Edit Vehicle</text>
 	
 	<text name='num-lbl' rel-anchor='prev' relative='pos-in pos' top='2' left='0' width='97' height='14'>Number</text>
-	<text name='num' rel-anchor='prev' relative='pos pos-in' top='0' left='5' width='46' height='16' framed='true'/>
+	<field name='num' rel-anchor='prev' relative='pos pos-in' top='0' left='5' width='46' height='14'/>
 	
 	<text name='area-lbl' anchor='num-lbl' relative='pos-in pos' top='11' left='0' width='97' height='14'>Starting Area</text>
 	<text name='area' rel-anchor='prev' relative='pos pos-in' top='0' left='5' width='100' height='16' framed='true'/>
 	
 	<text name='loc-lbl' anchor='area-lbl' relative='pos-in pos' top='11' left='0' width='97' height='14'>Location</text>
 	<text name='loc' rel-anchor='prev' relative='pos pos-in' top='0' left='5' width='40' height='16'/>
-	<button name='pick-loc' rel-anchor='prev' relative='pos neg' type='regular' top='4' left='5'>Move</button>
 	
 	<text name='name-lbl' anchor='loc-lbl' relative='pos-in pos' top='11' left='0' width='97' height='14'>Name</text>
 	<field name='name' rel-anchor='prev' relative='pos pos-in' top='0' left='5' width='100' height='14'/>

rsrc/dialogs/get-items.xml

@@ -4,8 +4,6 @@
 <dialog defbtn='done' escbtn='done'>
 	<button name='done' type='done' top='408' left='337'/>
 	<pict type='dlog' num='2' top='10' left='10'/>
-	<button name='gold' type='small' def-key='shift 4' relative='pos-in pos' rel-anchor='prev' top='4' left='0'><key/></button>
-	<text name='gold-label' relative='pos pos-in' rel-anchor='prev' top='0' left='2' width='38'>Get all gold</text>
 	<button name='pc1' type='small' def-key='1' top='354' left='89'><key/></button>
 	<button name='pc2' type='small' def-key='2' top='354' left='174'><key/></button>
 	<button name='pc3' type='small' def-key='3' top='354' left='259'><key/></button>

rsrc/dialogs/graphic-sheets.xml

@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='cancel'>
 	<pict type='dlog' num='16' top='6' left='6'/>
@@ -6,42 +7,14 @@
 	<text top='36' left='152' width='80' height='16'>Sheet Number:</text>
 	<text name='num' top='36' left='242' width='40' height='16'/>
 	<pict name='sheet' framed='true' scaled='true' type='full' num='0' top='54' left='12' width='280' height='360'/>
-
-	<!-- Icon grid segments -->
-	<tilemap name='zrows' anchor='sheet' relative='pos-in pos-in' top='0' left='0' rows='11' cols='10' framed='false'>
-		<line name='zrow' left='0' top='0' width='28' height='0'/>
-		<text height='36' left='0' top='0' />
-	</tilemap>
-	<tilemap name='zcols' anchor='sheet' relative='pos-in pos-in' top='0' left='0' rows='10' cols='11' framed='false'>
-		<line name='zcol' left='0' top='0' width='0' height='36'/>
-		<text width='28' left='0' top='0' />
-	</tilemap>
-
-	<!-- Whole-sheet operations -->
 	<button name='copy' type='regular' def-key='ctrl c' top='54' left='304'>Copy</button>
-	<button name='paste' type='regular' def-key='ctrl v' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Paste</button>
-	<button name='edit' type='regular' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Edit</button>
-	<button name='reload' type='regular' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Reload</button>
-	<button name='open' type='regular' def-key='ctrl o' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Import</button>
-	<button name='save' type='regular' def-key='ctrl s' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Export</button>
-	<button name='del' type='regular' def-key='ctrl x' relative='pos-in pos-in' rel-anchor='prev' top='26' left='0'>Delete</button>
-	
-	<!-- Icon operations -->
-	<text name='icon-head' relative='pos-in pos' rel-anchor='prev' top='5' left='0'>Selected icons:</text>
-	<text name='icon-min' relative='pos-in pos' rel-anchor='prev' top='2' left='0' width='30' framed='true'>0</text>
-	<text relative='pos pos-in' rel-anchor='prev' top='0' left='0'>-</text>
-	<text name='icon-max' relative='pos pos-in' rel-anchor='prev' top='0' left='0' width='30' framed='true'>0</text>
-
-	<button name='icon-terr' type='tiny' text-size='9' relative='pos-in pos' anchor='icon-min' top='2' left='0'>Import Terrain</button>
-	<button name='icon-terr-anim' type='tiny' text-size='9' relative='pos-in pos' rel-anchor='prev' top='2' left='0'>Import Animated Terrain</button>
-	<button name='strip-terr' type='tiny' text-size='9' relative='pos-in pos' rel-anchor='prev' top='2' left='0'>Strip Terrain Background</button>
-	<field name='diff-threshold' relative='pos-in pos' rel-anchor='prev' top='2' left='0' width='40' height='12' type='uint'>0</field>
-	<button name='add-terr' type='tiny' text-size='9' relative='pos-in pos' rel-anchor='prev' top='2' left='0'>Add Terrain Background</button>
-
+	<button name='paste' type='regular' def-key='ctrl v' top='80' left='304'>Paste</button>
+	<button name='open' type='regular' def-key='ctrl o' top='106' left='304'>Import</button>
+	<button name='save' type='regular' def-key='ctrl s' top='132' left='304'>Export</button>
+	<button name='del' type='regular' def-key='ctrl x' top='158' left='304'>Delete</button>
 	<button name='left' type='left' def-key='left' top='426' left='20'/>
 	<button name='right' type='right' def-key='right' top='426' left='85'/>
 	<button name='new' type='regular' def-key='ctrl n' top='426' left='162'>New</button>
-
 	<button name='cancel' type='regular' top='426' left='239'>Cancel</button>
 	<button name='okay' type='regular' top='426' left='304'>OK</button>
 </dialog>

rsrc/dialogs/help-distributing.xml

@@ -2,19 +2,34 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='okay'>
-	<text top='4' left='50' width='312' height='16'>BLADES OF EXILE - DISTRIBUTING YOUR SCENARIO</text>
+	<!--
+	 TODO: This dialog contains out-of-date information
+	 -->
+	<button name='okay' type='regular' top='284' left='403'>OK</button>
 	<pict type='dlog' num='16' top='6' left='6'/>
-	<text top='22' left='50' width='413'>
+	<text top='22' left='50' width='413' height='56'>
 		When you've completed your scenario, you probably want to give other people the chance to play through it.
 		It's a big kick letting other people run around in your own fantasy world, get stuck at your puzzles, and kill your creations.
 	</text>
-	<text top='4' left='0' width='414' relative='pos-in pos' rel-anchor='prev'>
-		The easiest way to release a scenario is to send it to NQNStudios. (nqn AT fastmail DOT com)<br/>
-		<br/>
-		Alternately, you can upload it as a game on itch.io, then share the link with the Blades of Exile: Itch Edition
-		community and/or the Spiderweb Software message board.
+	<text top='79' left='50' width='414' height='54'>
+		The easiest way to release a scenario is to send it over to Spiderweb Software.
+		Go to www.spidweb.com.
+		There's a scenario upload area there.
+		Alternately, mail it to us on disk (PO Box 85659, Seattle, WA 98145).
 	</text>
-	<text top='4' left='0' relative='pos-in pos' rel-anchor='prev' colour='link'>https://nqn.itch.io/blades-of-exile/community</text>
-	<text top='4' left='0' relative='pos-in pos' rel-anchor='prev' colour='link'>https://spiderwebforums.ipbhost.com/forum/12-blades-of-exile/</text>
-	<button name='okay' type='regular' relative='abs pos' rel-anchor='prev' top='4' left='403'>OK</button>
+	<text top='134' left='50' width='412' height='40'>
+		Before you send a scenario, however, be sure to read the License Agreement (in the file Blades of Exile License).
+		It says a lot of big no-no's and describes your (and our) rights for your scenario.
+	</text>
+	<text top='175' left='50' width='418' height='54'>
+		Also look for information on the Blades of Exile Scenario Contest.
+		Your scenario, if really good, could win you products or a hefty chunk of money.
+		If you think your scenario is good enough, be sure to send it in!
+	</text>
+	<text top='230' left='50' width='418' height='52'>
+		Finally, if your scenario is really, really good, we might like to sell it as a stand-alone.
+		If we're interested, you can actually make money from your work!
+		To take a shot at this, just send us your scenario before releasing it.
+	</text>
+	<text top='4' left='50' width='312' height='16'>BLADES OF EXILE - DISTRIBUTING YOUR SCENARIO</text>
 </dialog>

rsrc/dialogs/help-testing.xml

@@ -2,38 +2,33 @@
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='okay' escbtn='okay'>
+	<!--
+	 TODO: This dialog may contain out-of-date information
+	 -->
+	<button name='okay' type='regular' top='288' left='403'>OK</button>
 	<pict type='dlog' num='16' top='6' left='6'/>
-	<text top='4' left='50' width='312' height='16'>BLADES OF EXILE - TESTING YOUR SCENARIO</text>
-	<text top='22' left='50' width='413'>
+	<text top='22' left='50' width='413' height='52'>
 		If you want other people to play your scenario, it is vitally important that you test it.
-		Otherwise, lots of people might waste lots of hours playing a scenario that is unwinnable or otherwise doesn't work.
+		Otherwise, lots of people might waste lots of hours playing a scenairo that is unwinnable or otherwise doesn't work.
 	</text>
-	<text top='4' left='0' relative='pos-in pos' rel-anchor='prev' width='414'>
-		To run your scenario, copy it into the Blades of Exile Scenarios folder and start it using the Start Scenario button on the game title screen.
+	<text top='75' left='50' width='414' height='54'>
+		To run your scenario, copy it into the Blades of Exile Scenarios folder and start it using the Custom Scenario button on the game title screen.
+		Play from your scenario from start to finish, and, if possible, have friends play it too.
 	</text>
-	<text top='4' left='0' relative='pos-in pos' rel-anchor='prev' width='414'>
-		You can also quickly launch your scenario using one of the Launch options in the Scenario menu of the editor.
-		In the editor preferences menu, you can set a save file to be used as your debug party.
-	</text>
-	<text top='4' left='0' relative='pos-in pos' rel-anchor='prev' width='414'>
+	<text top='130' left='50' width='412' height='53'>
 		When testing your scenario, one useful feature is debug mode.
 		While playing the game, type 'D'.
 		This will put you in Debug Mode.
 		Monsters will no longer move or attack you, and you will be able to play much faster.
-		Type '?' in debug mode for a list of many other quick actions you can perform to help with testing.
 	</text>
-	<text top='4' left='0' relative='pos-in pos' rel-anchor='prev' width='414'>
-		When you make a change in a town, before testing it, be sure to leave the town and type '>' in debug mode.
+	<text top='184' left='50' width='417' height='54'>
+		When you make a change in a town, before testing it, be sure to leave the town and type '>'.
 		This causes the game to forget everything you've done in that town.
 		If you don't do this, your corrections may not be remembered properly.
 	</text>
-	<text top='4' left='0' relative='pos-in pos' rel-anchor='prev' width='414'>
+	<text top='239' left='50' width='418' height='41'>
 		Finally, if you edit your scenario while playing in it, whenever you save a change go back to the game and reload your save file.
 		Otherwise, the game may not read the scenario data properly and crash.
 	</text>
-
-	<text top='4' left='0' relative='pos-in pos' rel-anchor='prev' width='414'>
-		Before distributing your scenario, Playtest it from start to finish, and, if possible, have friends play it too!
-	</text>
-	<button name='okay' type='regular' relative='abs pos' rel-anchor='prev' top='4' left='403'>OK</button>
+	<text top='4' left='50' width='312' height='16'>BLADES OF EXILE - TESTING YOUR SCENARIO</text>
 </dialog>

rsrc/dialogs/many-str.xml

@@ -7,6 +7,6 @@
 	<button name='done' type='done' top='202' left='199'/>
 	<button name='left' type='left' def-key='left' top='202' left='55'/>
 	<button name='right' type='right' def-key='right' top='202' left='124'/>
-	<text name='title' size='large' top='17' left='55' width='179' height='40'/>
+	<text name='title' size='large' top='17' left='55' width='179' height='16'/>
 	<text name='str' framed='true' top='55' left='17' width='238' height='129'/>
 </dialog>

rsrc/dialogs/no-items-added.xml

@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay' escbtn='okay'>
-	<button name='okay' type='regular' top='37' left='256'>OK</button>
-	<pict type='dlog' num='16' top='6' left='6'/>
-	<text top='6' left='49' width='272' height='28'>No random items were added. Double-check your Item Placement Shortcuts in the Scenario menu.</text>
-</dialog>

rsrc/dialogs/no-items-property.xml

@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay' escbtn='okay'>
-	<button name='okay' type='regular' top='37' left='256'>OK</button>
-	<pict type='dlog' num='16' top='6' left='6'/>
-	<text top='6' left='49' width='272' height='28'>Nothing changed. No items in this town were marked as property.</text>
-</dialog>

rsrc/dialogs/no-items.xml

@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
-<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay' escbtn='okay'>
-	<button name='okay' type='regular' top='37' left='256'>OK</button>
-	<pict type='dlog' num='16' top='6' left='6'/>
-	<text top='6' left='49' width='272' height='28'>There are no items in this town.</text>
-</dialog>

rsrc/dialogs/pc-spell-info.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done' escbtn='cancel'>
+<dialog defbtn='done' escbtn='done'>
 	<!--
 	 TODO: Add width attributes to the LEDs
 	 -->
@@ -68,10 +68,9 @@
 	<led name='spell60' state='off' top='248' left='268'/>
 	<led name='spell61' state='off' top='260' left='268'/>
 	<led name='spell62' state='off' top='272' left='268'/>
-	<button name='cancel' type='regular' top='310' left='358'>Cancel</button>
 	<button name='done' type='done' top='310' left='422'/>
 	<button name='left' type='left' def-key='left' top='310' left='12'/>
-	<button name='right' type='right' def-key='right' top='310' left='79'/>
-	<text name='title' size='large' top='15' left='53' width='83' height='16'>{{type}} Spells For:</text>
-	<text name='who' framed='true' top='15' left='166' width='186' height='16'/>
+	<button name='right' type='right' def-key='right' top='309' left='79'/>
+	<text name='who' size='large' top='15' left='53' width='83' height='16'>Spells For:</text>
+	<text framed='true' top='15' left='146' width='186' height='16'/>
 </dialog>

rsrc/dialogs/pick-race-abil.xml

@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- NOTE: This file should be updated to use relative positioning the next time it changes. -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='done' escbtn='cancel'>
+<!--TODO Need a cancel button. In other contexts (like preferences), Escape would discard changes in a submenu.-->
+<dialog defbtn='done'>
 	<text size='large' top='9' left='55' width='181' height='16'>Special Characteristics:</text>
 	<pict type='dlog' num='7' top='6' left='6'/>
-	<button name='cancel' type='regular' top='349' left='350'>Cancel</button>
 	<button name='done' type='done' top='349' left='423'/>
 	<text size='large' top='30' left='55' width='65' height='18'>Species:</text>
 	<text name='xp' framed='true' top='352' left='254' width='50' height='16'/>

rsrc/dialogs/pick-scenario.xml

@@ -3,7 +3,6 @@
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog escbtn='cancel'>
 	<text size='large' top='9' left='130' width='126' height='17'>Start a Scenario:</text>
-	<text top='9' left='240' width='190' height='40' name='tooltip'></text>
 	<stack name='list'>
 		<page>
 			<!-- Prefab scenarios -->
@@ -36,67 +35,18 @@
 		<page default='true' template='scenarios'>
 			<!-- Custom scenarios -->
 			<pict type='dlog' num='16' top='10' left='10'/>
-
 			<pict name='pic1' type='scen' num='0' top='58' left='62'/>
 			<text name='desc1' framed='true' top='34' left='104' width='292' height='80'/>
 			<text outline='double' name='start1' top='32' left='59' width='342' height='84'/>
-			<pict name='tag1-1' type='item' size='small' num='0' top='95' left='110'/>
-			<pict name='tag1-2' type='item' size='small' num='0' top='95' left='134'/>
-			<pict name='tag1-3' type='item' size='small' num='0' top='95' left='158'/>
-			<pict name='tag1-4' type='item' size='small' num='0' top='95' left='182'/>
-			<pict name='tag1-5' type='item' size='small' num='0' top='95' left='206'/>
-
 			<pict name='pic2' type='scen' num='0' top='145' left='62'/>
 			<text name='desc2' framed='true' top='121' left='104' width='292' height='80'/>
 			<text outline='double' name='start2' top='118' left='59' width='342' height='84'/>
-			<pict name='tag2-1' type='item' size='small' num='0' top='181' left='110'/>
-			<pict name='tag2-2' type='item' size='small' num='0' top='181' left='134'/>
-			<pict name='tag2-3' type='item' size='small' num='0' top='181' left='158'/>
-			<pict name='tag2-4' type='item' size='small' num='0' top='181' left='182'/>
-			<pict name='tag2-5' type='item' size='small' num='0' top='181' left='206'/>
-
 			<pict name='pic3' type='scen' num='0' top='232' left='62'/>
 			<text name='desc3' framed='true' top='208' left='104' width='292' height='80'/>
 			<text outline='double' name='start3' top='205' left='59' width='342' height='84'/>
-			<pict name='tag3-1' type='item' size='small' num='0' top='268' left='110'/>
-			<pict name='tag3-2' type='item' size='small' num='0' top='268' left='134'/>
-			<pict name='tag3-3' type='item' size='small' num='0' top='268' left='158'/>
-			<pict name='tag3-4' type='item' size='small' num='0' top='268' left='182'/>
-			<pict name='tag3-5' type='item' size='small' num='0' top='268' left='206'/>
 		</page>
 	</stack>
-
-	<button name='core' def-key='0' type='tiny' top='294' left='5'>Core</button>
-	<text name='custom' relative='pos neg' size='large' rel-anchor='prev' left='5' top='2'>Custom:</text>
-	<button name='a' def-key='a' type='tiny' relative='pos pos-in' rel-anchor='prev' top='2' left='3'>A</button>
-	<button name='b' def-key='b' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>B</button>
-	<button name='c' def-key='c' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>C</button>
-	<button name='d' def-key='d' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>D</button>
-	<button name='e' def-key='e' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>E</button>
-	<button name='f' def-key='f' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>F</button>
-	<button name='g' def-key='g' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>G</button>
-	<button name='h' def-key='h' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>H</button>
-	<button name='i' def-key='i' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>I</button>
-	<button name='j' def-key='j' type='tiny' relative='pos-in pos' anchor='a' top='2' left='0'>J</button>
-	<button name='k' def-key='k' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>K</button>
-	<button name='l' def-key='l' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>L</button>
-	<button name='m' def-key='m' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>M</button>
-	<button name='n' def-key='n' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>N</button>
-	<button name='o' def-key='o' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>O</button>
-	<button name='p' def-key='p' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>P</button>
-	<button name='q' def-key='q' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Q</button>
-	<button name='r' def-key='r' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>R</button>
-	<button name='s' def-key='s' type='tiny' relative='pos-in pos' anchor='j' top='2' left='0'>S</button>
-	<button name='t' def-key='t' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>T</button>
-	<button name='u' def-key='u' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>U</button>
-	<button name='v' def-key='v' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>V</button>
-	<button name='w' def-key='w' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>W</button>
-	<button name='x' def-key='x' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>X</button>
-	<button name='y' def-key='y' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Y</button>
-	<button name='z' def-key='z' type='tiny' relative='pos pos-in' rel-anchor='prev' top='0' left='4'>Z</button>
-	<button name='#' def-key='shift 3' type='tiny' relative='neg pos-in' anchor='j' top='0' left='32'>#</button>
-
-	<button name='cancel' type='regular' top='330' left='5'>Cancel</button>
+	<button name='cancel' type='regular' top='294' left='5'>Cancel</button>
 	<button name='prev' type='left' def-key='left' relative='pos pos-in' rel-anchor='prev' top='0' left='14'/>
 	<button name='next' type='right' def-key='right' relative='pos pos-in' rel-anchor='prev' top='0' left='0'/>
 	<button name='folder' type='large' relative='pos pos-in' rel-anchor='prev' top='0' left='14'>Show Folder</button>

rsrc/dialogs/pref-scenario.xml

@@ -5,15 +5,15 @@
 	<text size='large' relative='pos pos-in' rel-anchor='prev' top='0' left='4' width='218' height='16'>
 		BoE Scenario Editor Preferences
 	</text>
-	<led name='nosound' relative='pos-in pos' rel-anchor='prev' top='10' left='0'>No UI Sounds</led>
+	<led name='nosound' relative='pos-in pos' rel-anchor='prev' top='10' left='0'>No Sounds</led>
 	<text name='scale-head' size='large' relative='neg pos' rel-anchor='prev' top='17' left='10' width='260' height='17'>Scale UI:</text>
 	<group name='scaleui'>
-		<led name='1' relative='neg pos' anchor='scale-head' top='4' left='20'>1</led>
-		<led name='1_5' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>1.5</led>
-		<led name='2' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>2</led>
-		<led name='3' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>3</led>
-		<led name='4' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>4</led>
-		<led name='other' relative='pos pos-in' rel-anchor='prev' top='0' left='3'/>
+		<led name='1' relative='pos-in pos' anchor='scale-head' top='4' left='15'>1</led>
+		<led name='1_5' relative='pos-in pos' anchor='scale-head' top='4' left='55'>1.5</led>
+		<led name='2' relative='pos-in pos' anchor='scale-head' top='4' left='95'>2</led>
+		<led name='3' relative='pos-in pos' anchor='scale-head' top='4' left='135'>3</led>
+		<led name='4' relative='pos-in pos' anchor='scale-head' top='4' left='175'>4</led>
+		<led name='other' relative='pos-in pos' anchor='scale-head' top='4' left='215'/>
 	</group>
 	
 	<text name='debug-party-head' size='large' relative='pos pos-in' anchor='nosound' top='0' left='50'>Debug Party:</text>
@@ -21,10 +21,6 @@
 	<button name='choose-party' relative='pos neg' rel-anchor='prev' type='regular' top='3' left='2'>Choose</button>
 	<led name='force-default-party' relative='pos-in pos' anchor='debug-party-head' top='2' left='0'>Force default party (ignore above)</led>
 
-	<text name='image-editor-head' size='large' relative='pos-in pos-in' anchor='force-default-party' top='30' left='0'>Image Editor:</text>
-	<field name='image-editor' type='text' relative='neg-in neg' rel-anchor='prev' top='2' left='5' width='100' height='15'/>
-	<button name='choose-image-editor' relative='pos neg' rel-anchor='prev' type='regular' top='3' left='2'>Choose</button>
-
-	<button name='okay' relative='abs pos' anchor='scale-head' type='regular' top='37' left='354'>OK</button>
+	<button name='okay' relative='abs pos' anchor='scale-head' type='regular' top='7' left='354'>OK</button>
 	<button name='cancel' relative='neg pos-in' anchor='okay' type='regular' top='0' left='73'>Cancel</button>
 </dialog>

rsrc/dialogs/select-import-town.xml

@@ -7,13 +7,15 @@
 	<button name='okay' type='regular' top='181' left='278'>OK</button>
 	<pict type='dlog' num='16' top='8' left='8'/>
 	<text size='large' top='6' left='50' width='175' height='17'>Importing a town</text>
-	<text name='prompt' top='143' left='50' width='162' height='27'>What town do you wish to import? (0 - {{max-num}})</text>
+	<text name='prompt' top='143' left='50' width='162' height='27'>What town do you wish to import?</text>
 	<text top='27' left='50' width='301' height='54'>
-		The town with this number in the selected scenario be imported.
+		Enter a town number and hit OK, and you will be asked to select a scenario file.
+		The town with that number in the selected scenario will then be loaded in over the current town.
 	</text>
 	<button name='cancel' type='regular' top='181' left='212'>Cancel</button>
 	<text top='83' left='50' width='301' height='54'>
-		Warning: This will overwrite over the town currently in memory.
+		Warning: This will write over the town currently in memory.
+		Also, the town you select must be the same size (large/medium/small) as the town currently in memory.
 	</text>
 	<button name='choose' type='regular' top='146' left='281'>Choose</button>
 </dialog>