Merge branch 'release' into autoexplore-speed

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
         path: BrogueCE-linux-x86_64.tar.gz
 
   macos:
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
     - name: "Checkout sources"
       uses: actions/checkout@v3

.github/workflows/test.yml

@@ -0,0 +1,28 @@
+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_13/
+        python3 test/run_regression_tests.py --extra_args "--variant rapid_brogue" test/regression_test_rapid_v1_5/

CHANGELOG.md

@@ -1,3 +1,48 @@
+1.13
+====
+
+Thanks to great work by flend and zenzombie, we now have support for multiple
+game variants in CE, and have added Rapid Brogue! Select it in *Play > Change
+Variant* in the main menu.
+
+Thanks to other contributors andkem, brturn, nathanf, nstoddard, and omar-polo.
+
+-
+  Rapid Brogue is now part of Brogue CE!
+-
+  Re-designed the main menu.
+-
+  Lumenstones are worth 500 gold on death, instead of 0.
+-
+  The rapier lunge attack works against invisible enemies when you are
+  telepathic.
+-
+  Levers are now indestructible via shattering and tunneling, which would leave
+  some vaults impossible to open.
+-
+  Autoexplore no longer walks through dangerous gases when wearing unidentified
+  respiration armor.
+-
+  Items falling from the previous level will now trigger any traps they land on.
+-
+  Items and monsters falling from the previous level will no longer fall into
+  reward rooms.
+-
+  Fixed an issue where unidentified rings could have higher bonuses than they
+  would have once identified.
+-
+  Fixed an issue where unidentified positive rings would be 1 enchant lower than
+  they should.
+-
+  Update rapier description to use 'triple damage' instead of 'treble damage'.
+-
+  Added a `-vn` command-line option to play a replay headlessly.
+-
+  Fix the default enchantment value being ignored in wizard mode.
+-
+  Fixed the dungeon version number in the seed catalog.
+
+
 1.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
+	-Wformat -Werror=format-security -Wformat-overflow=0 -Wmissing-prototypes
 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/inventory-full-color.md

@@ -0,0 +1 @@
+Change the color of the message when you try to pick up an item when your inventory is full, so it stands out more.

changes/names-for-blueprints.md

@@ -0,0 +1 @@
+Added names to blueprints which appear when using D_MESSAGE_MACHINE_GENERATION

macos/Info.plist

@@ -19,9 +19,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleVersion</key>
-    <string>1.12.0</string>
+    <string>1.13.0</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.12.0</string>
+    <string>1.13.0</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleSupportedPlatforms</key>

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 $@

make/releases.mk

@@ -10,15 +10,15 @@ define make_release_base
 endef
 
 # Flatten bin/ in the Windows archive
-BrogueCE-windows: bin/brogue.exe
+BrogueCE-windows:
 	$(make_release_base)
 	cp -r $(common_bin) bin/{brogue.exe,brogue-cmd.bat} $@
 
-BrogueCE-macos: Brogue.app
+BrogueCE-macos:
 	$(make_release_base)
 	cp -r Brogue.app $@/"Brogue CE.app"
 
-BrogueCE-linux: bin/brogue
+BrogueCE-linux:
 	$(make_release_base)
 	cp brogue $@
 	cp -r --parents $(common_bin) bin/brogue $@
@@ -42,5 +42,5 @@ Brogue.app: bin/brogue
 	cp -r macos/Brogue.icns bin/assets $@/Contents/Resources
 
 macos/sdl2.rb:
-	curl -L 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/sdl2.rb' >$@
+	curl -L 'https://raw.githubusercontent.com/Homebrew/homebrew-core/master/Formula/s/sdl2.rb' >$@
 	patch $@ macos/sdl2-deployment-target.patch