Release build squashed

Behaviorally: This change makes it so that Enter will never cancel
a dialog, unless that dialog only contains info to be read. Escape
will never unpredictably be treated as Enter. And some dialogs without
Escape to cancel, now can be canceled with Escape.

A lot of this just refactors dialogs to define the cancel button
at the top, not as a hotkey on a cancel button deep in the XML.
I think this makes enter/escape behavior in dialogxml files more
legible at a glance.

.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/butler_push.sh

@@ -25,4 +25,4 @@ unzip butler.zip
 chmod +x ${butler_exe}
 # just a sanity check run (and also helpful in case you're sharing CI logs)
 ./${butler_exe} -V
-./${butler_exe} push "build/Blades of Exile/" nqn/blades-of-exile:${release_dir}
+./${butler_exe} push "build/Blades of Exile/" nqn/blades-of-exile:${butler_channel}

.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 %*

.gitignore

@@ -57,7 +57,6 @@ proj/vs*/.vs
 proj/vs*/.vs
 proj/vs*/packages/
 proj/vs*/vcpkg_installed/
-proj/vs*/enc_temp_folder/
 # Windows debugging symbols
 *.pdb
 
@@ -98,8 +97,6 @@ test/junk/*.map
 oldstructs.txt
 src/tools/gitrev.hpp
 rsrc/**/scenario
-rsrc/scenarios/**/editor.xml
-rsrc/bases/**/editor.xml
 
 # Dependency-generated files
 deps/**/

.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/documentation.lyx

@@ -1552,7 +1552,7 @@ When in town, select this option to try to make a potion.
 \end_layout
 
 \begin_layout Paragraph
-Wait 80 Moves
+Wait 100 Moves
 \end_layout
 
 \begin_layout Standard

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>

doc/editor/Towns.html

@@ -140,7 +140,7 @@ it will be like to play through.</p>
 given day, you can have the town be abandoned (i.e. empty of creatures). If the given day
 is left at -1, this doesn't happen. You can also have an event which prevents the town from
 being emptied at the given day. To have an event prevent this, enter the event's number (1
-or higher) in the second text area. For more on this, read the section on Time Passing in the
+.. 9) in the second text area. For more on this, read the section on Time Passing in the
 Special Encounters Chapter.</li>
 <li><em>Lighting</em>: A town can be fully lit, dark, very dark (torches burn down
 faster), or totally dark (light sources go out immediately).</li>

doc/game/Menus.html

@@ -110,7 +110,7 @@ time you ran the game.</li>
 <ul>
 <li><em>Do Alchemy</em> - When in town, select this option to try to make a potion. There
 is more information on this in the next section.</li>
-<li><em>Wait 80 Moves</em> - When in town, you cannot make camp. Selecting this option,
+<li><em>Wait 100 Moves</em> - When in town, you cannot make camp. Selecting this option,
 however, has you wait for a long time in order to regain health and spells points. Beware
 - the monsters can use this time to get reinforcements.</li>
 <li><em>Display AutoMap</em> - This brings up a map of your current location.</li>

doc/game/Misc.html

@@ -39,7 +39,7 @@ poison a monster twice, it will do well over twice the damage the first spell wo
 caused. If one fear spell doesn't make a monster flee, the next one will have a much
 better chance of working. Casting two light spells makes the light last twice as long.</p>
 <p>Mage spells require great delicacy of movement to cast. For this reason, they cannot be
-cast during combat when when armor with total encumbrance of more than 1 is being worn. High defense
+cast when when armor with total encumbrance of more than 1 is being worn. High defense
 skill can sometimes offset this effect, but it never will when any single item has an
 encumbrance value of more than 2.</p>
 <p>Mage Spells and Encumbrance: If you are wearing armor with a total encumbrance of

pkg/credits/Funding.txt

@@ -10,7 +10,6 @@ Confirmed:
 - Bret Rodabaugh
 - Dylan Nugent
 - Evan Mulrooney
