Merge branch 'release'

.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: "Test"
+on:
+  pull_request:
+    # Only run on PRs into release
+    branches:
+    - 'release'
+
+jobs:
+
+  linux-test:
+    runs-on: ubuntu-20.04
+    steps:
+    - name: "Install dependencies"
+      run: |
+        sudo apt update -y
+        sudo apt install -y libsdl2-dev libsdl2-image-dev
+
+    - name: "Checkout sources"
+      uses: actions/checkout@v3
+
+    - name: "Compile"
+      run: |
+        make bin/brogue
+
+    - name: "Run regression tests on merge to release branch"
+      run: |
+        python3 test/run_regression_tests.py test/regression_test_v1_12/

Makefile

@@ -1,12 +1,12 @@
 include config.mk
 
-cflags := -Isrc/brogue -Isrc/platform -std=c99 \
+cflags := -Isrc/brogue -Isrc/platform -Isrc/variants -std=c99 \
 	-Wall -Wpedantic -Werror=implicit -Wno-parentheses -Wno-unused-result \
 	-Wformat -Werror=format-security -Wformat-overflow=0
 libs := -lm
 cppflags := -DDATADIR=$(DATADIR)
 
-sources := $(wildcard src/brogue/*.c) $(addprefix src/platform/,main.c platformdependent.c null-platform.c)
+sources := $(wildcard src/brogue/*.c) $(wildcard src/variants/*.c) $(addprefix src/platform/,main.c platformdependent.c null-platform.c)
 objects :=
 
 ifeq ($(SYSTEM),WINDOWS)
@@ -50,6 +50,10 @@ sources += $(addprefix src/platform/,web-platform.c)
 cppflags += -DBROGUE_WEB
 endif
 
+ifeq ($(RAPIDBROGUE),YES)
+cppflags += -DRAPID_BROGUE
+endif
+
 ifeq ($(MAC_APP),YES)
 cppflags += -DSDL_PATHS
 endif
@@ -76,7 +80,7 @@ clean:
 
 escape = $(subst ','\'',$(1))
 vars:
-	mkdir vars
+	mkdir -p vars
 # Write the value to a temporary file and only overwrite if it's different.
 vars/%: vars FORCE
 	@echo '$(call escape,$($*))' > vars/$*.tmp

changes/dungeon-version-1.11.md

@@ -0,0 +1 @@
+Fix the dungeon version number in the seed catalog

changes/main-menu-rework.md

@@ -0,0 +1,4 @@
+- Redesign the main menu to use flyouts
+- Update tiles to include a left-facing triangle glyph used in the main menu
+- Add a placeholder menu option for choosing the game variant
+- Add a menu option for selecting the game mode (easy/normal/wizard)

changes/respiration-autoexplore.md

@@ -0,0 +1 @@
+Autoexplore no longer walks through dangerous gases when wearing unidentified respiration armor.

changes/wizard-mode-default-enchant.md

@@ -0,0 +1 @@
+Fix the default enchantment value being ignored in wizard mode.

make/brogue.mk

@@ -1,5 +1,8 @@
 bin/brogue$(.exe): $(objects) vars/cflags vars/LDFLAGS vars/libs vars/objects make/brogue.mk
 	$(CC) $(cflags) $(LDFLAGS) -o $@ $(objects) $(libs)
+# on windows, embedding the manifest modifies the executable, preventing debugging
 ifeq ($(SYSTEM),WINDOWS)
+ifeq ($(DEBUG),NO)
 	mt -manifest windows/brogue.exe.manifest '-outputresource:bin/brogue.exe;1'
 endif
+endif

make/o.mk

@@ -1,2 +1,2 @@
-$(sources:.c=.o): %.o: %.c src/brogue/Rogue.h src/brogue/IncludeGlobals.h vars/cppflags vars/cflags make/o.mk
+$(sources:.c=.o): %.o: %.c src/brogue/Rogue.h src/brogue/Globals.h src/brogue/GlobalsBase.h vars/cppflags vars/cflags make/o.mk
 	$(CC) $(cppflags) $(cflags) -c $< -o $@