diff --git a/INSTALL.adoc b/INSTALL.adoc index fb93b7d..5184d6b 100644 --- a/INSTALL.adoc +++ b/INSTALL.adoc @@ -23,5 +23,3 @@ You can also use pip to install PyYAML: `pip3 install PyYAML`. 5. Run `./advent` to play. 6. If you want to buld the documentation you will need asciidoctor. - -7. Running the regression tests requires batchspell diff --git a/Makefile b/Makefile index e4e31cb..88c59e6 100644 --- a/Makefile +++ b/Makefile @@ -72,12 +72,9 @@ cppcheck: pylint: @-pylint --score=n *.py */*.py -check: advent cheat pylint cppcheck spellcheck +check: advent cheat pylint cppcheck cd tests; $(MAKE) --quiet -spellcheck: - @batchspell adventure.yaml advent.adoc - reflow: @clang-format --style="{IndentWidth: 8, UseTab: ForIndentation}" -i $$(find . -name "*.[ch]") @black --quiet *.py diff --git a/advent.adoc b/advent.adoc index a064d1a..f132b0c 100644 --- a/advent.adoc +++ b/advent.adoc @@ -3,9 +3,6 @@ // SPDX-FileCopyrightText: (C) Eric S. Raymond // SPDX-License-Identifier: CC-BY-4.0 -// batchspell: add advent logfile savefile roleplaying Gillogly PDP Ctrl-D -// batchspell: add EOF autosave endianness wumpus zork nethack - == NAME == advent - Colossal Cave Adventure diff --git a/adventure.yaml b/adventure.yaml index 141ffb7..75d415a 100644 --- a/adventure.yaml +++ b/adventure.yaml @@ -1,10 +1,6 @@ # SPDX-FileCopyrightText: (C) Eric S. Raymond # SPDX-License-Identifier: BSD-2-Clause # -# batchspell: add XYZZY Twopit Bedquilt ne se sw nw dwarves dwarvish gouts -# batchspell: add Crowther add axe pinin Har har meself Hmmm Adventuredom -# batchspell: add Tsk gameplay bugfixes -# # This YAML file gets processed into a collection of data structures and # variable initializers describing Colossal Cave. It replaces an ad-hoc # text database shipped with Adventure versions up to 2.5. The format @@ -3436,7 +3432,7 @@ objects: !!omap - 'There are a few recent issues of "Spelunker Today" magazine here.' texts: - |- - I'm afraid the magazine is written in dwarvish. But penciled on one + I'm afraid the magazine is written in dwarvish. But pencilled on one cover you see, "Please leave the magazines at the construction site." - DWARF: words: ['dwarf', 'dwarv'] @@ -3944,13 +3940,11 @@ obituaries: Oh dear, you seem to have gotten yourself killed. I might be able to help you out, but I've never really done this before. Do you want me to try to reincarnate you? - # batchspell: add wr yes_response: |- All right. But don't blame me if something goes wr...... --- POOF!! --- You are engulfed in a cloud of orange smoke. Coughing and gasping, you emerge from the smoke and find.... - # batchspell: remove wr - query: |- You clumsy oaf, you've done it again! I don't know how long I can keep this up. Do you want me to try reincarnating you again? @@ -4232,7 +4226,7 @@ actions: !!omap message: |- There is a puff of orange smoke; within it, fiery runes spell out: - Open Adventure %V - http://www.catb.org/esr/open-adventure/ + \tOpen Adventure %V - http://www.catb.org/esr/open-adventure/ words: ['versi'] noaction: true diff --git a/notes.adoc b/notes.adoc index a247e49..833682c 100644 --- a/notes.adoc +++ b/notes.adoc @@ -16,8 +16,8 @@ of Peje Nilsson in restructuring some particularly grotty gotos is gratefully acknowledged. Petr Voropaev contributed fuzz testing and code cleanups. Aaron Traas did a lot of painstaking work to improve test coverage, and factored out the last handful of gotos. Ryan -Sarson nudged us into fixing a longstanding minor bug in the -handling of incorrect magic-word sequences, +Sarson nudged us into fixing a longstannding minor bug in the +handling of incorrect magic-word sequebcesm, == Nomenclature == @@ -75,8 +75,7 @@ Bug fixes: * A few minor typos have been corrected: absence of capitalization on "Swiss" and "Persian", inconsistent spelling of "imbedded" vs. "embedded", - "eying" for "eyeing", "thresholds" for "threshholds", "pencilled" - for "penciled". + "eying" for "eyeing", "thresholds" for "threshholds". * Under odd circumstances (dropping rug or vase outdoors) the game could formerly say "floor" when it should say "ground" (or "dirt", or