-- Glen Chudley
 - Jake Harrelson
 - Jared Forcinito
 - Jeff Potter
@@ -18,7 +17,6 @@ Confirmed:
 - Jeremy Bracegirdle
 - Joe Ardent
 - Joel Joslin
-- Joshua Broad
 - Joshua Murphy
 - Juan Dionicio Becerra
 - Kelandon
@@ -26,7 +24,6 @@ Confirmed:
 - K L
 - Laura Nelson
 - Mariann Krizsan
-- Maryanne Wachter
 - Mike Lapinsky
 - Nathan Rickey
 - Nick Chaimov
@@ -39,7 +36,6 @@ Confirmed:
 - Sam M
 - Sareena Razak
 - Sean Hayden
-- Seb Galvez
 - Souren Papazian
 - Tony Martyn
 - Tony Vazquez

pkg/credits/Graphics.txt

@@ -4,5 +4,4 @@ Confirmed:
 - Mistb0rn
 - Celtic Minstrel
 - Kelyar-Ihrno
-- Jewels
-- Seb Galvez
+- Jewels

pkg/credits/about-boe-template.xml

@@ -21,7 +21,7 @@
 			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='{{Height}}' align='right'>
+		<text top='52' left='50' width='180' height='{{Height}}' align='right'>
 			<br/>
 			Concept, Design, Programming: <br/>
 			Graphics: <br/>

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

@@ -20,20 +20,6 @@ env.Install(path.join(data_dir, "shaders"), Glob("#src/gfx/mask.*"))
 
 # Scenarios
 
-def scenario_changed(header, target, prev_ni, _repo_node):
-	'''Decide whether to repackage a scenario'''
-	if not path.exists(str(target)): return True
-	last_packaged = path.getmtime(str(target))
-	scen_dir = path.dirname(str(header))
-	for dir, _, files in walk_dir(scen_dir):
-		for fname in files:
-			fname = path.join(dir, fname)
-			last_modified = path.getmtime(fname)
-			if last_modified > last_packaged:
-				print(f'{fname} is newer than {target} ({path.getmtime(fname)} > {last_packaged})')
-				return True
-	return False
-
 def pack_scenario(target, source, env):
 	prev_dir = path.abspath('.')
 	for i in range(min(len(target), len(source))):
@@ -45,20 +31,17 @@ def pack_scenario(target, source, env):
 					if fname.startswith('.'): continue
 					cur_file = path.join(cur_dir, fname)
 					tar.add(path.join(dir, fname), arcname = cur_file)
-scen_env = env.Clone()
-scen_env.Append(BUILDERS={"BuildScenario": Builder(action=pack_scenario, suffix=".boes", src_suffix="")})
 
