test butler early in CI

fix #797 other minor issue

.gitattributes

@@ -1,10 +1,4 @@
-**/*.spec linguist-language=SpecialNodes
-**/*.map linguist-language=Maps
+**/*.spec -linguist-detectable linguist-language=Text
 src/fileio/gzstream/** linguist-vendored
 src/fileio/xml-parser/** linguist-vendored
 src/fileio/xml-parser/tinyprint.* -linguist-vendored
-
-*.exs linguist-language=Scenario
-*.boes linguist-language=Scenario
-*.SAV linguist-detectable linguist-language=Party
-*.exg linguist-detectable linguist-language=Party

.github/workflows/ci.yml

@@ -7,164 +7,165 @@
 		},
 		pull_request: {
 			branches: [ master ]
-		}
+		},
+		workflow_dispatch: {}
 	},
 
 	jobs: {
-		# macos-xcode: {
-		# 	runs-on: macos-13,
-		# 	env: {
-		# 		DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
-		# 	},
-		# 	steps: [
-		# 		{
-		# 			name: checkout,
-		# 			uses: actions/checkout@v4,
-		# 			with: { submodules: true }
-		# 		},
-		# 		{
-		# 			name: install Boost,
-		# 			run: brew install Boost@1.85
-		# 		},
-		# 		{
-		# 			name: install SFML,
-		# 			run: ./.github/workflows/scripts/mac/install-sfml.sh
-		# 		},
-		# 		{
-		# 			name: patch Xcode project,
-		# 			run: ./.github/workflows/scripts/mac/fix-xcode-proj.sh
-		# 		},
-		# 		{
-		# 			name: build,
-		# 			run: ./.github/workflows/scripts/mac/xcode-build.sh
-		# 		},
-		# 		{
-		# 			name: unit tests,
-		# 			run: ./.github/workflows/scripts/mac/run-tests.sh
-		# 		}
-		# 	]
-		# },
-		# macos-scons: {
-		# 	runs-on: macos-13,
-		# 	steps:  [
-		# 		{
-		# 			name: checkout,
-		# 			uses: actions/checkout@v4,
-		# 			with: { submodules: true }
-		# 		},
-		# 		{
-		# 			name: install dependencies,
-		# 			run: brew install scons SFML@2 Boost@1.85
-		# 		},
-		# 		{
-		# 			name: build and unit test,
-		# 			run: ./.github/workflows/scripts/mac/scons-build.sh test=true
-		# 		}
-		# 	]
-		# },
-		# win-vs32: {
-		# 	runs-on: windows-2022,
-		# 	env: {
-		# 		VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-		# 	},
-		# 	steps: [
-		# 		{
-		# 			name: Export GitHub Actions cache environment variables,
-		# 			uses: actions/github-script@v7,
-		# 			with: {
-		# 				script: "core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');"
-		# 			}
-		# 		},
-		# 		{
-		# 			name: checkout,
-		# 			uses: actions/checkout@v4,
-		# 			with: { submodules: true }
-		# 		},
-		# 		{
-		# 			name: install dependencies,
-		# 			run: '${{ github.workspace }}\.github\workflows\scripts\win\install-deps.bat x86',
-		# 			working-directory: proj/vs2017
-		# 		},
-		# 		{
-		# 			name: build,
-		# 			run: '.\.github\workflows\scripts\win\msvc-build.bat x86'
-		# 		}
-		# 	]
-		# },
-		# win-vs64: {
-		# 	runs-on: windows-2022,
-		# 	env: {
-		# 		VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-		# 	},
-		# 	steps: [
-		# 		{
-		# 			name: Export GitHub Actions cache environment variables,
-		# 			uses: actions/github-script@v7,
-		# 			with: {
-		# 				script: "core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');"
-		# 			}
-		# 		},
-		# 		{
-		# 			name: checkout,
-		# 			uses: actions/checkout@v4,
-		# 			with: { submodules: true }
-		# 		},
-		# 		{
-		# 			name: install dependencies,
-		# 			run: '${{ github.workspace }}\.github\workflows\scripts\win\install-deps.bat x64',
-		# 			working-directory: proj/vs2017
-		# 		},
-		# 		{
-		# 			name: build,
-		# 			run: '.\.github\workflows\scripts\win\msvc-build.bat x64'
-		# 		},
-		# 		{
-		# 			name: unit tests,
-		# 			run: '.\.github\workflows\scripts\win\run-tests.bat'
-		# 		}
-		# 	]
-		# },
-		# win-scons: {
-		# 	runs-on: windows-2019,
-		# 	env: {
-		# 		VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-		# 	},
-		# 	steps: [
-		# 		{
-		# 			name: Export GitHub Actions cache environment variables,
-		# 			uses: actions/github-script@v7,
-		# 			with: {
-		# 				script: "core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');"
-		# 			}
-		# 		},
-		# 		{
-		# 			name: checkout,
-		# 			uses: actions/checkout@v4,
-		# 			with: { submodules: true }
-		# 		},
-		# 		{
-		# 			name: install build dependencies,
-		# 			run: 'vcpkg install libxml2 && pip install scons'
-		# 		},
-		# 		{
-		# 			name: install dependencies,
-		# 			run: '${{ github.workspace }}\.github\workflows\scripts\win\install-deps.bat x64',
-		# 			working-directory: proj/vs2017
-		# 		},
-		# 		{
-		# 			name: build and unit test,
-		# 			run: '.\.github\workflows\scripts\win\scons-build.bat test=true'
-		# 		},
-		# 		{
-		# 			name: warn about failure to launch tests,
-		# 			run: 'echo "::warning title=UNIT-TESTS::unit tests failed for win-scons"',
-		# 			shell: bash,
-		# 			if: "${{ hashFiles('build/test/passed') == '' }}"
-		# 		}
-		# 	]
-		# },
+		macos-xcode: {
+			runs-on: macos-13,
+			env: {
+				DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
+			},
+			steps: [
+				{
+					name: checkout,
+					uses: actions/checkout@v4,
+					with: { submodules: true }
+				},
+				{
+					name: install Boost,
+					run: brew install Boost@1.85
+				},
+				{
+					name: install SFML,
+					run: ./.github/workflows/scripts/mac/install-sfml.sh
+				},
+				{
+					name: patch Xcode project,
+					run: ./.github/workflows/scripts/mac/fix-xcode-proj.sh
+				},
+				{
+					name: build,
+					run: ./.github/workflows/scripts/mac/xcode-build.sh
+				},
+				{
+					name: unit tests,
+					run: ./.github/workflows/scripts/mac/run-tests.sh
+				}
+			]
+		},
+		macos-scons: {
+			runs-on: macos-13,
+			steps:  [
+				{
+					name: checkout,
+					uses: actions/checkout@v4,
+					with: { submodules: true }
+				},
+				{
+					name: install dependencies,
+					run: brew install scons SFML@2 Boost@1.85
+				},
+				{
+					name: build and unit test,
+					run: ./.github/workflows/scripts/mac/scons-build.sh test=true
+				}
+			]
+		},
+		win-vs32: {
+			runs-on: windows-2022,
+			env: {
+				VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+			},
+			steps: [
+				{
+					name: Export GitHub Actions cache environment variables,
+					uses: actions/github-script@v7,
+					with: {
+						script: "core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');"
+					}
+				},
+				{
+					name: checkout,
+					uses: actions/checkout@v4,
+					with: { submodules: true }
+				},
+				{
+					name: install dependencies,
+					run: '${{ github.workspace }}\.github\workflows\scripts\win\install-deps.bat x86',
+					working-directory: proj/vs2017
+				},
+				{
+					name: build,
+					run: '.\.github\workflows\scripts\win\msvc-build.bat x86'
+				}
+			]
+		},
+		win-vs64: {
+			runs-on: windows-2022,
+			env: {
+				VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+			},
+			steps: [
+				{
+					name: Export GitHub Actions cache environment variables,
+					uses: actions/github-script@v7,
+					with: {
+						script: "core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');"
+					}
+				},
+				{
+					name: checkout,
+					uses: actions/checkout@v4,
+					with: { submodules: true }
+				},
+				{
+					name: install dependencies,
+					run: '${{ github.workspace }}\.github\workflows\scripts\win\install-deps.bat x64',
+					working-directory: proj/vs2017
+				},
+				{
+					name: build,
+					run: '.\.github\workflows\scripts\win\msvc-build.bat x64'
+				},
+				{
+					name: unit tests,
+					run: '.\.github\workflows\scripts\win\run-tests.bat'
+				}
+			]
+		},
+		win-scons: {
+			runs-on: windows-2022,
+			env: {
+				VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+			},
+			steps: [
+				{
+					name: Export GitHub Actions cache environment variables,
+					uses: actions/github-script@v7,
+					with: {
+						script: "core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');"
+					}
+				},
+				{
+					name: checkout,
+					uses: actions/checkout@v4,
+					with: { submodules: true }
+				},
+				{
+					name: install build dependencies,
+					run: 'vcpkg install libxml2 && pip install scons'
+				},
+				{
+					name: install dependencies,
+					run: '${{ github.workspace }}\.github\workflows\scripts\win\install-deps.bat x64',
+					working-directory: proj/vs2017
+				},
+				{
+					name: build and unit test,
+					run: '.\.github\workflows\scripts\win\scons-build.bat test=true'
+				},
+				{
+					name: warn about failure to launch tests,
+					run: 'echo "::warning title=UNIT-TESTS::unit tests failed for win-scons"',
+					shell: bash,
+					if: "${{ hashFiles('build/test/passed') == '' }}"
+				}
+			]
+		},
 		# win-mingw: {
-		# 	runs-on: windows-2019,
+		# 	runs-on: windows-2022,
 		# 	steps: [
 		# 		{
 		# 			name: checkout,
@@ -196,7 +197,7 @@
 				},
 				{
 					name: install dependencies,
-					run: 'sudo apt-get update && sudo apt-get install -y scons cmake xvfb libxml2-utils zlib1g libsfml-dev libboost-all-dev zenity'
+					run: 'sudo apt-get update && sudo apt-get install scons cmake libxml2-utils zlib1g libsfml-dev libboost-all-dev zenity'
 				},
 				{
 					name: install TGUI,

README.md

@@ -1,4 +1,4 @@
-[![CI status](https://k7izh9.gitea.cloud/openboe/oboe/actions/workflows/ci.yml/badge.svg)](https://k7izh9.gitea.cloud/openboe/oboe/actions/workflows/ci.yml)
+[![CI status](https://github.com/calref/cboe/actions/workflows/ci.yml/badge.svg)](https://github.com/calref/cboe/actions/workflows/ci.yml)
 
 Open Blades of Exile
 ====================
@@ -147,5 +147,6 @@ Helpful Links
 #openboe on irc.libera.chat)
 * [Original Game Source](http://www.spiderwebsoftware.com/blades/opensource.html) - Where
   it all began. Warning: Terrifying code.
+* [Experimental Windows/Mac Builds](http://pentalithia.ca/oboe/?C=M;O=D) - will be put
+  up whenever Celtic Minstrel feels like it.
 * [Official Web Site](https://openboe.com/) - The hub for all things OpenBoE. The documentation is also in viewable format, and there is an archive of all known scenarios that could be located.
-* [The itch.io page](https://nqn.itch.io/blades-of-exile) - if you just want to get the game and play it.

src/game/boe.actions.cpp

@@ -3838,6 +3838,10 @@ void start_new_game(bool force) {
 void start_tutorial() {
 	std::string version_flag = get_feature_version("tutorial");
 	if(!version_flag.empty()){
+		#ifdef SHOWCASE
+		clear_pref("ReceivedHelp");
+		#endif
+
 		if(party_in_memory){
 			cChoiceDlog confirm("restart-game",{"okay","cancel"});
 			confirm->getControl("warning").replaceText("{{action}}", "Starting the tutorial");

src/game/boe.main.hpp

@@ -1,6 +1,9 @@
 
 #include <SFML/Graphics.hpp>
 
+// This flag marks a build for live showcase. Starting the tutorial will reset all help dialogs.
+// #define SHOWCASE 1
+
 #ifdef __APPLE__
 extern eMenuChoice menuChoice;
 extern short menuChoiceId;

src/game/boe.monster.cpp

@@ -827,7 +827,7 @@ void monst_inflict_fields(short which_monst) {
 	which_m = &univ.town.monst[which_monst];
 	bool have_radiate = which_m->abil[eMonstAbil::RADIATE].active;
 	eFieldType which_radiate = which_m->abil[eMonstAbil::RADIATE].radiate.type;
-	// Judgment call: big monsters should only get damaged once per damage type if they're on
+	// Judgment call: big monsters shouldn't only get damaged once per damage type if they're on
 	// multiple of the same field. (Except webs.)
 	bool quickfire = false;
 	bool blade_wall = false;