-scen_env.Decider(scenario_changed)
-scen_env.BuildScenario('#build/rsrc/bases/bladbase.boes', 'bases/bladbase/header.exs')
-scen_env.BuildScenario('#build/rsrc/bases/cavebase.boes', 'bases/cavebase/header.exs')
-scen_env.BuildScenario('#build/rsrc/scenarios/busywork.boes', 'scenarios/busywork/header.exs')
-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.Append(BUILDERS={"BuildScenario": Builder(action=pack_scenario, suffix=".boes", src_suffix="")})
+
+env.BuildScenario('#build/rsrc/bases/bladbase.boes', 'bases/bladbase/header.exs')
+env.BuildScenario('#build/rsrc/bases/cavebase.boes', 'bases/cavebase/header.exs')
+env.BuildScenario('#build/rsrc/scenarios/busywork.boes', 'scenarios/busywork/header.exs')
+env.BuildScenario('#build/rsrc/scenarios/valleydy.boes', 'scenarios/valleydy/header.exs')
+env.BuildScenario('#build/rsrc/scenarios/stealth.boes', 'scenarios/stealth/header.exs')
+env.BuildScenario('#build/rsrc/scenarios/zakhazi.boes', 'scenarios/zakhazi/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/bases/bladbase/items.xml

@@ -5071,7 +5071,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Curing Potion</full-name>
         <treasure>2</treasure>
@@ -5097,7 +5097,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Healing Potion</full-name>
         <treasure>2</treasure>
@@ -5123,7 +5123,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Energy Potion</full-name>
         <treasure>2</treasure>
@@ -5149,7 +5149,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Strength Potion</full-name>
         <treasure>2</treasure>
@@ -5175,7 +5175,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Speed Potion</full-name>
         <treasure>2</treasure>
@@ -5201,7 +5201,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Invuln. Potion</full-name>
         <treasure>2</treasure>
@@ -5227,7 +5227,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Skill Potion</full-name>
         <treasure>3</treasure>

rsrc/bases/bladbase/scenario.xml

@@ -552,6 +552,8 @@
     </game>
     <editor>
         <default-ground>2</default-ground>
+        <last-out-section x="0" y="0" />
+        <last-town>0</last-town>
         <item-typeflag id="1">Darts</item-typeflag>
         <item-typeflag id="2">Iron Darts</item-typeflag>
         <item-typeflag id="3">Magic Darts</item-typeflag>

rsrc/bases/bladbase/towns/town0.spec

@@ -9,8 +9,8 @@
 	sdf -1, -1
 	msg 0, -1, 0
 	pic 16, 4
-	ex1 2, 2, -1
-	ex2 3, -1, -1
+	ex1 3, -1, -1
+	ex2 2, 2, -1
 	goto -1
 @end-scen = 2
 	sdf -1, -1

rsrc/bases/cavebase/items.xml

@@ -5071,7 +5071,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Curing Potion</full-name>
         <treasure>2</treasure>
@@ -5097,7 +5097,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Healing Potion</full-name>
         <treasure>2</treasure>
@@ -5123,7 +5123,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Energy Potion</full-name>
         <treasure>2</treasure>
@@ -5149,7 +5149,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Strength Potion</full-name>
         <treasure>2</treasure>
@@ -5175,7 +5175,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Speed Potion</full-name>
         <treasure>2</treasure>
@@ -5201,7 +5201,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Invuln. Potion</full-name>
         <treasure>2</treasure>
@@ -5227,7 +5227,7 @@
         <bonus>0</bonus>
         <protection>0</protection>
         <charges>1</charges>
-        <pic>61</pic>
+        <pic>60</pic>
         <name>Potion</name>
         <full-name>Str. Skill Potion</full-name>
         <treasure>3</treasure>

rsrc/bases/cavebase/monsters.xml

@@ -4440,7 +4440,7 @@
     </monster>
     <monster id="181">
         <name>Baby Hydra</name>
-        <pic w="1" h="1">173</pic>
+        <pic w="1" h="1">159</pic>
         <race>reptile</race>
         <level>8</level>
         <armor>6</armor>

rsrc/bases/cavebase/scenario.xml

@@ -552,6 +552,8 @@
     </game>
     <editor>
         <default-ground>2</default-ground>
+        <last-out-section x="0" y="0" />
+        <last-town>0</last-town>
         <item-typeflag id="1">Darts</item-typeflag>
         <item-typeflag id="2">Iron Darts</item-typeflag>
         <item-typeflag id="3">Magic Darts</item-typeflag>

rsrc/bases/cavebase/towns/town0.spec

@@ -9,8 +9,8 @@
 	sdf -1, -1
 	msg 0, -1, 0
 	pic 16, 4
-	ex1 2, 2, -1
-	ex2 3, -1, -1
+	ex1 3, -1, -1
+	ex2 2, 2, -1
 	goto -1
 @end-scen = 2
 	sdf -1, -1

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

@@ -4,7 +4,7 @@
 	tpkg/credits/about-boe-template.xml. Do not modify it manually!
 -->
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog defbtn='okay'>
+<dialog defbtn='okay' escbtn='okay'>
 	<!--
 	 TODO: This dialog contains out-of-date information, such as pricing.
 	-->
@@ -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/>
 			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='30' width='200' height='810' align='right'>
 			<br/>
 			Concept, Design, Programming: <br/>
 			Graphics: <br/>
@@ -31,14 +31,14 @@
 			<br/>
 			<br/>
 			Programming: <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-			Graphics: <br/><br/><br/><br/><br/><br/><br/>
+			Graphics: <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/>
 			Bandit Busywork: <br/>
 		</text>
-		<text top='52' left='250' width='230' height='860'>
+		<text top='52' left='250' width='230' height='810'>
 			<!-- ORIGINAL GAME --><br/>
 			<!-- Concept, Design, Programming -->Jeff Vogel <br/>
 			<!-- Graphics -->Andrew Hunter <br/>
@@ -66,7 +66,6 @@
 							Celtic Minstrel <br/>
 							Kelyar-Ihrno <br/>
 							Jewels <br/>
-							Seb Galvez <br/>
 			<!-- Consulting -->The Almighty <br/>
 								    Doer of Stuff <br/>
 								Thuryl <br/>
@@ -84,7 +83,6 @@
 							Bret Rodabaugh <br/>
 							Dylan Nugent <br/>
 							Evan Mulrooney <br/>
-							Glen Chudley <br/>
 							Jake Harrelson <br/>
 							Jared Forcinito <br/>
 							Jeff Potter <br/>
@@ -92,7 +90,6 @@
 							Jeremy Bracegirdle <br/>
 							Joe Ardent <br/>
 							Joel Joslin <br/>
-							Joshua Broad <br/>
 							Joshua Murphy <br/>
 							Juan Dionicio Becerra <br/>
 							Kelandon <br/>
@@ -100,7 +97,6 @@
 							K L <br/>
 							Laura Nelson <br/>
 							Mariann Krizsan <br/>
-							Maryanne Wachter <br/>
 							Mike Lapinsky <br/>
 							Nathan Rickey <br/>
 							Nick Chaimov <br/>
@@ -113,7 +109,6 @@
 							Sam M <br/>
 							Sareena Razak <br/>
 							Sean Hayden <br/>
-							Seb Galvez <br/>
 							Souren Papazian <br/>
 							Tony Martyn <br/>
 							Tony Vazquez <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/basic-button.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 escbtn='no' defbtn='yes'>
+<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='8' left='9'/>
+	<pict type='dlog' num='11' top='9' left='9'/>
 	<text top='4' left='51' width='251' height='32'>
 		There is a large button here, waiting to be pressed.
 		Do you?

rsrc/dialogs/basic-lever.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 escbtn='leave' defbtn='pull'>
-	<pict type='dlog' num='9' top='8' left='8'/>
+<dialog defbtn='leave'>
+	<pict type='dlog' num='9' top='9' left='8'/>
 	<button name='leave' type='regular' top='46' left='176'>Leave</button>
 	<button name='pull' type='regular' top='46' left='244'>Pull</button>
 	<text top='4' left='50' width='253' height='43'>There is a stout wooden lever protruding from the ground here. Pull it?</text>

rsrc/dialogs/basic-portal.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 escbtn='no' defbtn='yes'>
+<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='22' top='8' left='9'/>
+	<pict type='dlog' num='22' top='9' left='9'/>
 	<text top='4' left='51' width='251' height='32'>
 		There is a glowing teleporter here.
 		Do you step through?

rsrc/dialogs/basic-slope-down.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='climb' escbtn='leave'>
+<dialog defbtn='leave'>
 	<button name='leave' type='regular' top='35' left='177'>Leave</button>
 	<button name='climb' type='regular' top='35' left='243'>Climb</button>
 	<pict type='dlog' num='19' top='8' left='8'/>

rsrc/dialogs/basic-slope-up.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='climb' escbtn='leave'>
+<dialog defbtn='leave'>
 	<button name='leave' type='regular' top='35' left='177'>Leave</button>
 	<button name='climb' type='regular' top='35' left='243'>Climb</button>
 	<pict type='dlog' num='19' top='8' left='8'/>

rsrc/dialogs/basic-stair-down.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='climb' escbtn='leave'>
+<dialog defbtn='leave'>
 	<button name='leave' type='regular' top='27' left='176'>Leave</button>
 	<button name='climb' type='regular' top='27' left='242'>Climb</button>
 	<pict type='dlog' num='19' top='8' left='8'/>

rsrc/dialogs/basic-stair-up.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='climb' escbtn='leave'>
+<dialog defbtn='leave'>
 	<button name='leave' type='regular' top='27' left='176'>Leave</button>
 	<button name='climb' type='regular' top='27' left='242'>Climb</button>
 	<pict type='dlog' num='19' top='8' left='8'/>

rsrc/dialogs/basic-trap.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 escbtn='no' defbtn='yes'>
+<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='27' top='8' left='9'/>
+	<pict type='dlog' num='27' top='9' left='9'/>
 	<text top='4' left='51' width='251' height='32'>
 		You think you've found a trap.
 		Do you try to disarm it?

rsrc/dialogs/cast-spell.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
 <dialog defbtn='cast' escbtn='cancel'>
-	<pict name='pic' type='dlog' num='12' top='8' left='8'/>
+	<pict name='pic' type='dlog' num='12' top='9' left='9'/>
 	<text size='large' top='6' left='54' width='139' height='18'>Select a Spell:</text>
 	<!-- To the left of PC names, buttons to select caster -->
 	<text name='caster-head' size='large' top='60' left='22' width='75' height='16'>Caster:</text>
@@ -13,12 +13,12 @@
 	<button name='caster6' type='regular' def-key='6' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0'><key/></button>
 	<!-- PC names -->
 	<text name='pc-head' size='large' relative='pos-in pos-in' anchor='caster-head' top='0' left='66' width='75' height='16'></text><!-- Just for positioning-->
-	<text name='pc1' ellipsis='true' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='122' height='16'/>
-	<text name='pc2' ellipsis='true' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='122' height='16'/>
-	<text name='pc3' ellipsis='true' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='122' height='16'/>
-	<text name='pc4' ellipsis='true' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='122' height='16'/>
-	<text name='pc5' ellipsis='true' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='122' height='16'/>
-	<text name='pc6' ellipsis='true' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='122' height='16'/>
+	<text name='pc1' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='122' height='16'/>
+	<text name='pc2' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='122' height='16'/>
+	<text name='pc3' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='122' height='16'/>
+	<text name='pc4' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='122' height='16'/>
+	<text name='pc5' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='122' height='16'/>
+	<text name='pc6' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='122' height='16'/>
 	<!-- To the right of PC name, buttons to select target -->
 	<text name='target-head' size='large' relative='pos-in pos-in' anchor='pc-head' top='0' left='112' width='223' height='16'>Target:</text>
 	<button name='target1' type='small' def-key='shift 1' relative='pos-in pos-in' rel-anchor='prev' top='19' left='6'><key/></button>
@@ -159,14 +159,6 @@
 	<pict name='pc5-stat15' type='status' num='0' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0'/>
 	<pict name='pc6-stat15' type='status' num='0' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0'/>
 
-	<!-- If dead, instead of status icons, say so -->
-	<text name='dead1' relative='pos-in pos-in' anchor='pc1-stat1' top='0' left='0' width='64' height='16'/>
-	<text name='dead2' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='64' height='16'/>
-	<text name='dead3' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='64' height='16'/>
-	<text name='dead4' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='64' height='16'/>
-	<text name='dead5' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='64' height='16'/>
-	<text name='dead6' relative='pos-in pos-in' rel-anchor='prev' top='24' left='0' width='64' height='16'/>
-
 	<!-- Spell columns -->
 	<text name='col1' top='227' left='10' width='100' height='16'/>
 	<led name='spell1' state='off' relative='pos-in pos-in' rel-anchor='prev' top='20' left='6'/>

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/confirm-spend-xp.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}} before training 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/convert-pics-now.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 escbtn='cancel' defbtn='convert'>
+<dialog defbtn='convert'>
 	<pict type='dlog' num='16' top='6' left='6'/>
 	<text top='6' left='48' width='252' height='121'>
 		This scenario was loaded from a legacy file, and as such its custom graphics have not yet been converted.

rsrc/dialogs/dark-slope-down.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 escbtn='leave' defbtn='climb'>
+<dialog defbtn='leave'>
 	<button name='leave' type='regular' top='50' left='180'>Leave</button>
 	<button name='climb' type='regular' top='50' left='246'>Climb</button>
 	<pict type='dlog' num='19' top='8' left='8'/>

rsrc/dialogs/dark-slope-up.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 escbtn='leave' defbtn='climb'>
+<dialog defbtn='leave'>
 	<button name='leave' type='regular' top='35' left='177'>Leave</button>
 	<button name='climb' type='regular' top='35' left='243'>Climb</button>
 	<pict type='dlog' num='19' top='8' left='8'/>

rsrc/dialogs/debug-crash-confirm.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
-<dialog escbtn='no' defbtn='yes'>
+<dialog defbtn='no'>
 	<pict type='dlog' num='7' top='6' left='6'/>
 	<text top='6' left='48' width='249' height='67'>
 		You are about to crash the game on purpose.<br/>

rsrc/dialogs/delete-pc-confirm.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 escbtn='no' defbtn='yes'>
+<dialog defbtn='no'>
 	<pict type='dlog' num='7' top='6' left='6'/>
 	<text top='6' left='48' width='249' height='67'>
 		You are about to consign this character to the eternal void.<br/>

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

@@ -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='okay' escbtn='cancel'>
+<dialog defbtn='okay'>
+	<!-- OK button -->
 	<field name='name' top='51' left='162' width='151' height='16'/>
 	<button name='okay' type='regular' top='295' left='354'>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'/>
 	<text size='large' top='6' left='50' width='256' height='17'>Outdoors Details</text>
 	<text top='53' left='50' width='101' height='14'>Section name:</text>
@@ -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-party.xml

@@ -7,7 +7,7 @@
 	
 	<pict name='pc1' type='pc' relative='abs pos' rel-anchor='prev' num='0' top='10' left='12'/>
 	<text size='large' relative='pos pos-in' rel-anchor='prev' top='11' left='2' width='40' height='16'>PC #1</text>
-	<text name='name1' size='title' font='dungeon' framed='true' ellipsis='true' relative='pos neg' rel-anchor='prev' top='3' left='11' width='152' height='20'/>
+	<text name='name1' size='title' font='dungeon' framed='true' relative='pos neg' rel-anchor='prev' top='3' left='11' width='152' height='20'/>
 	<button name='delete1' type='tall' relative='pos neg' rel-anchor='prev' top='10' left='13'>Delete</button>
 	<button name='trait1' type='trait' relative='pos pos-in' rel-anchor='prev' top='0' left='3'/>
 	<button name='train1' type='tall' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>Train</button>
@@ -15,7 +15,7 @@
 	
 	<pict name='pc2' type='pc' relative='abs pos' anchor='pc1' num='0' top='9' left='12'/>
 	<text size='large' relative='pos pos-in' rel-anchor='prev' top='11' left='2' width='40' height='16'>PC #2</text>
-	<text name='name2' size='title' font='dungeon' framed='true' ellipsis='true' relative='pos neg' rel-anchor='prev' top='3' left='11' width='152' height='20'/>
+	<text name='name2' size='title' font='dungeon' framed='true' relative='pos neg' rel-anchor='prev' top='3' left='11' width='152' height='20'/>
 	<button name='delete2' type='tall' relative='pos neg' rel-anchor='prev' top='10' left='13'>Delete</button>
 	<button name='trait2' type='trait' relative='pos pos-in' rel-anchor='prev' top='0' left='3'/>
 	<button name='train2' type='tall' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>Train</button>
@@ -23,7 +23,7 @@
 	
 	<pict name='pc3' type='pc' relative='abs pos' anchor='pc2' num='0' top='9' left='12'/>
 	<text size='large' relative='pos pos-in' rel-anchor='prev' top='11' left='2' width='40' height='16'>PC #3</text>
-	<text name='name3' size='title' font='dungeon' framed='true' ellipsis='true' relative='pos neg' rel-anchor='prev' top='3' left='11' width='152' height='20'/>
+	<text name='name3' size='title' font='dungeon' framed='true' relative='pos neg' rel-anchor='prev' top='3' left='11' width='152' height='20'/>
 	<button name='delete3' type='tall' relative='pos neg' rel-anchor='prev' top='10' left='13'>Delete</button>
 	<button name='trait3' type='trait' relative='pos pos-in' rel-anchor='prev' top='0' left='3'/>
 	<button name='train3' type='tall' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>Train</button>
@@ -31,7 +31,7 @@
 	
 	<pict name='pc4' type='pc' relative='abs pos' anchor='pc3' num='0' top='9' left='12'/>
 	<text size='large' relative='pos pos-in' rel-anchor='prev' top='11' left='2' width='40' height='16'>PC #4</text>
-	<text name='name4' size='title' font='dungeon' framed='true' ellipsis='true' relative='pos neg' rel-anchor='prev' top='3' left='11' width='152' height='20'/>
+	<text name='name4' size='title' font='dungeon' framed='true' relative='pos neg' rel-anchor='prev' top='3' left='11' width='152' height='20'/>
 	<button name='delete4' type='tall' relative='pos neg' rel-anchor='prev' top='10' left='13'>Delete</button>
 	<button name='trait4' type='trait' relative='pos pos-in' rel-anchor='prev' top='0' left='3'/>
 	<button name='train4' type='tall' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>Train</button>
@@ -39,7 +39,7 @@
 	
 	<pict name='pc5' type='pc' relative='abs pos' anchor='pc4' num='0' top='9' left='12'/>
 	<text size='large' relative='pos pos-in' rel-anchor='prev' top='11' left='2' width='40' height='16'>PC #5</text>
-	<text name='name5' size='title' font='dungeon' framed='true' ellipsis='true' relative='pos neg' rel-anchor='prev' top='3' left='11' width='152' height='20'/>
+	<text name='name5' size='title' font='dungeon' framed='true' relative='pos neg' rel-anchor='prev' top='3' left='11' width='152' height='20'/>
 	<button name='delete5' type='tall' relative='pos neg' rel-anchor='prev' top='10' left='13'>Delete</button>
 	<button name='trait5' type='trait' relative='pos pos-in' rel-anchor='prev' top='0' left='3'/>
 	<button name='train5' type='tall' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>Train</button>
@@ -47,7 +47,7 @@
 	
 	<pict name='pc6' type='pc' relative='abs pos' anchor='pc5' num='0' top='9' left='12'/>
 	<text size='large' relative='pos pos-in' rel-anchor='prev' top='11' left='2' width='40' height='16'>PC #6</text>
-	<text name='name6' size='title' font='dungeon' framed='true' ellipsis='true' relative='pos neg' rel-anchor='prev' top='3' left='11' width='152' height='20'/>
+	<text name='name6' size='title' font='dungeon' framed='true' relative='pos neg' rel-anchor='prev' top='3' left='11' width='152' height='20'/>
 	<button name='delete6' type='tall' relative='pos neg' rel-anchor='prev' top='10' left='13'>Delete</button>
 	<button name='trait6' type='trait' relative='pos pos-in' rel-anchor='prev' top='0' left='3'/>
 	<button name='train6' type='tall' relative='pos pos-in' rel-anchor='prev' top='0' left='3'>Train</button>