LambdaHack 0.10.2.0 → 0.10.3.0

raw patch · 145 files changed

+8899/−7020 lines, 145 filesdep +QuickCheckdep +ansi-terminaldep +doctestdep −gtk3dep −hscursesdep −int-castdep ~asyncdep ~basedep ~enummapsetPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies added: QuickCheck, ansi-terminal, doctest, tasty-quickcheck, witch

Dependencies removed: gtk3, hscurses, int-cast, vty

Dependency ranges changed: async, base, enummapset, filepath, splitmix, vector

API changes (from Hackage documentation)

Files

• CHANGELOG.md +29/−0
• CREDITS +103/−0
• GameDefinition/Content/CaveKind.hs +7/−9
• GameDefinition/Content/ItemKind.hs +131/−104
• GameDefinition/Content/ItemKindActor.hs +67/−53
• GameDefinition/Content/ItemKindBlast.hs +115/−85
• GameDefinition/Content/ItemKindEmbed.hs +32/−36
• GameDefinition/Content/ItemKindOrgan.hs +51/−29
• GameDefinition/Content/ItemKindTemporary.hs +2/−1
• GameDefinition/Content/ModeKind.hs +25/−29
• GameDefinition/Content/ModeKindPlayer.hs +18/−9
• GameDefinition/Content/PlaceKind.hs +138/−138
• GameDefinition/Content/RuleKind.hs +31/−3
• GameDefinition/Content/TileKind.hs +28/−25
• GameDefinition/InGameHelp.txt +179/−0
• GameDefinition/Main.hs +3/−7
• GameDefinition/PLAYING.md +77/−79
• GameDefinition/config.ui.default +20/−21
• GameDefinition/fonts/ubuntu-mono-v9-latin-ext_latin-700.ttf.woff binary
• GameDefinition/fonts/ubuntu-v14-latin-ext_latin-500.ttf.woff binary
• GameDefinition/fonts/ubuntu-v14-latin-ext_latin-regular.ttf.woff binary
• GameDefinition/game-src/Client/UI/Content/Input.hs +1/−11
• GameDefinition/game-src/Client/UI/Content/Screen.hs +1/−4
• GameDefinition/game-src/Implementation/MonadServerImplementation.hs +1/−1
• GameDefinition/game-src/TieKnot.hs +5/−3
• LICENSE +26/−0
• LambdaHack.cabal +61/−66
• Makefile +96/−108
• README.md +132/−74
• cabal.project +7/−0
• definition-src/Game/LambdaHack/Content/CaveKind.hs +42/−41
• definition-src/Game/LambdaHack/Content/ItemKind.hs +62/−8
• definition-src/Game/LambdaHack/Content/ModeKind.hs +17/−17
• definition-src/Game/LambdaHack/Content/PlaceKind.hs +50/−23
• definition-src/Game/LambdaHack/Content/RuleKind.hs +9/−6
• definition-src/Game/LambdaHack/Content/TileKind.hs +4/−8
• definition-src/Game/LambdaHack/Core/Prelude.hs +2/−2
• definition-src/Game/LambdaHack/Core/Random.hs +13/−9
• definition-src/Game/LambdaHack/Definition/Color.hs +22/−17
• definition-src/Game/LambdaHack/Definition/ContentData.hs +7/−1
• definition-src/Game/LambdaHack/Definition/Defs.hs +13/−28
• definition-src/Game/LambdaHack/Definition/DefsInternal.hs +74/−0
• definition-src/Game/LambdaHack/Definition/Flavour.hs +9/−2
• engine-src/Game/LambdaHack/Atomic/CmdAtomic.hs +3/−1
• engine-src/Game/LambdaHack/Atomic/HandleAtomicWrite.hs +2/−1
• engine-src/Game/LambdaHack/Atomic/PosAtomicRead.hs +2/−0
• engine-src/Game/LambdaHack/Client.hs +1/−1
• engine-src/Game/LambdaHack/Client/AI.hs +1/−1
• engine-src/Game/LambdaHack/Client/AI/ConditionM.hs +24/−22
• engine-src/Game/LambdaHack/Client/AI/PickActionM.hs +57/−37
• engine-src/Game/LambdaHack/Client/AI/PickTargetM.hs +8/−4
• engine-src/Game/LambdaHack/Client/BfsM.hs +5/−4
• engine-src/Game/LambdaHack/Client/CommonM.hs +11/−9
• engine-src/Game/LambdaHack/Client/HandleAtomicM.hs +74/−44
• engine-src/Game/LambdaHack/Client/HandleResponseM.hs +30/−13
• engine-src/Game/LambdaHack/Client/LoopM.hs +113/−8
• engine-src/Game/LambdaHack/Client/MonadClient.hs +18/−14
• engine-src/Game/LambdaHack/Client/Preferences.hs +1/−1
• engine-src/Game/LambdaHack/Client/Response.hs +3/−1
• engine-src/Game/LambdaHack/Client/State.hs +4/−6
• engine-src/Game/LambdaHack/Client/UI.hs +154/−123
• engine-src/Game/LambdaHack/Client/UI/Animation.hs +5/−1
• engine-src/Game/LambdaHack/Client/UI/Content/Input.hs +19/−18
• engine-src/Game/LambdaHack/Client/UI/Content/Screen.hs +2/−2
• engine-src/Game/LambdaHack/Client/UI/ContentClientUI.hs +0/−1
• engine-src/Game/LambdaHack/Client/UI/DisplayAtomicM.hs +0/−2418
• engine-src/Game/LambdaHack/Client/UI/DrawM.hs +48/−54
• engine-src/Game/LambdaHack/Client/UI/EffectDescription.hs +9/−9
• engine-src/Game/LambdaHack/Client/UI/Frame.hs +45/−25
• engine-src/Game/LambdaHack/Client/UI/FrameM.hs +97/−101
• engine-src/Game/LambdaHack/Client/UI/Frontend.hs +29/−28
• engine-src/Game/LambdaHack/Client/UI/Frontend/ANSI.hs +315/−0
• engine-src/Game/LambdaHack/Client/UI/Frontend/Chosen.hs +0/−21
• engine-src/Game/LambdaHack/Client/UI/Frontend/Common.hs +1/−1
• engine-src/Game/LambdaHack/Client/UI/Frontend/Curses.hs +0/−188
• engine-src/Game/LambdaHack/Client/UI/Frontend/Dom.hs +13/−7
• engine-src/Game/LambdaHack/Client/UI/Frontend/Gtk.hs +0/−279
• engine-src/Game/LambdaHack/Client/UI/Frontend/Sdl.hs +91/−56
• engine-src/Game/LambdaHack/Client/UI/Frontend/Teletype.hs +8/−9
• engine-src/Game/LambdaHack/Client/UI/Frontend/Vty.hs +0/−175
• engine-src/Game/LambdaHack/Client/UI/HandleHelperM.hs +216/−232
• engine-src/Game/LambdaHack/Client/UI/HandleHumanGlobalM.hs +362/−337
• engine-src/Game/LambdaHack/Client/UI/HandleHumanLocalM.hs +264/−276
• engine-src/Game/LambdaHack/Client/UI/HandleHumanM.hs +144/−98
• engine-src/Game/LambdaHack/Client/UI/HumanCmd.hs +5/−5
• engine-src/Game/LambdaHack/Client/UI/InventoryM.hs +174/−46
• engine-src/Game/LambdaHack/Client/UI/ItemDescription.hs +29/−13
• engine-src/Game/LambdaHack/Client/UI/Key.hs +1/−1
• engine-src/Game/LambdaHack/Client/UI/KeyBindings.hs +48/−62
• engine-src/Game/LambdaHack/Client/UI/MonadClientUI.hs +84/−89
• engine-src/Game/LambdaHack/Client/UI/Msg.hs +24/−34
• engine-src/Game/LambdaHack/Client/UI/MsgM.hs +23/−17
• engine-src/Game/LambdaHack/Client/UI/Overlay.hs +110/−26
• engine-src/Game/LambdaHack/Client/UI/PointUI.hs +8/−2
• engine-src/Game/LambdaHack/Client/UI/SessionUI.hs +49/−23
• engine-src/Game/LambdaHack/Client/UI/Slideshow.hs +125/−123
• engine-src/Game/LambdaHack/Client/UI/SlideshowM.hs +262/−137
• engine-src/Game/LambdaHack/Client/UI/UIOptions.hs +9/−15
• engine-src/Game/LambdaHack/Client/UI/UIOptionsParse.hs +10/−10
• engine-src/Game/LambdaHack/Client/UI/Watch.hs +9/−0
• engine-src/Game/LambdaHack/Client/UI/Watch/WatchCommonM.hs +302/−0
• engine-src/Game/LambdaHack/Client/UI/Watch/WatchQuitM.hs +365/−0
• engine-src/Game/LambdaHack/Client/UI/Watch/WatchSfxAtomicM.hs +989/−0
• engine-src/Game/LambdaHack/Client/UI/Watch/WatchUpdAtomicM.hs +1109/−0
• engine-src/Game/LambdaHack/Common/Actor.hs +18/−18
• engine-src/Game/LambdaHack/Common/Area.hs +3/−3
• engine-src/Game/LambdaHack/Common/ClientOptions.hs +6/−0
• engine-src/Game/LambdaHack/Common/Faction.hs +6/−16
• engine-src/Game/LambdaHack/Common/Item.hs +7/−7
• engine-src/Game/LambdaHack/Common/JSFile.hs +7/−1
• engine-src/Game/LambdaHack/Common/Level.hs +6/−5
• engine-src/Game/LambdaHack/Common/Misc.hs +3/−1
• engine-src/Game/LambdaHack/Common/Point.hs +49/−15
• engine-src/Game/LambdaHack/Common/PointArray.hs +3/−2
• engine-src/Game/LambdaHack/Common/ReqFailure.hs +9/−5
• engine-src/Game/LambdaHack/Common/State.hs +19/−10
• engine-src/Game/LambdaHack/Common/Thread.hs +1/−1
• engine-src/Game/LambdaHack/Common/Time.hs +7/−7
• engine-src/Game/LambdaHack/Common/Vector.hs +13/−16
• engine-src/Game/LambdaHack/Server/Commandline.hs +43/−30
• engine-src/Game/LambdaHack/Server/CommonM.hs +87/−39
• engine-src/Game/LambdaHack/Server/DebugM.hs +1/−0
• engine-src/Game/LambdaHack/Server/DungeonGen.hs +19/−23
• engine-src/Game/LambdaHack/Server/DungeonGen/AreaRnd.hs +1/−1
• engine-src/Game/LambdaHack/Server/DungeonGen/Cave.hs +2/−2
• engine-src/Game/LambdaHack/Server/DungeonGen/Place.hs +38/−56
• engine-src/Game/LambdaHack/Server/HandleAtomicM.hs +1/−0
• engine-src/Game/LambdaHack/Server/HandleEffectM.hs +44/−48
• engine-src/Game/LambdaHack/Server/HandleRequestM.hs +10/−6
• engine-src/Game/LambdaHack/Server/ItemM.hs +17/−17
• engine-src/Game/LambdaHack/Server/ItemRev.hs +51/−35
• engine-src/Game/LambdaHack/Server/LoopM.hs +27/−19
• engine-src/Game/LambdaHack/Server/MonadServer.hs +3/−0
• engine-src/Game/LambdaHack/Server/PeriodicM.hs +64/−27
• engine-src/Game/LambdaHack/Server/ProtocolM.hs +2/−3
• engine-src/Game/LambdaHack/Server/StartM.hs +47/−31
• engine-src/Game/LambdaHack/Server/State.hs +5/−0
• test/ItemDescriptionUnitTests.hs +66/−0
• test/ItemKindUnitTests.hs +78/−0
• test/ItemRevUnitTests.hs +77/−0
• test/ReqFailureUnitTests.hs +79/−0
• test/SessionUIMock.hs +9/−7
• test/SessionUIUnitTests.hs +312/−0
• test/Spec.hs +25/−283
• test/doctest-driver.hs +10/−0

@@ -1,3 +1,32 @@+## [v0.10.3.0](https://github.com/LambdaHack/LambdaHack/compare/v0.10.2.0...v0.10.3.0)++- Work around regression https://gitlab.freedesktop.org/freetype/freetype/-/issues/1076 by making the scalable square font the default as the map font; the tiny map fonts, for which there is no such workaround, wont work for anybody with freetype 2.11.0+- Enable display of details in right pane in many menus+- Switch mouse wheel to move selection now that it changes right pane display+- Make the line where messages wrap configurable in config file+- Remove rarely used options from config file and code+- Prepare client-server for delays when operating over the network+- Reveal all map at game over and make it explorable+- Don't run with -threaded, increasing speed by a couple dozen percent+- Don't show messages during enemy turn (except when under AI control)+- Spawn many actors at once with probability correlated to spawning at all+- Gut out Ubuntu Font Family fonts+- Default to more old-fashioned small fonts in LambdaHack the game+- Add a few tutorial messages, reword some in-game texts+- Move with CI from Travis to GitHub Actions (but GHA can't keep up as well)+- Add hlint to CI+- Make place content directly define legends instead of overriding them+- Add a warning that crosshair is out of flinging range+- Add ANSI display to SDL2 frontend; remove vty, hcurses and GTK frontends+- Make Teletype frontend more usable (input, speed, overlays)+- Remove sight malus from light sources to avoid micromanagement+- Keep convenience settings between new games+- Add an option to mark FOV area with grey background+- Refactor and clean up a lot of the code+- Unhardwire various constants (hat tip to Jamie)+- Fix a couple of bugs and improve documentation+- Add whole new kinds of tests (even greater hat tip to Jamie)+ ## [v0.10.2.0](https://github.com/LambdaHack/LambdaHack/compare/v0.9.5.0...v0.10.2.0)  - Let '?' scroll help

@@ -0,0 +1,103 @@+All kinds of contributions to the LambdaHack engine are gratefully welcome!+Some of the contributors are listed below, in chronological order.++Andres Loeh+Mikolaj Konarski+Tuukka Turto+Veronika Romashkina+Daniel Keefe+Pablo Reszczynski+Rafał Szczerski+Oleg Grenrus+Simon Michael+bulbousBullfrog+Alex Byaly+Jamie Fristrom++++Fonts 16x16xw.woff, 16x16xw.bdf, 16x16x.fnt, 8x8x.fnt and 8x8xb.fnt+are are derived from fonts taken from+https://github.com/angband/angband, copyrighted by Leon Marrick,+Sheldon Simms III and Nick McConnell and released by them under+GNU GPL, version 2 or any later version (confirmed at+http://www.thangorodrim.net/development/opensource.html).+Any further modifications by authors of LambdaHack+are also released under GNU GPL version 2.++Font 16x16xw.bdf is derived from 16x16x.fon by changing all but+a few glyphs, converting to BDF format, extending character set+and hacking the font file with bdftopcf and pcf2bdf to include+full bitmaps, not only non-zero portions, for otherwise SDL2-ttf+was not able to display the glyphs.+Font 16x16xw.woff was derived from 16x16xw.bdf by changing format+to TTF with bitsnpicas, faking descendent offsets to be 1 point lower+to prevent freetype from adding an extra pixel to the descendent,+tweaking with fontforge glyphs 3 5 6 8 A a S s b d h to prevent antialiasing+of their vital parts when zoomed out, auto-hinting, manually simplifying+hints in some glyphs and converting to WOFF format.++++Fonts BinarySansProLH-Regular.ttf.woff, BinarySansProLH-Semibold.ttf.woff+and BinaryCodeProLH-Bold.ttf.woff are compiled from sources+at https://github.com/adobe-fonts/source-sans-pro+and https://github.com/adobe-fonts/source-code-pro+published with the following copyright notice:++Copyright 2010-2019 Adobe (http://www.adobe.com/), with Reserved Font+Name 'Source'. All Rights Reserved. Source is a trademark of Adobe+in the United States and/or other countries.+This Font Software is licensed under the SIL Open Font License, Version 1.1.++The sources are modified and processed as follows (see+https://github.com/adobe-fonts/source-sans-pro/issues/193 for background):++in Roman/Instances/Semibold/font.ufo/glyphs/s.glif+put advance width="452"+rm Roman/Instances/Semibold/font.ufo/data/com.adobe.type.processedHashMap+bash build.sh+pyftfeatfreeze -f 'cv03' -S -U LH -R 'Source/Binary' target/TTF/SourceSansPro-Semibold.ttf BinarySansProLH-Semibold.ttf+pyftsubset BinarySansProLH-Semibold.ttf --unicodes="*" --flavor=woff --with-zopfli --output-file=BinarySansProLH-Semibold.ttf.woff++and similarly for BinarySansProLH-Regular.ttf.woff, while+for BinaryCodeProLH-Bold.ttf.woff the last steps are:++pyftfeatfreeze -f 'cv02' -S -U LH -R 'Source/Binary' target/TTF/SourceCodePro-Bold.ttf BinaryCodeProLH-Bold.ttf+pyftsubset BinaryCodeProLH-Bold.ttf --unicodes="*" --flavor=woff --with-zopfli --output-file=BinaryCodeProLH-Bold.ttf.woff++++Fonts DejaVuLGCSans.ttf.woff and DejaVuLGCSans-Bold.ttf.woff+are downloaded from https://github.com/dejavu-fonts/dejavu-fonts+and compresses with pyftsubset. Their copyright notice is+DejaVu fonts 2.37 (c)2004-2016 DejaVu fonts team.+Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.++Font Hack-Bold.ttf.woff is downloaded from+https://github.com/source-foundry/Hack+and compresses with pyftsubset. Its copyright notice is+Hack work is (c) 2018 Source Foundry Authors. MIT License.+Bitstream Vera Sans Mono (c) 2003 Bitstream, Inc. (with Reserved Font+Names _Bitstream_ and _Vera_). Bitstream Vera License.++++The Ubuntu Font Family fonts are currently removed, because they are+a little too tall (some glyphs on consecutive lines are touching)+and also considered non-free by Debian and so we can't include them+in Debian and some other GNU/Linux distributions anyway.+If there is sufficient interest, they may be brought back.++They were fonts ubuntu-v14-latin-ext_latin-regular.ttf.woff,+ubuntu-v14-latin-ext_latin-500.ttf.woff+and ubuntu-mono-v9-latin-ext_latin-700.ttf.woff+that were generated via google-webfonts-helper.herokuapp.com+from 'Ubuntu Font Family' fonts with the following copyright notice:+Copyright 2011 Canonical Ltd. Licensed under the Ubuntu Font Licence 1.0++The files were compressed with pyftsubset to save some space and make+sure they are created from TTF, not coverted OTF fonts. Unfortunately,+being TTF fonts and having broken hinting in the mono variant, they+require forcing TTF.Light hinting in the SDL frontend. If ever OTF fonts+emerge, they should be used instead (similarly compressed).

@@ -26,6 +26,7 @@ import           Game.LambdaHack.Content.TileKind import           Game.LambdaHack.Core.Dice import           Game.LambdaHack.Definition.Defs+import           Game.LambdaHack.Definition.DefsInternal  -- * Group name patterns @@ -88,10 +89,10 @@   , chidden       = 7   , cactorCoeff   = 65  -- the maze requires time to explore   , cactorFreq    = [(MONSTER, 60), (ANIMAL, 40)]-  , citemNum      = 6 `d` 5 + 10 - 10 `dL` 1  -- deep down quality over quantity+  , citemNum      = 6 `d` 5 + 10 - 10 `dL` 1+      -- deep down quality over quantity; generally quite random,+      -- for interesting replays at the cost of unreliable balance   , citemFreq     = [(IK.COMMON_ITEM, 40), (IK.TREASURE, 60)]-    -- note that the groups are flattened; e.g., if an item is moved to another-    -- group included here with the same weight, the outcome wouldn't change   , cplaceFreq    = [(ROGUE, 1)]   , cpassable     = False   , labyrinth     = False@@ -105,8 +106,6 @@   , cfenceTileS   = S_BASIC_OUTER_FENCE   , cfenceTileW   = S_BASIC_OUTER_FENCE   , cfenceApart   = False-  , clegendDarkTile = LEGEND_DARK-  , clegendLitTile  = LEGEND_LIT   , cminStairDist = 20   , cmaxStairsNum = 1 + 1 `d` 2   , cescapeFreq   = []@@ -280,7 +279,6 @@   , cminStairDist = 10   , cmaxStairsNum = 1   , cescapeFreq   = [(INDOOR_ESCAPE_UP, 1)]-  , cskip         = [0]   , cdesc         = "This close to the surface, the sunlight still illuminates the dungeon."   } shallowRogue = rogue@@ -312,7 +310,7 @@   , cmaxStairsNum = 0   , cescapeFreq   = [(INDOOR_ESCAPE_UP, 1)]   , cstairFreq    = []-  , cskip         = [0]+  , cstairAllowed = []   , cdesc         = ""   } brawl = rogue  -- many random solid tiles, to break LOS, since it's a day@@ -434,7 +432,7 @@   , chidden       = 0   , cactorFreq    = []   , citemNum      = 6 `d` 8-  , citemFreq     = [ (IK.COMMON_ITEM, 30), (GEM, 250)+  , citemFreq     = [ (IK.COMMON_ITEM, 30), (GEM, 500)                     , (WEAK_ARROW, 500), (HARPOON, 400)                     , (IK.EXPLOSIVE, 100) ]   , cplaceFreq    = [(ESCAPE, 1)]@@ -449,7 +447,7 @@   , cmaxStairsNum = 0   , cescapeFreq   = [(OUTDOOR_ESCAPE_DOWN, 1)]   , cstairFreq    = []-  , cskip         = [0]  -- don't start heroes on exit+  , cskip         = [0]  -- don't start heroes nor opponents on escape   , cdesc         = ""   } zoo = rogue  -- few lights and many solids, to help the less numerous heroes

@@ -23,6 +23,7 @@ import Game.LambdaHack.Definition.Ability import Game.LambdaHack.Definition.Color import Game.LambdaHack.Definition.Defs+import Game.LambdaHack.Definition.DefsInternal import Game.LambdaHack.Definition.Flavour  -- * Group name patterns@@ -31,7 +32,7 @@ groupNamesSingleton =        [S_FRAGRANCE, S_SINGLE_SPARK, S_SPARK]     ++ [FLASK_UNKNOWN, POTION_UNKNOWN, EDIBLE_PLANT_UNKNOWN, SCROLL_UNKNOWN, NECKLACE_UNKNOWN, RING_UNKNOWN, HAMMER_UNKNOWN, GEM_UNKNOWN, CURRENCY_UNKNOWN]-    ++ embedsGNSingleton ++ actorsGNSingleton ++ organsGNSingleton+    ++ actorsGNSingleton ++ organsGNSingleton     ++ blastsGNSingleton ++ temporariesGNSingleton  pattern FLASK_UNKNOWN, POTION_UNKNOWN, EDIBLE_PLANT_UNKNOWN, SCROLL_UNKNOWN, NECKLACE_UNKNOWN, RING_UNKNOWN, HAMMER_UNKNOWN, GEM_UNKNOWN, CURRENCY_UNKNOWN :: GroupName ItemKind@@ -73,9 +74,9 @@  items :: [ItemKind] items =-  [sandstoneRock, dart, spike, spike2, slingStone, slingBullet, paralizingProj, harpoon, harpoon2, net, fragmentationBomb, concussionBomb, flashBomb, firecrackerBomb, flaskTemplate, flask1, flask2, flask3, flask4, flask5, flask6, flask7, flask8, flask9, flask10, flask11, flask12, flask13, flask14, potionTemplate, potion1, potion2, potion3, potion4, potion5, potion6, potion7, potion8, potion9, potion10, potion11, potion12, potion13, potion14, potion15, scrollTemplate, scroll1, scroll2, scroll3, scroll4, scroll5, scroll6, scroll7, scroll8, scroll9, scroll10, scroll11, scroll12, scroll13, ediblePlantTemplate, ediblePlant1, ediblePlant2, ediblePlant3, ediblePlant4, ediblePlant5, ediblePlant6, ediblePlant7, light1, light2, light3, blanket, gorget, necklaceTemplate, necklace1, necklace2, necklace3, necklace4, necklace5, necklace6, necklace7, necklace8, necklace9, necklace10, motionScanner, imageItensifier, sightSharpening, ringTemplate, ring1, ring2, ring3, ring4, ring5, ring6, ring7, ring8, armorLeather, armorMail, meleeEnhancement, gloveFencing, gloveGauntlet, gloveJousting, hatUshanka, capReinforced, helmArmored, smokingJacket, buckler, shield, shield2, shield3, hammerTemplate, hammer1, hammer2, hammer3, hammerParalyze, hammerSpark, knife, daggerDropBestWeapon, sword, swordImpress, swordNullify, halberd, halberd2, halberd3, halberdPushActor, gemTemplate, gem1, gem2, gem3, gem4, gem5, currencyTemplate, currency, jumpingPole, seeingItem]+  [sandstoneRock, dart, spike, spike2, slingStone, slingBullet, paralizingProj, harpoon, harpoon2, net, fragmentationBomb, concussionBomb, flashBomb, firecrackerBomb, flaskTemplate, flask1, flask2, flask3, flask4, flask5, flask6, flask7, flask8, flask9, flask10, flask11, flask12, flask13, flask14, flask15, potionTemplate, potion1, potion2, potion3, potion4, potion5, potion6, potion7, potion8, potion9, potion10, potion11, potion12, potion13, potion14, potion15, scrollTemplate, scroll1, scroll2, scroll3, scroll4, scroll5, scroll6, scroll7, scroll8, scroll9, scroll10, scroll11, scroll12, scroll13, ediblePlantTemplate, ediblePlant1, ediblePlant2, ediblePlant3, ediblePlant4, ediblePlant5, ediblePlant6, ediblePlant7, light1, light2, light3, blanket, gorget, necklaceTemplate, necklace1, necklace2, necklace3, necklace4, necklace5, necklace6, necklace7, necklace8, necklace9, necklace10, motionScanner, imageItensifier, sightSharpening, ringTemplate, ring1, ring2, ring3, ring4, ring5, ring6, ring7, ring8, ring9, ring10, armorLeather, armorMail, meleeEnhancement, gloveFencing, gloveGauntlet, gloveJousting, hatUshanka, capReinforced, helmArmored, smokingJacket, buckler, shield, shield2, shield3, hammerTemplate, hammer1, hammer2, hammer3, hammerParalyze, hammerSpark, knife, daggerDischarge, sword, swordImpress, swordNullify, halberd, halberd2, halberd3, halberdPushActor, gemTemplate, gem1, gem2, gem3, gem4, gem5, currencyTemplate, currency, jumpingPole, seeingItem] -sandstoneRock,    dart, spike, spike2, slingStone, slingBullet, paralizingProj, harpoon, harpoon2, net, fragmentationBomb, concussionBomb, flashBomb, firecrackerBomb, flaskTemplate, flask1, flask2, flask3, flask4, flask5, flask6, flask7, flask8, flask9, flask10, flask11, flask12, flask13, flask14, potionTemplate, potion1, potion2, potion3, potion4, potion5, potion6, potion7, potion8, potion9, potion10, potion11, potion12, potion13, potion14, potion15, scrollTemplate, scroll1, scroll2, scroll3, scroll4, scroll5, scroll6, scroll7, scroll8, scroll9, scroll10, scroll11, scroll12, scroll13, ediblePlantTemplate, ediblePlant1, ediblePlant2, ediblePlant3, ediblePlant4, ediblePlant5, ediblePlant6, ediblePlant7, light1, light2, light3, blanket, gorget, necklaceTemplate, necklace1, necklace2, necklace3, necklace4, necklace5, necklace6, necklace7, necklace8, necklace9, necklace10, motionScanner, imageItensifier, sightSharpening, ringTemplate, ring1, ring2, ring3, ring4, ring5, ring6, ring7, ring8, armorLeather, armorMail, meleeEnhancement, gloveFencing, gloveGauntlet, gloveJousting, hatUshanka, capReinforced, helmArmored, smokingJacket, buckler, shield, shield2, shield3, hammerTemplate, hammer1, hammer2, hammer3, hammerParalyze, hammerSpark, knife, daggerDropBestWeapon, sword, swordImpress, swordNullify, halberd, halberd2, halberd3, halberdPushActor, gemTemplate, gem1, gem2, gem3, gem4, gem5, currencyTemplate, currency, jumpingPole, seeingItem :: ItemKind+sandstoneRock,    dart, spike, spike2, slingStone, slingBullet, paralizingProj, harpoon, harpoon2, net, fragmentationBomb, concussionBomb, flashBomb, firecrackerBomb, flaskTemplate, flask1, flask2, flask3, flask4, flask5, flask6, flask7, flask8, flask9, flask10, flask11, flask12, flask13, flask14, flask15, potionTemplate, potion1, potion2, potion3, potion4, potion5, potion6, potion7, potion8, potion9, potion10, potion11, potion12, potion13, potion14, potion15, scrollTemplate, scroll1, scroll2, scroll3, scroll4, scroll5, scroll6, scroll7, scroll8, scroll9, scroll10, scroll11, scroll12, scroll13, ediblePlantTemplate, ediblePlant1, ediblePlant2, ediblePlant3, ediblePlant4, ediblePlant5, ediblePlant6, ediblePlant7, light1, light2, light3, blanket, gorget, necklaceTemplate, necklace1, necklace2, necklace3, necklace4, necklace5, necklace6, necklace7, necklace8, necklace9, necklace10, motionScanner, imageItensifier, sightSharpening, ringTemplate, ring1, ring2, ring3, ring4, ring5, ring6, ring7, ring8, ring9, ring10, armorLeather, armorMail, meleeEnhancement, gloveFencing, gloveGauntlet, gloveJousting, hatUshanka, capReinforced, helmArmored, smokingJacket, buckler, shield, shield2, shield3, hammerTemplate, hammer1, hammer2, hammer3, hammerParalyze, hammerSpark, knife, daggerDischarge, sword, swordImpress, swordNullify, halberd, halberd2, halberd3, halberdPushActor, gemTemplate, gem1, gem2, gem3, gem4, gem5, currencyTemplate, currency, jumpingPole, seeingItem :: ItemKind  -- Keep the dice rolls and sides in aspects small so that not too many -- distinct items are generated (for display in item lore and for narrative@@ -91,29 +92,29 @@  -- * Item group symbols, partially from Nethack -symbolProjectile, _symbolLauncher, symbolLight, symbolTool, symbolSpecial, symbolGold, symbolNecklace, symbolRing, symbolPotion, symbolFlask, symbolScroll, symbolTorsoArmor, symbolMiscArmor, symbolClothes, symbolShield, symbolPolearm, symbolEdged, symbolHafted, symbolWand, _symbolStaff, symbolFood :: Char+symbolProjectile, _symbolLauncher, symbolLight, symbolTool, symbolSpecial, symbolGold, symbolNecklace, symbolRing, symbolPotion, symbolFlask, symbolScroll, symbolTorsoArmor, symbolMiscArmor, symbolClothes, symbolShield, symbolPolearm, symbolEdged, symbolHafted, symbolWand, _symbolStaff, symbolFood :: ContentSymbol ItemKind -symbolProjectile = rsymbolProjectile standardRules  -- '|'-_symbolLauncher  = '}'-symbolLight      = '('-symbolTool       = '('-symbolSpecial    = '*'  -- don't overuse, because it clashes with projectiles-symbolGold       = '$'  -- also gems-symbolNecklace   = '"'-symbolRing       = '='-symbolPotion     = '!'  -- concoction, bottle, jar, vial, canister-symbolFlask      = '!'-symbolScroll     = '?'  -- book, note, tablet, remote, chip, card-symbolTorsoArmor = '['-symbolMiscArmor  = '['-symbolClothes    = '['-symbolShield     = ']'-symbolPolearm    = ')'-symbolEdged      = ')'-symbolHafted     = ')'-symbolWand       = '/'  -- magical rod, transmitter, pistol, rifle, instrument-_symbolStaff     = '_'  -- scanner-symbolFood       = ','  -- also body part; distinct from floor: not middle dot+symbolProjectile = rsymbolProjectile $ ritemSymbols standardRules+_symbolLauncher  = toContentSymbol '}'+symbolLight      = rsymbolLight $ ritemSymbols standardRules+symbolTool       = rsymbolTool $ ritemSymbols standardRules+symbolSpecial    = rsymbolSpecial $ ritemSymbols standardRules+symbolGold       = rsymbolGold $ ritemSymbols standardRules+symbolNecklace   = rsymbolNecklace $ ritemSymbols standardRules+symbolRing       = rsymbolRing $ ritemSymbols standardRules+symbolPotion     = rsymbolPotion $ ritemSymbols standardRules+symbolFlask      = rsymbolFlask $ ritemSymbols standardRules+symbolScroll     = rsymbolScroll $ ritemSymbols standardRules+symbolTorsoArmor = rsymbolTorsoArmor $ ritemSymbols standardRules+symbolMiscArmor  = rsymbolMiscArmor $ ritemSymbols standardRules+symbolClothes    = rsymbolClothes $ ritemSymbols standardRules+symbolShield     = rsymbolShield $ ritemSymbols standardRules+symbolPolearm    = rsymbolPolearm $ ritemSymbols standardRules+symbolEdged      = rsymbolEdged $ ritemSymbols standardRules+symbolHafted     = rsymbolHafted $ ritemSymbols standardRules+symbolWand       = rsymbolWand $ ritemSymbols standardRules+_symbolStaff     = toContentSymbol '_'+symbolFood       = rsymbolFood $ ritemSymbols standardRules  -- ** Thrown weapons @@ -124,7 +125,7 @@                , (UNREPORTED_INVENTORY, 1) ]  -- too weak to spam   , iflavour = zipPlain [Green]   , icount   = 1 + 1 `d` 2  -- > 1, to let AI ignore sole pieces-  , irarity  = [(1, 50), (10, 1)]+  , irarity  = [(1, 20), (10, 1)]  -- a few already in starting stash   , iverbHit = "hit"   , iweight  = 300   , idamage  = 1 `d` 1@@ -155,7 +156,7 @@   { isymbol  = symbolProjectile   , iname    = "spike"   , ifreq    = [(COMMON_ITEM, 100), (ANY_ARROW, 50), (WEAK_ARROW, 50)]-  , iflavour = zipPlain [Cyan]+  , iflavour = zipPlain [BrCyan]   , icount   = 1 + 4 `dL` 5   , irarity  = [(1, 10), (10, 8)]   , iverbHit = "nick"@@ -174,10 +175,10 @@   } spike2 = spike   { ifreq    = [(COMMON_ITEM, 2), (ANY_ARROW, 1), (WEAK_ARROW, 1)]-  , icount   = 6 `dL` 5+  , iflavour = zipPlain [Cyan]   , iverbHit = "penetrate"   , iweight  = 200-  , idamage = 4 `d` 1+  , idamage  = 4 `d` 1   , iaspects = [ AddSkill SkHurtMelee $ (-10 + 1 `d` 2 + 1 `dL` 3) * 5                , SetFlag MinorEffects                , Odds (10 * 1 `dL` 10) [] [toVelocity 70] ]@@ -215,7 +216,10 @@   , idamage  = 1 `d` 1   , iaspects = [ AddSkill SkHurtMelee $ (-17 + 1 `d` 2 + 1 `dL` 3) * 5                    -- not too good against armor-               , ToThrow $ ThrowMod 200 100 2 ]  -- piercing+               , ToThrow $ ThrowMod 200 100 2  -- piercing+               , SetFlag Fragile ]+                   -- otherwise would rarely break and the player would have+                   -- unlimited resource and would have to pick up constantly   , ieffects = []   , idesc    = "Small almond-shaped leaden projectile that weighs more than the sling used to tie the bag. It doesn't drop out of the sling's pouch when swung and doesn't snag when released. Known to pierce through flesh, at least at maximum speed."  -- we lie, it doesn't slow down in our model; but it stops piercing alright   , ikit     = []@@ -391,7 +395,7 @@                , (ANY_GLASS, 100) ]   , icount   = 1 `dL` 5   , irarity  = [(10, 10)]-  , iaspects = ELabel "of strength renewal brew"+  , iaspects = ELabel "of strength brew"                : iaspects flaskTemplate   , ieffects = [ toOrganGood S_STRENGTHENED (20 + 1 `d` 5)                , OnSmash (Explode S_DENSE_SHOWER) ]@@ -436,8 +440,8 @@   , irarity  = [(1, 1)]  -- not every playthrough needs one   , iaspects = ELabel "of resolution"                : iaspects flaskTemplate-  , ieffects = [ toOrganGood S_RESOLUTE (500 + 1 `d` 200)  -- long, for scouting-               , RefillCalm 60  -- not to make it a drawback, via @calmEnough@+  , ieffects = [ toOrganGood S_RESOLUTE (100 + 1 `d` 20)  -- long, for scouting+               , RefillCalm 100  -- not to make it a drawback, via @calmEnough@                , OnSmash (Explode S_RESOLUTION_DUST) ]   } flask7 = flaskTemplate@@ -517,8 +521,16 @@                , toOrganBad S_DEFENSELESS (20 + 1 `d` 5)                , OnSmash (Explode S_GLASS_HAIL) ]  -- enough glass to cause that   }+flask15 = flaskTemplate+  { ifreq    = [ (COMMON_ITEM, 100), (ANY_FLASK, 100), (EXPLOSIVE, 100)+               , (ANY_GLASS, 100) ]+  , iaspects = ELabel "of snail gel"+               : iaspects flaskTemplate+  , ieffects = [ toOrganBad S_SLOWED (3 + 1 `d` 3)+               , OnSmash (Explode S_FOCUSED_SLOWNESS_MIST) ]+  } --- Vials are often not intended to be thrown. They usually natural,+-- Potions are often not intended to be thrown. They are usually natural, -- including natural stat boosts. They also include the only healing -- consumables in the game, apart of elixirs and, to a limited extent, fruits. -- They appear deeper than most flasks. Various configurations of effects.@@ -547,7 +559,7 @@   , icount   = 3 `dL` 1  -- very useful, despite appearances   , iaspects = ELabel "of rose water"                : iaspects potionTemplate-  , ieffects = [ Impress, toOrganGood S_ROSE_SMELLING (80 + 1 `d` 20)+  , ieffects = [ Impress, toOrganGood S_ROSE_SMELLING (50 + 1 `d` 10)                , OnSmash ApplyPerfume, OnSmash (Explode S_FRAGRANCE) ]   } potion2 = potionTemplate@@ -615,7 +627,7 @@                                 , Explode S_DISTRESSING_ODOR                                 , Explode $ blastNoStatOf S_IMPATIENT                                 , Explode S_HASTE_SPRAY-                                , Explode S_SLOWNESS_MIST+                                , Explode S_VIOLENT_SLOWNESS_MIST                                 , Explode S_FRAGRANCE                                 , Explode S_VIOLENT_FLASH ]) ]   }@@ -685,8 +697,7 @@                , OnSmash (Explode $ blastNoStatOf S_IMMOBILE) ]   } potion13 = potionTemplate-  { ifreq    = [ (COMMON_ITEM, 100), (ANY_FLASK, 100), (EXPLOSIVE, 100)-               , (ANY_GLASS, 100) ]+  { ifreq    = [(COMMON_ITEM, 100), (ANY_POTION, 100), (ANY_GLASS, 100)]   , irarity  = [(10, 4)]   , iaspects = ELabel "of slow resistance"                : iaspects potionTemplate@@ -694,23 +705,21 @@                , OnSmash (Explode S_ANTI_SLOW_MIST) ]   } potion14 = potionTemplate-  { ifreq    = [ (COMMON_ITEM, 100), (ANY_FLASK, 100), (EXPLOSIVE, 100)-               , (ANY_GLASS, 100) ]+  { ifreq    = [(COMMON_ITEM, 100), (ANY_POTION, 100), (ANY_GLASS, 100)]   , irarity  = [(10, 4)]   , iaspects = ELabel "of poison resistance"                : iaspects potionTemplate   , ieffects = [ toOrganNoTimer S_POISON_RESISTANT                , OnSmash (Explode S_ANTIDOTE_MIST) ]   }--- The player has full control over throwing the flask at his party,+-- The player has full control over throwing the potion at his party, -- so he can milk the explosion, so it has to be much weaker, so a weak -- healing effect is enough. OTOH, throwing a harmful flask at many enemies -- at once is not easy to arrange, so these explosions can stay powerful. potion15 = potionTemplate-  { ifreq    = [ (COMMON_ITEM, 100), (ANY_FLASK, 100), (EXPLOSIVE, 100)-               , (ANY_GLASS, 100) ]+  { ifreq    = [(COMMON_ITEM, 100), (ANY_POTION, 100), (ANY_GLASS, 100)]   , irarity  = [(1, 2), (10, 12)]-  , iaspects = ELabel "of regeneration brew"+  , iaspects = ELabel "of regeneration"                : iaspects potionTemplate   , ieffects = [ toOrganGood S_ROSE_SMELLING (80 + 1 `d` 20)                , toOrganNoTimer S_REGENERATING@@ -769,7 +778,8 @@   , irarity  = [(10, 14)]   , ieffects = [ Impress                , OneOf [ Teleport 20, Ascend False, Ascend True-                       , Summon HERO 1, Summon MOBILE_ANIMAL $ 1 `d` 2+                       , OneOf [Summon HERO 1, Summon MOBILE_ANIMAL $ 1 `d` 2]+                           -- gaining a hero particularly uncommon                        , Detect DetectLoot 20  -- the most useful of detections                        , CreateItem Nothing CGround COMMON_ITEM timerNone ] ]   }@@ -909,9 +919,7 @@   , iverbHit = "scorch"   , iweight  = 1000   , idamage  = 0-  , iaspects = [ AddSkill SkShine 3, AddSkill SkSight (-2)-                   -- not only flashes, but also sparks,-                   -- so unused by AI due to the mixed blessing+  , iaspects = [ AddSkill SkShine 3  -- no malus, to lessen micromanagement                , SetFlag Lobable, SetFlag Equipable                , EqpSlot EqpSlotShine ]                    -- not Fragile; reusable flare@@ -929,13 +937,12 @@   , iverbHit = "burn"   , iweight  = 1500   , idamage  = 1 `d` 1-  , iaspects = [ AddSkill SkShine 3, AddSkill SkSight (-1)+  , iaspects = [ AddSkill SkShine 3                , SetFlag Lobable, SetFlag Fragile, SetFlag Equipable                , EqpSlot EqpSlotShine ]-  , ieffects = [ Burn 1-               , toOrganBad S_PACIFIED (2 + 1 `d` 2)-               , OnSmash (Explode S_BURNING_OIL_2) ]-  , idesc    = "A clay lamp filled with plant oil feeding a tiny wick."+  , ieffects = [ Explode S_FOCUSED_BURNING_OIL_2+               , OnSmash (Explode S_VIOLENT_BURNING_OIL_2) ]+  , idesc    = "A small clay lamp filled with plant oil feeding a tiny wick."   , ikit     = []   } light3 = ItemKind@@ -948,12 +955,11 @@   , iverbHit = "burn"   , iweight  = 3000   , idamage  = 2 `d` 1-  , iaspects = [ AddSkill SkShine 4, AddSkill SkSight (-1)+  , iaspects = [ AddSkill SkShine 4                , SetFlag Lobable, SetFlag Fragile, SetFlag Equipable                , EqpSlot EqpSlotShine ]-  , ieffects = [ Burn 1-               , toOrganBad S_PACIFIED (4 + 1 `d` 2)-               , OnSmash (Explode S_BURNING_OIL_4) ]+  , ieffects = [ Explode S_FOCUSED_BURNING_OIL_4+               , OnSmash (Explode S_VIOLENT_BURNING_OIL_4) ]   , idesc    = "Very bright and very heavy brass lantern."   , ikit     = []   }@@ -969,10 +975,10 @@   , iweight  = 1000   , idamage  = 0   , iaspects = [ AddSkill SkShine (-10)-               , AddSkill SkArmorMelee 2, AddSkill SkMaxCalm 5+               , AddSkill SkArmorMelee 3, AddSkill SkMaxCalm 5                , SetFlag Lobable, SetFlag Equipable                , EqpSlot EqpSlotArmorMelee ]-                  -- not Fragile; reusable douse implement;+                   -- not Fragile; reusable douse implement;                    -- douses torch, lamp and lantern in one action,                    -- both in equipment and when thrown at the floor   , ieffects = []@@ -982,30 +988,31 @@  -- ** Periodic jewelry --- Morally these are the aspects, but we also need to add a fake @Timeout@,--- to let clients know that the not identified item is periodic jewelry.-iaspects_necklaceTemplate :: [Aspect]-iaspects_necklaceTemplate =-  [ PresentAs NECKLACE_UNKNOWN-  , SetFlag Periodic, SetFlag Precious, SetFlag Equipable-  , toVelocity 50 ]  -- not dense enough+-- This looks like a necklace, but is not periodic. Instead, it auto-activates+-- when under melee attack. gorget = necklaceTemplate   { iname    = "Old Gorget"   , ifreq    = [(COMMON_ITEM, 25), (TREASURE, 25)]   , iflavour = zipFancy [BrCyan]  -- looks exactly the same as one of necklaces,                                   -- but it's OK, it's an artifact   , iaspects = [ SetFlag Unique-               , Timeout $ 5 - 1 `dL` 4+               , Timeout $ 7 - 1 `dL` 4                    -- the dL dice need to be in negative positions                    -- for negative stats, such as @Timeout@, so that                    -- the @RerollItem@ effect makes the item better, not worse-               , AddSkill SkArmorMelee 3, AddSkill SkArmorRanged 2-               , AddSkill SkHearing 3-               , SetFlag Durable ]-               ++ iaspects_necklaceTemplate-  , ieffects = [RefillCalm 1]+               , AddSkill SkArmorMelee 3, AddSkill SkHearing 3+               , SetFlag UnderMelee, SetFlag Durable ]+               ++ delete (SetFlag Periodic) iaspects_necklaceTemplate+  , ieffects = [RefillCalm 15]   , idesc    = "Highly ornamental, cold, large steel medallion on a chain. Unlikely to offer much protection as an armor piece, but the old worn engraving reassures the wearer."   }+-- Morally these are the aspects, but we also need to add a fake @Timeout@,+-- to let clients know that the not identified item is periodic jewelry.+iaspects_necklaceTemplate :: [Aspect]+iaspects_necklaceTemplate =+  [ PresentAs NECKLACE_UNKNOWN+  , SetFlag Periodic, SetFlag Precious, SetFlag Equipable+  , toVelocity 50 ]  -- not dense enough -- Not identified, because id by use, e.g., via periodic activations. Fun. necklaceTemplate = ItemKind   { isymbol  = symbolNecklace@@ -1091,12 +1098,12 @@ necklace6 = necklaceTemplate   { ifreq    = [(COMMON_ITEM, 100), (ANY_JEWELRY, 100)]   , iaspects = Timeout ((3 + 1 `d` 3 - 1 `dL` 3) * 2)-               : iaspects_necklaceTemplate+               : iaspects_necklaceTemplate  -- OP if Durable; free blink   , ieffects = [Teleport $ 3 `d` 2]   } necklace7 = necklaceTemplate   { ifreq    = [(COMMON_ITEM, 100), (ANY_JEWELRY, 100)]-  , iaspects = Timeout (1 + (1 `d` 3) * 2)+  , iaspects = Timeout ((1 `d` 3) * 2)                : iaspects_necklaceTemplate   , ieffects = [PushActor (ThrowMod 100 50 1)]  -- 1 step, slow                   -- the @50@ is only for the case of very light actor, etc.@@ -1119,14 +1126,17 @@ necklace9 = necklaceTemplate   { ifreq    = [(COMMON_ITEM, 100), (ANY_JEWELRY, 100)]   , irarity  = [(4, 3)]  -- entirely optional-  , iaspects = Timeout ((1 + 1 `d` 3) * 5)+  , iaspects = Timeout ((1 + 1 `d` 3) * 5)  -- low timeout for offensive use                : iaspects_necklaceTemplate   , ieffects = [Explode S_SPARK]   } necklace10 = necklaceTemplate   { ifreq    = [(COMMON_ITEM, 100), (ANY_JEWELRY, 100)]-  , iaspects = Timeout ((1 + 1 `d` 3) * 5)+  , iaspects = Timeout ((3 + 1 `d` 3) * 10)                : iaspects_necklaceTemplate+                   -- high timeout to prevent spam obscuring messages+                   -- when other actors act and annoying bumping into+                   -- projectiles caused by own necklace when walking   , ieffects = [Explode S_FRAGRANCE]   } motionScanner = necklaceTemplate@@ -1136,8 +1146,9 @@   , iverbHit = "jingle"   , iweight  = 300  -- almost gives it away   , iaspects = [ Timeout $ 4 + 1 `dL` 6+                   -- positive dL dice, since the periodic effect is detrimental                , AddSkill SkNocto 1-               , AddSkill SkArmorMelee (-20 + (1 `dL` 3) * 5)+               , AddSkill SkArmorMelee $ (-4 + 1 `dL` 3) * 5                , EqpSlot EqpSlotMiscBonus ]                ++ iaspects_necklaceTemplate   , ieffects = [Explode S_PING_PLASH]@@ -1156,8 +1167,8 @@   , iverbHit = "bang"   , iweight  = 500   , idamage  = 0-  , iaspects = [ AddSkill SkNocto 1, AddSkill SkSight (-1)-               , AddSkill SkArmorMelee $ (-1 + 1 `dL` 6) * 3+  , iaspects = [ AddSkill SkNocto 1+               , AddSkill SkArmorMelee $ (-6 + 1 `dL` 3) * 5                , SetFlag Precious, SetFlag Equipable                , EqpSlot EqpSlotMiscBonus ]   , ieffects = []@@ -1173,7 +1184,7 @@   , irarity  = [(7, 1), (10, 12)]  -- low @ifreq@   , iweight  = 50  -- heavier that it looks, due to glass   , iaspects = [ AddSkill SkSight $ 1 + 1 `dL` 2-               , AddSkill SkHurtMelee $ (-1 + 1 `d` 3) * 3+               , AddSkill SkHurtMelee $ (1 `d` 3) * 3                , EqpSlot EqpSlotSight ]                ++ iaspects ringTemplate   , idesc    = "Lets you better focus your weaker eye."@@ -1204,48 +1215,63 @@ ring1 = ringTemplate   { ifreq    = [(COMMON_ITEM, 100), (ANY_JEWELRY, 100)]   , irarity  = [(8, 4)]-  , iaspects = [ AddSkill SkSpeed $ 1 `dL` 3-               , AddSkill SkMaxHP (-10)+  , iaspects = [ AddSkill SkSpeed $ 1 `dL` 2+               , AddSkill SkMaxHP (-20)                , EqpSlot EqpSlotSpeed ]                ++ iaspects ringTemplate   } ring2 = ringTemplate+  { ifreq    = [(COMMON_ITEM, 100), (ANY_JEWELRY, 100)]+  , irarity  = [(8, 4)]+  , iaspects = [ AddSkill SkSpeed $ 1 + 1 `dL` 3+               , AddSkill SkArmorMelee (-40)+               , EqpSlot EqpSlotSpeed ]+               ++ iaspects ringTemplate+  }+ring3 = ringTemplate   { iname    = "the Ring"   , ifreq    = [(TREASURE, 100), (ANY_JEWELRY, 100)]   , iaspects = [ SetFlag Unique, ELabel "of Rush"                , AddSkill SkSpeed $ (1 + 1 `dL` 2) * 2                , AddSkill SkMaxHP (-20)-               , AddSkill SkMaxCalm (-40)+               , AddSkill SkArmorMelee (-20)                , SetFlag Durable, EqpSlot EqpSlotSpeed ]                ++ iaspects ringTemplate   , idesc    = "Roughly-shaped metal with shallow scratches marking it."   }-ring3 = ringTemplate+ring4 = ringTemplate   { ifreq    = [(COMMON_ITEM, 100), (ANY_JEWELRY, 100)]   , irarity  = [(3, 4), (10, 8)]-  , iaspects = [ AddSkill SkHurtMelee $ (2 + 1 `d` 2 + (1 `dL` 2) * 2 ) * 3-               , AddSkill SkMaxHP $ (-3 + 1 `dL` 3) * 10+  , iaspects = [ AddSkill SkHurtMelee $ (2 + 1 `d` 3 + (1 `dL` 2) * 2 ) * 3+               , AddSkill SkMaxHP (-10)                , EqpSlot EqpSlotHurtMelee ]                ++ iaspects ringTemplate   }-ring4 = ringTemplate+ring5 = ringTemplate   { ifreq    = [(COMMON_ITEM, 100), (ANY_JEWELRY, 100)]+  , iaspects = [ AddSkill SkHurtMelee $ (4 + 1 `d` 3 + (1 `dL` 2) * 2 ) * 3+               , AddSkill SkArmorMelee (-20)+               , EqpSlot EqpSlotHurtMelee ]+               ++ iaspects ringTemplate+  }+ring6 = ringTemplate+  { ifreq    = [(COMMON_ITEM, 100), (ANY_JEWELRY, 100)]   , irarity  = [(10, 8)]   , iaspects = [ AddSkill SkMaxHP $ 5 + (1 `d` 2 + 1 `dL` 2) * 5                , AddSkill SkMaxCalm $ -30 + (1 `dL` 3) * 5                , EqpSlot EqpSlotMaxHP ]                ++ iaspects ringTemplate   }-ring5 = ringTemplate+ring7 = ringTemplate   { ifreq    = [(COMMON_ITEM, 100), (ANY_JEWELRY, 100)]-  , irarity  = [(5, 1), (10, 9)]  -- needed after other rings drop Calm-  , iaspects = [ AddSkill SkMaxCalm $ 20 + (1 `dL` 4) * 5+  , irarity  = [(5, 1), (10, 9)]  -- needed after other items drop Calm+  , iaspects = [ AddSkill SkMaxCalm $ 30 + (1 `dL` 4) * 5                , AddSkill SkHearing 6                , EqpSlot EqpSlotMiscBonus ]                ++ iaspects ringTemplate   , idesc    = "Cold, solid to the touch, perfectly round, engraved with solemn, strangely comforting, worn out words."   }-ring6 = ringTemplate  -- weak skill per eqp slot, so can be without drawbacks+ring8 = ringTemplate  -- weak skill per eqp slot, so can be without drawbacks   { ifreq    = [(COMMON_ITEM, 100), (ANY_JEWELRY, 100)]   , irarity  = [(10, 3)]   , iaspects = [ AddSkill SkShine 1@@ -1253,7 +1279,7 @@                ++ iaspects ringTemplate   , idesc    = "A sturdy ring with a large, shining stone."   }-ring7 = ringTemplate+ring9 = ringTemplate   { ifreq    = [(RING_OF_OPPORTUNITY_SNIPER, 1) ]  -- only for scenarios   , irarity  = [(1, 1)]   , iaspects = [ ELabel "of opportunity sniper"@@ -1261,7 +1287,7 @@                , EqpSlot EqpSlotProject ]                ++ iaspects ringTemplate   }-ring8 = ringTemplate+ring10 = ringTemplate   { ifreq    = [(RING_OF_OPPORTUNITY_GRENADIER, 1) ]  -- only for scenarios   , irarity  = [(1, 1)]   , iaspects = [ ELabel "of opportunity grenadier"@@ -1350,6 +1376,7 @@   , ifreq    = [(COMMON_ITEM, 100), (ARMOR_MISC, 1), (STARTING_ARMOR, 50)]   , iflavour = zipPlain [BrCyan]   , irarity  = [(1, 9), (10, 3)]+  , iverbHit = "mow"   , iweight  = 300   , idamage  = 2 `d` 1   , iaspects = [ AddSkill SkArmorMelee $ (1 + 1 `dL` 4) * 5@@ -1363,7 +1390,7 @@   , ifreq    = [(COMMON_ITEM, 100), (ARMOR_MISC, 1)]   , iflavour = zipFancy [BrRed]   , irarity  = [(1, 3), (10, 3)]-  , iverbHit = "rasp"+  , iverbHit = "ram"   , iweight  = 3000   , idamage  = 3 `d` 1   , iaspects = [ SetFlag Unique@@ -1389,7 +1416,7 @@   , iweight  = 500   , idamage  = 0   , iaspects = [ Timeout $ (2 + 1 `d` 2) * 3-               , AddSkill SkArmorMelee 5, AddSkill SkHearing (-10)+               , AddSkill SkArmorMelee 5, AddSkill SkHearing (-6)                , SetFlag Periodic, SetFlag Durable, SetFlag Equipable                , EqpSlot EqpSlotArmorMelee                , toVelocity 50 ]  -- flaps and flutters@@ -1428,8 +1455,8 @@   , idamage  = 0   , iaspects = [ AddSkill SkArmorMelee $ (1 + 1 `dL` 4) * 5                , AddSkill SkArmorRanged $ (2 + 1 `dL` 2) * 3  -- headshot-               , AddSkill SkHearing (-7), AddSkill SkSight (-1)-               , AddSkill SkSmell (-5)+               , AddSkill SkSight (-2)+               , AddSkill SkHearing (-3), AddSkill SkSmell (-5)                , SetFlag Durable, SetFlag Equipable                , EqpSlot EqpSlotArmorRanged ]   , ieffects = []@@ -1475,7 +1502,7 @@   , idamage  = 0  -- safe to be used on self   , iaspects = [ Timeout $ (3 + 1 `d` 3 - 1 `dL` 3) * 2                , AddSkill SkArmorMelee 40-                   -- not enough to compensate; won't be in eqp+                   -- not enough to compensate; won't be in AI's eqp                , AddSkill SkHurtMelee (-30)                    -- too harmful; won't be wielded as weapon                , SetFlag Durable, SetFlag Meleeable@@ -1492,7 +1519,7 @@   , idamage  = 4 `d` 1   , iaspects = [ Timeout $ (3 + 1 `d` 3 - 1 `dL` 3) * 4                , AddSkill SkArmorMelee 80-                   -- not enough to compensate; won't be in eqp+                   -- not enough to compensate; won't be in AI's eqp                , AddSkill SkHurtMelee (-70)                    -- too harmful; won't be wielded as weapon                , SetFlag Durable, SetFlag Meleeable@@ -1536,7 +1563,7 @@   , idesc    = "A short dagger for thrusting and parrying blows. Does not penetrate deeply, but is quick to move and hard to block. Especially useful in conjunction with a larger weapon."   , ikit     = []   }-daggerDropBestWeapon = knife+daggerDischarge = knife   { iname    = "The Double Dagger"   , ifreq    = [(TREASURE, 20)]   , irarity  = [(1, 3), (10, 3)]@@ -1552,7 +1579,7 @@   , ifreq    = [(HAMMER_UNKNOWN, 1)]   , iflavour = zipFancy [BrMagenta]  -- avoid "pink"   , icount   = 1-  , irarity  = [(5, 20), (8, 1)]+  , irarity  = [(3, 25), (5, 1)]   , iverbHit = "club"   , iweight  = 1600   , idamage  = 8 `d` 1  -- we are lying about the dice here, but the dungeon@@ -1620,7 +1647,7 @@   , ifreq    = [(COMMON_ITEM, 100), (STARTING_WEAPON, 30)]   , iflavour = zipPlain [BrBlue]   , icount   = 1-  , irarity  = [(4, 1), (6, 20)]+  , irarity  = [(4, 1), (6, 15)]   , iverbHit = "slash"   , iweight  = 2000   , idamage  = 10 `d` 1@@ -1659,7 +1686,7 @@   , ifreq    = [(COMMON_ITEM, 100), (STARTING_WEAPON, 20)]   , iflavour = zipPlain [BrYellow]   , icount   = 1-  , irarity  = [(5, 1), (8, 15)]+  , irarity  = [(5, 1), (8, 12)]   , iverbHit = "impale"   , iweight  = 3000   , idamage  = 12 `d` 1@@ -1784,7 +1811,7 @@   { isymbol  = symbolWand   , iname    = "jumping pole"   , ifreq    = [(COMMON_ITEM, 100)]-  , iflavour = zipPlain [White]+  , iflavour = zipFancy [White]   , icount   = 1   , irarity  = [(1, 3)]   , iverbHit = "prod"

@@ -1,7 +1,7 @@ -- | Actor (or rather actor body trunk) definitions. module Content.ItemKindActor   ( -- * Group name patterns-    pattern S_WOODEN_TORCH+    pattern S_WOODEN_TORCH, pattern S_SANDSTONE_ROCK   , pattern HERO, pattern SCOUT_HERO, pattern RANGER_HERO, pattern ESCAPIST_HERO, pattern AMBUSHER_HERO, pattern BRAWLER_HERO, pattern SOLDIER_HERO, pattern CIVILIAN, pattern MONSTER, pattern MOBILE_MONSTER, pattern SCOUT_MONSTER, pattern ANIMAL, pattern MOBILE_ANIMAL, pattern IMMOBILE_ANIMAL   , pattern ADD_SIGHT, pattern ARMOR_RANGED, pattern ADD_NOCTO_1, pattern WEAK_ARROW, pattern LIGHT_ATTENUATOR, pattern FIREPROOF_CLOTH, pattern RING_OF_OPPORTUNITY_SNIPER, pattern ANY_ARROW, pattern STARTING_ARMOR, pattern STARTING_WEAPON, pattern GEM   , actorsGN, actorsGNSingleton@@ -18,15 +18,16 @@ import Game.LambdaHack.Definition.Ability import Game.LambdaHack.Definition.Color import Game.LambdaHack.Definition.Defs+import Game.LambdaHack.Definition.DefsInternal import Game.LambdaHack.Definition.Flavour  -- * Group name patterns  actorsGNSingleton :: [GroupName ItemKind] actorsGNSingleton =-       [S_WOODEN_TORCH]+       [S_WOODEN_TORCH, S_SANDSTONE_ROCK] -pattern S_WOODEN_TORCH :: GroupName ItemKind+pattern S_WOODEN_TORCH, S_SANDSTONE_ROCK :: GroupName ItemKind  actorsGN :: [GroupName ItemKind] actorsGN =@@ -53,6 +54,7 @@ pattern IMMOBILE_ANIMAL = GroupName "immobile animal"  pattern S_WOODEN_TORCH = GroupName "wooden torch"+pattern S_SANDSTONE_ROCK = GroupName "sandstone rock"  pattern ADD_SIGHT = GroupName "sight improvement" pattern ARMOR_RANGED = GroupName "ranged armor"@@ -91,7 +93,7 @@               , (S_EYE_6, COrgan), (S_EAR_3, COrgan)               , (S_SAPIENT_BRAIN, COrgan) ] warrior = ItemKind-  { isymbol  = '@'+  { isymbol  = toContentSymbol '@'   , iname    = "warrior"  -- modified if initial actors in hero faction   , ifreq    = [(HERO, 100), (MOBILE, 1)]   , iflavour = zipPlain [BrWhite]@@ -112,9 +114,12 @@   , ieffects = []   , idesc    = ""  -- "A hardened veteran of combat."   , ikit     = humanOrgans+               ++ [(S_SANDSTONE_ROCK, CStash)]   } warrior2 = warrior   { iname    = "adventurer"+  , ikit     = humanOrgans+               ++ [(COMMON_ITEM, CStash)]   -- , idesc    = ""   } warrior3 = warrior@@ -164,7 +169,7 @@   , ifreq    = [(AMBUSHER_HERO, 100), (MOBILE, 1)]   , ikit     = humanOrgans  -- dark and numerous, so more kit without exploring                ++ [ (RING_OF_OPPORTUNITY_SNIPER, CEqp)-                  , (ANY_ARROW, CStash)+                  , (ANY_ARROW, CStash), (ANY_ARROW, CStash)                   , (WEAK_ARROW, CStash)                   , (EXPLOSIVE, CStash)                   , (LIGHT_ATTENUATOR, CEqp)@@ -214,7 +219,7 @@ -- They have bright colours, because they are not natural.  eye = ItemKind-  { isymbol  = 'e'+  { isymbol  = toContentSymbol 'e'   , iname    = "reducible eye"   , ifreq    = [ (MONSTER, 100), (MOBILE, 1)                , (MOBILE_MONSTER, 100), (SCOUT_MONSTER, 10) ]@@ -228,7 +233,7 @@                , AddSkill SkSpeed 20, AddSkill SkNocto 2                , AddSkill SkAggression 1                , AddSkill SkProject 2  -- can lob-               , AddSkill SkApply 1  -- can even use cultural artifacts+               , AddSkill SkApply 1  -- can use even cultural artifacts                , SetFlag Durable ]   , ieffects = []   , idesc    = "Under your stare, it reduces to the bits that define its essence. Under introspection, the bits slow down and solidify into an arbitrary form again. It must be huge inside, for holographic principle to manifest so overtly."  -- holographic principle is an anachronism for XIX or most of XX century, but "the cosmological scale effects" is too weak@@ -236,7 +241,7 @@                , (S_SAPIENT_BRAIN, COrgan) ]  -- no hearing, it's all eyes   } fastEye = ItemKind-  { isymbol  = 'j'+  { isymbol  = toContentSymbol 'j'   , iname    = "injective jaw"   , ifreq    = [ (MONSTER, 100), (MOBILE, 1)                , (MOBILE_MONSTER, 100), (SCOUT_MONSTER, 60) ]@@ -252,13 +257,13 @@                , SetFlag Durable ]   , ieffects = []   , idesc    = "Hungers but never eats. Bites but never swallows. Burrows its own image through, but never carries anything back."  -- rather weak: not about injective objects, but puny, concrete, injective functions  --- where's the madness in that?-  , ikit     = [ (S_TOOTH, COrgan), (S_LIP, COrgan)+  , ikit     = [ (S_TOOTH, COrgan), (S_LIP, COrgan)  -- at least one non-timed                , (S_SPEED_GLAND_10, COrgan)                , (S_VISION_6, COrgan), (S_EAR_3, COrgan)                , (S_SAPIENT_BRAIN, COrgan) ]   } nose = ItemKind  -- depends solely on smell-  { isymbol  = 'n'+  { isymbol  = toContentSymbol 'n'   , iname    = "point-free nose"   , ifreq    = [(MONSTER, 100), (MOBILE, 1), (MOBILE_MONSTER, 100)]   , iflavour = zipFancy [BrGreen]@@ -274,12 +279,12 @@                , SetFlag Durable ]   , ieffects = []   , idesc    = "No mouth, yet it devours everything around, constantly sniffing itself inward; pure movement structure, no constant point to focus one's maddened gaze on."-  , ikit     = [ (S_TIP, COrgan), (S_LIP, COrgan)+  , ikit     = [ (S_TIP, COrgan), (S_LIP, COrgan)  -- at least one non-timed                , (S_NOSTRIL, COrgan)                , (S_SAPIENT_BRAIN, COrgan) ]  -- no sight nor hearing   } elbow = ItemKind-  { isymbol  = 'e'+  { isymbol  = toContentSymbol 'e'   , iname    = "commutative elbow"   , ifreq    = [ (MONSTER, 100), (MOBILE, 1)                , (MOBILE_MONSTER, 100), (SCOUT_MONSTER, 30) ]@@ -305,7 +310,7 @@                , (WEAK_ARROW, CStash), (WEAK_ARROW, CStash) ]   } torsor = ItemKind-  { isymbol  = 'T'+  { isymbol  = toContentSymbol 'T'   , iname    = "The Forgetful Torsor"   , ifreq    = [(MONSTER, 100), (MOBILE, 1)]   , iflavour = zipFancy [BrCyan]@@ -326,7 +331,8 @@   , ieffects = []   , idesc    = "A principal homogeneous manifold, that acts freely and with enormous force, but whose stabilizers are trivial, making it rather helpless without a support group."   , ikit     = [ (S_RIGHT_TORSION, COrgan), (S_LEFT_TORSION, COrgan)-               , (S_PUPIL, COrgan), (S_TENTACLE, COrgan)+               , (S_PUPIL, COrgan)+               , (S_TENTACLE, COrgan)  -- low timeout, so rarely a stall                , (S_EAR_8, COrgan)                , (S_SAPIENT_BRAIN, COrgan)                , (GEM, CStash), (GEM, CStash)@@ -342,7 +348,7 @@ -- They have dull colors, except for yellow, because there is no dull variant.  goldenJackal = ItemKind  -- basically a much smaller, slower and nosy hyena-  { isymbol  = 'j'+  { isymbol  = toContentSymbol 'j'   , iname    = "golden jackal"   , ifreq    = [ (ANIMAL, 100), (MOBILE, 1), (MOBILE_ANIMAL, 100)                , (SCAVENGER, 50) ]@@ -354,6 +360,8 @@   , idamage  = 0   , iaspects = [ AddSkill SkMaxHP 15, AddSkill SkMaxCalm 70                , AddSkill SkSpeed 24, AddSkill SkNocto 2+               , AddSkill SkAggression 2  -- scout+               , AddSkill SkDisplace 1  -- scout                , SetFlag Durable ]   , ieffects = []   , idesc    = "An opportunistic predator, feeding on carrion and the weak."@@ -362,7 +370,7 @@                , (S_ANIMAL_BRAIN, COrgan) ]   } griffonVulture = ItemKind  -- keep it boring and weak, because it summons-  { isymbol  = 'v'+  { isymbol  = toContentSymbol 'v'   , iname    = "griffon vulture"   , ifreq    = [ (ANIMAL, 100), (MOBILE, 1), (MOBILE_ANIMAL, 100)                , (SCAVENGER, 30) ]@@ -376,7 +384,7 @@                    -- enough Calm to summon twice only if not attacked at all;                    -- loses a lot of sight after summoning                , AddSkill SkSpeed 22, AddSkill SkNocto 2-               , AddSkill SkAlter (-2)  -- can't use normal stairs nor doors+               , AddSkill SkAlter (-2)  -- can't use hard stairs nor doors                , AddSkill SkFlying 10  -- flies slowly, but far                , SetFlag Durable ]       -- Animals don't have leader, usually, so even if only one on level,@@ -391,7 +399,7 @@                , (S_ANIMAL_BRAIN, COrgan) ]   } skunk = ItemKind-  { isymbol  = 's'+  { isymbol  = toContentSymbol 's'   , iname    = "hog-nosed skunk"   , ifreq    = [(ANIMAL, 100), (MOBILE, 1), (MOBILE_ANIMAL, 100)]   , iflavour = zipPlain [White]@@ -402,7 +410,7 @@   , idamage  = 0   , iaspects = [ AddSkill SkMaxHP 13, AddSkill SkMaxCalm 30                , AddSkill SkSpeed 22, AddSkill SkNocto 2-               , AddSkill SkAlter (-2)  -- can't use stairs nor doors+               , AddSkill SkAlter (-2)  -- can't use hard stairs nor doors                , AddSkill SkOdor 5  -- and no smell skill, to let it leave smell                , SetFlag Durable ]   , ieffects = []@@ -413,18 +421,19 @@                , (S_ANIMAL_BRAIN, COrgan) ]   } armadillo = ItemKind-  { isymbol  = 'a'+  { isymbol  = toContentSymbol 'a'   , iname    = "giant armadillo"   , ifreq    = [(ANIMAL, 100), (MOBILE, 1), (MOBILE_ANIMAL, 100)]   , iflavour = zipPlain [Brown]   , icount   = 1   , irarity  = [(1, 7)]   , iverbHit = "thud"-  , iweight  = 80000+  , iweight  = 54000   , idamage  = 0-  , iaspects = [ AddSkill SkMaxHP 13, AddSkill SkMaxCalm 30+  , iaspects = [ AddSkill SkMaxHP 30, AddSkill SkMaxCalm 30                , AddSkill SkSpeed 20, AddSkill SkNocto 2-               , AddSkill SkAlter (-2)  -- can't use normal stairs nor doors+               , AddSkill SkHurtMelee (-70)  -- quite harmless rolled in a ball+               , AddSkill SkAlter (-2)  -- can't use hard stairs nor doors                , SetFlag Durable ]   , ieffects = []   , idesc    = "When threatened, it rolls into a ball."@@ -434,7 +443,7 @@                , (S_ANIMAL_BRAIN, COrgan) ]   } gilaMonster = ItemKind-  { isymbol  = 'g'+  { isymbol  = toContentSymbol 'g'   , iname    = "Gila monster"   , ifreq    = [(ANIMAL, 100), (MOBILE, 1), (MOBILE_ANIMAL, 100)]   , iflavour = zipPlain [Magenta]@@ -445,7 +454,7 @@   , idamage  = 0   , iaspects = [ AddSkill SkMaxHP 15, AddSkill SkMaxCalm 50                , AddSkill SkSpeed 18, AddSkill SkNocto 2-               , AddSkill SkAlter (-2)  -- can't use normal stairs nor doors+               , AddSkill SkAlter (-2)  -- can't use hard stairs nor doors                , SetFlag Durable ]   , ieffects = []   , idesc    = "Numbing venom ensures that even the fastest prey has no escape."@@ -454,19 +463,19 @@                , (S_ANIMAL_BRAIN, COrgan) ]   } rattlesnake = ItemKind-  { isymbol  = 's'+  { isymbol  = toContentSymbol 's'   , iname    = "rattlesnake"   , ifreq    = [(ANIMAL, 100), (MOBILE, 1), (MOBILE_ANIMAL, 100)]   , iflavour = zipPlain [Brown]   , icount   = 1-  , irarity  = [(5, 1), (10, 7)]+  , irarity  = [(5, 1), (10, 7), (20, 10)]  -- common among late spawns   , iverbHit = "thud"   , iweight  = 80000   , idamage  = 0   , iaspects = [ AddSkill SkMaxHP 28, AddSkill SkMaxCalm 60                , AddSkill SkSpeed 16, AddSkill SkNocto 2                , AddSkill SkAggression 2  -- often discharged. so flees anyway-               , AddSkill SkAlter (-2)  -- can't use normal stairs nor doors+               , AddSkill SkAlter (-2)  -- can't use hard stairs nor doors                , SetFlag Durable ]   , ieffects = []   , idesc    = "Beware its rattle - it serves as a warning of an agonising death."@@ -476,13 +485,14 @@                , (S_ANIMAL_BRAIN, COrgan) ]   } hyena = ItemKind-  { isymbol  = 'h'+  { isymbol  = toContentSymbol 'h'   , iname    = "spotted hyena"   , ifreq    = [ (ANIMAL, 100), (MOBILE, 1), (MOBILE_ANIMAL, 100)                , (SCAVENGER, 20) ]   , iflavour = zipPlain [BrYellow]   , icount   = 1-  , irarity  = [(4, 1), (10, 5)]  -- gets summoned often, so low base rarity+  , irarity  = [(4, 1), (10, 5), (20, 10)]+      -- gets summoned often, so low base rarity, except among late spawns   , iverbHit = "thud"   , iweight  = 60000   , idamage  = 0@@ -491,39 +501,41 @@                , SetFlag Durable ]   , ieffects = []   , idesc    = "Skulking in the shadows, waiting for easy prey."-  , ikit     = [ (S_JAW, COrgan)+  , ikit     = [ (S_JAW, COrgan), (S_SMALL_CLAW, COrgan)                , (S_EYE_6, COrgan), (S_NOSTRIL, COrgan), (S_EAR_8, COrgan)                , (S_ANIMAL_BRAIN, COrgan) ]   } komodoDragon = ItemKind-  { isymbol  = 'k'+  { isymbol  = toContentSymbol 'k'   , iname    = "Komodo dragon"   , ifreq    = [(ANIMAL, 100), (MOBILE, 1), (MOBILE_ANIMAL, 100)]   , iflavour = zipPlain [BrRed]  -- speedy, so bright red   , icount   = 1-  , irarity  = [(9, 0), (10, 11)]+  , irarity  = [(9, 0), (10, 11), (20, 20)]   , iverbHit = "thud"   , iweight  = 80000   , idamage  = 0   , iaspects = [ AddSkill SkMaxHP 40, AddSkill SkMaxCalm 60  -- regens                , AddSkill SkSpeed 17, AddSkill SkNocto 2+               , AddSkill SkHurtMelee 60  -- great fighter with low cooldowns                , AddSkill SkAggression 1  -- match the description                , SetFlag Durable ]   , ieffects = []   , idesc    = "Larger and more aggressive than any other lizard, but as easily recovering from wounds as its lesser cousins."   , ikit     = [ (S_LARGE_TAIL, COrgan), (S_JAW, COrgan)-               , (S_HOOKED_CLAW, COrgan)+               , (S_LIP, COrgan), (S_FOOT, COrgan)                , (S_SPEED_GLAND_5, COrgan), (S_ARMORED_SKIN, COrgan)                , (S_EYE_3, COrgan), (S_NOSTRIL, COrgan), (S_EAR_3, COrgan)                , (S_ANIMAL_BRAIN, COrgan) ]   }-alligator = ItemKind-  { isymbol  = 'a'+alligator = ItemKind  -- late, slow, deadly semi-tank with some armor;+                      -- too deadly to get more HP; bombs the only recourse+  { isymbol  = toContentSymbol 'a'   , iname    = "alligator"   , ifreq    = [(ANIMAL, 100), (MOBILE, 1), (MOBILE_ANIMAL, 100)]   , iflavour = zipPlain [Blue]   , icount   = 1-  , irarity  = [(9, 0), (10, 12)]+  , irarity  = [(9, 0), (10, 12), (20, 10), (40, 40)]   , iverbHit = "thud"   , iweight  = 80000   , idamage  = 0@@ -541,12 +553,12 @@                , (S_ANIMAL_BRAIN, COrgan) ]   } rhinoceros = ItemKind-  { isymbol  = 'R'+  { isymbol  = toContentSymbol 'R'   , iname    = "The Maddened Rhinoceros"   , ifreq    = [(ANIMAL, 100), (MOBILE, 1)]   , iflavour = zipPlain [Brown]   , icount   = 1-  , irarity  = [(2, 0), (3, 1000), (4, 0)]  -- unique+  , irarity  = [(2, 0), (3, 1000), (4, 0)]  -- an early unique   , iverbHit = "thud"   , iweight  = 80000   , idamage  = 0@@ -554,7 +566,7 @@                , AddSkill SkMaxHP 90, AddSkill SkMaxCalm 60                , AddSkill SkSpeed 27, AddSkill SkNocto 2                , AddSkill SkAggression 2-               , AddSkill SkAlter (-1)  -- can't use normal stairs nor dig;+               , AddSkill SkAlter (-1)  -- can't use hard stairs nor dig;                                         -- a weak miniboss                , SetFlag Durable ]   , ieffects = []@@ -568,7 +580,7 @@ -- * Non-animal animals  beeSwarm = ItemKind-  { isymbol  = 'b'+  { isymbol  = toContentSymbol 'b'   , iname    = "bee swarm"   , ifreq    = [(ANIMAL, 100), (MOBILE, 1)]   , iflavour = zipPlain [Brown]@@ -579,7 +591,7 @@   , idamage  = 0   , iaspects = [ AddSkill SkMaxHP 10, AddSkill SkMaxCalm 60                , AddSkill SkSpeed 30, AddSkill SkNocto 2  -- armor in sting-               , AddSkill SkAlter (-2)  -- can't use normal stairs nor doors+               , AddSkill SkAlter (-2)  -- can't use hard stairs nor doors                , AddSkill SkWait (-2)  -- can't brace, sleep and lurk                , AddSkill SkFlying 10  -- flies slowly, but far                , SetFlag Durable ]@@ -589,20 +601,22 @@                , (S_VISION_6, COrgan), (S_EAR_6, COrgan)                , (S_INSECT_MORTALITY, COrgan), (S_ANIMAL_BRAIN, COrgan) ]   }-hornetSwarm = ItemKind-  { isymbol  = 'h'+hornetSwarm = ItemKind  -- kind of tank with armor, but short-lived+  { isymbol  = toContentSymbol 'h'   , iname    = "hornet swarm"   , ifreq    = [(ANIMAL, 100), (MOBILE, 1), (MOBILE_ANIMAL, 100)]   , iflavour = zipPlain [Magenta]   , icount   = 1-  , irarity  = [(5, 1), (10, 4)]  -- should be many, because die after a time+  , irarity  = [(5, 1), (10, 4), (20, 10)]+      -- should be many, because die after a time   , iverbHit = "buzz"   , iweight  = 1000   , idamage  = 0   , iaspects = [ AddSkill SkArmorMelee 80, AddSkill SkArmorRanged 40-               , AddSkill SkMaxHP 8, AddSkill SkMaxCalm 70+               , AddSkill SkHurtMelee 50+               , AddSkill SkMaxHP 10, AddSkill SkMaxCalm 70                , AddSkill SkSpeed 30, AddSkill SkNocto 2-               , AddSkill SkAlter (-2)  -- can't use normal stairs nor doors+               , AddSkill SkAlter (-2)  -- can't use hard stairs nor doors                , AddSkill SkWait (-2)  -- can't brace, sleep and lurk                , AddSkill SkFlying 10  -- flies slowly, but far                , SetFlag Durable ]@@ -612,8 +626,8 @@                , (S_VISION_6, COrgan), (S_EAR_6, COrgan)                , (S_INSECT_MORTALITY, COrgan), (S_ANIMAL_BRAIN, COrgan) ]   }-thornbush = ItemKind-  { isymbol  = 't'+thornbush = ItemKind  -- the wimpiest kind of early tank+  { isymbol  = toContentSymbol 't'   , iname    = "thornbush"   , ifreq    = [(ANIMAL, 20), (IMMOBILE_ANIMAL, 20)]   , iflavour = zipPlain [Brown]@@ -622,7 +636,7 @@   , iverbHit = "scrape"   , iweight  = 80000   , idamage  = 0-  , iaspects = [ AddSkill SkMaxHP 20, AddSkill SkMaxCalm 999+  , iaspects = [ AddSkill SkMaxHP 30, AddSkill SkMaxCalm 999                , AddSkill SkSpeed 22, AddSkill SkNocto 2                , AddSkill SkWait 1, AddSkill SkMelee 1  -- no brain                , SetFlag Durable ]@@ -632,7 +646,7 @@                , (S_BARK, COrgan) ]   } geyserBoiling = ItemKind-  { isymbol  = 'g'+  { isymbol  = toContentSymbol 'g'   , iname    = "geyser"   , ifreq    = [(ANIMAL, 8), (IMMOBILE_ANIMAL, 30)]   , iflavour = zipPlain [Blue]@@ -650,7 +664,7 @@   , ikit     = [(S_BOILING_VENT, COrgan), (S_BOILING_FISSURE, COrgan)]   } geyserArsenic = ItemKind-  { isymbol  = 'g'+  { isymbol  = toContentSymbol 'g'   , iname    = "arsenic geyser"   , ifreq    = [(ANIMAL, 8), (IMMOBILE_ANIMAL, 40)]   , iflavour = zipPlain [Cyan]@@ -668,7 +682,7 @@   , ikit     = [(S_ARSENIC_VENT, COrgan), (S_ARSENIC_FISSURE, COrgan)]   } geyserSulfur = ItemKind-  { isymbol  = 'g'+  { isymbol  = toContentSymbol 'g'   , iname    = "sulfur geyser"   , ifreq    = [(ANIMAL, 8), (IMMOBILE_ANIMAL, 120)]   , iflavour = zipPlain [BrYellow]  -- exception, animal with bright color

@@ -1,7 +1,7 @@ -- | Blast definitions. module Content.ItemKindBlast   ( -- * Group name patterns-    pattern S_FIRECRACKER, pattern S_VIOLENT_FRAGMENTATION, pattern S_FRAGMENTATION, pattern S_FOCUSED_FRAGMENTATION, pattern S_VIOLENT_CONCUSSION, pattern S_CONCUSSION, pattern S_FOCUSED_CONCUSSION, pattern S_VIOLENT_FLASH, pattern S_FOCUSED_FLASH, pattern S_GLASS_HAIL, pattern S_FOCUSED_GLASS_HAIL, pattern S_PHEROMONE, pattern S_CALMING_MIST, pattern S_DISTRESSING_ODOR, pattern S_HEALING_MIST, pattern S_HEALING_MIST_2, pattern S_WOUNDING_MIST, pattern S_DISTORTION, pattern S_SMOKE, pattern S_BOILING_WATER, pattern S_GLUE, pattern S_WASTE, pattern S_ANTI_SLOW_MIST, pattern S_ANTIDOTE_MIST, pattern S_SLEEP_MIST, pattern S_DENSE_SHOWER, pattern S_SPARSE_SHOWER, pattern S_MELEE_PROTECTIVE_BALM, pattern S_RANGE_PROTECTIVE_BALM, pattern S_DEFENSELESSNESS_RUNOUT, pattern S_RESOLUTION_DUST, pattern S_HASTE_SPRAY, pattern S_SLOWNESS_MIST, pattern S_EYE_DROP, pattern S_IRON_FILING, pattern S_SMELLY_DROPLET, pattern S_EYE_SHINE, pattern S_WHISKEY_SPRAY, pattern S_YOUTH_SPRINKLE, pattern S_POISON_CLOUD, pattern S_PING_PLASH, pattern S_VIOLENT_BURNING_OIL_2, pattern S_VIOLENT_BURNING_OIL_3, pattern S_VIOLENT_BURNING_OIL_4, pattern S_BURNING_OIL_2, pattern S_BURNING_OIL_3, pattern S_BURNING_OIL_4, pattern S_FOCUSED_BURNING_OIL_2, pattern S_FOCUSED_BURNING_OIL_3, pattern S_FOCUSED_BURNING_OIL_4+    pattern S_FIRECRACKER, pattern S_VIOLENT_FRAGMENTATION, pattern S_FRAGMENTATION, pattern S_FOCUSED_FRAGMENTATION, pattern S_VIOLENT_CONCUSSION, pattern S_CONCUSSION, pattern S_FOCUSED_CONCUSSION, pattern S_VIOLENT_FLASH, pattern S_FOCUSED_FLASH, pattern S_GLASS_HAIL, pattern S_FOCUSED_GLASS_HAIL, pattern S_PHEROMONE, pattern S_CALMING_MIST, pattern S_DISTRESSING_ODOR, pattern S_HEALING_MIST, pattern S_HEALING_MIST_2, pattern S_WOUNDING_MIST, pattern S_DISTORTION, pattern S_SMOKE, pattern S_BOILING_WATER, pattern S_GLUE, pattern S_WASTE, pattern S_ANTI_SLOW_MIST, pattern S_ANTIDOTE_MIST, pattern S_SLEEP_MIST, pattern S_DENSE_SHOWER, pattern S_SPARSE_SHOWER, pattern S_MELEE_PROTECTIVE_BALM, pattern S_RANGE_PROTECTIVE_BALM, pattern S_DEFENSELESSNESS_RUNOUT, pattern S_RESOLUTION_DUST, pattern S_HASTE_SPRAY, pattern S_VIOLENT_SLOWNESS_MIST, pattern S_SLOWNESS_MIST, pattern S_FOCUSED_SLOWNESS_MIST, pattern S_EYE_DROP, pattern S_IRON_FILING, pattern S_SMELLY_DROPLET, pattern S_EYE_SHINE, pattern S_WHISKEY_SPRAY, pattern S_YOUTH_SPRINKLE, pattern S_POISON_CLOUD, pattern S_PING_PLASH, pattern S_VIOLENT_BURNING_OIL_2, pattern S_VIOLENT_BURNING_OIL_3, pattern S_VIOLENT_BURNING_OIL_4, pattern S_BURNING_OIL_2, pattern S_BURNING_OIL_3, pattern S_BURNING_OIL_4, pattern S_FOCUSED_BURNING_OIL_2, pattern S_FOCUSED_BURNING_OIL_3, pattern S_FOCUSED_BURNING_OIL_4   , blastNoStatOf, blastBonusStatOf   , pattern ARMOR_MISC   , blastsGNSingleton, blastsGN@@ -19,18 +19,19 @@ import Game.LambdaHack.Definition.Ability import Game.LambdaHack.Definition.Color import Game.LambdaHack.Definition.Defs+import Game.LambdaHack.Definition.DefsInternal import Game.LambdaHack.Definition.Flavour  -- * Group name patterns  blastsGNSingleton :: [GroupName ItemKind] blastsGNSingleton =-       [S_FIRECRACKER, S_VIOLENT_FRAGMENTATION, S_FRAGMENTATION, S_FOCUSED_FRAGMENTATION, S_VIOLENT_CONCUSSION, S_CONCUSSION, S_FOCUSED_CONCUSSION, S_VIOLENT_FLASH, S_FOCUSED_FLASH, S_GLASS_HAIL, S_FOCUSED_GLASS_HAIL, S_PHEROMONE, S_CALMING_MIST, S_DISTRESSING_ODOR, S_HEALING_MIST, S_HEALING_MIST_2, S_WOUNDING_MIST, S_DISTORTION, S_SMOKE, S_BOILING_WATER, S_GLUE, S_WASTE, S_ANTI_SLOW_MIST, S_ANTIDOTE_MIST, S_SLEEP_MIST, S_DENSE_SHOWER, S_SPARSE_SHOWER, S_MELEE_PROTECTIVE_BALM, S_RANGE_PROTECTIVE_BALM, S_DEFENSELESSNESS_RUNOUT, S_RESOLUTION_DUST, S_HASTE_SPRAY, S_SLOWNESS_MIST, S_EYE_DROP, S_IRON_FILING, S_SMELLY_DROPLET, S_EYE_SHINE, S_WHISKEY_SPRAY, S_YOUTH_SPRINKLE, S_POISON_CLOUD, S_PING_PLASH, S_VIOLENT_BURNING_OIL_2, S_VIOLENT_BURNING_OIL_3, S_VIOLENT_BURNING_OIL_4, S_BURNING_OIL_2, S_BURNING_OIL_3, S_BURNING_OIL_4, S_FOCUSED_BURNING_OIL_2, S_FOCUSED_BURNING_OIL_3, S_FOCUSED_BURNING_OIL_4]+       [S_FIRECRACKER, S_VIOLENT_FRAGMENTATION, S_FRAGMENTATION, S_FOCUSED_FRAGMENTATION, S_VIOLENT_CONCUSSION, S_CONCUSSION, S_FOCUSED_CONCUSSION, S_VIOLENT_FLASH, S_FOCUSED_FLASH, S_GLASS_HAIL, S_FOCUSED_GLASS_HAIL, S_PHEROMONE, S_CALMING_MIST, S_DISTRESSING_ODOR, S_HEALING_MIST, S_HEALING_MIST_2, S_WOUNDING_MIST, S_DISTORTION, S_SMOKE, S_BOILING_WATER, S_GLUE, S_WASTE, S_ANTI_SLOW_MIST, S_ANTIDOTE_MIST, S_SLEEP_MIST, S_DENSE_SHOWER, S_SPARSE_SHOWER, S_MELEE_PROTECTIVE_BALM, S_RANGE_PROTECTIVE_BALM, S_DEFENSELESSNESS_RUNOUT, S_RESOLUTION_DUST, S_HASTE_SPRAY, S_VIOLENT_SLOWNESS_MIST, S_SLOWNESS_MIST, S_FOCUSED_SLOWNESS_MIST, S_EYE_DROP, S_IRON_FILING, S_SMELLY_DROPLET, S_EYE_SHINE, S_WHISKEY_SPRAY, S_YOUTH_SPRINKLE, S_POISON_CLOUD, S_PING_PLASH, S_VIOLENT_BURNING_OIL_2, S_VIOLENT_BURNING_OIL_3, S_VIOLENT_BURNING_OIL_4, S_BURNING_OIL_2, S_BURNING_OIL_3, S_BURNING_OIL_4, S_FOCUSED_BURNING_OIL_2, S_FOCUSED_BURNING_OIL_3, S_FOCUSED_BURNING_OIL_4]   ++ map firecrackerAt [1..4]   ++ map blastNoStatOf noStatGN   ++ map blastBonusStatOf bonusStatGN -pattern S_FIRECRACKER, S_VIOLENT_FRAGMENTATION, S_FRAGMENTATION, S_FOCUSED_FRAGMENTATION, S_VIOLENT_CONCUSSION, S_CONCUSSION, S_FOCUSED_CONCUSSION, S_VIOLENT_FLASH, S_FOCUSED_FLASH, S_GLASS_HAIL, S_FOCUSED_GLASS_HAIL, S_PHEROMONE, S_CALMING_MIST, S_DISTRESSING_ODOR, S_HEALING_MIST, S_HEALING_MIST_2, S_WOUNDING_MIST, S_DISTORTION, S_SMOKE, S_BOILING_WATER, S_GLUE, S_WASTE, S_ANTI_SLOW_MIST, S_ANTIDOTE_MIST, S_SLEEP_MIST, S_DENSE_SHOWER, S_SPARSE_SHOWER, S_MELEE_PROTECTIVE_BALM, S_RANGE_PROTECTIVE_BALM, S_DEFENSELESSNESS_RUNOUT, S_RESOLUTION_DUST, S_HASTE_SPRAY, S_SLOWNESS_MIST, S_EYE_DROP, S_IRON_FILING, S_SMELLY_DROPLET, S_EYE_SHINE, S_WHISKEY_SPRAY, S_YOUTH_SPRINKLE, S_POISON_CLOUD, S_PING_PLASH, S_VIOLENT_BURNING_OIL_2, S_VIOLENT_BURNING_OIL_3, S_VIOLENT_BURNING_OIL_4, S_BURNING_OIL_2, S_BURNING_OIL_3, S_BURNING_OIL_4, S_FOCUSED_BURNING_OIL_2, S_FOCUSED_BURNING_OIL_3, S_FOCUSED_BURNING_OIL_4 :: GroupName ItemKind+pattern S_FIRECRACKER, S_VIOLENT_FRAGMENTATION, S_FRAGMENTATION, S_FOCUSED_FRAGMENTATION, S_VIOLENT_CONCUSSION, S_CONCUSSION, S_FOCUSED_CONCUSSION, S_VIOLENT_FLASH, S_FOCUSED_FLASH, S_GLASS_HAIL, S_FOCUSED_GLASS_HAIL, S_PHEROMONE, S_CALMING_MIST, S_DISTRESSING_ODOR, S_HEALING_MIST, S_HEALING_MIST_2, S_WOUNDING_MIST, S_DISTORTION, S_SMOKE, S_BOILING_WATER, S_GLUE, S_WASTE, S_ANTI_SLOW_MIST, S_ANTIDOTE_MIST, S_SLEEP_MIST, S_DENSE_SHOWER, S_SPARSE_SHOWER, S_MELEE_PROTECTIVE_BALM, S_RANGE_PROTECTIVE_BALM, S_DEFENSELESSNESS_RUNOUT, S_RESOLUTION_DUST, S_HASTE_SPRAY, S_VIOLENT_SLOWNESS_MIST, S_SLOWNESS_MIST, S_FOCUSED_SLOWNESS_MIST, S_EYE_DROP, S_IRON_FILING, S_SMELLY_DROPLET, S_EYE_SHINE, S_WHISKEY_SPRAY, S_YOUTH_SPRINKLE, S_POISON_CLOUD, S_PING_PLASH, S_VIOLENT_BURNING_OIL_2, S_VIOLENT_BURNING_OIL_3, S_VIOLENT_BURNING_OIL_4, S_BURNING_OIL_2, S_BURNING_OIL_3, S_BURNING_OIL_4, S_FOCUSED_BURNING_OIL_2, S_FOCUSED_BURNING_OIL_3, S_FOCUSED_BURNING_OIL_4 :: GroupName ItemKind  blastsGN :: [GroupName ItemKind] blastsGN =@@ -70,7 +71,9 @@ pattern S_DEFENSELESSNESS_RUNOUT = GroupName "PhD defense question" pattern S_RESOLUTION_DUST = GroupName "resolution dust" pattern S_HASTE_SPRAY = GroupName "haste spray"-pattern S_SLOWNESS_MIST = GroupName "slowness mist"+pattern S_VIOLENT_SLOWNESS_MIST = GroupName "violent nitrogen mist"+pattern S_SLOWNESS_MIST = GroupName "nitrogen mist"+pattern S_FOCUSED_SLOWNESS_MIST = GroupName "focused nitrogen mist" pattern S_EYE_DROP = GroupName "eye drop" pattern S_IRON_FILING = GroupName "iron filing" pattern S_SMELLY_DROPLET = GroupName "smelly droplet"@@ -104,9 +107,9 @@  blasts :: [ItemKind] blasts =-  [spreadBurningOil2, spreadBurningOil3, spreadBurningOil4, spreadBurningOil82, spreadBurningOil83, spreadBurningOil84, focusedBurningOil2, focusedBurningOil3, focusedBurningOil4, firecracker1, firecracker2, firecracker3, firecracker4, firecracker5, spreadFragmentation, spreadFragmentation8, focusedFragmentation, spreadConcussion, spreadConcussion8, focusedConcussion, spreadFlash, spreadFlash8, focusedFlash, singleSpark, glassPiece, focusedGlass, fragrance, pheromone, mistCalming, odorDistressing, mistHealing, mistHealing2, mistWounding, distortion, smoke, boilingWater, glue, waste, mistAntiSlow, mistAntidote, mistSleep, denseShower, sparseShower, protectingBalmMelee, protectingBalmRanged, defenselessnessRunout, resolutionDust, hasteSpray, slownessMist, eyeDrop, ironFiling, smellyDroplet, eyeShine, whiskeySpray, youthSprinkle, poisonCloud, pingFlash, blastNoSkMove, blastNoSkMelee, blastNoSkDisplace, blastNoSkAlter, blastNoSkWait, blastNoSkMoveItem, blastNoSkProject, blastNoSkApply, blastBonusSkMove, blastBonusSkMelee, blastBonusSkDisplace, blastBonusSkAlter, blastBonusSkWait, blastBonusSkMoveItem, blastBonusSkProject, blastBonusSkApply]+  [spreadBurningOil2, spreadBurningOil3, spreadBurningOil4, spreadBurningOil82, spreadBurningOil83, spreadBurningOil84, focusedBurningOil2, focusedBurningOil3, focusedBurningOil4, firecracker1, firecracker2, firecracker3, firecracker4, firecracker5, spreadFragmentation, spreadFragmentation8, focusedFragmentation, spreadConcussion, spreadConcussion8, focusedConcussion, spreadFlash, spreadFlash8, focusedFlash, singleSpark, glassPiece, focusedGlass, fragrance, pheromone, mistCalming, odorDistressing, mistHealing, mistHealing2, mistWounding, distortion, smoke, boilingWater, glue, waste, mistAntiSlow, mistAntidote, mistSleep, denseShower, sparseShower, protectingBalmMelee, protectingBalmRanged, defenselessnessRunout, resolutionDust, hasteSpray, spreadNitrogen, spreadNitrogen8, focusedNitrogen, eyeDrop, ironFiling, smellyDroplet, eyeShine, whiskeySpray, youthSprinkle, poisonCloud, pingFlash, blastNoSkMove, blastNoSkMelee, blastNoSkDisplace, blastNoSkAlter, blastNoSkWait, blastNoSkMoveItem, blastNoSkProject, blastNoSkApply, blastBonusSkMove, blastBonusSkMelee, blastBonusSkDisplace, blastBonusSkAlter, blastBonusSkWait, blastBonusSkMoveItem, blastBonusSkProject, blastBonusSkApply] -spreadBurningOil2,    spreadBurningOil3, spreadBurningOil4, spreadBurningOil82, spreadBurningOil83, spreadBurningOil84, focusedBurningOil2, focusedBurningOil3, focusedBurningOil4, firecracker1, firecracker2, firecracker3, firecracker4, firecracker5, spreadFragmentation, spreadFragmentation8, focusedFragmentation, spreadConcussion, spreadConcussion8, focusedConcussion, spreadFlash, spreadFlash8, focusedFlash, singleSpark, glassPiece, focusedGlass, fragrance, pheromone, mistCalming, odorDistressing, mistHealing, mistHealing2, mistWounding, distortion, smoke, boilingWater, glue, waste, mistAntiSlow, mistAntidote, mistSleep, denseShower, sparseShower, protectingBalmMelee, protectingBalmRanged, defenselessnessRunout, resolutionDust, hasteSpray, slownessMist, eyeDrop, ironFiling, smellyDroplet, eyeShine, whiskeySpray, youthSprinkle, poisonCloud, pingFlash, blastNoSkMove, blastNoSkMelee, blastNoSkDisplace, blastNoSkAlter, blastNoSkWait, blastNoSkMoveItem, blastNoSkProject, blastNoSkApply, blastBonusSkMove, blastBonusSkMelee, blastBonusSkDisplace, blastBonusSkAlter, blastBonusSkWait, blastBonusSkMoveItem, blastBonusSkProject, blastBonusSkApply :: ItemKind+spreadBurningOil2,    spreadBurningOil3, spreadBurningOil4, spreadBurningOil82, spreadBurningOil83, spreadBurningOil84, focusedBurningOil2, focusedBurningOil3, focusedBurningOil4, firecracker1, firecracker2, firecracker3, firecracker4, firecracker5, spreadFragmentation, spreadFragmentation8, focusedFragmentation, spreadConcussion, spreadConcussion8, focusedConcussion, spreadFlash, spreadFlash8, focusedFlash, singleSpark, glassPiece, focusedGlass, fragrance, pheromone, mistCalming, odorDistressing, mistHealing, mistHealing2, mistWounding, distortion, smoke, boilingWater, glue, waste, mistAntiSlow, mistAntidote, mistSleep, denseShower, sparseShower, protectingBalmMelee, protectingBalmRanged, defenselessnessRunout, resolutionDust, hasteSpray, spreadNitrogen, spreadNitrogen8, focusedNitrogen,  eyeDrop, ironFiling, smellyDroplet, eyeShine, whiskeySpray, youthSprinkle, poisonCloud, pingFlash, blastNoSkMove, blastNoSkMelee, blastNoSkDisplace, blastNoSkAlter, blastNoSkWait, blastNoSkMoveItem, blastNoSkProject, blastNoSkApply, blastBonusSkMove, blastBonusSkMelee, blastBonusSkDisplace, blastBonusSkAlter, blastBonusSkWait, blastBonusSkMoveItem, blastBonusSkProject, blastBonusSkApply :: ItemKind  -- We take care (e.g., in burningOil below) that blasts are not faster -- than 100% fastest natural speed, or some frames would be skipped,@@ -116,16 +119,16 @@  spreadBurningOil :: Int -> GroupName ItemKind -> ItemKind spreadBurningOil n grp = ItemKind-  { isymbol  = '*'+  { isymbol  = toContentSymbol '*'   , iname    = "burning oil"   , ifreq    = [(grp, 1)]   , iflavour = zipPlain [BrYellow]-  , icount   = intToDice (4 + n * 3)+  , icount   = intToDice (4 + n * 2)   , irarity  = [(1, 1)]   , iverbHit = "sear"   , iweight  = 1   , idamage  = 0-  , iaspects = [ toVelocity (min 100 $ n `div` 2 * 10)+  , iaspects = [ toVelocity (max 10 $ min 100 $ n `div` 2 * 10)                , SetFlag Fragile, SetFlag Blast                , AddSkill SkShine 2 ]   , ieffects = [ Burn 1@@ -142,17 +145,18 @@                       -- 4 steps, 2 turns spreadBurningOil8 :: Int -> GroupName ItemKind -> ItemKind spreadBurningOil8 n grp = (spreadBurningOil (n `div` 2) grp)-  { icount   = 7+  { icount   = 7  -- 8 was too deadly   } spreadBurningOil82 = spreadBurningOil8 2 S_BURNING_OIL_2 spreadBurningOil83 = spreadBurningOil8 3 S_BURNING_OIL_3 spreadBurningOil84 = spreadBurningOil8 4 S_BURNING_OIL_4 focusedBurningOil :: Int -> GroupName ItemKind -> GroupName ItemKind -> ItemKind focusedBurningOil n grp grpExplode = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "igniting oil"   , ifreq    = [(grp, 1)]-  , iflavour = zipPlain [Brown]+  , iflavour = zipPlain [BrYellow]  -- all ignitions yellow to avoid appearing+                                    -- as a small vial explosion   , icount   = intToDice n   , irarity  = [(1, 1)]   , iverbHit = "ignite"@@ -171,7 +175,7 @@ focusedBurningOil4 = focusedBurningOil 4 S_FOCUSED_BURNING_OIL_4 S_BURNING_OIL_4 firecracker :: Int -> ItemKind firecracker n = ItemKind-  { isymbol  = '*'+  { isymbol  = toContentSymbol '*'   , iname    = "firecracker"   , ifreq    = [(if n == 5                  then S_FIRECRACKER@@ -200,11 +204,11 @@ -- * Focused blasts  spreadFragmentation = ItemKind-  { isymbol  = '*'+  { isymbol  = toContentSymbol '*'   , iname    = "fragmentation burst"   , ifreq    = [(S_VIOLENT_FRAGMENTATION, 1)]   , iflavour = zipPlain [Red]-  , icount   = 16  -- strong but few, so not always hits target+  , icount   = 8  -- strong but few, so not always hits target   , irarity  = [(1, 1)]   , iverbHit = "tear apart"   , iweight  = 1@@ -219,18 +223,18 @@   } spreadFragmentation8 = spreadFragmentation   { ifreq    = [(S_FRAGMENTATION, 1)]-  , icount   = 8+  , icount   = 5   , iaspects = [ ToThrow $ ThrowMod 100 10 2  -- 2 steps, 1 turn                , SetFlag Lobable, SetFlag Fragile, SetFlag Blast                , AddSkill SkShine 3, AddSkill SkHurtMelee $ -12 * 5 ]       -- smaller radius, so worse for area effect, but twice the direct damage   } focusedFragmentation = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "deflagration ignition"  -- black powder   , ifreq    = [(S_FOCUSED_FRAGMENTATION, 1)]   , iflavour = zipPlain [BrYellow]-  , icount   = 4  -- 32 in total vs 16; on average 4 hits+  , icount   = 3  -- 15 in total vs 8, higher spread   , irarity  = [(1, 1)]   , iverbHit = "ignite"   , iweight  = 1@@ -244,11 +248,12 @@   , ikit     = []   } spreadConcussion = ItemKind-  { isymbol  = '*'+  { isymbol  = toContentSymbol '*'   , iname    = "concussion blast"   , ifreq    = [(S_VIOLENT_CONCUSSION, 1)]   , iflavour = zipPlain [Magenta]-  , icount   = 16+  , icount   = 12  -- pushing sometimes gets the victim out of attacker range,+                   -- but also sometimes moves to a position hit again later   , irarity  = [(1, 1)]   , iverbHit = "shock"   , iweight  = 1@@ -263,24 +268,24 @@   , ieffects = [ DropItem maxBound 1 CEqp ARMOR_MISC                , PushActor (ThrowMod 400 25 1)  -- 1 step, fast; after DropItem                    -- this produces spam for braced actors; too bad-               , toOrganBad S_IMMOBILE 3  -- no balance+               , toOrganBad S_IMMOBILE 1  -- no balance                , toOrganBad S_DEAFENED 23 ]   , idesc    = "Shock wave, hot gases, some fire and smoke."   , ikit     = []   } spreadConcussion8 = spreadConcussion   { ifreq    = [(S_CONCUSSION, 1)]-  , icount   = 8+  , icount   = 6   , iaspects = [ ToThrow $ ThrowMod 100 10 2  -- 2 steps, 1 turn                , SetFlag Lobable, SetFlag Fragile, SetFlag Blast                , AddSkill SkShine 3, AddSkill SkHurtMelee $ -8 * 5 ]   } focusedConcussion = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "detonation ignition"  -- nitroglycerine   , ifreq    = [(S_FOCUSED_CONCUSSION, 1)]   , iflavour = zipPlain [BrYellow]-  , icount   = 4+  , icount   = 4  -- 24 in total vs 12, higher spread, less harm from pushing   , irarity  = [(1, 1)]   , iverbHit = "ignite"   , iweight  = 1@@ -292,11 +297,11 @@   , ikit     = []   } spreadFlash = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "magnesium flash"   , ifreq    = [(S_VIOLENT_FLASH, 1)]   , iflavour = zipPlain [BrWhite]-  , icount   = 16+  , icount   = 13   , irarity  = [(1, 1)]   , iverbHit = "dazzle"   , iweight  = 1@@ -304,27 +309,28 @@   , iaspects = [ ToThrow $ ThrowMod 100 20 4  -- 4 steps, 1 turn                , SetFlag Fragile, SetFlag Blast                , AddSkill SkShine 5 ]-  , ieffects = [toOrganBad S_BLIND 5, toOrganBad S_WEAKENED 20]+  , ieffects = [ toOrganBad S_BLIND 5+               , toOrganBad S_WEAKENED 20 ]                  -- Wikipedia says: blind for five seconds and afterimage                  -- for much longer, harming aim-  , idesc    = "A very bright flash of fire."+  , idesc    = "A very bright flash of fire, causing long-lasting afterimages."   , ikit     = []   } spreadFlash8 = spreadFlash   { iname    = "spark"   , ifreq    = [(S_SPARK, 1)]-  , icount   = 8+  , icount   = 5   , iverbHit = "singe"   , iaspects = [ ToThrow $ ThrowMod 100 10 2  -- 2 steps, 1 turn                , SetFlag Fragile, SetFlag Blast                , AddSkill SkShine 5 ]   } focusedFlash = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "magnesium ignition"   , ifreq    = [(S_FOCUSED_FLASH, 1)]   , iflavour = zipPlain [BrYellow]-  , icount   = 4+  , icount   = 5  -- 25 in total vs 13, higher spread   , irarity  = [(1, 1)]   , iverbHit = "ignite"   , iweight  = 1@@ -337,7 +343,7 @@   } singleSpark = spreadFlash   { iname    = "single spark"-  , ifreq    = [(S_SINGLE_SPARK, 1)]+  , ifreq    = [(S_SINGLE_SPARK, 1)]  -- too weak to start a fire   , icount   = 1   , iverbHit = "spark"   , iaspects = [ toLinger 5  -- 1 step, 1 turn@@ -348,16 +354,16 @@   , ikit     = []   } glassPiece = ItemKind-  { isymbol  = '*'+  { isymbol  = toContentSymbol '*'   , iname    = "glass piece"   , ifreq    = [(S_GLASS_HAIL, 1)]   , iflavour = zipPlain [Blue]-  , icount   = 8+  , icount   = 6   , irarity  = [(1, 1)]   , iverbHit = "cut"   , iweight  = 1   , idamage  = 2 `d` 1-  , iaspects = [ ToThrow $ ThrowMod 100 20 4  -- 4 steps, 1 turn+  , iaspects = [ ToThrow $ ThrowMod 100 10 4  -- 2 steps, 1 turn                , SetFlag Fragile, SetFlag Blast                , AddSkill SkHurtMelee $ -15 * 5 ]                  -- brittle, not too dense; armor blocks@@ -367,7 +373,7 @@   } focusedGlass = glassPiece  -- when blowing up windows   { ifreq    = [(S_FOCUSED_GLASS_HAIL, 1)]-  , icount   = 4+  , icount   = 2   , iaspects = [ toLinger 0  -- 0 steps, 1 turn                , SetFlag Fragile, SetFlag Blast                , AddSkill SkHurtMelee $ -15 * 5 ]@@ -377,11 +383,11 @@ -- * Assorted blasts that don't induce conditions or not used mainly for them  fragrance = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "fragrance"  -- instant, fast fragrance   , ifreq    = [(S_FRAGRANCE, 1)]   , iflavour = zipPlain [Magenta]-  , icount   = 12+  , icount   = 8   , irarity  = [(1, 1)]   , iverbHit = "engulf"   , iweight  = 1@@ -395,7 +401,7 @@   , ikit     = []   } pheromone = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "musky whiff"  -- a kind of mist rather than fragrance   , ifreq    = [(S_PHEROMONE, 1)]   , iflavour = zipPlain [BrMagenta]@@ -411,7 +417,7 @@   , ikit     = []   } mistCalming = ItemKind  -- unused-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "mist"   , ifreq    = [(S_CALMING_MIST, 1)]   , iflavour = zipPlain [BrGreen]@@ -427,7 +433,7 @@   , ikit     = []   } odorDistressing = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "distressing whiff"   , ifreq    = [(S_DISTRESSING_ODOR, 1)]   , iflavour = zipFancy [BrRed]  -- salmon@@ -445,7 +451,7 @@   , ikit     = []   } mistHealing = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "mist"  -- powerful, so slow and narrow   , ifreq    = [(S_HEALING_MIST, 1)]   , iflavour = zipFancy [BrGreen]@@ -462,7 +468,7 @@   , ikit     = []   } mistHealing2 = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "mist"   , ifreq    = [(S_HEALING_MIST_2, 1)]   , iflavour = zipPlain [Green]@@ -479,7 +485,7 @@   , ikit     = []   } mistWounding = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "mist"   , ifreq    = [(S_WOUNDING_MIST, 1)]   , iflavour = zipPlain [BrRed]@@ -495,7 +501,7 @@   , ikit     = []   } distortion = ItemKind-  { isymbol  = 'v'+  { isymbol  = toContentSymbol 'v'   , iname    = "vortex"   , ifreq    = [(S_DISTORTION, 1)]   , iflavour = zipPlain [White]@@ -511,7 +517,7 @@   , ikit     = []   } smoke = ItemKind  -- when stuff burns out  -- unused-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "smoke fume"  -- pluralizes better than 'smokes'   , ifreq    = [(S_SMOKE, 1)]   , iflavour = zipPlain [BrBlack]@@ -528,7 +534,7 @@   , ikit     = []   } boilingWater = ItemKind-  { isymbol  = '*'+  { isymbol  = toContentSymbol '*'   , iname    = "boiling water"   , ifreq    = [(S_BOILING_WATER, 1)]   , iflavour = zipPlain [White]@@ -544,7 +550,7 @@   , ikit     = []   } glue = ItemKind-  { isymbol  = '*'+  { isymbol  = toContentSymbol '*'   , iname    = "hoof glue"   , ifreq    = [(S_GLUE, 1)]   , iflavour = zipPlain [Cyan]@@ -553,14 +559,14 @@   , iverbHit = "glue"   , iweight  = 1   , idamage  = 0-  , iaspects = [ toVelocity 20  -- 4 steps, 2 turns+  , iaspects = [ toVelocity 10  -- 2 steps, 2 turns                , SetFlag Fragile, SetFlag Blast ]   , ieffects = [Paralyze 10]   , idesc    = "Thick and clinging."   , ikit     = []   } waste = ItemKind-  { isymbol  = '*'+  { isymbol  = toContentSymbol '*'   , iname    = "waste piece"   , ifreq    = [(S_WASTE, 1)]   , iflavour = zipPlain [Brown]@@ -576,7 +582,7 @@   , ikit     = []   } mistAntiSlow = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "mist"   , ifreq    = [(S_ANTI_SLOW_MIST, 1)]   , iflavour = zipFancy [BrYellow]@@ -592,7 +598,7 @@   , ikit     = []   } mistAntidote = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "mist"   , ifreq    = [(S_ANTIDOTE_MIST, 1)]   , iflavour = zipFancy [BrBlue]@@ -608,7 +614,7 @@   , ikit     = []   } mistSleep = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "mist"   , ifreq    = [(S_SLEEP_MIST, 1)]   , iflavour = zipFancy [BrMagenta]@@ -632,7 +638,7 @@ -- A few are slower 'mists'.  denseShower = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "dense shower"   , ifreq    = [(S_DENSE_SHOWER, 1)]   , iflavour = zipFancy [Green]@@ -647,7 +653,7 @@   , ikit     = []   } sparseShower = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "sparse shower"   , ifreq    = [(S_SPARSE_SHOWER, 1)]   , iflavour = zipFancy [Red]@@ -662,22 +668,23 @@   , ikit     = []   } protectingBalmMelee = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "balm droplet"   , ifreq    = [(S_MELEE_PROTECTIVE_BALM, 1)]   , iflavour = zipFancy [Brown]-  , icount   = 16+  , icount   = 6   , irarity  = [(1, 1)]   , iverbHit = "balm"   , iweight  = 1   , idamage  = 0-  , iaspects = [toLinger 10, SetFlag Fragile, SetFlag Blast]+  , iaspects = [ toLinger 0  -- 0 steps, 1 turn+               , SetFlag Fragile, SetFlag Blast ]   , ieffects = [toOrganGood S_PROTECTED_FROM_MELEE (3 + 1 `d` 3)]   , idesc    = "A thick ointment that hardens the skin."   , ikit     = []   } protectingBalmRanged = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "balm droplet"   , ifreq    = [(S_RANGE_PROTECTIVE_BALM, 1)]   , iflavour = zipPlain [BrYellow]@@ -692,7 +699,7 @@   , ikit     = []   } defenselessnessRunout = ItemKind-  { isymbol  = '?'+  { isymbol  = toContentSymbol '?'   , iname    = "PhD defense question"   , ifreq    = [(S_DEFENSELESSNESS_RUNOUT, 1)]   , iflavour = zipFancy [BrRed]@@ -707,7 +714,7 @@   , ikit     = []   } resolutionDust = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "resolution dust"   , ifreq    = [(S_RESOLUTION_DUST, 1)]   , iflavour = zipPlain [Brown]@@ -723,7 +730,7 @@   , ikit     = []   } hasteSpray = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "haste spray"   , ifreq    = [(S_HASTE_SPRAY, 1)]   , iflavour = zipFancy [BrYellow]@@ -737,24 +744,47 @@   , idesc    = "A quick spurt."   , ikit     = []   }-slownessMist = ItemKind-  { isymbol  = '`'+spreadNitrogen = ItemKind+  { isymbol  = toContentSymbol '`'   , iname    = "slowness mist"-  , ifreq    = [(S_SLOWNESS_MIST, 1)]-  , iflavour = zipPlain [BrBlue]-  , icount   = 8+  , ifreq    = [(S_VIOLENT_SLOWNESS_MIST, 1)]+  , iflavour = zipPlain [BrBlack]+  , icount   = 15   , irarity  = [(1, 1)]-  , iverbHit = "slow"-  , iweight  = 0+  , iverbHit = "freeze"+  , iweight  = 1   , idamage  = 0-  , iaspects = [toVelocity 5, SetFlag Fragile, SetFlag Blast]-                 -- 1 step, 1 turn, mist, slow-  , ieffects = [toOrganBad S_SLOWED (3 + 1 `d` 3)]-  , idesc    = "Clammy fog, making each movement an effort."+  , iaspects = [ toVelocity 10  -- 2 steps, 2 turns, mist, slow+               , SetFlag Fragile, SetFlag Blast ]+  , ieffects = [toOrganBad S_SLOWED (2 + 1 `d` 3)]+  , idesc    = "Colourless cold clammy fog, making each movement an effort."   , ikit     = []   }+spreadNitrogen8 = spreadNitrogen+  { ifreq    = [(S_SLOWNESS_MIST, 1)]+  , icount   = 7+  , iaspects = [ toVelocity 5  -- 1 step, 1 turn, mist, slow+               , SetFlag Fragile, SetFlag Blast ]+  }+focusedNitrogen = ItemKind+  { isymbol  = toContentSymbol '`'+  , iname    = "slowness mist droplet"+  , ifreq    = [(S_FOCUSED_SLOWNESS_MIST, 1)]+  , iflavour = zipFancy [White]+  , icount   = 4 -- 28 in total vs 15, higher spread+  , irarity  = [(1, 1)]+  , iverbHit = "freeze"+  , iweight  = 1+  , idamage  = 0+  , iaspects = [ toLinger 0  -- 0 steps, 1 turn+               , SetFlag Fragile, SetFlag Blast ]+  , ieffects = [ OnSmash $ Explode S_SLOWNESS_MIST+               , toOrganBad S_SLOWED (2 + 1 `d` 3) ]+  , idesc    = "Colourless and colder than ice."+  , ikit     = []+  } eyeDrop = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "eye drop"   , ifreq    = [(S_EYE_DROP, 1)]   , iflavour = zipFancy [BrCyan]@@ -769,7 +799,7 @@   , ikit     = []   } ironFiling = ItemKind  -- fast, short, strongly blinding blast-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "iron filing"   , ifreq    = [(S_IRON_FILING, 1)]   , iflavour = zipPlain [Red]@@ -784,7 +814,7 @@   , ikit     = []   } smellyDroplet = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "smelly droplet"   , ifreq    = [(S_SMELLY_DROPLET, 1)]   , iflavour = zipFancy [Blue]@@ -799,7 +829,7 @@   , ikit     = []   } eyeShine = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "eye shine"   , ifreq    = [(S_EYE_SHINE, 1)]   , iflavour = zipFancy [Cyan]@@ -814,7 +844,7 @@   , ikit     = []   } whiskeySpray = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "whiskey spray"   , ifreq    = [(S_WHISKEY_SPRAY, 1)]   , iflavour = zipFancy [Brown]@@ -829,7 +859,7 @@   , ikit     = []   } youthSprinkle = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "youth sprinkle"   , ifreq    = [(S_YOUTH_SPRINKLE, 1)]   , iflavour = zipFancy [BrGreen]@@ -845,11 +875,11 @@   , ikit     = []   } poisonCloud = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "poison cloud"   , ifreq    = [(S_POISON_CLOUD, 1)]   , iflavour = zipFancy [BrMagenta]-  , icount   = 16+  , icount   = 11  -- low, to be less deadly in a tunnel, compared to single hit   , irarity  = [(1, 1)]   , iverbHit = "poison"   , iweight  = 0  -- lingers, blocking path@@ -861,7 +891,7 @@   , ikit     = []   } pingFlash = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "flash"   , ifreq    = [(S_PING_PLASH, 1)]   , iflavour = zipFancy [Green]@@ -870,7 +900,7 @@   , iverbHit = "ping"   , iweight  = 1  -- to prevent blocking the way   , idamage  = 0-  , iaspects = [ toLinger 0+  , iaspects = [ ToThrow $ ThrowMod 200 0 1  -- 1 step, .5 turn (necklaces)                , SetFlag Fragile, SetFlag Blast                , AddSkill SkShine 2 ]   , ieffects = [OnSmash Yell]@@ -879,7 +909,7 @@   } blastNoStat :: GroupName ItemKind -> ItemKind blastNoStat grp = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "mist"   , ifreq    = [(blastNoStatOf grp, 1)]   , iflavour = zipFancy [White]@@ -904,7 +934,7 @@ blastNoSkApply = blastNoStat S_PARSIMONIOUS blastBonusStat :: GroupName ItemKind -> ItemKind blastBonusStat grp = ItemKind-  { isymbol  = '`'+  { isymbol  = toContentSymbol '`'   , iname    = "dew"   , ifreq    = [(blastBonusStatOf grp, 1)]   , iflavour = zipFancy [White]

@@ -2,8 +2,7 @@ module Content.ItemKindEmbed   ( -- * Group name patterns     pattern SCRATCH_ON_WALL, pattern OBSCENE_PICTOGRAM, pattern SUBTLE_FRESCO, pattern TREASURE_CACHE, pattern TREASURE_CACHE_TRAP, pattern SIGNAGE, pattern SMALL_FIRE, pattern BIG_FIRE, pattern FROST, pattern RUBBLE, pattern DOORWAY_TRAP_UNKNOWN, pattern DOORWAY_TRAP, pattern STAIRS_UP, pattern STAIRS_DOWN, pattern ESCAPE, pattern STAIRS_TRAP_UP, pattern STAIRS_TRAP_DOWN, pattern LECTERN, pattern SHALLOW_WATER, pattern STRAIGHT_PATH, pattern FROZEN_GROUND-  , pattern S_SANDSTONE_ROCK-  , embedsGNSingleton, embedsGN+  , embedsGN   , -- * Content     embeds   ) where@@ -20,15 +19,11 @@ import Game.LambdaHack.Definition.Ability import Game.LambdaHack.Definition.Color import Game.LambdaHack.Definition.Defs+import Game.LambdaHack.Definition.DefsInternal import Game.LambdaHack.Definition.Flavour  -- * Group name patterns -embedsGNSingleton :: [GroupName ItemKind]-embedsGNSingleton = [S_SANDSTONE_ROCK]--pattern S_SANDSTONE_ROCK :: GroupName ItemKind- embedsGN :: [GroupName ItemKind] embedsGN =        [SCRATCH_ON_WALL, OBSCENE_PICTOGRAM, SUBTLE_FRESCO, TREASURE_CACHE, TREASURE_CACHE_TRAP, SIGNAGE, SMALL_FIRE, BIG_FIRE, FROST, RUBBLE, DOORWAY_TRAP_UNKNOWN, DOORWAY_TRAP, STAIRS_UP, STAIRS_DOWN, ESCAPE, STAIRS_TRAP_UP, STAIRS_TRAP_DOWN, LECTERN, SHALLOW_WATER, STRAIGHT_PATH, FROZEN_GROUND]@@ -57,8 +52,6 @@ pattern STRAIGHT_PATH = GroupName "straight path" pattern FROZEN_GROUND = GroupName "frozen ground" -pattern S_SANDSTONE_ROCK = GroupName "sandstone rock"- -- * Content  embeds :: [ItemKind]@@ -67,7 +60,6 @@  scratchOnWall,    obscenePictogram, subtleFresco, treasureCache, treasureCacheTrap, signageExit, signageEmbed, signageMerchandise, fireSmall, fireBig, frost, rubble, doorwayTrapTemplate, doorwayTrap1, doorwayTrap2, doorwayTrap3, stairsUp, stairsDown, escape, stairsTrapUp, stairsTrapDown, lectern, shallowWater, straightPath, frozenGround :: ItemKind --- * Embedded items  -- Make sure very few walls are substantially useful, e.g., caches, -- and none that are secret. Otherwise the player will spend a lot of time@@ -76,7 +68,7 @@ -- and foregoing the fun of guessing how to find entrance to a disjoint part -- of the level by bumping the least number of secret walls. scratchOnWall = ItemKind-  { isymbol  = '?'+  { isymbol  = toContentSymbol '?'   , iname    = "claw mark"   , ifreq    = [(SCRATCH_ON_WALL, 1)]   , iflavour = zipPlain [BrBlack]@@ -87,12 +79,12 @@   , idamage  = 0   , iaspects = [SetFlag Durable]   , ieffects = [ VerbMsg "start making sense of the scratches" "."-               , Detect DetectHidden 3 ]+               , Detect DetectHidden 4 ]   , idesc    = "A seemingly random series of scratches, carved deep into the wall."   , ikit     = []   } obscenePictogram = ItemKind-  { isymbol  = '*'+  { isymbol  = toContentSymbol '*'   , iname    = "obscene pictogram"   , ifreq    = [(OBSCENE_PICTOGRAM, 1)]   , iflavour = zipPlain [BrMagenta]@@ -111,7 +103,7 @@   , ikit     = []   } subtleFresco = ItemKind-  { isymbol  = '*'+  { isymbol  = toContentSymbol '*'   , iname    = "subtle fresco"   , ifreq    = [(SUBTLE_FRESCO, 1)]   , iflavour = zipPlain [BrGreen]@@ -129,7 +121,7 @@   , ikit     = []   } treasureCache = ItemKind-  { isymbol  = 'o'+  { isymbol  = toContentSymbol 'o'   , iname    = "treasure cache"   , ifreq    = [(TREASURE_CACHE, 1)]   , iflavour = zipPlain [BrBlue]@@ -146,7 +138,7 @@ reliefMsg :: Effect reliefMsg = VerbMsg "sigh with relief when nothing explodes in your face!" "" treasureCacheTrap = ItemKind-  { isymbol  = '^'+  { isymbol  = toContentSymbol '^'   , iname    = "cache trap"   , ifreq    = [(TREASURE_CACHE_TRAP, 1)]   , iflavour = zipPlain [Red]@@ -164,10 +156,10 @@   , ikit     = []   } signageExit = ItemKind-  { isymbol  = '?'+  { isymbol  = toContentSymbol '?'   , iname    = "inscription"-  , ifreq    = [(SIGNAGE, 50)]-  , iflavour = zipPlain [BrMagenta]+  , ifreq    = [(SIGNAGE, 100)]+  , iflavour = zipPlain [BrGreen]   , icount   = 1   , irarity  = [(1, 1)]   , iverbHit = "whack"@@ -180,18 +172,20 @@   } signageEmbed = signageExit   { iname    = "notice"-  , ifreq    = [(SIGNAGE, 50)]+  , ifreq    = [(SIGNAGE, 100)]+  , iflavour = zipPlain [Cyan]   , ieffects = [Detect DetectEmbed 12]   , idesc    = "The battered poster is untitled and unsigned."   } signageMerchandise = signageExit   { iname    = "treasure map"-  , ifreq    = [(SIGNAGE, 50)]+  , ifreq    = [(SIGNAGE, 100)]+  , iflavour = zipPlain [BrCyan]   , ieffects = [Detect DetectLoot 20]   , idesc    = "In equal parts cryptic and promising."   } fireSmall = ItemKind-  { isymbol  = 'o'+  { isymbol  = toContentSymbol 'o'   , iname    = "small fire"   , ifreq    = [(SMALL_FIRE, 1)]   , iflavour = zipPlain [BrRed]@@ -206,9 +200,10 @@   , ikit     = []   } fireBig = fireSmall-  { isymbol  = '0'+  { isymbol  = toContentSymbol '0'   , iname    = "big fire"   , ifreq    = [(BIG_FIRE, 1)]+  , iflavour = zipPlain [Red]   , ieffects = [ Burn 2                , CreateItem Nothing CGround S_WOODEN_TORCH timerNone                , Explode S_SPARK ]@@ -216,7 +211,7 @@   , ikit     = []   } frost = ItemKind-  { isymbol  = '^'+  { isymbol  = toContentSymbol '^'   , iname    = "frost"   , ifreq    = [(FROST, 1)]   , iflavour = zipPlain [BrBlue]@@ -233,7 +228,7 @@   , ikit     = []   } rubble = ItemKind-  { isymbol  = '&'+  { isymbol  = toContentSymbol '&'   , iname    = "rubble"   , ifreq    = [(RUBBLE, 1)]   , iflavour = zipPlain [BrYellow]@@ -254,7 +249,7 @@   , ikit     = []   } doorwayTrapTemplate = ItemKind-  { isymbol  = '+'+  { isymbol  = toContentSymbol '+'   , iname    = "doorway trap"   , ifreq    = [(DOORWAY_TRAP_UNKNOWN, 1), (DOORWAY_TRAP, 0)]       -- the void group needed to pick the item for tile triggering@@ -287,7 +282,7 @@   -- , idesc    = ""   } stairsUp = ItemKind-  { isymbol  = '<'+  { isymbol  = toContentSymbol '<'   , iname    = "flight"   , ifreq    = [(STAIRS_UP, 1)]   , iflavour = zipPlain [BrWhite]@@ -303,16 +298,16 @@   , ikit     = []   } stairsDown = stairsUp-  { isymbol  = '>'+  { isymbol  = toContentSymbol '>'   , ifreq    = [(STAIRS_DOWN, 1)]   , ieffects = [Ascend False]   , idesc    = ""   } escape = stairsUp-  { isymbol  = 'E'+  { isymbol  = toContentSymbol '>'   , iname    = "way"   , ifreq    = [(ESCAPE, 1)]-  , iflavour = zipPlain [BrYellow]+  , iflavour = zipPlain [BrGreen]   , iaspects = [SetFlag Durable]   , ieffects = [Escape]   , idesc    = "May this nightmare have an end?"@@ -320,10 +315,10 @@                  -- for moon outdoors, spaceship, everywhere   } stairsTrapUp = ItemKind-  { isymbol  = '^'+  { isymbol  = toContentSymbol '^'   , iname    = "staircase trap"   , ifreq    = [(STAIRS_TRAP_UP, 1)]-  , iflavour = zipPlain [Red]+  , iflavour = zipPlain [BrRed]   , icount   = 1   , irarity  = [(1, 1)]   , iverbHit = "buffet"@@ -340,13 +335,14 @@ -- so that effects are invoked in the proper order and, e.g., teleport works. stairsTrapDown = stairsTrapUp   { ifreq    = [(STAIRS_TRAP_DOWN, 1)]+  , iflavour = zipPlain [Red]   , iverbHit = "open up under"   , ieffects = [ VerbMsgFail "tumble down the stairwell" "."                , toOrganGood S_DRUNK (20 + 1 `d` 5) ]   , idesc    = "A treacherous slab, to teach those who are too proud."   } lectern = ItemKind-  { isymbol  = '?'+  { isymbol  = toContentSymbol '?'   , iname    = "lectern"   , ifreq    = [(LECTERN, 1)]   , iflavour = zipFancy [BrYellow]@@ -365,7 +361,7 @@   , ikit     = []   } shallowWater = ItemKind-  { isymbol  = '~'+  { isymbol  = toContentSymbol '~'   , iname    = "shallow water"   , ifreq    = [(SHALLOW_WATER, 1)]   , iflavour = zipFancy [BrCyan]@@ -380,7 +376,7 @@   , ikit     = []   } straightPath = ItemKind-  { isymbol  = '.'+  { isymbol  = toContentSymbol '.'   , iname    = "straight path"   , ifreq    = [(STRAIGHT_PATH, 1)]   , iflavour = zipFancy [BrRed]@@ -395,7 +391,7 @@   , ikit     = []   } frozenGround = ItemKind-  { isymbol  = '.'+  { isymbol  = toContentSymbol '.'   , iname    = "shade"   , ifreq    = [(FROZEN_GROUND, 1)]   , iflavour = zipFancy [BrBlue]

@@ -2,8 +2,8 @@ module Content.ItemKindOrgan   ( -- * Group name patterns     pattern S_FIST, pattern S_FOOT, pattern S_HOOKED_CLAW, pattern S_SMALL_CLAW, pattern S_SNOUT, pattern S_SMALL_JAW, pattern S_JAW, pattern S_LARGE_JAW, pattern S_ANTLER, pattern S_HORN, pattern S_RHINO_HORN, pattern S_TENTACLE, pattern S_TIP, pattern S_LIP, pattern S_THORN, pattern S_BOILING_FISSURE, pattern S_ARSENIC_FISSURE, pattern S_SULFUR_FISSURE, pattern S_BEE_STING, pattern S_STING, pattern S_VENOM_TOOTH, pattern S_VENOM_FANG, pattern S_SCREECHING_BEAK, pattern S_LARGE_TAIL, pattern S_HUGE_TAIL, pattern S_ARMORED_SKIN, pattern S_BARK, pattern S_NOSTRIL, pattern S_RATLLE, pattern S_INSECT_MORTALITY, pattern S_SAPIENT_BRAIN, pattern S_ANIMAL_BRAIN, pattern S_SCENT_GLAND, pattern S_BOILING_VENT, pattern S_ARSENIC_VENT, pattern S_SULFUR_VENT, pattern S_EYE_3, pattern S_EYE_6, pattern S_EYE_8, pattern S_VISION_6, pattern S_VISION_12, pattern S_VISION_16, pattern S_EAR_3, pattern S_EAR_6, pattern S_EAR_8, pattern S_SPEED_GLAND_5, pattern S_SPEED_GLAND_10-  , pattern S_TOOTH, pattern S_LASH, pattern S_RIGHT_TORSION, pattern S_LEFT_TORSION, pattern S_PUPIL   , pattern SCAVENGER+  , pattern S_TOOTH, pattern S_LASH, pattern S_RIGHT_TORSION, pattern S_LEFT_TORSION, pattern S_PUPIL   , organsGNSingleton, organsGN   , -- * Content     organs@@ -15,11 +15,14 @@  import Content.ItemKindBlast import Content.ItemKindTemporary+import Content.RuleKind import Game.LambdaHack.Content.ItemKind+import Game.LambdaHack.Content.RuleKind import Game.LambdaHack.Core.Dice import Game.LambdaHack.Definition.Ability import Game.LambdaHack.Definition.Color import Game.LambdaHack.Definition.Defs+import Game.LambdaHack.Definition.DefsInternal import Game.LambdaHack.Definition.Flavour  -- * Group name patterns@@ -87,6 +90,8 @@ pattern S_SPEED_GLAND_5 = GroupName "speed gland 5" pattern S_SPEED_GLAND_10 = GroupName "speed gland 10" +pattern SCAVENGER = GroupName "scavenger"+ -- * LH-specific pattern S_TOOTH = GroupName "tooth" pattern S_LASH = GroupName "lash"@@ -94,8 +99,6 @@ pattern S_LEFT_TORSION = GroupName "left torsion" pattern S_PUPIL = GroupName "pupil" -pattern SCAVENGER = GroupName "scavenger"- -- * Content  organs :: [ItemKind]@@ -108,11 +111,14 @@ -- LH-specific tooth, lash, torsionRight, torsionLeft, pupil :: ItemKind +symbolWand :: ContentSymbol ItemKind+symbolWand = rsymbolWand $ ritemSymbols standardRules  -- * No-cooldown melee damage organs without effects  thorn = fist-  { iname    = "thorn"+  { isymbol  = symbolWand+  , iname    = "thorn"   , ifreq    = [(S_THORN, 1)]   , icount   = 2 + 1 `d` 2  -- unrealistic, but not boring   , iverbHit = "puncture"@@ -130,7 +136,7 @@   , idesc    = ""   } fist = ItemKind-  { isymbol  = ','+  { isymbol  = toContentSymbol ','   , iname    = "fist"   , ifreq    = [(S_FIST, 1)]   , iflavour = zipPlain [Red]@@ -202,7 +208,7 @@   , ifreq    = [(S_HORN, 1)]   , iverbHit = "impale"   , idamage  = 5 `d` 1-  , iaspects = [ AddSkill SkHurtMelee 10+  , iaspects = [ Timeout 7  -- no effect, but limit raw damage; two copies                , AddSkill SkArmorMelee 10 ]  -- bonus doubled                ++ iaspects fist   , idesc    = "Sharp and long, for defence or attack."@@ -221,7 +227,8 @@ -- * Direct damage organs with effects  beeSting = fist-  { iname    = "bee sting"+  { isymbol  = symbolWand+  , iname    = "bee sting"   , ifreq    = [(S_BEE_STING, 1)]   , icount   = 1   , iverbHit = "sting"@@ -233,7 +240,8 @@   , idesc    = "Painful, but beneficial."   } sting = fist-  { iname    = "sting"+  { isymbol  = symbolWand+  , iname    = "sting"   , ifreq    = [(S_STING, 1)]   , icount   = 1   , iverbHit = "inject"@@ -255,7 +263,8 @@   , idesc    = ""   } venomTooth = fist-  { iname    = "venom tooth"+  { isymbol  = symbolWand+  , iname    = "venom tooth"   , ifreq    = [(S_VENOM_TOOTH, 1)]   , iverbHit = "bite"   , idamage  = 1 `d` 1@@ -265,7 +274,8 @@   , idesc    = "A chilling numbness spreads from its bite."   } hookedClaw = fist-  { iname    = "hooked claw"+  { isymbol  = symbolWand+  , iname    = "hooked claw"   , ifreq    = [(S_HOOKED_CLAW, 1)]   , icount   = 2  -- even if more, only the fore claws used for fighting   , iverbHit = "hook"@@ -276,7 +286,8 @@   , idesc    = "A curved talon."   } screechingBeak = fist-  { iname    = "screeching beak"+  { isymbol  = symbolWand+  , iname    = "screeching beak"   , ifreq    = [(S_SCREECHING_BEAK, 1)]   , icount   = 1   , iverbHit = "peck"@@ -287,7 +298,8 @@   , idesc    = "Both a weapon and a beacon, calling more scavengers to the meal."   } antler = fist-  { iname    = "antler"+  { isymbol  = symbolWand+  , iname    = "antler"   , ifreq    = [(S_ANTLER, 1)]   , iverbHit = "ram"   , idamage  = 4 `d` 1@@ -298,7 +310,8 @@   , idesc    = ""   } rhinoHorn = fist-  { iname    = "ugly horn"  -- made of keratin, unlike real horns+  { isymbol  = symbolWand+  , iname    = "ugly horn"  -- made of keratin, unlike real horns   , ifreq    = [(S_RHINO_HORN, 1)]   , icount   = 1  -- single, unlike real horns   , iverbHit = "gore"@@ -309,7 +322,8 @@   , idesc    = "Very solid, considering it has the same composition as fingernails."   } largeTail = fist-  { iname    = "large tail"+  { isymbol  = symbolWand+  , iname    = "large tail"   , ifreq    = [(S_LARGE_TAIL, 1)]   , icount   = 1   , iverbHit = "knock"@@ -321,7 +335,8 @@   , idesc    = "Almost as long as the trunk."   } hugeTail = largeTail-  { iname    = "huge tail"+  { isymbol  = symbolWand+  , iname    = "huge tail"   , ifreq    = [(S_HUGE_TAIL, 1)]   , iverbHit = "upend"   , iaspects = [Timeout $ 3 + 1 `d` 2, AddSkill SkHurtMelee 20]@@ -334,7 +349,8 @@ -- * Melee weapons without direct damage  venomFang = fist-  { iname    = "venom fang"+  { isymbol  = symbolWand+  , iname    = "venom fang"   , ifreq    = [(S_VENOM_FANG, 1)]   , iverbHit = "bite"   , idamage  = 0@@ -357,7 +373,8 @@   , idesc    = ""   } boilingFissure = fist-  { iname    = "fissure"+  { isymbol  = symbolWand+  , iname    = "fissure"   , ifreq    = [(S_BOILING_FISSURE, 1)]   , icount   = 5 + 1 `d` 5   , iverbHit = "hiss at"@@ -382,7 +399,7 @@ -- * Armor organs  armoredSkin = ItemKind-  { isymbol  = ','+  { isymbol  = toContentSymbol ','   , iname    = "armored skin"   , ifreq    = [(S_ARMORED_SKIN, 1)]   , iflavour = zipPlain [Red]@@ -505,11 +522,12 @@   } speedGland :: Int -> GroupName ItemKind -> ItemKind speedGland n grp = armoredSkin-  { iname    = "speed gland"+  { isymbol  = symbolWand+  , iname    = "speed gland"   , ifreq    = [(grp, 1)]   , iverbHit = "spit at"-  , iaspects = [ AddSkill SkSpeed $ intToDice n-               , Timeout $ intToDice (100 `div` n)+  , iaspects = [ Timeout $ intToDice (100 `div` n)+               , AddSkill SkSpeed $ intToDice n                , SetFlag Periodic, SetFlag Durable ]   , ieffects = [RefillHP 1]   , idesc    = ""@@ -517,7 +535,8 @@ speedGland5 = speedGland 5 S_SPEED_GLAND_5 speedGland10 = speedGland 10 S_SPEED_GLAND_10 scentGland = armoredSkin-  { iname    = "scent gland"+  { isymbol  = symbolWand+  , iname    = "scent gland"   , ifreq    = [(S_SCENT_GLAND, 1)]   , icount   = 10 + 1 `d` 3  -- runs out   , iverbHit = "spray at"@@ -531,7 +550,8 @@   , idesc    = ""   } sulfurVent = armoredSkin-  { iname    = "vent"+  { isymbol  = toContentSymbol 'v'+  , iname    = "vent"   , ifreq    = [(S_SULFUR_VENT, 1)]   , iflavour = zipPlain [BrYellow]   , iverbHit = "menace"@@ -541,7 +561,8 @@   , idesc    = ""   } boilingVent = armoredSkin-  { iname    = "vent"+  { isymbol  = toContentSymbol 'v'+  , iname    = "vent"   , ifreq    = [(S_BOILING_VENT, 1)]   , iflavour = zipPlain [Blue]   , iverbHit = "menace"@@ -551,7 +572,8 @@   , idesc    = ""   } arsenicVent = armoredSkin-  { iname    = "vent"+  { isymbol  = toContentSymbol 'v'+  , iname    = "vent"   , ifreq    = [(S_ARSENIC_VENT, 1)]   , iflavour = zipPlain [Cyan]   , iverbHit = "menace"@@ -564,7 +586,7 @@ -- * Special  bonusHP = armoredSkin-  { isymbol  = 'H'  -- '+' reserved for conditions+  { isymbol  = toContentSymbol 'H'  -- '+' reserved for conditions   , iname    = "bonus HP"   , ifreq    = [(S_BONUS_HP, 1)]   , iflavour = zipPlain [BrBlue]@@ -574,7 +596,7 @@   , idesc    = "Growing up in a privileged background gave you the training and the discrete garment accessories that improve your posture and resilience."   } braced = armoredSkin-  { isymbol  = 'B'+  { isymbol  = toContentSymbol 'B'   , iname    = "braced"   , ifreq    = [(S_BRACED, 1)]   , iflavour = zipPlain [BrGreen]@@ -586,7 +608,7 @@   , idesc    = "Apart of increased resilience to attacks, being braced protects from displacement by foes and other forms of forced translocation, e.g., pushing or pulling."   } asleep = armoredSkin-  { isymbol  = 'S'+  { isymbol  = toContentSymbol 'S'   , iname    = "asleep"   , ifreq    = [(S_ASLEEP, 1)]   , iflavour = zipPlain [BrGreen]  -- regenerates HP (very slowly)@@ -600,7 +622,7 @@   , idesc    = "Sleep helps to regain health, albeit extremely slowly. Being asleep makes you vulnerable, with gradually diminishing effects as the slumber wears off over several turns. Any non-idle action, not only combat but even yawning or stretching removes a sizable portion of the sleepiness."   } impressed = armoredSkin-  { isymbol  = 'I'+  { isymbol  = toContentSymbol 'I'   , iname    = "impressed"  -- keep the same as in @ifreq@, to simplify code   , ifreq    = [(S_IMPRESSED, 1), (CONDITION, 1)]   , iflavour = zipPlain [BrRed]

@@ -18,6 +18,7 @@ import Game.LambdaHack.Definition.Ability import Game.LambdaHack.Definition.Color import Game.LambdaHack.Definition.Defs+import Game.LambdaHack.Definition.DefsInternal import Game.LambdaHack.Definition.Flavour  -- * Group name patterns@@ -98,7 +99,7 @@ tmpAspects grp aspects =   let name = fromGroupName grp  -- @iname@ must match @ifreq@, see @myBadGrps@   in ItemKind-    { isymbol  = '+'+    { isymbol  = toContentSymbol '+'     , iname    = name     , ifreq    = [(grp, 1), (CONDITION, 1)]     , iflavour = zipPlain [BrWhite]

@@ -23,6 +23,7 @@ import Game.LambdaHack.Content.ModeKind import Game.LambdaHack.Core.Dice import Game.LambdaHack.Definition.Defs+import Game.LambdaHack.Definition.DefsInternal  -- * Group name patterns @@ -132,7 +133,7 @@   , mtutorial = False   , mroster = rosterCrawl   , mcaves  = cavesCrawl-  , mendMsg = [ (Killed, "To think that followers of science and agents of enlightenment would earn death as their reward! Where did we err in our ways? Perhaps nature should not have been disturbed so brashly and the fell beasts woken up from their slumber so eagerly? Perhaps the gathered items should have been used for scientific experiments on the spot rather than hoarded as if of base covetousness? Or perhaps the challenge, chosen freely but without the foreknowledge of the grisly difficulty, was insurmountable and forlorn from the start, despite the enormous power of educated reason at out disposal?")+  , mendMsg = [ (Killed, "To think that followers of science and agents of enlightenment would earn death as their reward! Where did we err in our ways? Perhaps nature should not have been disturbed so brashly and the fell beasts woken up from their slumber so eagerly?\nPerhaps the gathered items should have been used for scientific experiments on the spot rather than hoarded as if of base covetousness? Or perhaps the challenge, chosen freely but without the foreknowledge of the grisly difficulty, was insurmountable and forlorn from the start, despite the enormous power of educated reason at out disposal?")               , (Escape, "It's better to live to tell the tale than to choke on more than one can swallow. There was no more exquisite cultural artifacts and glorious scientific wonders in these forbidding tunnels anyway. Or were there?") ]   , mrules  = T.intercalate "\n"       [ "* Many levels"@@ -198,7 +199,7 @@   , mtutorial = False   , mroster = rosterEscape   , mcaves  = cavesEscape-  , mendMsg = []+  , mendMsg = [ (Conquer, "It was enough to reach the escape area marked by yellow '>' symbol. Spilling that much blood was risky. unnecessary and alerted the authorities. Having said that --- impressive indeed.") ]   , mrules  = T.intercalate "\n"       [ "* One level only"       , "* Three heroes vs. Seven human enemies capable of concurrent attacks"@@ -487,16 +488,16 @@ rosterRaid, rosterBrawl, rosterCrawl, rosterShootout, rosterHunt, rosterEscape, rosterZoo, rosterAmbush, rosterSafari, rosterCrawlEmpty, rosterCrawlSurvival, rosterSafariSurvival, rosterBattle, rosterBattleDefense, rosterBattleSurvival, rosterDefense, rosterDefenseEmpty :: Roster  rosterRaid = Roster-  { rosterList = [ ( playerHero {fhiCondPoly = hiHeroShort}+  { rosterList = [ ( playerAnimal  -- starting over escape+                   , Nothing+                   , [(-2, 2, ANIMAL)] )+                 , ( playerHero {fhiCondPoly = hiHeroShort}                    , Just teamExplorer                    , [(-2, 2, HERO)] )                  , ( playerAntiHero { fname = "Indigo Founder"                                     , fhiCondPoly = hiHeroShort }                    , Just teamCompetitor                    , [(-2, 1, HERO)] )-                 , ( playerAnimal  -- starting over escape-                   , Nothing-                   , [(-2, 2, ANIMAL)] )                  , (playerHorror, Nothing, []) ]  -- for summoned monsters   , rosterEnemy = [ ("Explorer", "Animal Kingdom")                   , ("Explorer", "Horror Den")@@ -521,18 +522,18 @@   , rosterAlly = [] }  rosterCrawl = Roster-  { rosterList = [ ( playerHero-                   , Just teamExplorer-                   , [(-1, 3, HERO)] )-                 , ( playerMonster-                   , Nothing-                   , [(-4, 1, SCOUT_MONSTER), (-4, 3, MONSTER)] )-                 , ( playerAnimal+  { rosterList = [ ( playerAnimal  -- starting over escape                    , Nothing                    , -- Fun from the start to avoid empty initial level:                      [ (-1, 1 + 1 `d` 2, ANIMAL)                      -- Huge battle at the end:-                     , (-10, 100, MOBILE_ANIMAL) ] ) ]+                     , (-10, 100, MOBILE_ANIMAL) ] )+                 , ( playerHero  -- start on stairs so that stash is handy+                   , Just teamExplorer+                   , [(-1, 3, HERO)] )+                 , ( playerMonster+                   , Nothing+                   , [(-4, 1, SCOUT_MONSTER), (-4, 3, MONSTER)] ) ]   , rosterEnemy = [ ("Explorer", "Monster Hive")                   , ("Explorer", "Animal Kingdom") ]   , rosterAlly = [("Monster Hive", "Animal Kingdom")] }@@ -576,7 +577,6 @@ rosterEscape = Roster   { rosterList = [ ( playerAntiHero { fname = "Indigo Researcher"                                     , fcanEscape = False  -- start on escape-                                    , fneverEmpty = False  -- loot after killing                                     , fhiCondPoly = hiHeroMedium }                    , Just teamCompetitor                    , [(-7, 6, AMBUSHER_HERO), (-7, 1, SCOUT_HERO)] )@@ -670,16 +670,18 @@  rosterSafariSurvival = rosterSafari   { rosterList = [ ( playerMonsterTourist-                       { fleaderMode = LeaderAI $ AutoLeader True True-                       , fhasUI = False }+                       { fleaderMode = Just $ AutoLeader True True+                       , fhasUI = False+                       , funderAI = True }                    , Nothing                    , [(-4, 15, MONSTER)] )                  , ( playerHunamConvict                    , Just teamCivilian                    , [(-4, 3, CIVILIAN)] )                  , ( playerAnimalMagnificent-                       { fleaderMode = LeaderUI $ AutoLeader True False-                       , fhasUI = True }+                       { fleaderMode = Just $ AutoLeader True False+                       , fhasUI = True+                       , funderAI = False }                    , Nothing                    , [(-7, 20, MOBILE_ANIMAL)] )                  , ( playerAnimalExquisite@@ -702,11 +704,8 @@   , rosterAlly = [("Monster Hive", "Animal Kingdom")] }  rosterBattleDefense = rosterBattle-  { rosterList = [ ( playerHero { fcanEscape = False-                                , fhiCondPoly = hiHeroLong-                                , fleaderMode =-                                    LeaderAI $ AutoLeader False False-                                , fhasUI = False }+  { rosterList = [ ( playerAntiHero { fcanEscape = False+                                    , fhiCondPoly = hiHeroLong }                    , Just teamExplorer                    , [(-5, 5, SOLDIER_HERO)] )                  , ( playerMonster { fneverEmpty = True@@ -718,11 +717,8 @@                    , [(-5, 30, MOBILE_ANIMAL)] ) ] }  rosterBattleSurvival = rosterBattle-  { rosterList = [ ( playerHero { fcanEscape = False-                                , fhiCondPoly = hiHeroLong-                                , fleaderMode =-                                    LeaderAI $ AutoLeader False False-                                , fhasUI = False }+  { rosterList = [ ( playerAntiHero { fcanEscape = False+                                    , fhiCondPoly = hiHeroLong }                    , Just teamExplorer                    , [(-5, 5, SOLDIER_HERO)] )                  , ( playerMonster {fneverEmpty = True}

@@ -28,13 +28,15 @@   , fhiCondPoly = hiHeroLong   , fhasGender = True   , fdoctrine = TExplore-  , fleaderMode = LeaderUI $ AutoLeader False False+  , fleaderMode = Just $ AutoLeader False False   , fhasUI = True+  , funderAI = False   }  playerAntiHero = playerHero-  { fleaderMode = LeaderAI $ AutoLeader True False+  { fleaderMode = Just $ AutoLeader True False   , fhasUI = False+  , funderAI = True   }  playerCivilian = Player@@ -46,8 +48,9 @@   , fhiCondPoly = hiHeroMedium   , fhasGender = True   , fdoctrine = TPatrol-  , fleaderMode = LeaderNull  -- unorganized+  , fleaderMode = Nothing  -- unorganized   , fhasUI = False+  , funderAI = True   }  playerMonster = Player@@ -62,13 +65,15 @@   , fleaderMode =       -- No point changing leader on level, since all move and they       -- don't follow the leader.-      LeaderAI $ AutoLeader True True+      Just $ AutoLeader True True   , fhasUI = False+  , funderAI = True   }  playerAntiMonster = playerMonster-  { fleaderMode = LeaderUI $ AutoLeader True True+  { fleaderMode = Just $ AutoLeader True True   , fhasUI = True+  , funderAI = False   }  playerAnimal = Player@@ -80,8 +85,9 @@   , fhiCondPoly = hiDweller   , fhasGender = False   , fdoctrine = TRoam  -- can't pick up, so no point exploring-  , fleaderMode = LeaderNull+  , fleaderMode = Nothing   , fhasUI = False+  , funderAI = True   }  -- | A special player, for summoned actors that don't belong to any@@ -98,8 +104,9 @@   , fhiCondPoly = []   , fhasGender = False   , fdoctrine = TPatrol  -- disoriented-  , fleaderMode = LeaderNull+  , fleaderMode = Nothing   , fhasUI = False+  , funderAI = True   }  playerMonsterTourist =@@ -108,11 +115,13 @@                     , fneverEmpty = True  -- no spawning                     , fhiCondPoly = hiHeroMedium                     , fdoctrine = TFollow  -- follow-the-guide, as tourists do-                    , fleaderMode = LeaderUI $ AutoLeader False False }+                    , fleaderMode = Just $ AutoLeader False False+                    , funderAI = False }  playerHunamConvict =   playerCivilian { fname = "Hunam Convict"-                 , fleaderMode = LeaderAI $ AutoLeader True False }+                 , fleaderMode = Just $ AutoLeader True False+                 , funderAI = True }  playerAnimalMagnificent =   playerAnimal { fname = "Animal Magnificent Specimen Variety"

@@ -13,12 +13,14 @@  import Game.LambdaHack.Core.Prelude +import qualified Data.EnumMap.Strict as EM import qualified Data.Text as T  import Content.TileKind hiding (content, groupNames, groupNamesSingleton) import Game.LambdaHack.Content.PlaceKind import Game.LambdaHack.Content.TileKind (TileKind) import Game.LambdaHack.Definition.Defs+import Game.LambdaHack.Definition.DefsInternal  -- * Group name patterns @@ -103,7 +105,33 @@       outdoorEscapes = map switchEscapeToOutdoorDown escapeDownBasic   in upEscapes ++ outdoorEscapes --- The dots below are @'\x00B7'@, as defined in @TileKind.floorSymbol@.+-- The dots below are @'\x00B7'@, as defined in `TileKind.floorSymbol`.+defaultLegendLit :: EM.EnumMap Char (GroupName TileKind)+defaultLegendLit = EM.fromList+  [ (' ', FILLER_WALL)+  , ('|', S_WALL_LIT)+  , ('-', S_WALL_HORIZONTAL_LIT)+  , ('0', S_PILLAR)+  , ('&', S_RUBBLE_PILE)+  , ('<', ESCAPE_UP)+  , ('>', ESCAPE_DOWN)+  , ('·', FLOOR_ACTOR_ITEM_LIT)+  , ('~', S_SHALLOW_WATER_LIT)+  , ('I', SIGNBOARD) ]++defaultLegendDark :: EM.EnumMap Char (GroupName TileKind)+defaultLegendDark = EM.fromList+  [ (' ', FILLER_WALL)+  , ('|', S_WALL_DARK)+  , ('-', S_WALL_HORIZONTAL_DARK)+  , ('0', S_PILLAR)+  , ('&', S_RUBBLE_PILE)+  , ('<', ESCAPE_UP)+  , ('>', ESCAPE_DOWN)+  , ('·', FLOOR_ACTOR_ITEM_DARK)+  , ('~', S_SHALLOW_WATER_DARK)+  , ('I', SIGNBOARD) ]+ deadEnd = PlaceKind  -- needs to have index 0   { psymbol  = 'd'   , pname    = "a dead end"@@ -112,8 +140,8 @@   , pcover   = CStretch   , pfence   = FNone   , ptopLeft = ["·"]-  , poverrideDark = []-  , poverrideLit = []+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   } rect = PlaceKind  -- Valid for any nonempty area, hence low frequency.   { psymbol  = 'r'@@ -125,26 +153,27 @@   , ptopLeft = [ "--"                , "|·"                ]-  , poverrideDark = []-  , poverrideLit = []+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   } rect2 = rect   { pname    = "a pen"   , pfreq    = [(ZOO, 3)]   }-rect3 = rect+rect3 = overridePlaceKind [ ('|', S_WALL_LIT)  -- visible from afar+                          , ('-', S_WALL_HORIZONTAL_LIT) ] $ rect   { pname    = "a shed"   , pfreq    = [(BRAWL, 10), (SHOOTOUT, 1)]-  , poverrideDark = [ ('|', S_WALL_LIT)  -- visible from afar-                    , ('-', S_WALL_HORIZONTAL_LIT) ]-  , poverrideLit = [ ('|', S_WALL_LIT)-                   , ('-', S_WALL_HORIZONTAL_LIT) ]   } rect4 = rect3   { pname    = "cabinet"   , pfreq    = [(ARENA, 10)]   }-rectWindows = PlaceKind+rectWindows = override2PlaceKind+                [ ('=', RECT_WINDOWS_HORIZONTAL_DARK)+                , ('!', RECT_WINDOWS_VERTICAL_DARK) ]+                [ ('=', RECT_WINDOWS_HORIZONTAL_LIT)+                , ('!', RECT_WINDOWS_VERTICAL_LIT) ] $ PlaceKind   { psymbol  = 'w'   , pname    = "a hut"   , pfreq    = [(ESCAPE, 10), (AMBUSH, 7)]@@ -154,12 +183,12 @@   , ptopLeft = [ "-="                , "!·"                ]-  , poverrideDark = [ ('=', RECT_WINDOWS_HORIZONTAL_DARK)-                    , ('!', RECT_WINDOWS_VERTICAL_DARK) ]-  , poverrideLit = [ ('=', RECT_WINDOWS_HORIZONTAL_LIT)-                   , ('!', RECT_WINDOWS_VERTICAL_LIT) ]+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   }-glasshouse = PlaceKind+glasshouse = overridePlaceKind+               [ ('=', GLASSHOUSE_HORIZONTAL_LIT)  -- visible from afar+               , ('!', GLASSHOUSE_VERTICAL_LIT) ] $ PlaceKind   { psymbol  = 'g'   , pname    = "a glasshouse"   , pfreq    = [(SHOOTOUT, 4)]@@ -169,24 +198,24 @@   , ptopLeft = [ "=="                , "!·"                ]-  , poverrideDark = [ ('=', GLASSHOUSE_HORIZONTAL_LIT)  -- visible from afar-                    , ('!', GLASSHOUSE_VERTICAL_LIT) ]-  , poverrideLit = [ ('=', GLASSHOUSE_HORIZONTAL_LIT)-                   , ('!', GLASSHOUSE_VERTICAL_LIT) ]+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   }-glasshouse2 = glasshouse+glasshouse2 = override2PlaceKind [ ('=', GLASSHOUSE_HORIZONTAL_DARK)+                                 , ('!', GLASSHOUSE_VERTICAL_DARK) ]+                                 [ ('=', GLASSHOUSE_HORIZONTAL_LIT)+                                 , ('!', GLASSHOUSE_VERTICAL_LIT) ] $ glasshouse   { pname    = "a glass cage"   , pfreq    = [(ZOO, 10)]-  , poverrideDark = [ ('=', GLASSHOUSE_HORIZONTAL_DARK)-                    , ('!', GLASSHOUSE_VERTICAL_DARK) ]-  , poverrideLit = [ ('=', GLASSHOUSE_HORIZONTAL_LIT)-                   , ('!', GLASSHOUSE_VERTICAL_LIT) ]   } glasshouse3 = glasshouse   { pname    = "a reading room"   , pfreq    = [(ARENA, 40)]   }-pulpit = PlaceKind+pulpit = overridePlaceKind [ ('=', GLASSHOUSE_HORIZONTAL_LIT)+                           , ('!', GLASSHOUSE_VERTICAL_LIT)+                           , ('0', S_PULPIT) ] $ PlaceKind+           -- except for floor, all will be lit, regardless of night/dark; OK   { psymbol  = 'p'   , pname    = "a stand dais"   , pfreq    = [(ARENA, 200), (ZOO, 200)]@@ -197,13 +226,8 @@                , "!··"                , "··0"                ]-  , poverrideDark = [ ('=', GLASSHOUSE_HORIZONTAL_LIT)-                    , ('!', GLASSHOUSE_VERTICAL_LIT)-                    , ('0', S_PULPIT) ]-  , poverrideLit = [ ('=', GLASSHOUSE_HORIZONTAL_LIT)-                   , ('!', GLASSHOUSE_VERTICAL_LIT)-                   , ('0', S_PULPIT) ]-      -- except for floor, this will all be lit, regardless of night/dark; OK+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   } ruin = PlaceKind   { psymbol  = 'R'@@ -215,16 +239,13 @@   , ptopLeft = [ "--"                , "|X"                ]-  , poverrideDark = []-  , poverrideLit = []+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   }-ruin2 = ruin+ruin2 = overridePlaceKind [ ('|', S_WALL_LIT)  -- visible from afar+                          , ('-', S_WALL_HORIZONTAL_LIT) ] $ ruin   { pname    = "blasted walls"   , pfreq    = [(AMBUSH, 50)]-  , poverrideDark = [ ('|', S_WALL_LIT)  -- visible from afar-                    , ('-', S_WALL_HORIZONTAL_LIT) ]-  , poverrideLit = [ ('|', S_WALL_LIT)-                   , ('-', S_WALL_HORIZONTAL_LIT) ]   } collapsed = PlaceKind   { psymbol  = 'c'@@ -237,8 +258,8 @@   , pfence   = FNone   , ptopLeft = [ "0"                ]-  , poverrideDark = []-  , poverrideLit = []+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   } collapsed2 = collapsed   { pfreq    = [(NOISE, 1000), (BATTLE, 200)]@@ -292,8 +313,8 @@                , "|·0·"                , "|···"                ]-  , poverrideDark = []-  , poverrideLit = []+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   } pillar2 = pillar   { pfreq    = [(ROGUE, 60), (LABORATORY, 200)]@@ -312,7 +333,7 @@                , "|····"                ]   }-pillar4 = pillar+pillar4 = overridePlaceKind [('&', CACHE)] $ pillar   { pname    = "an exquisite hall"   , pfreq    = [(ROGUE, 30000), (LABORATORY, 100000)]   , ptopLeft = [ "-----"@@ -321,10 +342,8 @@                , "|0·0·"                , "|····"                ]-  , poverrideDark = [('&', CACHE)]-  , poverrideLit = [('&', CACHE)]   }-pillar5 = pillar+pillar5 = overridePlaceKind [('&', CACHE)] $ pillar   { pname    = "a decorated hall"   , pfreq    = [(ROGUE, 30000), (LABORATORY, 100000)]   , ptopLeft = [ "-----"@@ -333,8 +352,6 @@                , "|0···"                , "|····"                ]-  , poverrideDark = [('&', CACHE)]-  , poverrideLit = [('&', CACHE)]   } colonnade = PlaceKind   { psymbol  = 'c'@@ -348,8 +365,8 @@   , ptopLeft = [ "0·"                , "··"                ]-  , poverrideDark = []-  , poverrideLit = []+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   } colonnade2 = colonnade   { prarity  = [(1, 15), (10, 15)]@@ -384,7 +401,8 @@                , "·0"                ]   }-lampPost = PlaceKind+lampPost = overridePlaceKind [ ('0', S_LAMP_POST)+                             , ('·', S_FLOOR_ACTOR_LIT) ] $ PlaceKind   { psymbol  = 'l'   , pname    = "a lamp-lit area"   , pfreq    = [(ESCAPE, 200), (AMBUSH, 200), (ZOO, 100), (BATTLE, 100)]@@ -395,8 +413,8 @@                , "·0·"                , "X·X"                ]-  , poverrideDark = [('0', S_LAMP_POST), ('·', S_FLOOR_ACTOR_LIT)]-  , poverrideLit = [('0', S_LAMP_POST), ('·', S_FLOOR_ACTOR_LIT)]+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   } lampPost2 = lampPost   { ptopLeft = [ "···"@@ -423,7 +441,11 @@                , "X···X"                ]   }-treeShade = PlaceKind+treeShade = override2PlaceKind [ ('0', S_TREE_DARK)+                               , ('s', TREE_SHADE_WALKABLE_DARK) ]+                               [ ('0', S_TREE_LIT)+                               , ('s', TREE_SHADE_WALKABLE_LIT) ] $+            overridePlaceKind [('·', S_SHADED_GROUND)] $ PlaceKind   { psymbol  = 't'   , pname    = "a tree shade"   , pfreq    = [(BRAWL, 1000)]@@ -434,14 +456,12 @@                , "s0·"                , "Xs·"                ]-  , poverrideDark = [ ('0', S_TREE_DARK)-                    , ('s', TREE_SHADE_WALKABLE_DARK)-                    , ('·', S_SHADED_GROUND) ]-  , poverrideLit = [ ('0', S_TREE_LIT)-                   , ('s', TREE_SHADE_WALKABLE_LIT)-                   , ('·', S_SHADED_GROUND) ]+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   }-fogClump = PlaceKind+fogClump = override2PlaceKind [('f', FOG_CLUMP_DARK)]+                              [('f', FOG_CLUMP_LIT)] $+           overridePlaceKind [(';', S_FOG_LIT)] $ PlaceKind   { psymbol  = 'f'   , pname    = "a foggy patch"   , pfreq    = [(SHOOTOUT, 150), (EMPTY, 15)]@@ -452,8 +472,8 @@                , ";f"                , ";X"                ]-  , poverrideDark = [('f', FOG_CLUMP_DARK), (';', S_FOG_LIT)]-  , poverrideLit = [('f', FOG_CLUMP_LIT), (';', S_FOG_LIT)]+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   } fogClump2 = fogClump   { pfreq    = [(SHOOTOUT, 500), (EMPTY, 50)]@@ -463,7 +483,11 @@                , "Xff"                ]   }-smokeClump = PlaceKind+smokeClump = override2PlaceKind [ ('f', SMOKE_CLUMP_DARK)+                                , ('·', S_FLOOR_ACTOR_DARK) ]+                                [ ('f', SMOKE_CLUMP_LIT)+                                , ('·', S_FLOOR_ACTOR_LIT) ] $+             overridePlaceKind [(';', S_SMOKE_LIT)] $ PlaceKind   { psymbol  = 's'   , pname    = "a smoky patch"   , pfreq    = [(ZOO, 50)]@@ -474,10 +498,8 @@                , ";f"                , ";X"                ]-  , poverrideDark = [ ('f', SMOKE_CLUMP_DARK), (';', S_SMOKE_LIT)-                    , ('·', S_FLOOR_ACTOR_DARK) ]-  , poverrideLit = [ ('f', SMOKE_CLUMP_LIT), (';', S_SMOKE_LIT)-                   , ('·', S_FLOOR_ACTOR_LIT) ]+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   } smokeClump2 = smokeClump   { pfreq    = [(ZOO, 500)]@@ -501,7 +523,9 @@       -- should not be used in caves with trails, because bushes should       -- not grow over such artificial trails   }-bushClump = PlaceKind+bushClump = override2PlaceKind [('f', BUSH_CLUMP_DARK)]+                               [('f', BUSH_CLUMP_LIT)] $+            overridePlaceKind [(';', S_BUSH_LIT)] $ PlaceKind   { psymbol  = 'b'   , pname    = "a bushy patch"   , pfreq    = [(SHOOTOUT, 40)]@@ -512,8 +536,8 @@                , ";X"                , ";;"                ]-  , poverrideDark = [('f', BUSH_CLUMP_DARK), (';', S_BUSH_LIT)]-  , poverrideLit = [('f', BUSH_CLUMP_LIT), (';', S_BUSH_LIT)]+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit       -- should not be used in caves with trails, because bushes can't       -- grow over such artificial trails   }@@ -525,7 +549,8 @@                , ";;"                ]   }-escapeDown = PlaceKind+escapeDown = overridePlaceKind [ ('|', S_WALL_LIT)  -- visible from afar+                               , ('-', S_WALL_HORIZONTAL_LIT) ] $ PlaceKind   { psymbol  = '>'   , pname    = "an escape down"   , pfreq    = [(INDOOR_ESCAPE_DOWN, 1)]@@ -534,10 +559,8 @@   , pfence   = FGround   , ptopLeft = [ ">"                ]-  , poverrideDark = [ ('|', S_WALL_LIT)  -- visible from afar-                    , ('-', S_WALL_HORIZONTAL_LIT) ]-  , poverrideLit = [ ('|', S_WALL_LIT)-                   , ('-', S_WALL_HORIZONTAL_LIT) ]+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   } escapeDown2 = escapeDown   { pfreq    = [(INDOOR_ESCAPE_DOWN, 1000)]@@ -577,7 +600,10 @@                , "-----"                ]   }-staircase = PlaceKind+staircase = overridePlaceKind [ ('<', STAIRCASE_UP)+                              , ('>', STAIRCASE_DOWN)+                              , ('|', S_WALL_LIT)  -- visible from afar+                              , ('-', S_WALL_HORIZONTAL_LIT) ] $ PlaceKind   { psymbol  = '/'   , pname    = "a staircase"   , pfreq    = [(TINY_STAIRCASE, 1)]  -- no cover when arriving; low freq@@ -586,14 +612,8 @@   , pfence   = FGround   , ptopLeft = [ "<·>"                ]-  , poverrideDark = [ ('<', STAIRCASE_UP), ('>', STAIRCASE_DOWN)-                    , ('I', SIGNBOARD)-                    , ('|', S_WALL_LIT), ('-', S_WALL_HORIZONTAL_LIT) ]-                      -- seen from afar-  , poverrideLit = [ ('<', STAIRCASE_UP), ('>', STAIRCASE_DOWN)-                   , ('I', SIGNBOARD)-                   , ('|', S_WALL_LIT), ('-', S_WALL_HORIZONTAL_LIT) ]-                     -- seen from afar+  , plegendDark = defaultLegendDark+  , plegendLit = defaultLegendLit   } staircase1 = staircase   { prarity  = [(1, 1)]  -- no cover when arriving; so low rarity@@ -967,74 +987,54 @@   }  switchStaircaseToUp :: PlaceKind -> PlaceKind-switchStaircaseToUp s = s- { psymbol   = '<'- , pname     = pname s <+> "up"- , pfreq     = map (\(t, k) -> (GroupName $ fromGroupName t <+> "up", k))-               $ pfreq s- , poverrideDark = ('>', STAIR_TERMINAL_DARK)-                   : filter ((/= '>') . fst) (poverrideDark s)- , poverrideLit = ('>', STAIR_TERMINAL_LIT)-                  : filter ((/= '>') . fst) (poverrideLit s)- }+switchStaircaseToUp s = override2PlaceKind [('>', STAIR_TERMINAL_DARK)]+                                           [('>', STAIR_TERMINAL_LIT)] $ s+  { psymbol   = '<'+  , pname     = pname s <+> "up"+  , pfreq     = renameFreqs (<+> "up") $ pfreq s+  }  switchStaircaseToDown :: PlaceKind -> PlaceKind-switchStaircaseToDown s = s- { psymbol   = '>'- , pname     = pname s <+> "down"- , pfreq     = map (\(t, k) -> (GroupName $ fromGroupName t <+> "down", k))-               $ pfreq s- , poverrideDark = ('<', STAIR_TERMINAL_DARK)-                   : filter ((/= '<') . fst) (poverrideDark s)- , poverrideLit = ('<', STAIR_TERMINAL_LIT)-                  : filter ((/= '<') . fst) (poverrideLit s)- }+switchStaircaseToDown s = override2PlaceKind [('<', STAIR_TERMINAL_DARK)]+                                             [('<', STAIR_TERMINAL_LIT)] $ s+  { psymbol   = '>'+  , pname     = pname s <+> "down"+  , pfreq     = renameFreqs (<+> "down") $ pfreq s+  }  overrideGated :: [(Char, GroupName TileKind)] overrideGated =   [ ('<', GATED_STAIRCASE_UP), ('>', GATED_STAIRCASE_DOWN)-  , ('I', SIGNBOARD)   , ('|', S_WALL_LIT), ('-', S_WALL_HORIZONTAL_LIT) ]  -- visible from afar  switchStaircaseToGated :: PlaceKind -> PlaceKind-switchStaircaseToGated s = s- { psymbol   = 'g'- , pname     = T.unwords $ "a gated" : tail (T.words (pname s))- , pfreq     = map (first (\t -> GroupName $ "gated" <+> fromGroupName t))-               $ pfreq s- , poverrideDark = overrideGated- , poverrideLit = overrideGated- }+switchStaircaseToGated s = overridePlaceKind overrideGated $ s+  { psymbol   = 'g'+  , pname     = T.unwords $ "a gated" : tail (T.words (pname s))+  , pfreq     = renameFreqs ("gated" <+>) $ pfreq s+  }  overrideOutdoor :: [(Char, GroupName TileKind)] overrideOutdoor =   [ ('<', STAIRCASE_OUTDOOR_UP), ('>', STAIRCASE_OUTDOOR_DOWN)-  , ('I', SIGNBOARD)   , ('|', S_WALL_LIT), ('-', S_WALL_HORIZONTAL_LIT) ]  -- visible from afar  switchStaircaseToOutdoor :: PlaceKind -> PlaceKind-switchStaircaseToOutdoor s = s- { psymbol   = 'o'- , pname     = "an outdoor area exit"- , pfreq     = map (first (\t -> GroupName $ "outdoor" <+> fromGroupName t))-               $ pfreq s- , poverrideDark = overrideOutdoor- , poverrideLit = overrideOutdoor- }+switchStaircaseToOutdoor s = overridePlaceKind overrideOutdoor $ s+  { psymbol   = 'o'+  , pname     = "an outdoor area exit"+  , pfreq     = renameFreqs ("outdoor" <+>) $ pfreq s+  }  switchEscapeToUp :: PlaceKind -> PlaceKind-switchEscapeToUp s = s- { psymbol   = '<'- , pname     = "an escape up"- , pfreq     = map (\(_, n) -> (INDOOR_ESCAPE_UP, n)) $ pfreq s- , poverrideDark = ('>', ESCAPE_UP) : poverrideDark s- , poverrideLit = ('>', ESCAPE_UP) : poverrideLit s- }+switchEscapeToUp s = overridePlaceKind [('>', ESCAPE_UP)] $ s+  { psymbol   = '<'+  , pname     = "an escape up"+  , pfreq     = map (\(_, n) -> (INDOOR_ESCAPE_UP, n)) $ pfreq s+  }  switchEscapeToOutdoorDown :: PlaceKind -> PlaceKind-switchEscapeToOutdoorDown s = s- { pname     = "outdoor escape route"- , pfreq     = map (\(_, n) -> (OUTDOOR_ESCAPE_DOWN, n)) $ pfreq s- , poverrideDark = ('>', ESCAPE_OUTDOOR_DOWN) : poverrideDark s- , poverrideLit = ('>', ESCAPE_OUTDOOR_DOWN) : poverrideLit s- }+switchEscapeToOutdoorDown s = overridePlaceKind [('>', ESCAPE_OUTDOOR_DOWN)] $ s+  { pname     = "outdoor escape route"+  , pfreq     = map (\(_, n) -> (OUTDOOR_ESCAPE_DOWN, n)) $ pfreq s+  }

@@ -18,13 +18,15 @@ -- Cabal import qualified Paths_LambdaHack as Self (version) +import Game.LambdaHack.Content.ItemKind (ItemSymbolsUsedInEngine (..)) import Game.LambdaHack.Content.RuleKind+import Game.LambdaHack.Definition.DefsInternal  standardRules :: RuleContent standardRules = RuleContent   { rtitle = "LambdaHack"-  , rXmax = 80-  , rYmax = 21+  , rWidthMax = 80+  , rHeightMax = 21   , rexeVersion = Self.version   -- The strings containing the default configuration file   -- included from config.ui.default.@@ -45,5 +47,31 @@   , rscoresFile = "LambdaHack.scores"   , rnearby = 20   , rstairWordCarried = ["staircase"]  -- only one, so inert-  , rsymbolProjectile = '|'+  , ritemSymbols = ItemSymbolsUsedInEngine+      { rsymbolProjectile = toContentSymbol '|'+      , rsymbolLight      = toContentSymbol '('+      , rsymbolTool       = toContentSymbol '('+      , rsymbolSpecial    = toContentSymbol '*'+                              -- don't overuse; it clashes with projectiles+      , rsymbolGold       = toContentSymbol '$'+                              -- also gems+      , rsymbolNecklace   = toContentSymbol '"'+      , rsymbolRing       = toContentSymbol '='+      , rsymbolPotion     = toContentSymbol '!'+                              -- also concoction, bottle, jar, vial+      , rsymbolFlask      = toContentSymbol '!'+      , rsymbolScroll     = toContentSymbol '?'+                              -- also book, note, tablet, card+      , rsymbolTorsoArmor = toContentSymbol '['+      , rsymbolMiscArmor  = toContentSymbol '['+      , rsymbolClothes    = toContentSymbol '['+      , rsymbolShield     = toContentSymbol ']'+      , rsymbolPolearm    = toContentSymbol ')'+      , rsymbolEdged      = toContentSymbol ')'+      , rsymbolHafted     = toContentSymbol ')'+      , rsymbolWand       = toContentSymbol '/'+                              -- also magical rod, pistol, instrument+      , rsymbolFood       = toContentSymbol ','+          -- also body part; distinct enough from floor, which is middle dot+      }   }

@@ -6,8 +6,8 @@     pattern FILLER_WALL, pattern FLOOR_CORRIDOR_LIT, pattern FLOOR_CORRIDOR_DARK, pattern TRAIL_LIT, pattern SAFE_TRAIL_LIT, pattern LAB_TRAIL_LIT, pattern DAMP_FLOOR_LIT, pattern DAMP_FLOOR_DARK, pattern OUTDOOR_OUTER_FENCE, pattern DIRT_LIT, pattern DIRT_DARK, pattern FLOOR_ARENA_LIT, pattern FLOOR_ARENA_DARK   , pattern EMPTY_SET_LIT, pattern EMPTY_SET_DARK, pattern NOISE_SET_LIT, pattern POWER_SET_LIT, pattern POWER_SET_DARK, pattern BATTLE_SET_LIT, pattern BATTLE_SET_DARK, pattern BRAWL_SET_LIT, pattern SHOOTOUT_SET_LIT, pattern ZOO_SET_LIT, pattern ZOO_SET_DARK, pattern ESCAPE_SET_LIT, pattern ESCAPE_SET_DARK, pattern AMBUSH_SET_LIT, pattern AMBUSH_SET_DARK, pattern ARENA_SET_LIT, pattern ARENA_SET_DARK     -- ** Used in PlaceKind, but not in CaveKind.-  , pattern RECT_WINDOWS_VERTICAL_LIT, pattern RECT_WINDOWS_VERTICAL_DARK, pattern RECT_WINDOWS_HORIZONTAL_LIT, pattern RECT_WINDOWS_HORIZONTAL_DARK, pattern TREE_SHADE_WALKABLE_LIT, pattern TREE_SHADE_WALKABLE_DARK, pattern SMOKE_CLUMP_LIT, pattern SMOKE_CLUMP_DARK, pattern GLASSHOUSE_VERTICAL_LIT, pattern GLASSHOUSE_VERTICAL_DARK, pattern GLASSHOUSE_HORIZONTAL_LIT, pattern GLASSHOUSE_HORIZONTAL_DARK, pattern BUSH_CLUMP_LIT, pattern BUSH_CLUMP_DARK, pattern FOG_CLUMP_LIT, pattern FOG_CLUMP_DARK, pattern STAIR_TERMINAL_LIT, pattern STAIR_TERMINAL_DARK, pattern CACHE, pattern SIGNBOARD, pattern STAIRCASE_UP, pattern ORDINARY_STAIRCASE_UP, pattern STAIRCASE_OUTDOOR_UP, pattern GATED_STAIRCASE_UP, pattern STAIRCASE_DOWN, pattern ORDINARY_STAIRCASE_DOWN, pattern STAIRCASE_OUTDOOR_DOWN, pattern GATED_STAIRCASE_DOWN, pattern ESCAPE_UP, pattern ESCAPE_DOWN, pattern ESCAPE_OUTDOOR_DOWN-  , pattern S_LAMP_POST, pattern S_TREE_LIT, pattern S_TREE_DARK, pattern S_WALL_LIT, pattern S_WALL_HORIZONTAL_LIT, pattern S_PULPIT, pattern S_BUSH_LIT, pattern S_FOG_LIT, pattern S_SMOKE_LIT, pattern S_FLOOR_ACTOR_LIT, pattern S_FLOOR_ACTOR_DARK, pattern S_FLOOR_ASHES_LIT, pattern S_FLOOR_ASHES_DARK, pattern S_SHADED_GROUND+  , pattern RECT_WINDOWS_VERTICAL_LIT, pattern RECT_WINDOWS_VERTICAL_DARK, pattern RECT_WINDOWS_HORIZONTAL_LIT, pattern RECT_WINDOWS_HORIZONTAL_DARK, pattern TREE_SHADE_WALKABLE_LIT, pattern TREE_SHADE_WALKABLE_DARK, pattern SMOKE_CLUMP_LIT, pattern SMOKE_CLUMP_DARK, pattern GLASSHOUSE_VERTICAL_LIT, pattern GLASSHOUSE_VERTICAL_DARK, pattern GLASSHOUSE_HORIZONTAL_LIT, pattern GLASSHOUSE_HORIZONTAL_DARK, pattern BUSH_CLUMP_LIT, pattern BUSH_CLUMP_DARK, pattern FOG_CLUMP_LIT, pattern FOG_CLUMP_DARK, pattern STAIR_TERMINAL_LIT, pattern STAIR_TERMINAL_DARK, pattern CACHE, pattern SIGNBOARD, pattern STAIRCASE_UP, pattern ORDINARY_STAIRCASE_UP, pattern STAIRCASE_OUTDOOR_UP, pattern GATED_STAIRCASE_UP, pattern STAIRCASE_DOWN, pattern ORDINARY_STAIRCASE_DOWN, pattern STAIRCASE_OUTDOOR_DOWN, pattern GATED_STAIRCASE_DOWN, pattern ESCAPE_UP, pattern ESCAPE_DOWN, pattern ESCAPE_OUTDOOR_DOWN, pattern FLOOR_ACTOR_ITEM_LIT, pattern FLOOR_ACTOR_ITEM_DARK+  , pattern S_PILLAR, pattern S_RUBBLE_PILE, pattern S_LAMP_POST, pattern S_TREE_LIT, pattern S_TREE_DARK, pattern S_WALL_LIT, pattern S_WALL_DARK, pattern S_WALL_HORIZONTAL_LIT, pattern S_WALL_HORIZONTAL_DARK, pattern S_PULPIT, pattern S_BUSH_LIT, pattern S_FOG_LIT, pattern S_SMOKE_LIT, pattern S_FLOOR_ACTOR_LIT, pattern S_FLOOR_ACTOR_DARK, pattern S_FLOOR_ASHES_LIT, pattern S_FLOOR_ASHES_DARK, pattern S_SHADED_GROUND, pattern S_SHALLOW_WATER_LIT, pattern S_SHALLOW_WATER_DARK   , groupNamesSingleton, groupNames     -- * Content   , content@@ -23,6 +23,7 @@ import Game.LambdaHack.Content.TileKind import Game.LambdaHack.Definition.Color import Game.LambdaHack.Definition.Defs+import Game.LambdaHack.Definition.DefsInternal  -- * Group name patterns @@ -30,18 +31,18 @@  groupNamesSingleton :: [GroupName TileKind] groupNamesSingleton =-       [S_LAMP_POST, S_TREE_LIT, S_TREE_DARK, S_WALL_LIT, S_WALL_HORIZONTAL_LIT, S_PULPIT, S_BUSH_LIT, S_FOG_LIT, S_SMOKE_LIT, S_FLOOR_ACTOR_LIT, S_FLOOR_ACTOR_DARK, S_FLOOR_ASHES_LIT, S_FLOOR_ASHES_DARK, S_SHADED_GROUND]-    ++ [S_SUSPECT_VERTICAL_WALL_LIT, S_SUSPECT_HORIZONTAL_WALL_LIT, S_CLOSED_VERTICAL_DOOR_LIT, S_CLOSED_HORIZONTAL_DOOR_LIT, S_OPEN_VERTICAL_DOOR_LIT, S_OPEN_HORIZONTAL_DOOR_LIT, S_RUBBLE_PILE, S_SHALLOW_WATER_LIT, S_SIGNBOARD_UNREAD]-    ++ [S_BUSH_DARK, S_CLOSED_HORIZONTAL_DOOR_DARK, S_CLOSED_VERTICAL_DOOR_DARK, S_OPEN_HORIZONTAL_DOOR_DARK, S_OPEN_VERTICAL_DOOR_DARK, S_SHALLOW_WATER_DARK, S_SUSPECT_HORIZONTAL_WALL_DARK, S_SUSPECT_VERTICAL_WALL_DARK, S_WALL_DARK, S_WALL_HORIZONTAL_DARK]+       [S_PILLAR, S_RUBBLE_PILE, S_LAMP_POST, S_TREE_LIT, S_TREE_DARK, S_WALL_LIT, S_WALL_DARK, S_WALL_HORIZONTAL_LIT, S_WALL_HORIZONTAL_DARK, S_PULPIT, S_BUSH_LIT, S_FOG_LIT, S_SMOKE_LIT, S_FLOOR_ACTOR_LIT, S_FLOOR_ACTOR_DARK, S_FLOOR_ASHES_LIT, S_FLOOR_ASHES_DARK, S_SHADED_GROUND, S_SHALLOW_WATER_LIT, S_SHALLOW_WATER_DARK]+    ++ [S_SUSPECT_VERTICAL_WALL_LIT, S_SUSPECT_HORIZONTAL_WALL_LIT, S_CLOSED_VERTICAL_DOOR_LIT, S_CLOSED_HORIZONTAL_DOOR_LIT, S_OPEN_VERTICAL_DOOR_LIT, S_OPEN_HORIZONTAL_DOOR_LIT, S_SIGNBOARD_UNREAD]+    ++ [S_BUSH_DARK, S_CLOSED_HORIZONTAL_DOOR_DARK, S_CLOSED_VERTICAL_DOOR_DARK, S_OPEN_HORIZONTAL_DOOR_DARK, S_OPEN_VERTICAL_DOOR_DARK, S_SUSPECT_HORIZONTAL_WALL_DARK, S_SUSPECT_VERTICAL_WALL_DARK]  -- ** Used in PlaceKind, but not in CaveKind.-pattern S_LAMP_POST, S_TREE_LIT, S_TREE_DARK, S_WALL_LIT, S_WALL_HORIZONTAL_LIT, S_PULPIT, S_BUSH_LIT, S_FOG_LIT, S_SMOKE_LIT, S_FLOOR_ACTOR_LIT, S_FLOOR_ACTOR_DARK, S_FLOOR_ASHES_LIT, S_FLOOR_ASHES_DARK, S_SHADED_GROUND :: GroupName TileKind+pattern S_PILLAR, S_RUBBLE_PILE, S_LAMP_POST, S_TREE_LIT, S_TREE_DARK, S_WALL_LIT, S_WALL_DARK, S_WALL_HORIZONTAL_LIT, S_WALL_HORIZONTAL_DARK, S_PULPIT, S_BUSH_LIT, S_FOG_LIT, S_SMOKE_LIT, S_FLOOR_ACTOR_LIT, S_FLOOR_ACTOR_DARK, S_FLOOR_ASHES_LIT, S_FLOOR_ASHES_DARK, S_SHADED_GROUND, S_SHALLOW_WATER_LIT, S_SHALLOW_WATER_DARK :: GroupName TileKind  -- ** Used only internally in other TileKind definitions or never used.-pattern S_SUSPECT_VERTICAL_WALL_LIT, S_SUSPECT_HORIZONTAL_WALL_LIT, S_CLOSED_VERTICAL_DOOR_LIT, S_CLOSED_HORIZONTAL_DOOR_LIT, S_OPEN_VERTICAL_DOOR_LIT, S_OPEN_HORIZONTAL_DOOR_LIT, S_RUBBLE_PILE, S_SHALLOW_WATER_LIT, S_SIGNBOARD_UNREAD :: GroupName TileKind+pattern S_SUSPECT_VERTICAL_WALL_LIT, S_SUSPECT_HORIZONTAL_WALL_LIT, S_CLOSED_VERTICAL_DOOR_LIT, S_CLOSED_HORIZONTAL_DOOR_LIT, S_OPEN_VERTICAL_DOOR_LIT, S_OPEN_HORIZONTAL_DOOR_LIT, S_SIGNBOARD_UNREAD :: GroupName TileKind  -- * Not used, but needed, because auto-generated. Singletons.-pattern S_BUSH_DARK, S_CLOSED_HORIZONTAL_DOOR_DARK, S_CLOSED_VERTICAL_DOOR_DARK, S_OPEN_HORIZONTAL_DOOR_DARK, S_OPEN_VERTICAL_DOOR_DARK, S_SHALLOW_WATER_DARK, S_SUSPECT_HORIZONTAL_WALL_DARK, S_SUSPECT_VERTICAL_WALL_DARK, S_WALL_DARK, S_WALL_HORIZONTAL_DARK :: GroupName TileKind+pattern S_BUSH_DARK, S_CLOSED_HORIZONTAL_DOOR_DARK, S_CLOSED_VERTICAL_DOOR_DARK, S_OPEN_HORIZONTAL_DOOR_DARK, S_OPEN_VERTICAL_DOOR_DARK, S_SUSPECT_HORIZONTAL_WALL_DARK, S_SUSPECT_VERTICAL_WALL_DARK :: GroupName TileKind  -- TODO: if we stick to the current system of generating extra kinds and their -- group names, let's also add the generated group names to @groupNames@.@@ -49,7 +50,7 @@ groupNames =        [FILLER_WALL, FLOOR_CORRIDOR_LIT, FLOOR_CORRIDOR_DARK, TRAIL_LIT, SAFE_TRAIL_LIT, LAB_TRAIL_LIT, DAMP_FLOOR_LIT, DAMP_FLOOR_DARK, OUTDOOR_OUTER_FENCE, DIRT_LIT, DIRT_DARK, FLOOR_ARENA_LIT, FLOOR_ARENA_DARK]     ++ [EMPTY_SET_LIT, EMPTY_SET_DARK, NOISE_SET_LIT, POWER_SET_LIT, POWER_SET_DARK, BATTLE_SET_LIT, BATTLE_SET_DARK, BRAWL_SET_LIT, SHOOTOUT_SET_LIT, ZOO_SET_LIT, ZOO_SET_DARK, ESCAPE_SET_LIT, ESCAPE_SET_DARK, AMBUSH_SET_LIT, AMBUSH_SET_DARK, ARENA_SET_LIT, ARENA_SET_DARK]-    ++ [RECT_WINDOWS_VERTICAL_LIT, RECT_WINDOWS_VERTICAL_DARK, RECT_WINDOWS_HORIZONTAL_LIT, RECT_WINDOWS_HORIZONTAL_DARK, TREE_SHADE_WALKABLE_LIT, TREE_SHADE_WALKABLE_DARK, SMOKE_CLUMP_LIT, SMOKE_CLUMP_DARK, GLASSHOUSE_VERTICAL_LIT, GLASSHOUSE_VERTICAL_DARK, GLASSHOUSE_HORIZONTAL_LIT, GLASSHOUSE_HORIZONTAL_DARK, BUSH_CLUMP_LIT, BUSH_CLUMP_DARK, FOG_CLUMP_LIT, FOG_CLUMP_DARK, STAIR_TERMINAL_LIT, STAIR_TERMINAL_DARK, CACHE, SIGNBOARD, STAIRCASE_UP, ORDINARY_STAIRCASE_UP, STAIRCASE_OUTDOOR_UP, GATED_STAIRCASE_UP, STAIRCASE_DOWN, ORDINARY_STAIRCASE_DOWN, STAIRCASE_OUTDOOR_DOWN, GATED_STAIRCASE_DOWN, ESCAPE_UP, ESCAPE_DOWN, ESCAPE_OUTDOOR_DOWN]+    ++ [RECT_WINDOWS_VERTICAL_LIT, RECT_WINDOWS_VERTICAL_DARK, RECT_WINDOWS_HORIZONTAL_LIT, RECT_WINDOWS_HORIZONTAL_DARK, TREE_SHADE_WALKABLE_LIT, TREE_SHADE_WALKABLE_DARK, SMOKE_CLUMP_LIT, SMOKE_CLUMP_DARK, GLASSHOUSE_VERTICAL_LIT, GLASSHOUSE_VERTICAL_DARK, GLASSHOUSE_HORIZONTAL_LIT, GLASSHOUSE_HORIZONTAL_DARK, BUSH_CLUMP_LIT, BUSH_CLUMP_DARK, FOG_CLUMP_LIT, FOG_CLUMP_DARK, STAIR_TERMINAL_LIT, STAIR_TERMINAL_DARK, CACHE, SIGNBOARD, STAIRCASE_UP, ORDINARY_STAIRCASE_UP, STAIRCASE_OUTDOOR_UP, GATED_STAIRCASE_UP, STAIRCASE_DOWN, ORDINARY_STAIRCASE_DOWN, STAIRCASE_OUTDOOR_DOWN, GATED_STAIRCASE_DOWN, ESCAPE_UP, ESCAPE_DOWN, ESCAPE_OUTDOOR_DOWN, FLOOR_ACTOR_ITEM_LIT, FLOOR_ACTOR_ITEM_DARK]     ++ [OBSCURED_VERTICAL_WALL_LIT, OBSCURED_HORIZONTAL_WALL_LIT, TRAPPED_VERTICAL_DOOR_LIT, TRAPPED_HORIZONAL_DOOR_LIT, TREE_BURNING_OR_NOT, BUSH_BURNING_OR_NOT, CACHE_OR_NOT]     ++ [BRAWL_SET_DARK, NOISE_SET_DARK, OBSCURED_HORIZONTAL_WALL_DARK, OBSCURED_VERTICAL_WALL_DARK, SHOOTOUT_SET_DARK, TRAPPED_HORIZONAL_DOOR_DARK, TRAPPED_VERTICAL_DOOR_DARK] @@ -58,7 +59,7 @@ pattern EMPTY_SET_LIT, EMPTY_SET_DARK, NOISE_SET_LIT, POWER_SET_LIT, POWER_SET_DARK, BATTLE_SET_LIT, BATTLE_SET_DARK, BRAWL_SET_LIT, SHOOTOUT_SET_LIT, ZOO_SET_LIT, ZOO_SET_DARK, ESCAPE_SET_LIT, ESCAPE_SET_DARK, AMBUSH_SET_LIT, AMBUSH_SET_DARK, ARENA_SET_LIT, ARENA_SET_DARK :: GroupName TileKind  -- ** Used in PlaceKind, but not in CaveKind.-pattern RECT_WINDOWS_VERTICAL_LIT, RECT_WINDOWS_VERTICAL_DARK, RECT_WINDOWS_HORIZONTAL_LIT, RECT_WINDOWS_HORIZONTAL_DARK, TREE_SHADE_WALKABLE_LIT, TREE_SHADE_WALKABLE_DARK, SMOKE_CLUMP_LIT, SMOKE_CLUMP_DARK, GLASSHOUSE_VERTICAL_LIT, GLASSHOUSE_VERTICAL_DARK, GLASSHOUSE_HORIZONTAL_LIT, GLASSHOUSE_HORIZONTAL_DARK, BUSH_CLUMP_LIT, BUSH_CLUMP_DARK, FOG_CLUMP_LIT, FOG_CLUMP_DARK, STAIR_TERMINAL_LIT, STAIR_TERMINAL_DARK, CACHE, SIGNBOARD, STAIRCASE_UP, ORDINARY_STAIRCASE_UP, STAIRCASE_OUTDOOR_UP, GATED_STAIRCASE_UP, STAIRCASE_DOWN, ORDINARY_STAIRCASE_DOWN, STAIRCASE_OUTDOOR_DOWN, GATED_STAIRCASE_DOWN, ESCAPE_UP, ESCAPE_DOWN, ESCAPE_OUTDOOR_DOWN :: GroupName TileKind+pattern RECT_WINDOWS_VERTICAL_LIT, RECT_WINDOWS_VERTICAL_DARK, RECT_WINDOWS_HORIZONTAL_LIT, RECT_WINDOWS_HORIZONTAL_DARK, TREE_SHADE_WALKABLE_LIT, TREE_SHADE_WALKABLE_DARK, SMOKE_CLUMP_LIT, SMOKE_CLUMP_DARK, GLASSHOUSE_VERTICAL_LIT, GLASSHOUSE_VERTICAL_DARK, GLASSHOUSE_HORIZONTAL_LIT, GLASSHOUSE_HORIZONTAL_DARK, BUSH_CLUMP_LIT, BUSH_CLUMP_DARK, FOG_CLUMP_LIT, FOG_CLUMP_DARK, STAIR_TERMINAL_LIT, STAIR_TERMINAL_DARK, CACHE, SIGNBOARD, STAIRCASE_UP, ORDINARY_STAIRCASE_UP, STAIRCASE_OUTDOOR_UP, GATED_STAIRCASE_UP, STAIRCASE_DOWN, ORDINARY_STAIRCASE_DOWN, STAIRCASE_OUTDOOR_DOWN, GATED_STAIRCASE_DOWN, ESCAPE_UP, ESCAPE_DOWN, ESCAPE_OUTDOOR_DOWN, FLOOR_ACTOR_ITEM_LIT, FLOOR_ACTOR_ITEM_DARK :: GroupName TileKind  -- ** Used only internally in other TileKind definitions or never used. pattern OBSCURED_VERTICAL_WALL_LIT, OBSCURED_HORIZONTAL_WALL_LIT, TRAPPED_VERTICAL_DOOR_LIT, TRAPPED_HORIZONAL_DOOR_LIT, TREE_BURNING_OR_NOT, BUSH_BURNING_OR_NOT, CACHE_OR_NOT :: GroupName TileKind@@ -135,13 +136,19 @@ pattern ESCAPE_UP = GroupName "escape up" pattern ESCAPE_DOWN = GroupName "escape down" pattern ESCAPE_OUTDOOR_DOWN = GroupName "escape outdoor down"+pattern FLOOR_ACTOR_ITEM_LIT = GroupName "floorActorItemLit"+pattern FLOOR_ACTOR_ITEM_DARK = GroupName "floorActorItemDark"  -- ** Used in PlaceKind, but not in CaveKind. Singletons.+pattern S_PILLAR = GroupName "pillar"+pattern S_RUBBLE_PILE = GroupName "rubble pile" pattern S_LAMP_POST = GroupName "lamp post" pattern S_TREE_LIT = GroupName "tree Lit" pattern S_TREE_DARK = GroupName "tree Dark" pattern S_WALL_LIT = GroupName "wall Lit"+pattern S_WALL_DARK = GroupName "wall Dark" pattern S_WALL_HORIZONTAL_LIT = GroupName "wall horizontal Lit"+pattern S_WALL_HORIZONTAL_DARK = GroupName "wall horizontal Dark" pattern S_PULPIT = GroupName "pulpit" pattern S_BUSH_LIT = GroupName "bush Lit" pattern S_FOG_LIT = GroupName "fog Lit"@@ -151,6 +158,8 @@ pattern S_FLOOR_ASHES_LIT = GroupName "floor with ashes Lit" pattern S_FLOOR_ASHES_DARK = GroupName "floor with ashes Dark" pattern S_SHADED_GROUND = GroupName "shaded ground"+pattern S_SHALLOW_WATER_LIT = GroupName "shallow water Lit"+pattern S_SHALLOW_WATER_DARK = GroupName "shallow water Dark"  -- ** Used only internally in other TileKind definitions. Not singletons. pattern OBSCURED_VERTICAL_WALL_LIT = GroupName "obscured vertical wall Lit"@@ -168,8 +177,6 @@ pattern S_CLOSED_HORIZONTAL_DOOR_LIT = GroupName "closed horizontal door Lit" pattern S_OPEN_VERTICAL_DOOR_LIT = GroupName "open vertical door Lit" pattern S_OPEN_HORIZONTAL_DOOR_LIT = GroupName "open horizontal door Lit"-pattern S_RUBBLE_PILE = GroupName "rubble pile"-pattern S_SHALLOW_WATER_LIT = GroupName "shallow water Lit" pattern S_SIGNBOARD_UNREAD = GroupName "signboard unread"  -- * Not used, but needed, because auto-generated. Not singletons.@@ -190,12 +197,9 @@ pattern S_CLOSED_VERTICAL_DOOR_DARK = GroupName "closed vertical door Dark" pattern S_OPEN_HORIZONTAL_DOOR_DARK = GroupName "open horizontal door Dark" pattern S_OPEN_VERTICAL_DOOR_DARK = GroupName "open vertical door Dark"-pattern S_SHALLOW_WATER_DARK = GroupName "shallow water Dark" pattern S_SUSPECT_HORIZONTAL_WALL_DARK =   GroupName "suspect horizontal wall Dark" pattern S_SUSPECT_VERTICAL_WALL_DARK = GroupName "suspect vertical wall Dark"-pattern S_WALL_DARK = GroupName "wall Dark"-pattern S_WALL_HORIZONTAL_DARK = GroupName "wall horizontal Dark"  -- * Content @@ -270,7 +274,7 @@ bedrock = TileKind   { tsymbol  = ' '   , tname    = "bedrock"-  , tfreq    = [(FILLER_WALL, 1), (LEGEND_LIT, 100), (LEGEND_DARK, 100)]+  , tfreq    = [(FILLER_WALL, 1)]   , tcolor   = defFG   , tcolor2  = defFG   , talter   = 100@@ -290,7 +294,7 @@ wall = TileKind   { tsymbol  = '|'   , tname    = "granite wall"-  , tfreq    = [ (LEGEND_LIT, 100), (S_WALL_LIT, 100)+  , tfreq    = [ (S_WALL_LIT, 100)                , (RECT_WINDOWS_VERTICAL_LIT, 80) ]   , tcolor   = BrWhite   , tcolor2  = defFG@@ -322,7 +326,7 @@ wallH = TileKind   { tsymbol  = '-'   , tname    = "sandstone wall"-  , tfreq    = [ (LEGEND_LIT, 100), (S_WALL_HORIZONTAL_LIT, 100)+  , tfreq    = [ (S_WALL_HORIZONTAL_LIT, 100)                , (RECT_WINDOWS_HORIZONTAL_LIT, 80) ]   , tcolor   = BrWhite   , tcolor2  = defFG@@ -366,9 +370,8 @@ pillar = TileKind   { tsymbol  = '0'   , tname    = "rock outcrop"-  , tfreq    = [ (CACHE_OR_NOT, 70)+  , tfreq    = [ (S_PILLAR, 1), (CACHE_OR_NOT, 70)                , (STAIR_TERMINAL_LIT, 100), (STAIR_TERMINAL_DARK, 100)-               , (LEGEND_LIT, 100), (LEGEND_DARK, 100)                , (EMPTY_SET_LIT, 20), (NOISE_SET_LIT, 700)                , (POWER_SET_DARK, 700)                , (BATTLE_SET_DARK, 200), (BRAWL_SET_LIT, 50)@@ -453,7 +456,7 @@ rubble = TileKind   { tsymbol  = '&'   , tname    = "rubble pile"-  , tfreq    = [ (S_RUBBLE_PILE, 1), (LEGEND_LIT, 1), (LEGEND_DARK, 1)+  , tfreq    = [ (S_RUBBLE_PILE, 1)                , (STAIR_TERMINAL_LIT, 4), (STAIR_TERMINAL_DARK, 4)                , (EMPTY_SET_LIT, 10), (EMPTY_SET_DARK, 10)                , (NOISE_SET_LIT, 50), (POWER_SET_DARK, 50)@@ -571,7 +574,7 @@ escapeUp = TileKind   { tsymbol  = '<'   , tname    = "exit hatch up"-  , tfreq    = [(LEGEND_LIT, 1), (LEGEND_DARK, 1), (ESCAPE_UP, 1)]+  , tfreq    = [(ESCAPE_UP, 1)]   , tcolor   = BrYellow   , tcolor2  = BrYellow   , talter   = 0  -- anybody can escape (or guard escape)@@ -580,7 +583,7 @@ escapeDown = TileKind   { tsymbol  = '>'   , tname    = "exit trapdoor down"-  , tfreq    = [(LEGEND_LIT, 1), (LEGEND_DARK, 1), (ESCAPE_DOWN, 1)]+  , tfreq    = [(ESCAPE_DOWN, 1)]   , tcolor   = BrYellow   , tcolor2  = BrYellow   , talter   = 0  -- anybody can escape (or guard escape)@@ -769,7 +772,7 @@   , tfeature = OftenActor : tfeature floorArena   } floorActorItem = floorActor-  { tfreq    = [(LEGEND_LIT, 100)]+  { tfreq    = [(FLOOR_ACTOR_ITEM_LIT, 1)]   , tfeature = VeryOftenItem : tfeature floorActor   } floorAshes = floorActor@@ -782,7 +785,7 @@ shallowWater = TileKind   { tsymbol  = '~'   , tname    = "water puddle"-  , tfreq    = [ (S_SHALLOW_WATER_LIT, 1), (LEGEND_LIT, 100)+  , tfreq    = [ (S_SHALLOW_WATER_LIT, 1)                , (EMPTY_SET_LIT, 5), (NOISE_SET_LIT, 20)                , (POWER_SET_LIT, 20), (SHOOTOUT_SET_LIT, 5) ]   , tcolor   = BrCyan

@@ -0,0 +1,179 @@+This is a snapshot of in-game help, rendered with the default config file.+For more general gameplay information see+https://github.com/LambdaHack/LambdaHack/blob/master/GameDefinition/PLAYING.md+++ Minimal cheat sheet for casual play++ Walk throughout a level with mouse or numeric keypad (right diagram below)+ or the Vi editor keys (middle) or the left-hand movement keys (left). Run until+ disturbed with Shift or Control. Go-to a position with LMB (left mouse button).+ In aiming mode, the same keys (and mouse) move the aiming crosshair.++      q w e     y k u     7 8 9+       \|/       \|/       \|/+      a-s-d     h-.-l     4-5-6+       /|\       /|\       /|\+      z x c     b j n     1 2 3++ Press `KP_5` (`5` on keypad) to wait, bracing for impact, which reduces any+ damage taken and prevents displacement by foes. Press `S-KP_5` or `C-KP_5`+ (the same key with Shift or Control) to lurk 0.1 of a turn, without bracing.++ Displace enemies by running into them with Shift/Control or S-LMB. Search,+ open, descend and melee by bumping into walls, doors, stairs and enemies.+ The best, and not on cooldown, melee weapon is automatically chosen+ for attack from your equipment and from among your body parts.++ The following few commands, joined with the movement and running keys,+ let you accomplish almost anything in the game, though not necessarily+ with the fewest keystrokes. You can also play the game exclusively+ with a mouse, or both mouse and keyboard (e.g., mouse for go-to+ and terrain inspection and keyboard for everything else). Lastly,+ you can select a command with arrows or mouse directly from the help+ screen or the dashboard and execute it on the spot.++  keys         command+  I            manage the shared inventory stash+  g or ,       grab item(s)+  ESC          clear messages/open main menu/finish aiming+  RET or INS   open dashboard/accept target+  SPACE        clear messages/show history/cycle detail level+  TAB          cycle among all party members+  *            cycle crosshair among enemies+  /            cycle crosshair among items+  M            modify any admissible terrain+  %            yell or yawn and stop sleeping+++ Optional mouse commands++ Screen area and UI mode (exploration/aiming) determine mouse click+ effects. Here we give an overview of effects of each button over+ the game map area. The list includes not only left and right buttons,+ but also the optional middle mouse button (MMB) and the mouse wheel,+ which is also used over menus to move selection. For mice without RMB,+ one can use Control key with LMB and for mice without MMB, one can use+ C-RMB or C-S-LMB.++  keys         command (exploration/aiming)+  LMB          go to pointer for 25 steps/fling at enemy+  S-LMB        run to pointer collectively for 25 steps/fling at enemy+  RMB or C-LMB start aiming at enemy under pointer/cycle detail level+  S-RMB        modify terrain at pointer+  MMB or C-RMB snap crosshair to floor under pointer/cycle detail level+  WHEEL-UP     swerve the aiming line+  WHEEL-DN     unswerve the aiming line++ Note that mouse is optional. Keyboard suffices, occasionally requiring+ a lookup for an obscure command key in help screens.+++ Mouse button effects per screen area, in exploration and in aiming modes++  Exploration    LMB (left mouse button)         RMB (right mouse button)+  message line   show history                    display help+  pointman tile  grab item(s)                    remove item(s)+  party on map   pick new pointman on screen     select party member on screen+  the map area   go to pointer for 25 steps      set crosshair to enemy+  level number   move aiming one level up        move aiming one level down+  level caption  open dashboard                  clear msgs and open main menu+  percent seen   explore nearest unknown spot    autoexplore 25 times+  crosshair info cycle crosshair among enemies   cycle crosshair among items+  party roster   pick new pointman on screen     select party member on screen+  Calm value     yell or yawn and stop sleeping  yell or yawn and stop sleeping+  HP gauge       rest (wait 25 times)            heed (lurk 0.1 turns 100 times)+  HP value       wait a turn, bracing for impact lurk 0.1 of a turn+  pointman info  auto-fling and keep choice      clear chosen item and crosshair++  Aiming Mode    LMB (left mouse button)         RMB (right mouse button)+  the map area   fling at enemy under pointer    snap crosshair to enemy+  level caption  accept target                   cancel aiming+  percent seen   aim at nearest upstairs         aim at nearest downstairs+++ All item-related commands++  keys         command+  I            manage the shared inventory stash+  O            manage the equipment outfit of the pointman+  g or ,       grab item(s)+  r            remove item(s)+  f            fling in-range projectile+  C-f          auto-fling and keep choice+  t            trigger consumable item+  C-t          trigger item and keep choice+  i            stash item into shared inventory+  o            equip item into outfit of the pointman+  G            manage items on the ground+  T            manage our total team belongings++ Note how lower case item commands (stash item, equip item) place items+ into a particular item store, while upper case item commands (manage Inventory,+ manage Outfit) open management menu for a store. Once a store menu is opened,+ you can switch stores with `<` and `>`, so the multiple commands only determine+ the starting item store. Each store is accessible from the dashboard as well.+++ Terrain exploration and modification commands++  keys         command+  TAB          cycle among all party members+  S-TAB        cycle backwards among all party members+  C-TAB        cycle among party members on the level+  C-S-TAB      cycle backwards among party members on the level+  m            modify door by closing it+  M            modify any admissible terrain+  =            select (or deselect) party member+  _            deselect (or select) all on the level+  ;            go to crosshair for 25 steps+  :            run to crosshair collectively for 25 steps+  [            explore nearest unknown spot+  ]            autoexplore 25 times+  R            rest (wait 25 times)+  C-R          heed (lurk 0.1 turns 100 times)+  0, 1 ... 9   pick a particular actor as the new pointman+++ All aiming commands++  keys         command+  ESC          clear messages/open main menu/finish aiming+  RET or INS   open dashboard/accept target+  SPACE        clear messages/show history/cycle detail level+  *            cycle crosshair among enemies+  /            cycle crosshair among items+  +            swerve the aiming line+  -            unswerve the aiming line+  \            cycle aiming modes+  C-?          set crosshair to nearest unknown spot+  C-/          set crosshair to nearest item+  C-{          aim at nearest upstairs+  C-}          aim at nearest downstairs+  <            move aiming one level up+  >            move aiming one level down+  BACKSPACE    clear chosen item and crosshair+++ Assorted commands++  keys         command+  %            yell or yawn and stop sleeping+  @            describe organs of the pointman+  #            show skill summary of the pointman+  ~            display relevant lore+  C-g          start new game+  C-x          save and exit to desktop+  C-q          quit game and start autoplay+  C-c          exit to desktop without saving+  ?            display help+  F1           display help immediately+  F12          open dashboard+  v            voice last action again+  V            voice recorded macro again+  '            start recording commands+  C-S          save game backup+  C-P          print screen+++ For more playing instructions see file PLAYING.md.

@@ -56,13 +56,9 @@   -- because they are not the source of the failure.   !serverOptions <- OA.execParser serverOptionsPI   resOrEx :: Either Ex.SomeException () <- Ex.try $ tieKnot serverOptions-  let unwrapEx e =-#if MIN_VERSION_async(2,2,1)-        case Ex.fromException e of-          Just (ExceptionInLinkedThread _ ex) -> unwrapEx ex-          _ ->-#endif-               e+  let unwrapEx e = case Ex.fromException e of+        Just (ExceptionInLinkedThread _ ex) -> unwrapEx ex+        _ -> e   case resOrEx of     Right () -> return ()     Left e -> case Ex.fromException $ unwrapEx e of

@@ -48,13 +48,13 @@   or shot down; less so explosions that are swarms of projectile particles   (turn-based just the same) * time passes and factions pursue their goals on a few levels-  simultaneously, while other levels are frozen (but all are persistent)+  simultaneously, while other floors are frozen (but all are persistent) * the same laws of simulated world apply to all factions and all actors,   whether player-controlled or AI-controlled; e.g., the same field of view   calculation, skill checks, equipment limitations, rules for item   and terrain use * combat mechanics is deterministic; randomness comes only from AI-  decisions and procedurally generated terrain+  decisions and procedurally generated world * there's (almost) no HP regeneration; attrition ensures all past (silly)   decisions matter; HP of every actor starts at around half max * each character has 10 uniform equipment slots, which fill quickly given@@ -77,29 +77,16 @@  Commands for starting a new game, saving and exiting the current game, configuring convenience settings and toggling AI control of the party-are listed in the main menu, brought up by the Esc key. Of the convenience-settings, the `suspect terrain` choice is of particular interest,-because it determines not only screen display of the level map,+are listed in the main menu, brought up by the Esc key.+Game difficulty level, from the new game setup menu, determines how hard+the survival in the game is. Each of the several named optional challenges+make the game additionally much harder, but usually simpler, as well.+Of the convenience settings, the `suspect terrain` choice is of particular+interest, because it determines not only screen display of the floor map, but also whether suspect tiles are considered for mouse go-to, auto-explore and for the `C-?` command that marks the nearest unexplored position.-Game difficulty, from the game setup menu, determines hitpoints at birth:-difficulty below 5 multiplies hitpoints of player characters, difficulty-over 5 multiplies hitpoints of their enemies. Each of the several named-optional challenges make the game much harder, but usually simpler, as well. -The "cold fish" challenge mode makes it impossible for player-characters to be healed by actors from other factions (this is-a significant restriction in the long crawl adventure).-The "ready goods" challenge mode disables crafting for the player,-which is however not a part of the LambdaHack game, so has no effect.-The "lone wolf" challenge mode reduces player's starting actors-to exactly one, though later on new heroes may join the party.-The "finder keeper" completely disables flinging projectiles-by the player, which affects not only ranged damage dealing,-but also throwing of consumables that buff teammates engaged in melee combat,-weaken and distract enemies, light dark corners, etc.--The game scenarios, as ordered by their number, lead the player along+Game scenarios, as ordered by their number, lead the player along an optional story arc. The first two adventures double as tutorials that offer rudimentary preparation for the main game, the long crawl. They gradually introduce exploration, stealth and melee combat,@@ -109,21 +96,22 @@ with hints about strategies known to work in the given tactical context. Alternatively, the player may postpone reading these messages and instead try to puzzle out the tactics himself --- this is not so hard, as there are-not so many moving parts to figure, at least in the short adventures.+not yet so many moving parts to figure out in the first two adventures. -As soon as the player learns to navigate initial levels of the crawl game-and starts employing ranged combat, light sources and other means-of gaining or denying battlefield intel, and dies a lot, it makes sense-to return to the remaining short adventures. They bring forth many extra-game features and tactics and prevent the player from missing half the fun-by trying to play the crawl just like a normal roguelike with spare heroes.+In the third scenario, the main 'crawl' game mode, the player starts+employing ranged combat, stealth, light sources, item and terrain alteration.+As soon as the player learns to navigate the initial levels of crawl,+but still dies a lot, it makes sense to return to the remaining+short adventures. They bring forth many extra game features+and tactics and prevent the player from missing half the fun by trying+to play the crawl just like a normal roguelike with spare heroes. The extra scenarios continue the plotline from the initial tutorial adventures in the form of flashbacks and eventually lead up to the events that start the main crawl adventure. The training they provide has narrow focus, drilling a particular skill set, even as exotic as opportunity fire-management, a frantic race to the exit and big asymmetric melee battle.+management, a frantic race to the exit and big asymmetric melee battles. The challenge the scenarios offer may be, accordingly, quite extreme,-particularly at higher difficulty levels and when striving for high scores.+particularly at higher difficulty settings and when striving for high scores.  The main adventure, the long crawl, is the only one that takes place in a multi-floor setting, requiring lots of time to beat.@@ -131,16 +119,15 @@ including terrain transformation using tools, spotting environment clues and guessing and countering opponents' strategies. The player has a choice of exploring a single level at a time or portions-of many levels along a single staircase. On some levels he may explore+of many floors along a single staircase. On some levels he may explore and loot with a single scout, eluding most opponents. On others he may be-forced to change the pace and perform a complete exterminatory sweep+forced to change pace and perform a complete exterminatory sweep involving his whole party. On yet others, his best course of action may be to defend a key location until the first wave of attackers is broken. The large game arena calls for strategic thinking, including resource-management, frantic races to the exit, big asymmetric melee battles.-Thus, the crawl scenario is the most replayable adventure, but even the small-ones can be refreshed by striving to beat a high score and then-ramping up the difficulty settings.+management and area denial. Thus, the crawl scenario is the most replayable+adventure, but even the small ones can be refreshed by striving to beat+a high score and by ramping up the difficulty settings.   Exploring the world@@ -193,7 +180,7 @@     smoke, fog, open fire                 ;     workshop, curtain, foliage            : -The four groups above, in turn, block movement but not view,+The four groups above, from top to bottom, block movement but not view, block both, block neither, block view but not movement. Additionally, each tile, regardless if open and if translucent, may be permanently lit with ambient light or not.@@ -245,7 +232,7 @@ is pressed, though that's usually not a precise enough method of controlling a team. Any sleeping hero is highlighted in blue and can be woken up by yelling with `%` key, which also taunts-or stresses up nearby enemies.+and unnerves nearby enemies.  Next on the bottom-most status line is the pointman's current and maximum Calm (morale, composure, focus, attentiveness), then his current@@ -253,13 +240,13 @@ into a dot signifies that the pointman is in a position without ambient illumination, making stealthy conduct easier. A brace sign instead of a colon after "HP" means the pointman is braced for combat-(see section [Moving and acting](#Moving-and-acting)).+(see chapter [Moving and acting](#Moving-and-acting)).  In the second half of the bottom-most status line, the pointman's name-is shown. Then come damage dice of the pointman's melee weapons and pointman's-appendages, ordered by their power. The dice of the first recharged weapon,-the one that is going to be used now, is adorned with percentage-damage bonus collected from the whole equipment of the pointman.+is shown. Then come damage dice of the pointman's melee weapons and+the pointman's appendages, ordered by their power. The dice of the first+recharged weapon, the one that is going to be used now, is adorned with+percentage damage bonus collected from the whole equipment of the pointman. If the dice are displayed with upper-case `D` instead of lower-case `d`, the weapon has additional effects apart of the usual direct damage. The nature of the effects can be appraised via the equipment outfit menu.@@ -273,11 +260,11 @@ the dice notation `xdy`, which denotes `x` rolls of `y`-sided dice. A variant written `xdLy` is additionally scaled by the level depth in proportion to the maximal level depth (at the first level the result-is always one, then it grows up to the full rolled value at the last level).+is always one; it grows up to the full rolled value at the last level). Section [Battling monsters](#Battling-monsters) below describes combat resolution in detail, including the role of the percentage bonuses. -The upper status line describes the current level in relation+The upper status line describes the currently visited level in relation to the party.      5  Lofty hall    [33% seen] dire basilisk    [__**]@@ -306,16 +293,16 @@ Moving and acting ----------------- -This section is a copy of the few initial bits of in-game help. The in-game-help pages are automatically generated based on a game's keybinding content-definitions and on overrides in the player's config file. The remaining-in-game help screens, not shown here, list all game commands grouped-by categories in detail. A text snapshot of the complete in-game help is in-[InGameHelp.txt](InGameHelp.txt).+This chapter is a copy of the few initial pages of in-game help.+The in-game help is automatically generated based on a game's keybinding+content definitions and on overrides in the player's config file.+The remaining in-game help screens, not shown here, list all game+commands grouped by categories in detail.  Walk throughout a level with mouse or numeric keypad (right diagram below) or the Vi editor keys (middle) or the left-hand movement keys (left). Run until disturbed with Shift or Control. Go-to a position with LMB (left mouse button).+In aiming mode, the same keys (and mouse) move the aiming crosshair.            q w e          y k u          7 8 9            \|/            \|/            \|/@@ -323,15 +310,14 @@            /|\            /|\            /|\           z x c          b j n          1 2 3 -In aiming mode, the same keys (and mouse) move the aiming crosshair. Press `KP_5` (`5` on keypad) to wait, bracing for impact, which reduces any damage taken and prevents displacement by foes. Press `S-KP_5` or `C-KP_5` (the same key with Shift or Control) to lurk 0.1 of a turn, without bracing.  Displace enemies by running into them with Shift/Control or S-LMB. Search,-open, descend and attack by bumping into walls, doors, stairs and enemies.-The best, not on cooldown, melee weapon is automatically chosen from your-equipment and from among your body parts.+open, descend and melee by bumping into walls, doors, stairs and enemies.+The best, and not on cooldown, melee weapon is automatically chosen+for attack from your equipment and from among your body parts.  The following few commands, joined with the movement and running keys, let you accomplish almost anything in the game, though not necessarily@@ -357,7 +343,7 @@ effects. Here we give an overview of effects of each button over the game map area. The list includes not only left and right buttons, but also the optional middle mouse button (MMB) and the mouse wheel,-which is also used over menus, to page-scroll them. For mice without RMB,+which is also used over menus to move selection. For mice without RMB, one can use Control key with LMB and for mice without MMB, one can use C-RMB or C-S-LMB. @@ -370,8 +356,8 @@     WHEEL-UP     swerve the aiming line     WHEEL-DN     unswerve the aiming line -Note that mouse is totally optional. Keyboard suffices, occasionally-requiring a lookup for some obscure command key in the help screens.+Note that mouse is optional. Keyboard suffices, occasionally requiring+a lookup for an obscure command key in help screens.   Battling monsters@@ -442,27 +428,30 @@ Attacking from a distance ------------------------- -For ranged attacks, setting the aiming crosshair before `f` to attack-is pressed is not mandatory. Crosshair is set automatically as soon+Before the player presses `f` to make a ranged attack, he may move+and set the aiming crosshair in aiming mode. However, this is+not often needed, since crosshair is set automatically as soon as a monster comes into view and can still be adjusted for as long-as the missile to fling is not chosen. However, sometimes before-flinging you want to examine the level map tile by tile by moving-the crosshair or assign persistent personal targets to party members.+as the missile to fling is not chosen.++Nevertheless, sometimes before flinging you want to examine+the level map tile by tile by moving the crosshair+or to assign persistent personal targets to party members. The latter is essential in the rare cases when your henchmen (non-pointman characters) can move autonomously or fire opportunistically (via innate skills or rare equipment). Also, if your non-pointman character is adjacent to more than one enemy, setting his target makes him melee a particular foe. -You can enter the aiming mode with the `*` and `KP_*` keys that-select enemies or the `/` and `KP_/` keys that cycle among items-on the floor. You can move crosshair with direction keys and assign-a personal target to the pointman with a `RET` key (Return, Enter).+You can enter the aiming mode with the `*` and `KP_*` keys that select+enemies or the `/` and `KP_/` keys that cycle among items on the level.+You can move crosshair with direction keys and assign a personal+target to the pointman with the `RET` key (Return, Enter). The details about the shared crosshair position are displayed in a status-line close to the bottom of the screen, as explained in section+line close to the bottom of the screen, as explained in chapter [Leading your heroes](#Leading-your-heroes) above. You cycle aiming-mode from foe to spot to vector with the ``\`` key, which is useful-when a monster vanishes but you still want to fling at its last+mode from foe to spot and to vector with the ``\`` key, which is useful,+e.g., when a monster vanishes but you still want to fling at its last known position.  @@ -507,14 +496,15 @@ A: Perhaps he's just sleeping (blue box indicates that)? If so, you can wake him up with the `%` command. If he's not asleep, his movement skill may be temporarily drained. Switch to another hero-or perform some other productive action that walking or wait-or rest with `R`.+or perform some other productive action different from walking+or wait with `KP_5` or rest with `R`.  - Q: Is autoexplore safe?  A: Not at all. It doesn't try to guess which hazardous terrain you want to avoid and which to barge through, so be prepared to abort exploration if open fire or slippery ground comes into view. Unless you have HP to spare.+Oh the other hand, running is very safe and go-to is rather safe.  - Q: Why does the percentage of explored tiles turn from 100% to 99%? @@ -534,7 +524,7 @@ and revealing their position or leaving a vantage point from which they can observe and relay enemy movement. For untrained teams, simultaneous synchronized squad movement is not feasible.-It would be practical, if all squaddies had cameras, with a few drones+It would be practical if all squaddies had cameras, with a few drones overhead for best effect, and if a team of off-site coordinators analyzed the situation and micromanaged them all. This is not the case here. @@ -563,8 +553,16 @@ of turns?  A: This is an artifact of time running independently on each level.-Any ideas on how to improve this are welcome. A workaround is to drop and then-pick up the item on the level you want to use it. When picked up,-it gets recharged after, randomly, from one to two times the normal-cooldown period of the item and then recharges normally for as long-as it's used on this level.+Any ideas on how to improve this game mechanics are welcome.+A workaround is to drop and then pick up the item on the level+you want to use it. When picked up, it gets recharged after, randomly,+from one to two times the normal cooldown period of the item+and then recharges normally while it's used on this level.++- Q: Why the bottom line displays a weapon with a timeout to the right+of a weapon without timeout? Doesn't it mean the former is never used?++A: Yes, it's never used and, quite possibly, it's your party inventory+management mistake and if not, at least a very special situation+and the display turns your attention to it. Shuffle the equipment+among your team if you want the weapon to get used.

@@ -50,22 +50,27 @@ ; and/or to avoid moving due to accidental key presses. movementViKeys_hjklyubn = True movementLeftHandKeys_axwdqezc = True-; recommended: "binary" or "dejavuBold" or, if not a Debian package, "ubuntu"-chosenFontset = "binary"+; recommended: "binary" or "dejavuBold"+chosenFontset = "dejavuBold" ; 1.0 means don't scale; 1.5, 2.0, 3.0 give good results, <0.7 very bad ; for scales < 1 try fontsets with bolder auxiliary fonts and/or HintingLight allFontsScale = 1.0-; NotFullscreen (default), BigBorderlessWindow (preferred), ModeChange-; for 1920×1080 fullscreen, set allFontsScale = 1.5 above+; NotFullscreen (default), BigBorderlessWindow (preferred), ModeChange.+; For 1920×1080 fullscreen, set allFontsScale = 1.5 above. fullscreenMode = NotFullscreen-screenOneMessagePerLine = True-historyOneMessagePerLine = True+; HP percent at which warning is emitted.+hpWarningPercent = 20+; Wrap messages after this column (measured in small font, if available).+; In LambdaHack, not enough height to fit longer messages if wrapped earlier.+msgWrapColumn = 80 ; New historyMax takes effect after removal of savefiles. ; Looks best if is divisble by screenful of message (rheight - 4 = 20). historyMax = 5000+; Frames per second throttled at this value. maxFps = 24+; Animations when actors act are not displayed. noAnim = False-hpWarningPercent = 20+; Hardwired commandline arguments to process. overrideCmdline = ""  [fonts]@@ -76,9 +81,6 @@ dejavuRegular = FontProportional "DejaVuLGCSans.ttf.woff" 15 HintingHeavy dejavuBold = FontProportional "DejaVuLGCSans-Bold.ttf.woff" 13 HintingHeavy dejavuMono = FontMonospace "Hack-Bold.ttf.woff" 13 HintingHeavy-ubuntuRegular = FontProportional "ubuntu-v14-latin-ext_latin-regular.ttf.woff" 16 HintingLight-ubuntuBold = FontProportional "ubuntu-v14-latin-ext_latin-500.ttf.woff" 16 HintingLight-ubuntuMono = FontMonospace "ubuntu-mono-v9-latin-ext_latin-700.ttf.woff" 16 HintingLight ; the map fonts (the format is: kind name size hinting cellSizeAdd): ; with allFontsScale < 1, try HintingLight for fuzzy, but less distorted shapes: 16x16xwScalable = FontMapScalable "16x16xw.woff" 16 HintingHeavy 0@@ -88,26 +90,23 @@ 8x8xBitmap = FontMapBitmap "8x8x.fnt" 2  [fontsets]+; This is a temporary hack around bitmap font breakage caused by+; https://gitlab.freedesktop.org/freetype/freetype/-/issues/1076+; In a couple of years this can be removed and the small bitmap fonts will work+; fine again, too.+dejavuBold = FontSet {fontMapScalable = "16x16xwScalable", fontMapBitmap = "16x16xwScalable", fontPropRegular = "dejavuBold", fontPropBold = "dejavuBold", fontMono = "dejavuMono"}+ ; best proportional: binary = FontSet {fontMapScalable = "16x16xwScalable", fontMapBitmap = "16x16xwBitmap", fontPropRegular = "binaryRegular", fontPropBold = "binaryBold", fontMono = "binaryMono"}-dejavuBold = FontSet {fontMapScalable = "16x16xwScalable", fontMapBitmap = "16x16xwBitmap", fontPropRegular = "dejavuBold", fontPropBold = "dejavuBold", fontMono = "dejavuMono"}--; Warning: the Ubuntu Font Family fonts are considered non-free by Debian-; and so we don't include them in Debian and some other GNU/Linux packages.-; If you use such a package, feel free to download the fonts from our github-; repository or specify absolute paths to their locations in non-free Debian-; package fonts-ubuntu.-ubuntu = FontSet {fontMapScalable = "16x16xwScalable", fontMapBitmap = "16x16xwBitmap", fontPropRegular = "ubuntuRegular", fontPropBold = "ubuntuBold", fontMono = "ubuntuMono"}+dejavuBold_original = FontSet {fontMapScalable = "16x16xwScalable", fontMapBitmap = "16x16xwBitmap", fontPropRegular = "dejavuBold", fontPropBold = "dejavuBold", fontMono = "dejavuMono"}  ; decent proportional: binaryBold = FontSet {fontMapScalable = "16x16xwScalable", fontMapBitmap = "16x16xwBitmap", fontPropRegular = "binaryBold", fontPropBold = "binaryBold", fontMono = "binaryMono"} dejavu = FontSet {fontMapScalable = "16x16xwScalable", fontMapBitmap = "16x16xwBitmap", fontPropRegular = "dejavuRegular", fontPropBold = "dejavuBold", fontMono = "dejavuMono"}-ubuntuThin = FontSet {fontMapScalable = "16x16xwScalable", fontMapBitmap = "16x16xwBitmap", fontPropRegular = "ubuntuRegular", fontPropBold = "ubuntuRegular", fontMono = "ubuntuMono"}  ; monospace, for people that don't like proportional or many fonts: binaryMono = FontSet {fontMapScalable = "16x16xwScalable", fontMapBitmap = "16x16xwBitmap", fontPropRegular = "binaryMono", fontPropBold = "binaryMono", fontMono = "binaryMono"} dejavuMono = FontSet {fontMapScalable = "16x16xwScalable", fontMapBitmap = "16x16xwBitmap", fontPropRegular = "dejavuMono", fontPropBold = "dejavuMono", fontMono = "dejavuMono"}-ubuntuMono = FontSet {fontMapScalable = "16x16xwScalable", fontMapBitmap = "16x16xwBitmap", fontPropRegular = "ubuntuMono", fontPropBold = "ubuntuMono", fontMono = "ubuntuMono"}  ; square: 16x16xw = FontSet {fontMapScalable = "16x16xwScalable", fontMapBitmap = "16x16xwBitmap", fontPropRegular = "", fontPropBold = "", fontMono = ""}@@ -126,4 +125,4 @@ ; any more, the game crashes. To prevent that, one of the first three components ; of the game version should be bumped whenever fonts are changed. ; Configs from old versions are rejected, preventing the crash.-version = 0.10.2+version = 0.10.3

binary file changed (57416 → absent bytes)

binary file changed (69288 → absent bytes)

binary file changed (76672 → absent bytes)

@@ -29,19 +29,10 @@   -- Remember to put commands that show information (e.g., enter aiming   -- mode) first. -  -- Main menu-  [ ("s", ([CmdMainMenu], "setup and start new game>", ChallengeMenu))-  , ("x", ([CmdMainMenu], "save and exit to desktop", GameExit))-  , ("v", ([CmdMainMenu], "tweak convenience settings>", SettingsMenu))-  , ("t", ([CmdMainMenu], "toggle autoplay", AutomateToggle))-  , ("?", ([CmdMainMenu], "see command help", Help))-  , ("F12", ([CmdMainMenu], "switch to dashboard", Dashboard))-  , ("Escape", ([CmdMainMenu], "back to playing", AutomateBack))-   -- Minimal command set, in the desired presentation order.   -- A lot of these are not necessary, but may be familiar to new players.   -- Also a few non-minimal item commands to keep proper order.-  , ("I", ( [CmdMinimal, CmdItem, CmdDashboard]+  [ ("I", ( [CmdMinimal, CmdItem, CmdDashboard]           , "manage the shared inventory stash"           , ChooseItemMenu (MStore CStash) ))   , ("O", ( [CmdItem, CmdDashboard]@@ -70,7 +61,6 @@   , ("A-BackTab", memberCycleLevel Backward [])   , ("C-Tab", memberCycleLevel Forward [CmdMove])   , ("C-BackTab", memberCycleLevel Backward [CmdMove])-      -- TODO: the keys are too long to fit in help menu, unless vertically   , ("*", ( [CmdMinimal, CmdAim]           , "cycle crosshair among enemies"           , AimEnemy ))

@@ -20,7 +20,6 @@ standardLayoutAndFeatures = ScreenContent   { rwidth = 80   , rheight = 24-  , rwrap = 80  -- not enough height to fit longer messages if wrapped early   , rwebAddress = "http://lambdahack.github.io"   , rintroScreen = $(do       let path = "GameDefinition/PLAYING.md"@@ -48,9 +47,7 @@       lift intro)   , rapplyVerbMap = EM.fromList [('!', "quaff"), (',', "eat"), ('?', "read")]   , rFontFiles =--- Checking USE_SDL would be more accurate, but would require complicating--- .cabal file and slightly larger vty executable is not a problem.-#ifdef USE_JSFILE+#ifdef USE_BROWSER       [] #else       $(embedDir "GameDefinition/fonts")

@@ -137,7 +137,7 @@ -- initial states, in the @IO@ monad. executorSer :: COps -> CCUI -> ServerOptions -> UIOptions -> IO () executorSer cops@COps{corule} ccui soptionsNxtCmdline sUIOptions = do-  soptionsNxtRaw <- case uCmdline sUIOptions of+  soptionsNxtRaw <- case uOverrideCmdline sUIOptions of     []   -> return soptionsNxtCmdline     args -> handleParseResult $ execParserPure defaultPrefs serverOptionsPI args   -- Options for the clients modified with the configuration file.

@@ -57,7 +57,7 @@   -- Set the X size of the dungeon from content ASAP, before it's used.   speedupHackXSizeThawed <- PA.unsafeThawPrimArray speedupHackXSize   PA.writePrimArray speedupHackXSizeThawed 0 $-    RK.rXmax Content.RuleKind.standardRules+    RK.rWidthMax Content.RuleKind.standardRules   void $ PA.unsafeFreezePrimArray speedupHackXSizeThawed   -- This setup ensures the boosting option doesn't affect generating initial   -- RNG for dungeon, etc., and also, that setting dungeon RNG on commandline@@ -69,7 +69,8 @@         if sboostRandomItem         then boostedItems ++ Content.ItemKind.otherItemContent         else Content.ItemKind.content-      coitem = IK.makeData itemContent+      coitem = IK.makeData (RK.ritemSymbols Content.RuleKind.standardRules)+                           itemContent                            Content.ItemKind.groupNamesSingleton                            Content.ItemKind.groupNames       coItemSpeedup = speedupItem coitem@@ -89,7 +90,8 @@         , comode = MK.makeData Content.ModeKind.content                                Content.ModeKind.groupNamesSingleton                                Content.ModeKind.groupNames-        , coplace = PK.makeData Content.PlaceKind.content+        , coplace = PK.makeData cotile+                                Content.PlaceKind.content                                 Content.PlaceKind.groupNamesSingleton                                 Content.PlaceKind.groupNames         , corule = RK.makeData Content.RuleKind.standardRules

@@ -0,0 +1,26 @@+BSD 3-Clause License++All rights reserved.++Redistribution and use in source and binary forms, with or without+modification, are permitted provided that the following conditions+are met:+1. Redistributions of source code must retain the above copyright notice, this+   list of conditions and the following disclaimer.+2. Redistributions in binary form must reproduce the above copyright notice,+   this list of conditions and the following disclaimer in the documentation+   and/or other materials provided with the distribution.+3. Neither the name of the copyright holder nor the names of its+   contributors may be used to endorse or promote products derived from+   this software without specific prior written permission.++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

@@ -1,4 +1,4 @@-cabal-version: 2.2+cabal-version: 2.4 name:          LambdaHack -- The package version. See the Haskell package versioning policy (PVP) -- for standards guiding when and how versions should be incremented.@@ -6,7 +6,7 @@ -- PVP summary:+-+------- breaking API changes --             | |  +----- minor or non-breaking API additions --             | |  | +--- code changes with no API change-version:       0.10.2.0+version:       0.10.3.0 synopsis:      A game engine library for tactical squad ASCII roguelike dungeon crawlers description: LambdaHack is a Haskell game engine library for ASCII roguelike              games of arbitrary theme, size and complexity, with optional@@ -44,11 +44,11 @@ bug-reports:   http://github.com/LambdaHack/LambdaHack/issues license:       BSD-3-Clause license-file:  COPYLEFT-tested-with:   GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.4, GHC==8.10.4,+tested-with:   GHC==8.2.2, GHC==8.4.4, GHC==8.6.5, GHC==8.8.4, GHC==8.10.7,                GHC==9.0.1--- Enough files is included to build and run CI and manual tests--- and be presentable on Hackage, but not enough to create--- a user-friendly binary package, e.g., no InGameHelp.txt.+-- Enough files is included in the Hackage package to run CI and manual+-- tests off it, to be presentable on Hackage and to create user-friendly+-- binary packages. extra-source-files: GameDefinition/config.ui.default,                     GameDefinition/PLAYING.md,                     GameDefinition/fonts/16x16xw.woff,@@ -61,13 +61,15 @@                     GameDefinition/fonts/BinaryCodeProLH-Bold.ttf.woff,                     GameDefinition/fonts/DejaVuLGCSans.ttf.woff,                     GameDefinition/fonts/DejaVuLGCSans-Bold.ttf.woff,-                    GameDefinition/fonts/Hack-Bold.ttf.woff,-                    GameDefinition/fonts/ubuntu-v14-latin-ext_latin-regular.ttf.woff,-                    GameDefinition/fonts/ubuntu-v14-latin-ext_latin-500.ttf.woff,-                    GameDefinition/fonts/ubuntu-mono-v9-latin-ext_latin-700.ttf.woff,-                    Makefile,+                    GameDefinition/fonts/Hack-Bold.ttf.woff+extra-doc-files:    GameDefinition/InGameHelp.txt,+                    README.md,                     CHANGELOG.md,-                    README.md+                    LICENSE,+                    COPYLEFT,+                    CREDITS,+                    cabal.project,+                    Makefile author:        Andres Loeh, Mikolaj Konarski and others maintainer:    Mikolaj Konarski <mikolaj.konarski@funktory.com> category:      Game Engine, Game@@ -77,32 +79,6 @@   type:               git   location:           git://github.com/LambdaHack/LambdaHack.git -flag vty-  description:        switch to the vty frontend (screen reader friendly)-  default:            False-  manual:             True--flag curses-  description:        switch to the curses frontend (not fully supported)-  default:            False-  manual:             True--flag gtk-  description:        switch to the GTK frontend (not fully supported)-  default:            False-  manual:             True---- This flag is not used.--- flag sdl---   description:        switch to the SDL2 frontend---   default:            False---   manual:             True--flag jsaddle-  description:        switch to the JSaddle frontend (may be bit-rotted)-  default:            False-  manual:             True- flag with_expensive_assertions   description:        turn on expensive assertions of well-tested code   default:            False@@ -118,12 +94,17 @@   default:            True   manual:             True +flag jsaddle+  description:        switch to the JSaddle frontend (may be bit-rotted)+  default:            False+  manual:             True+ common options   default-language:   Haskell2010-  default-extensions: MonoLocalBinds, ScopedTypeVariables, OverloadedStrings+  default-extensions: MonoLocalBinds, ScopedTypeVariables, OverloadedStrings,                       BangPatterns, RecordWildCards, NamedFieldPuns, MultiWayIf,                       LambdaCase, DefaultSignatures, InstanceSigs,-                      PatternSynonyms, StrictData, CPP+                      PatternSynonyms, StrictData, CPP, TypeApplications   other-extensions:   TemplateHaskell, MultiParamTypeClasses, RankNTypes,                       TypeFamilies, FlexibleContexts, FlexibleInstances,                       DeriveFunctor, FunctionalDependencies,@@ -131,7 +112,8 @@                       DeriveFoldable, DeriveTraversable,                       ExistentialQuantification, GADTs, StandaloneDeriving,                       DataKinds, KindSignatures, DeriveGeneric, DeriveLift-  ghc-options:        -Wall -Wcompat -Worphans -Wincomplete-uni-patterns -Wincomplete-record-updates -Wimplicit-prelude -Wmissing-home-modules -Widentities -Wredundant-constraints -Wmissing-export-lists -Wpartial-fields+  ghc-options:        -Wall -Wcompat -Worphans -Wincomplete-uni-patterns -Wincomplete-record-updates -Wimplicit-prelude -Wmissing-home-modules -Widentities -Wredundant-constraints -Wmissing-export-lists -Wpartial-fields -Wunused-packages -Winvalid-haddock+-- TODO: remove -Winvalid-haddock when added to -Wall in a GHC I use for haddock   ghc-options:        -Wall-missed-specialisations   ghc-options:        -fno-ignore-asserts -fexpose-all-unfoldings -fspecialise-aggressively -fsimpl-tick-factor=200 @@ -147,7 +129,7 @@     ghcjs-options:    -DREMOVE_TELETYPE  common exe-options-  ghc-options:        -threaded -rtsopts+  ghc-options:        -rtsopts -- (Ignored by GHCJS) Minimize median lag at the cost of occasional bigger -- GC lag, which fortunately sometimes fits into idle time between turns): -- (Ignored by GHCJS) Avoid frequent GCs. Only idle-GC during a break in@@ -178,6 +160,7 @@                       Game.LambdaHack.Definition.Color                       Game.LambdaHack.Definition.ContentData                       Game.LambdaHack.Definition.Defs+                      Game.LambdaHack.Definition.DefsInternal                       Game.LambdaHack.Definition.Flavour                       Game.LambdaHack.Content.CaveKind                       Game.LambdaHack.Content.ItemKind@@ -215,12 +198,10 @@                       Game.LambdaHack.Client.UI.Content.Screen                       Game.LambdaHack.Client.UI.ContentClientUI                       Game.LambdaHack.Client.UI.DrawM-                      Game.LambdaHack.Client.UI.DisplayAtomicM                       Game.LambdaHack.Client.UI.EffectDescription                       Game.LambdaHack.Client.UI.Frame                       Game.LambdaHack.Client.UI.FrameM                       Game.LambdaHack.Client.UI.Frontend-                      Game.LambdaHack.Client.UI.Frontend.Chosen                       Game.LambdaHack.Client.UI.Frontend.Common                       Game.LambdaHack.Client.UI.Frontend.Teletype                       Game.LambdaHack.Client.UI.HandleHelperM@@ -244,6 +225,11 @@                       Game.LambdaHack.Client.UI.SlideshowM                       Game.LambdaHack.Client.UI.UIOptions                       Game.LambdaHack.Client.UI.UIOptionsParse+                      Game.LambdaHack.Client.UI.Watch+                      Game.LambdaHack.Client.UI.Watch.WatchCommonM+                      Game.LambdaHack.Client.UI.Watch.WatchQuitM+                      Game.LambdaHack.Client.UI.Watch.WatchSfxAtomicM+                      Game.LambdaHack.Client.UI.Watch.WatchUpdAtomicM                       Game.LambdaHack.Common.Analytics                       Game.LambdaHack.Common.Area                       Game.LambdaHack.Common.Actor@@ -293,6 +279,8 @@                       Game.LambdaHack.Server.ServerOptions                       Game.LambdaHack.Server.StartM                       Game.LambdaHack.Server.State+-- for doctest:+                      Paths_LambdaHack   exposed-modules:    Content.CaveKind                       Content.ItemKind                       Content.ItemKindEmbed@@ -310,10 +298,9 @@                       Client.UI.Content.Screen                       Implementation.MonadClientImplementation                       Implementation.MonadServerImplementation-  other-modules:      Paths_LambdaHack   autogen-modules:    Paths_LambdaHack   build-depends:      assert-failure >= 0.1.2 && < 0.2,-                      async      >= 2,+                      async      >= 2.2.1,                       base       >= 4.10 && < 99,                       base-compat >= 0.10.0,                       binary     >= 0.8,@@ -327,13 +314,14 @@                       ghc-prim,                       hashable   >= 1.1.2.5,                       hsini      >= 0.2,-                      int-cast   >= 0.2,+                      witch      >= 0.3,                       keys       >= 3,                       miniutter  >= 0.5.0.0,                       open-browser >= 0.2,                       optparse-applicative >= 0.13,                       pretty-show >= 1.6,                       primitive  >= 0.6.1.0,+                      QuickCheck,                       splitmix   >= 0.0.3,                       stm        >= 2.4,                       time       >= 1.4,@@ -347,25 +335,15 @@                       ghc-compact    if impl(ghcjs) || flag(jsaddle) {-    exposed-modules:    Game.LambdaHack.Client.UI.Frontend.Dom+    exposed-modules:  Game.LambdaHack.Client.UI.Frontend.Dom     build-depends:    ghcjs-dom >= 0.9.1.1     cpp-options:      -DUSE_BROWSER-  } elif flag(vty) {-    exposed-modules:    Game.LambdaHack.Client.UI.Frontend.Vty-    build-depends:    vty >= 5-    cpp-options:      -DUSE_VTY-  } elif flag(curses) {-    exposed-modules:    Game.LambdaHack.Client.UI.Frontend.Curses-    build-depends:    hscurses >= 1.4.1-    cpp-options:      -DUSE_CURSES-  } elif flag(gtk) {-    exposed-modules:    Game.LambdaHack.Client.UI.Frontend.Gtk-    build-depends:    gtk3 >= 0.12.1-    cpp-options:      -DUSE_GTK   } else {-    exposed-modules:    Game.LambdaHack.Client.UI.Frontend.Sdl-    build-depends:    sdl2 >= 2, sdl2-ttf >= 2-    cpp-options:      -DUSE_SDL+    exposed-modules:  Game.LambdaHack.Client.UI.Frontend.Sdl+                      Game.LambdaHack.Client.UI.Frontend.ANSI+    build-depends:    sdl2 >= 2,+                      sdl2-ttf >= 2,+                      ansi-terminal >= 0.10   }    if impl(ghcjs) {@@ -390,14 +368,31 @@   type:               exitcode-stdio-1.0   hs-source-dirs:     test   main-is:            Spec.hs-  other-modules:      SessionUIMock+  other-modules:      ItemDescriptionUnitTests+                      ItemKindUnitTests+                      ItemRevUnitTests+                      ReqFailureUnitTests+                      SessionUIMock+                      SessionUIUnitTests   build-depends:      ,LambdaHack-                      ,async                       ,base                       ,containers-                      ,filepath+                      ,enummapset                       ,optparse-applicative+                      ,splitmix                       ,tasty >= 1.0+                      ,tasty-quickcheck                       ,tasty-hunit                       ,text                       ,transformers+                      ,vector++test-suite doctests+  import: options, exe-options+  type:               exitcode-stdio-1.0+  main-is:            test/doctest-driver.hs+  build-tool-depends: doctest-driver-gen:doctest-driver-gen+  ghc-options:        -Wno-unused-packages+  build-depends:      ,base+                      ,doctest >= 0.13+                      ,QuickCheck

@@ -1,21 +1,20 @@-# some of this (not the parts run by CI) needs 'cabal install cabal-plan' play:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix play --dumpInitRngs+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix play --dumpInitRngs  shot:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix play --dumpInitRngs --printEachScreen+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix play --dumpInitRngs --printEachScreen  expose-lore:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix know --newGame 5 --dumpInitRngs --gameMode crawl --knowItems --exposePlaces --exposeItems --exposeActors --showItemSamples --benchmark --noAnim --maxFps 1000+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix know --newGame 5 --dumpInitRngs --gameMode crawl --knowItems --exposePlaces --exposeItems --exposeActors --showItemSamples --benchmark --noAnim --maxFps 1000  dig-lore:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix know --newGame 5 --dumpInitRngs --gameMode dig --knowItems --exposePlaces --exposeItems --exposeActors --showItemSamples --benchmark --noAnim --maxFps 1000+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix know --newGame 5 --dumpInitRngs --gameMode dig --knowItems --exposePlaces --exposeItems --exposeActors --showItemSamples --benchmark --noAnim --maxFps 1000  see-caves:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix know --newGame 5 --dumpInitRngs --gameMode see --knowItems --exposePlaces --exposeItems --exposeActors --showItemSamples --benchmark --noAnim --maxFps 1000+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix know --newGame 5 --dumpInitRngs --gameMode see --knowItems --exposePlaces --exposeItems --exposeActors --showItemSamples --benchmark --noAnim --maxFps 1000  short-caves:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix know --newGame 5 --dumpInitRngs --gameMode short --knowItems --exposePlaces --exposeItems --exposeActors --showItemSamples --benchmark --noAnim --maxFps 1000+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix know --newGame 5 --dumpInitRngs --gameMode short --knowItems --exposePlaces --exposeItems --exposeActors --showItemSamples --benchmark --noAnim --maxFps 1000  configure-debug: 	cabal configure --enable-profiling --profiling-detail=all-functions -fwith_expensive_assertions --disable-optimization@@ -33,10 +32,10 @@ 	google-chrome --no-sandbox --js-flags="--logfile=%t.log --prof" ../lambdahack.github.io/index.html  minific:-	npx google-closure-compiler dist-newstyle/build/x86_64-linux/ghcjs-8.6.0.1/LambdaHack-0.10.2.0/x/LambdaHack/build/LambdaHack/LambdaHack.jsexe/all.js --compilation_level=ADVANCED_OPTIMIZATIONS --isolation_mode=IIFE --assume_function_wrapper --externs=dist-newstyle/build/x86_64-linux/ghcjs-8.6.0.1/LambdaHack-0.10.2.0/x/LambdaHack/build/LambdaHack/LambdaHack.jsexe/all.js.externs --externs=/home/mikolaj/r/lambdahack.github.io/lz-string.extern.js --jscomp_off="*" > ../lambdahack.github.io/lambdahack.all.js+	npx google-closure-compiler dist-newstyle/build/x86_64-linux/ghcjs-8.6.0.1/LambdaHack-0.10.3.0/x/LambdaHack/build/LambdaHack/LambdaHack.jsexe/all.js --compilation_level=ADVANCED_OPTIMIZATIONS --isolation_mode=IIFE --assume_function_wrapper --externs=dist-newstyle/build/x86_64-linux/ghcjs-8.6.0.1/LambdaHack-0.10.3.0/x/LambdaHack/build/LambdaHack/LambdaHack.jsexe/all.js.externs --externs=/home/mikolaj/r/lambdahack.github.io/lz-string.extern.js --jscomp_off="*" > ../lambdahack.github.io/lambdahack.all.js  minificForNode:-	npx google-closure-compiler dist-newstyle/build/x86_64-linux/ghcjs-8.6.0.1/LambdaHack-0.10.2.0/x/LambdaHack/build/LambdaHack/LambdaHack.jsexe/all.js --compilation_level=ADVANCED_OPTIMIZATIONS --isolation_mode=IIFE --assume_function_wrapper --externs=/home/mikolaj/r/lambdahack.github.io/lz-string.extern.js --externs=dist-newstyle/build/x86_64-linux/ghcjs-8.6.0.1/LambdaHack-0.10.2.0/x/LambdaHack/build/LambdaHack/LambdaHack.jsexe/all.js.externs --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/assert.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/child_process.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/crypto.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/dns.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/events.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/globals.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/https.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/os.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/punycode.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/readline.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/stream.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/tls.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/url.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/vm.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/buffer.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/cluster.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/dgram.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/domain.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/fs.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/http.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/net.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/path.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/querystring.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/repl.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/string_decoder.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/tty.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/util.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/zlib.js --jscomp_off="*" > ../lambdahack.github.io/lambdahack.all.js+	npx google-closure-compiler dist-newstyle/build/x86_64-linux/ghcjs-8.6.0.1/LambdaHack-0.10.3.0/x/LambdaHack/build/LambdaHack/LambdaHack.jsexe/all.js --compilation_level=ADVANCED_OPTIMIZATIONS --isolation_mode=IIFE --assume_function_wrapper --externs=/home/mikolaj/r/lambdahack.github.io/lz-string.extern.js --externs=dist-newstyle/build/x86_64-linux/ghcjs-8.6.0.1/LambdaHack-0.10.3.0/x/LambdaHack/build/LambdaHack/LambdaHack.jsexe/all.js.externs --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/assert.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/child_process.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/crypto.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/dns.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/events.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/globals.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/https.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/os.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/punycode.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/readline.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/stream.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/tls.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/url.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/vm.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/buffer.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/cluster.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/dgram.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/domain.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/fs.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/http.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/net.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/path.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/querystring.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/repl.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/string_decoder.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/tty.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/util.js --externs=/home/mikolaj/r/closure-compiler/contrib/nodejs/zlib.js --jscomp_off="*" > ../lambdahack.github.io/lambdahack.all.js  # Low delay to display animations swiftly and not bore the public too much. # Delay can't be lower than 2, because browsers sometimes treat delay 1@@ -46,61 +45,61 @@ 	../gifsicle/src/gifsicle -O3 --careful -d2 --colors 255 --no-extensions --no-conserve-memory -l ~/.LambdaHack/screenshots/prtscn*.gif -o ~/.LambdaHack/screenshots/screenshot.gif  frontendRaid:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode raid --exposeActors+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --benchMessages --gameMode raid --exposeActors  frontendBrawl:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode brawl+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode brawl --benchMessages  frontendShootout:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode shootout+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode shootout  frontendHunt:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode hunt+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode hunt  frontendEscape:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 3 --dumpInitRngs --automateAll --gameMode escape+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 3 --dumpInitRngs --automateAll --gameMode escape  frontendZoo:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 2 --dumpInitRngs --automateAll --gameMode zoo --exposeActors+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 2 --dumpInitRngs --automateAll --gameMode zoo --exposeActors  frontendAmbush:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode ambush+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode ambush  frontendCrawl:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 1 --dumpInitRngs --automateAll --gameMode crawl --exposeItems --exposeActors+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 1 --dumpInitRngs --automateAll --gameMode crawl --exposeItems --exposeActors  frontendCrawlEmpty:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 1 --dumpInitRngs --automateAll --gameMode crawlEmpty+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 1 --dumpInitRngs --automateAll --gameMode crawlEmpty --maxFps 100000 --benchmark  frontendCrawlSurvival:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 9 --dumpInitRngs --automateAll --gameMode crawlSurvival --maxFps 1000+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 9 --dumpInitRngs --automateAll --gameMode crawlSurvival --maxFps 100000 --benchmark  frontendSafari:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode safari --exposeActors+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode safari --exposeActors  frontendSafariSurvival:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode safariSurvival --exposeActors+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 5 --dumpInitRngs --automateAll --gameMode safariSurvival --exposeActors --maxFps 100000 --benchmark  frontendBattle:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 4 --dumpInitRngs --automateAll --gameMode battle --exposeActors+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 4 --dumpInitRngs --automateAll --gameMode battle --exposeActors  frontendBattleDefense:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 6 --dumpInitRngs --automateAll --gameMode battleDefense --exposeActors+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 6 --dumpInitRngs --automateAll --gameMode battleDefense --exposeActors --maxFps 100000 --benchmark  frontendBattleSurvival:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 6 --dumpInitRngs --automateAll --gameMode battleSurvival --exposeActors+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 6 --dumpInitRngs --automateAll --gameMode battleSurvival --exposeActors --maxFps 100000 --benchmark  frontendDefense:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 9 --dumpInitRngs --automateAll --gameMode defense --exposeItems --exposeActors+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 9 --dumpInitRngs --automateAll --gameMode defense --exposeItems --exposeActors  frontendDefenseEmpty:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 9 --dumpInitRngs --automateAll --gameMode defenseEmpty+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 9 --dumpInitRngs --automateAll --gameMode defenseEmpty --maxFps 100000 --benchmark  fastCrawl:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 1 --dumpInitRngs --automateAll --gameMode crawl --exposeItems --exposeActors --showItemSamples --noAnim --maxFps 100000 --benchmark+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 1 --dumpInitRngs --automateAll --gameMode crawl --exposeItems --exposeActors --showItemSamples --noAnim --maxFps 100000 --benchmark  slowCrawl:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 1 --dumpInitRngs --automateAll --gameMode crawl --exposeItems --exposeActors --showItemSamples+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --savePrefix test --newGame 1 --dumpInitRngs --automateAll --gameMode crawl --exposeItems --exposeActors --showItemSamples  # different benchmarks use different arguments RNGOPTS=--setDungeonRng "SMGen 123 123" --setMainRng "SMGen 123 125"@@ -108,164 +107,163 @@ RNGOPTS2=--setDungeonRng "SMGen 129 123" --setMainRng "SMGen 129 125"  benchMemoryAnim:-	$$(cabal-plan list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 1 --maxFps 100000 --benchmark --stopAfterFrames 33000 --automateAll --keepAutomated --gameMode crawl $(RNGOPTS2)  --frontendNull --noAnim +RTS -s -A1M -RTS+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 1 --maxFps 100000 --benchmark --benchMessages --stopAfterFrames 33000 --automateAll --keepAutomated --gameMode crawl $(RNGOPTS2) --frontendLazy +RTS -s -A1M -RTS  benchBattle:-	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 3 --noAnim --maxFps 100000 --frontendNull --benchmark --stopAfterFrames 1500 --automateAll --keepAutomated --gameMode battle $(RNGOPTS1)+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 3 --noAnim --maxFps 100000 --frontendNull --benchmark --benchMessages --stopAfterFrames 1500 --automateAll --keepAutomated --gameMode battle $(RNGOPTS1)  benchAnimBattle:-	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 3 --maxFps 100000 --frontendNull --benchmark --stopAfterFrames 7000 --automateAll --keepAutomated --gameMode battle $(RNGOPTS1)+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 3 --maxFps 100000 --frontendLazy --benchmark --benchMessages --stopAfterFrames 7000 --automateAll --keepAutomated --gameMode battle $(RNGOPTS1)  benchFrontendBattle:-	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 3 --noAnim --maxFps 100000 --benchmark --stopAfterFrames 2000 --automateAll --keepAutomated --gameMode battle $(RNGOPTS1)+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 3 --noAnim --maxFps 100000 --benchmark --benchMessages --stopAfterFrames 2000 --automateAll --keepAutomated --gameMode battle $(RNGOPTS1)  benchCrawl:-	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendNull --benchmark --stopAfterFrames 7000 --automateAll --keepAutomated --gameMode crawl $(RNGOPTS)+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendNull --benchmark --benchMessages --stopAfterFrames 7000 --automateAll --keepAutomated --gameMode crawl $(RNGOPTS)  benchFrontendCrawl:-	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --benchmark --stopAfterFrames 7000 --automateAll --keepAutomated --gameMode crawl $(RNGOPTS)+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --benchmark --benchMessages --stopAfterFrames 7000 --automateAll --keepAutomated --gameMode crawl $(RNGOPTS)  benchDig:-	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendNull --benchmark --stopAfterFrames 1 --automateAll --keepAutomated --gameMode dig $(RNGOPTS)+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendNull --benchmark --benchMessages --stopAfterFrames 1 --automateAll --keepAutomated --gameMode dig $(RNGOPTS)  benchNull: benchBattle benchAnimBattle benchCrawl  bench: benchBattle benchAnimBattle benchFrontendBattle benchCrawl benchFrontendCrawl  nativeBenchCrawl:-	$$(cabal-plan list-bin exe:LambdaHack)		   --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendNull --benchmark --stopAfterFrames 2000 --automateAll --keepAutomated --gameMode crawl $(RNGOPTS)+	$$(cabal list-bin exe:LambdaHack)		   --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendNull --benchmark --benchMessages --stopAfterFrames 2000 --automateAll --keepAutomated --gameMode crawl $(RNGOPTS)  nativeBenchBattle:-	$$(cabal-plan list-bin exe:LambdaHack)		   --dbgMsgSer --logPriority 4 --newGame 3 --noAnim --maxFps 100000 --frontendNull --benchmark --stopAfterFrames 1000 --automateAll --keepAutomated --gameMode battle $(RNGOPTS)+	$$(cabal list-bin exe:LambdaHack)		   --dbgMsgSer --logPriority 4 --newGame 3 --noAnim --maxFps 100000 --frontendNull --benchmark --benchMessages --stopAfterFrames 1000 --automateAll --keepAutomated --gameMode battle $(RNGOPTS)  nativeBench: nativeBenchBattle nativeBenchCrawl  nodeBenchCrawl:-	node $$(cabal-plan list-bin exe:LambdaHack).jsexe/all.js --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendNull --benchmark --stopAfterFrames 2000 --automateAll --keepAutomated --gameMode crawl $(RNGOPTS)+	node $$(cabal list-bin exe:LambdaHack).jsexe/all.js --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendNull --benchmark --benchMessages --stopAfterFrames 2000 --automateAll --keepAutomated --gameMode crawl $(RNGOPTS)  nodeBenchBattle:-	node $$(cabal-plan list-bin exe:LambdaHack).jsexe/all.js --dbgMsgSer --logPriority 4 --newGame 3 --noAnim --maxFps 100000 --frontendNull --benchmark --stopAfterFrames 1000 --automateAll --keepAutomated --gameMode battle $(RNGOPTS)+	node $$(cabal list-bin exe:LambdaHack).jsexe/all.js --dbgMsgSer --logPriority 4 --newGame 3 --noAnim --maxFps 100000 --frontendNull --benchmark --benchMessages --stopAfterFrames 1000 --automateAll --keepAutomated --gameMode battle $(RNGOPTS)  nodeBench: nodeBenchBattle nodeBenchCrawl  nodeMinifiedBench:-	node ../lambdahack.github.io/lambdahack.all.js --dbgMsgSer --logPriority 4 --newGame 3 --noAnim --maxFps 100000 --frontendNull --benchmark --stopAfterFrames 1000 --automateAll --keepAutomated --gameMode battle $(RNGOPTS)-	node ../lambdahack.github.io/lambdahack.all.js --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendNull --benchmark --stopAfterFrames 2000 --automateAll --keepAutomated --gameMode crawl $(RNGOPTS)+	node ../lambdahack.github.io/lambdahack.all.js --dbgMsgSer --logPriority 4 --newGame 3 --noAnim --maxFps 100000 --frontendNull --benchmark --benchMessages --stopAfterFrames 1000 --automateAll --keepAutomated --gameMode battle $(RNGOPTS)+	node ../lambdahack.github.io/lambdahack.all.js --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendNull --benchmark --benchMessages --stopAfterFrames 2000 --automateAll --keepAutomated --gameMode crawl $(RNGOPTS)  -test-travis: test-short test-medium--test-travis2: test-sniff benchNull+test: test-short test-medium benchNull -test: test-sniff test-short test-medium benchNull+test-gha: test testCrawl-medium testCrawl-stopAfterGameOver testDefense-medium test-sniff  test-short: test-short-new test-short-load  test-medium: testRaid-medium testBrawl-medium testShootout-medium testHunt-medium testEscape-medium testZoo-medium testAmbush-medium testCrawlEmpty-medium testCrawl-medium-know testSafari-medium testSafariSurvival-medium testBattle-medium testBattleDefense-medium testBattleSurvival-medium testDig-medium testDefenseEmpty-medium testMany-teletype  test-sniff:-	bash -c "./LambdaHack --dbgMsgSer --logPriority 4 --newGame 5 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterFrames 1  --dumpInitRngs --automateAll --keepAutomated --gameMode raid --sniff &> /tmp/teletypetest.log"+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 5 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterFrames 1  --dumpInitRngs --automateAll --keepAutomated --gameMode raid --sniff > /tmp/teletypetest.log 2>&1  testMany-teletype:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 9 --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 50 --dumpInitRngs --automateAll --keepAutomated 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 9 --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 50 --dumpInitRngs --automateAll --keepAutomated 2> /tmp/teletypetest.log  testMany-sdlInit:-	./LambdaHack --dbgMsgSer --logPriority 0 --boostRandomItem --newGame 9 --maxFps 100000 --benchmark --stopAfterSeconds 50 --dumpInitRngs --automateAll --keepAutomated 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 0 --boostRandomItem --newGame 9 --maxFps 100000 --benchmark --benchMessages --stopAfterSeconds 50 --dumpInitRngs --automateAll --keepAutomated 2> /tmp/teletypetest.log  testRaid-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 20 --dumpInitRngs --automateAll --keepAutomated --gameMode raid 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 20 --dumpInitRngs --automateAll --keepAutomated --gameMode raid 2> /tmp/teletypetest.log  testBrawl-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 20 --dumpInitRngs --automateAll --keepAutomated --gameMode brawl 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --maxFps 100000 --frontendTeletype --benchmark --benchMessages --stopAfterSeconds 20 --dumpInitRngs --automateAll --keepAutomated --gameMode brawl 2> /tmp/teletypetest.log  testShootout-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 20 --dumpInitRngs --automateAll --keepAutomated --gameMode shootout 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --maxFps 100000 --frontendTeletype --benchmark --benchMessages --stopAfterSeconds 20 --dumpInitRngs --automateAll --keepAutomated --gameMode shootout 2> /tmp/teletypetest.log  testHunt-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 20 --dumpInitRngs --automateAll --keepAutomated --gameMode hunt 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --maxFps 100000 --frontendTeletype --benchmark --benchMessages --stopAfterSeconds 20 --dumpInitRngs --automateAll --keepAutomated --gameMode hunt 2> /tmp/teletypetest.log  testEscape-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 3 --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode escape 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 3 --maxFps 100000 --frontendTeletype --benchmark --benchMessages --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode escape 2> /tmp/teletypetest.log  testZoo-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 2 --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode zoo 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 2 --maxFps 100000 --frontendTeletype --benchmark --benchMessages --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode zoo 2> /tmp/teletypetest.log  testAmbush-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 20 --dumpInitRngs --automateAll --keepAutomated --gameMode ambush 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --noAnim --maxFps 100000 --frontendTeletype --benchmark --benchMessages --stopAfterSeconds 20 --dumpInitRngs --automateAll --keepAutomated --gameMode ambush 2> /tmp/teletypetest.log  testCrawl-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterGameOver --stopAfterSeconds 200 --dumpInitRngs --automateAll --keepAutomated --gameMode crawl --assertExplored 5 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 600 --dumpInitRngs --automateAll --keepAutomated --gameMode crawl --assertExplored 5 2> /tmp/teletypetest.log -testCrawl-medium-double:-	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendLazy --benchmark --stopAfterGameOver --stopAfterSeconds 590 --dumpInitRngs --automateAll --keepAutomated --gameMode crawl --assertExplored 4 +testCrawl-stopAfterGameOver:+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 9 --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 100 --dumpInitRngs --automateAll --keepAutomated --gameMode crawl --stopAfterGameOver 2> /tmp/teletypetest.log+ testCrawlEmpty-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode crawlEmpty 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendTeletype --benchmark --benchMessages --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode crawlEmpty 2> /tmp/teletypetest.log  testCrawl-medium-know:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix know --newGame 1 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 100 --dumpInitRngs --automateAll --keepAutomated --gameMode crawl --knowItems --exposePlaces --exposeItems --exposeActors --showItemSamples 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix know --newGame 1 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 100 --dumpInitRngs --automateAll --keepAutomated --gameMode crawl --knowItems --exposePlaces --exposeItems --exposeActors --showItemSamples 2> /tmp/teletypetest.log  testSafari-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 100 --dumpInitRngs --automateAll --keepAutomated --gameMode safari 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 100 --dumpInitRngs --automateAll --keepAutomated --gameMode safari 2> /tmp/teletypetest.log  testSafariSurvival-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode safariSurvival 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --noAnim --maxFps 100000 --frontendTeletype --benchmark --benchMessages --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode safariSurvival 2> /tmp/teletypetest.log  testBattle-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 3 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 20 --dumpInitRngs --automateAll --keepAutomated --gameMode battle 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 3 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 20 --dumpInitRngs --automateAll --keepAutomated --gameMode battle 2> /tmp/teletypetest.log  testBattleDefense-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 7 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode battleDefense 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 7 --noAnim --maxFps 100000 --frontendTeletype --benchmark --benchMessages --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode battleDefense 2> /tmp/teletypetest.log  testBattleSurvival-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 7 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode battleSurvival 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 7 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode battleSurvival 2> /tmp/teletypetest.log  testDefense-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 9 --noAnim --maxFps 100000 --frontendLazy --benchmark --stopAfterSeconds 100 --dumpInitRngs --automateAll --keepAutomated --gameMode defense 2> /tmp/teletypetest.log--testDig-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterFrames 100 --dumpInitRngs --automateAll --keepAutomated --gameMode dig 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 9 --noAnim --maxFps 100000 --frontendLazy --benchmark --stopAfterSeconds 600 --dumpInitRngs --automateAll --keepAutomated --gameMode defense 2> /tmp/teletypetest.log  testDefenseEmpty-medium:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 9 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode defenseEmpty 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 9 --noAnim --maxFps 100000 --frontendTeletype --benchmark --benchMessages --stopAfterSeconds 40 --dumpInitRngs --automateAll --keepAutomated --gameMode defenseEmpty 2> /tmp/teletypetest.log +testDig-medium:+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendTeletype --benchmark --stopAfterFrames 100 --dumpInitRngs --automateAll --keepAutomated --gameMode dig 2> /tmp/teletypetest.log+ testCrawl-appveyor: 	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 1 --noAnim --maxFps 100000 --frontendNull --benchmark --stopAfterGameOver --stopAfterSeconds 300 --dumpInitRngs --automateAll --keepAutomated --gameMode crawl --assertExplored 5  testDefense-appveyor:-	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 9 --noAnim --maxFps 100000 --frontendLazy --benchmark --stopAfterSeconds 600 --dumpInitRngs --automateAll --keepAutomated --gameMode defense+	./LambdaHack --dbgMsgSer --logPriority 4 --newGame 9 --noAnim --maxFps 100000 --frontendNull --benchmark --benchMessages --stopAfterSeconds 600 --dumpInitRngs --automateAll --keepAutomated --gameMode defense  test-short-new:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix raid --dumpInitRngs --automateAll --keepAutomated --gameMode raid --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix brawl --dumpInitRngs --automateAll --keepAutomated --gameMode brawl --showItemSamples --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix shootout --dumpInitRngs --automateAll --keepAutomated --gameMode shootout --showItemSamples --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix hunt --dumpInitRngs --automateAll --keepAutomated --gameMode hunt --showItemSamples --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix escape --dumpInitRngs --automateAll --keepAutomated --gameMode escape --showItemSamples --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix zoo --dumpInitRngs --automateAll --keepAutomated --gameMode zoo --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix ambush --dumpInitRngs --automateAll --keepAutomated --gameMode ambush --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix crawl --dumpInitRngs --automateAll --keepAutomated --gameMode crawl --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix safari --dumpInitRngs --automateAll --keepAutomated --gameMode safari --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix safariSurvival --dumpInitRngs --automateAll --keepAutomated --gameMode safariSurvival --showItemSamples --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix battle --showItemSamples --dumpInitRngs --automateAll --keepAutomated --gameMode battle --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix battleDefense --dumpInitRngs --automateAll --keepAutomated --gameMode battleDefense --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix battleSurvival --dumpInitRngs --automateAll --keepAutomated --gameMode battleSurvival --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix raid --dumpInitRngs --automateAll --keepAutomated --gameMode raid --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix brawl --dumpInitRngs --automateAll --keepAutomated --gameMode brawl --showItemSamples --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix shootout --dumpInitRngs --automateAll --keepAutomated --gameMode shootout --showItemSamples --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix hunt --dumpInitRngs --automateAll --keepAutomated --gameMode hunt --showItemSamples --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix escape --dumpInitRngs --automateAll --keepAutomated --gameMode escape --showItemSamples --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix zoo --dumpInitRngs --automateAll --keepAutomated --gameMode zoo --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix ambush --dumpInitRngs --automateAll --keepAutomated --gameMode ambush --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix crawl --dumpInitRngs --automateAll --keepAutomated --gameMode crawl --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix safari --dumpInitRngs --automateAll --keepAutomated --gameMode safari --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix safariSurvival --dumpInitRngs --automateAll --keepAutomated --gameMode safariSurvival --showItemSamples --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix battle --showItemSamples --dumpInitRngs --automateAll --keepAutomated --gameMode battle --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix battleDefense --dumpInitRngs --automateAll --keepAutomated --gameMode battleDefense --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --newGame 5 --savePrefix battleSurvival --dumpInitRngs --automateAll --keepAutomated --gameMode battleSurvival --frontendTeletype --stopAfterSeconds 2 2> /tmp/teletypetest.log  # $(RNGOPTS) is needed for determinism relative to seed # generated before game save test-short-load:-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix raid --dumpInitRngs --automateAll --keepAutomated --gameMode raid --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix brawl --dumpInitRngs --automateAll --keepAutomated --gameMode brawl --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix shootout --dumpInitRngs --automateAll --keepAutomated --gameMode shootout --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix hunt --dumpInitRngs --automateAll --keepAutomated --gameMode hunt --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix escape --dumpInitRngs --automateAll --keepAutomated --gameMode escape --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix zoo --dumpInitRngs --automateAll --keepAutomated --gameMode zoo --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix ambush --dumpInitRngs --automateAll --keepAutomated --gameMode ambush --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix crawl --dumpInitRngs --automateAll --keepAutomated --gameMode crawl --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix safari --dumpInitRngs --automateAll --keepAutomated --gameMode safari --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix safariSurvival --dumpInitRngs --automateAll --keepAutomated --gameMode safariSurvival --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix battle --dumpInitRngs --automateAll --keepAutomated --gameMode battle --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix battleDefense --dumpInitRngs --automateAll --keepAutomated --gameMode battleDefense --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log-	./LambdaHack --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix battleSurvival --dumpInitRngs --automateAll --keepAutomated --gameMode battleSurvival --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix raid --dumpInitRngs --automateAll --keepAutomated --gameMode raid --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix brawl --dumpInitRngs --automateAll --keepAutomated --gameMode brawl --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix shootout --dumpInitRngs --automateAll --keepAutomated --gameMode shootout --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix hunt --dumpInitRngs --automateAll --keepAutomated --gameMode hunt --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix escape --dumpInitRngs --automateAll --keepAutomated --gameMode escape --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix zoo --dumpInitRngs --automateAll --keepAutomated --gameMode zoo --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix ambush --dumpInitRngs --automateAll --keepAutomated --gameMode ambush --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix crawl --dumpInitRngs --automateAll --keepAutomated --gameMode crawl --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix safari --dumpInitRngs --automateAll --keepAutomated --gameMode safari --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix safariSurvival --dumpInitRngs --automateAll --keepAutomated --gameMode safariSurvival --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix battle --dumpInitRngs --automateAll --keepAutomated --gameMode battle --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix battleDefense --dumpInitRngs --automateAll --keepAutomated --gameMode battleDefense --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log+	$$(cabal list-bin exe:LambdaHack) --dbgMsgSer --logPriority 4 --boostRandomItem --savePrefix battleSurvival --dumpInitRngs --automateAll --keepAutomated --gameMode battleSurvival --frontendTeletype --stopAfterSeconds 2 $(RNGOPTS) 2> /tmp/teletypetest.log   build-binary-v1:@@ -277,14 +275,11 @@ 	cabal v1-copy --destdir=LambdaHackTheGameInstall  copy-binary:-	cp $$(cabal-plan list-bin exe:LambdaHack) LambdaHackTheGame+	cp $$(cabal list-bin exe:LambdaHack) LambdaHackTheGame  configure-binary-v2: 	cabal configure --disable-tests --disable-library-profiling --disable-profiling --enable-optimization -configure-binary-v2-vty:-	cabal configure -fvty --disable-tests --disable-library-profiling --disable-profiling --disable-documentation --enable-optimization- build-binary-v2: 	cabal build --only-dependencies . 	cabal build exe:LambdaHack@@ -315,10 +310,3 @@ 	LH_VERSION=$$(cat ~/.LambdaHack/stdout.txt); \ 	OS_VERSION=$$(sw_vers -productVersion); \ 	tar -czf LambdaHack_$${LH_VERSION}_macosx-$${OS_VERSION}-amd64.tar.gz LambdaHackTheGame--build-directory-vty: configure-binary-v2-vty build-binary-v2 copy-directory copy-binary--build-binary-screen-reader-ubuntu: build-directory-vty-	LambdaHackTheGame/LambdaHack --version > /dev/null; \-	LH_VERSION=$$(cat ~/.LambdaHack/stdout.txt); \-	tar -czf LambdaHack_$${LH_VERSION}_screen-reader-ubuntu-16.04-amd64.tar.gz LambdaHackTheGame

@@ -1,10 +1,9 @@ LambdaHack ========== -[![Build Status](https://secure.travis-ci.org/LambdaHack/LambdaHack.svg?master)](https://travis-ci.org/LambdaHack/LambdaHack) [![Hackage](https://img.shields.io/hackage/v/LambdaHack.svg)](https://hackage.haskell.org/package/LambdaHack) [![Join the chat at Discord](https://img.shields.io/discord/688792755564052486.svg?label=chat%20on%20Discord&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/87Ghnws)-[![Join the chat at Matrix](https://img.shields.io/matrix/lambdahack:mozilla.org.svg?label=chat%20on%20Matrix&logo=matrix&server_fqdn=mozilla.modular.im)](https://matrix.to/#/!HnbpAHMjOGHlYtrASl:mozilla.org?via=mozilla.modular.im)+[![Join the chat at Matrix](https://img.shields.io/matrix/lambdahack:mozilla.org.svg?label=chat%20on%20Matrix&logo=matrix&server_fqdn=mozilla.modular.im)](https://matrix.to/#/#lambdahack:mozilla.org)  LambdaHack is a Haskell[1] game engine library for ASCII roguelike[2] games of arbitrary theme, size and complexity, with optional@@ -16,6 +15,7 @@ of shooting down explosive projectiles. A couple were shot down close enough to enemies to harm them. Others exploded closer to our party members and took out of the air the projectiles that would otherwise harm them.+Actual in-game footage.  ![gameplay screenshot](https://raw.githubusercontent.com/LambdaHack/media/master/screenshot/allureofthestars.com.shooting.down.explosives.gif) @@ -39,11 +39,11 @@ and the engine builds the world and runs it. The library lets you compile a ready-to-play game binary, using either the supplied or a custom-made main loop.-Several frontends are available (SDL2 is the default+A couple of frontends are available (SDL2 is the default for desktop and there is a JavaScript browser frontend) and many other generic engine components are easily overridden,-but the fundamental source of flexibility lies-in the strict and type-safe separation of code from the content+but the fundamental source of flexibility lies in the strict+and enforced with types separation of code from the content and of clients (human and AI-controlled) from the server.  Please see the changelog file for recent improvements@@ -54,12 +54,12 @@ Please offer feedback to mikolaj.konarski@funktory.com or, preferably, on any of the public forums. -Other games known to use the LambdaHack library:+Games from different repos known to use the LambdaHack library:  * Allure of the Stars[6], a near-future Sci-Fi game -Note: the engine and the sample game are bundled together in a single-Hackage[3] package released under the permissive `BSD3` license.+Note: the engine and the LambdaHack sample game are bundled together+in a single Hackage[3] package released under the permissive `BSD3` license. You are welcome to create your own games by forking and modifying the single package, but please consider eventually splitting your changes into a separate content-heavy package that depends on the upstream@@ -84,7 +84,7 @@ you may prefer to use a native binary for your architecture, if it exists.  Pre-compiled game binaries are available through the release page[11]-(and, for Windows, dev versions continuously from AppVeyor[18]).+(and Linux dev versions from GitHub Actions[18] and Windows from AppVeyor[19]). To use a pre-compiled binary archive, unpack it and run the executable in the unpacked directory or use program shortcuts from the installer, if available. On Linux, make sure you have the SDL2 libraries installed@@ -97,19 +97,19 @@ ---------------------------------  The game UI can be configured via a config file.-The default settings, the same that are built into the binary,+The default config settings, the same that are built into the binary, are on github at [GameDefinition/config.ui.default](https://github.com/LambdaHack/LambdaHack/blob/master/GameDefinition/config.ui.default).-When the game is run for the first time, or whenever the settings file+When the game is run for the first time, or whenever the config file is deleted, the file is written to the default user data location,-which is `~/.Allure/` on Linux,+which is `~/.LambdaHack/` on Linux, `C:\Users\<username>\AppData\Roaming\LambdaHack\` (or `C:\Documents And Settings\user\Application Data\LambdaHack\` or something else altogether) on Windows and `Inspect/Application/Local Storage` under RMB menu when run inside the Chrome browser. If the user config file is outdated or corrupted, it's automatically-moved away together with old savefiles, which guarantees that the new-default config file is ultimately put in its place.+moved away together with old savefiles. At the next game start,+the new default config file appears at its place.  Screen fonts and, consequently, window size can be changed by editing the config file in the user data folder. The default bitmap font@@ -118,8 +118,8 @@ and results in a game window of exactly 720p HD dimensions. The `8x8xb.fnt` bitmap font results in a tiny window and covers latin-1 characters only. The config file parameter `allFontsScale` permits further window size-adjustments, automatically switching to the scalable `16x16xw.woff`-version of the game map font. Config file option `chosenFontset` governs+adjustments, automatically switching to the scalable version of the large+game map font (`16x16xw.woff`). Config file option `chosenFontset` governs not only the main game map font, but also the shape of the rectangular fonts, if any, in which longer texts are overlaid over the map. @@ -129,7 +129,7 @@ too small or, in fullscreen or on retina displays in OS X, the screen may be automatically scaled as a whole, not each letter separately, softening letter edges of the square fonts that should-be pixel-perfect and crisp.+rather be pixel-perfect and crisp.  If you don't have a numeric keypad, you can use the left-hand movement key setup (axwdqezc) or Vi editor keys (aka roguelike keys) or mouse.@@ -140,38 +140,41 @@ may be mouse for menus, go-to, inspecting the map, aiming at distant positions and keyboard for everything else. -If you are using a terminal frontend, e.g. the best supported vty frontend,-then numeric keypad (especially keypad `*` and `/`) may not work correctly,-depending on versions of libraries, terminfo and terminal emulators.-Toggling the Num Lock key may help or make issues worse. As a workaround,-in the vty frontend, numbers are used for movement, which sadly prevents-the number keys from selecting heroes. The commands that require pressing-Control and Shift together won't work either, but fortunately they are-not crucial to gameplay.+If you run the ANSI terminal frontend (`--frontendANSI` on commandline),+then numeric keypad (especially keypad `*`, `/` and `5`) may not work+correctly, depending on the terminal emulator you use. Toggling+the Num Lock key may help or make issues worse. As a work around+these issues, numbers are used for movement in the ANSI frontend,+which sadly prevents the number keys from selecting heroes.+The commands that require pressing Control and Shift together won't work+either, but fortunately they are not crucial to gameplay. -Some effort went into making the vty frontend usable with screen readers,+Some effort went into making the ANSI frontend usable with screen readers, but without feedback it's hard to say how accessible that setup is.+This doesn't work on Windows, due to extra code that would be required. As a side effect of screen reader support, there is no aiming line-nor path in vty frontend and some of map position highlighting+nor path in ANSI frontend and some of map position highlighting is performed using the terminal cursor. Screen readers may also work better with animations turned off, using `--noAnim` or the corresponding-config file option.+config file or main game menu options.   Compilation of the library and sample game from source ------------------------------------------------------ -The recommended frontend is based on SDL2, so you need the SDL2 libraries-for your OS. On Linux, remember to install the -dev versions as well,-e.g., libsdl2-dev and libsdl2-ttf-dev on Ubuntu Linux 16.04.-Other frontends are compiled similarly, but compilation to JavaScript-for the browser is more complicated and requires the ghcjs[15] compiler-and optionally the Google Closure Compiler[16].+To compile with the standard frontend based on SDL2, you need the SDL2+libraries for your OS. On Linux, remember to install the -dev versions+as well, e.g., libsdl2-dev and libsdl2-ttf-dev on Ubuntu Linux 16.04.+Compilation to JavaScript for the browser is more complicated+and requires the ghcjs[15] compiler and optionally the Google Closure+Compiler[16].  The latest official version of the LambdaHack library can be downloaded,-compiled for SDL2 and installed automatically using the Cabal tool,-which is already a part of your OS distribution, or available within-The Haskell Platform[7]. Get the library from Hackage[3] as follows+compiled for SDL2 and installed automatically using the 'cabal' tool,+which may already be a part of your OS distribution, but if it's too old+(version 3.4 or later is required) you can download the whole current+compilation suite as described at https://www.haskell.org/downloads/.+Get the LambdaHack package from Hackage[3] as follows      cabal update     cabal run LambdaHack@@ -182,9 +185,8 @@ the following speeds up the turn-around a lot      cp cabal.project.local.development cabal.project.local-    cabal install cabal-plan -and then compile with+and then you can compile (and recompile) with      cabal build . @@ -192,51 +194,50 @@      make play -There is a built-in black and white line terminal frontend, suitable-for teletype terminals or a keyboard and a printer (but it's going to use-a lot of paper, unless you disable animations with `--noAnim`). It is used-in CI and for some tests and benchmarks defined in Makefile. To compile-with one of the less rudimentary terminal frontends (in which case you are-on your own regarding font choice and color setup and you won't have-the spiffy colorful squares outlining special positions that exist in SDL2-frontend, but only crude cursor highlights), use Cabal flags, e.g,-to switch to the vty console frontend optimized for screen readers, run--    cabal run -fvty LambdaHack+The SDL2 frontend binary also contains the ANSI terminal frontend+(`--frontendANSI` on commandline) intended for screen readers+and a simplified black and white line terminal frontend (`--frontendTeletype`)+suitable for teletype terminals or a keyboard and a printer (but it's going+to use a lot of paper, unless you disable animations with `--noAnim`).+The teletype frontend is used in CI and for some tests and benchmarks defined+in Makefile. The terminal frontends leave you on your own regarding font+choice and color setup and you won't have the colorful squares outlining+special positions that exist in the SDL2 frontend, but only crude+cursor highlights. The terminal frontends should run on Windows,+but Windows disables console for GUI applications, so they don't.   Testing and debugging --------------------- +Unit tests and integration tests can be run and displayed with++    cabal test test --enable-tests --test-show-details=direct++To prepare doctests[7], set `tests: True` in your `cabal.project.local`.+Afterwards, doctests can be executed with++    cabal build . && cabal exec cabal test doctests++and their detailed results observed in a log file.+(This repeating of `cabal build` before each testsuite run+is required due to bug https://github.com/haskell/cabal/issues/7522.+Contributions to cabal development are very welcome.)+ The [Makefile](https://github.com/LambdaHack/LambdaHack/blob/master/Makefile)-contains many sample test commands.+contains many sample automated playtest commands. Numerous tests that use the screensaver game modes (AI vs. AI)-and the teletype frontend are gathered in `make test`.-Of these, travis runs `test-travis` on each push to github.+and the teletype frontend are gathered in `make test-locally`.+Some of these are run by CI  on each push to github. Test commands with prefix `frontend` start AI vs. AI games with-the standard, user-friendly frontend and auto-locating the game binary.+the standard SDL2 frontend to view them on.  Run `LambdaHack --help` to see a brief description of all debug options. Of these, the `--sniff` option is very useful (though verbose and initially cryptic), for displaying the traffic between clients-and the server. Some options in the config file may prove useful too,-though they mostly overlap with commandline options (and will be totally-merged at some point).--You can use HPC with the game as follows (details vary according-to HPC version).--    cabal clean-    cabal build --enable-coverage-    make test-    hpc report --hpcdir=dist/hpc/dyn/mix/LambdaHack --hpcdir=dist/hpc/dyn/mix/LambdaHack-xxx/ LambdaHack-    hpc markup --hpcdir=dist/hpc/dyn/mix/LambdaHack --hpcdir=dist/hpc/dyn/mix/LambdaHack-xxx/ LambdaHack--A quick manual playing session, after the automated tests, would be-in order as well, since the tests don't touch the topmost UI layer.-Note that a debug option of the form `--stopAfter*` is required to cleanly-terminate any automated test. This is needed to gather any HPC info,-because HPC requires a clean exit to save data files.+and the server. Some options in the config file may prove useful+for debugging too, though they mostly overlap with commandline options+(and will be totally merged at some point).   Coding style@@ -250,6 +251,10 @@ Generally, relax and try to stick to the style apparent in a file you are editing. Put big formatting changes in separate commits. +CI checks the code with `hlint .` using the very liberal configuration file at+[.hlint.yaml](https://github.com/LambdaHack/LambdaHack/blob/master/.hlint.yaml).+If hlint is still too naggy, feel free to add more exceptions.+ Haddocks are provided for all module headers and for all functions and types from major modules, in particular for the modules that are interfaces for a whole directory of modules. Apart of that, only very important@@ -266,9 +271,59 @@ This codebase is an experiment in extensive use of states without lens. So far, it works, doesn't result in much larger files or lots of repetition and has the added benefits that newcomers don't need-to learn any lens library. Record punning, etc., definitely helps.+to learn any optics library. Record punning, etc., definitely help.  +First steps reading the codebase+--------------------------------++A good start may be++https://github.com/LambdaHack/LambdaHack/blob/master/GameDefinition/game-src/Client/UI/Content/Input.hs++That's where keyboard keys are assigned commands, help texts and categories+(including special categories indicating that a group of keys+also forms an in-game menu). This file is specific to a particular game+(hence `GameDefinition` in the path) and the engine dynamically creates+in-game help screens based on this file and on player config file+that can partially overwrite it.++The commands assigned to keys are interpreted by the UI client+(each faction in the game uses a client and the player's client additionally+has UI capabilities) in the following module:++https://github.com/LambdaHack/LambdaHack/blob/master/engine-src/Game/LambdaHack/Client/UI/HandleHumanM.hs++By this point you've seen one of the six major command sets (`HumanCmd`,+the others being `Effect`, `UpdAtomic`, `Request`, `Response`, `FrontReq`)+and one of around ten distinct interpreters for the commands+(mostly in `Handle*` modules). You've also seen a bit of the UI+client code, but not the AI client nor the server (game arbiter) code.+The wiki[17] contains not entirely outdated further reading about+the client-server architecture.++At this point, before trying to grasp anything more and drown in abstraction,+you are welcome to pick up a few `good first issue`-labeled tickets+and get some hands-on experience with the codebase.++For further study, note that most of the commands are interpreted in monads.+Server and clients share some of the customized monadic API, but their+monads are implemented differently (in `*Implementation` modules).+All these monads are state monads (managing different aspects of game state),+therefore the semantics of a command is a state transformer with extra+side effects (e.g., frontend drawing).++The "main loop" is the following: the UI client receives keystrokes+and interprets the commands they correspond to. As soon as one of the commands+is not just local UI manipulation, but a request to change the main game state,+such a request is packaged and sent to the server (e.g., a request+to move a hero to the north). The server responds "not possible,+there is a wall" or reacts by sending to clients (to all UI and AI clients+that can see the event) a series of game state-changing responses.+AI clients, likewise, send to the server requests, generated based+on the perceived game state changes and the AI goals of each AI faction.++ Further information ------------------- @@ -287,9 +342,12 @@ [4]: https://github.com/LambdaHack/LambdaHack/wiki [5]: https://github.com/LambdaHack/LambdaHack [6]: http://allureofthestars.com-[7]: https://www.haskell.org/platform+[7]: https://github.com/sol/doctest [9]: https://github.com/LambdaHack/LambdaHack/wiki/Sample-dungeon-crawler [10]: https://github.com/AllureOfTheStars/Allure [11]: https://github.com/LambdaHack/LambdaHack/releases [15]: https://github.com/ghcjs/ghcjs [16]: https://www.npmjs.com/package/google-closure-compiler+[17]: https://github.com/LambdaHack/LambdaHack/wiki/Client-server-architecture+[18]: https://github.com/LambdaHack/LambdaHack/actions+[19]: https://ci.appveyor.com/project/Mikolaj/lambdahack

@@ -0,0 +1,7 @@+packages: ./++package sdl2+    flags: +no-linear++package splitmix+    flags: +optimised-mixer

@@ -22,55 +22,56 @@ import           Game.LambdaHack.Core.Random import           Game.LambdaHack.Definition.ContentData import           Game.LambdaHack.Definition.Defs+import           Game.LambdaHack.Definition.DefsInternal  -- | Parameters for the generation of dungeon levels. -- Warning: for efficiency, avoid embedded items in any of the common tiles. data CaveKind = CaveKind-  { csymbol         :: Char             -- ^ a symbol-  , cname           :: Text             -- ^ short description-  , cfreq           :: Freqs CaveKind   -- ^ frequency within groups-  , cXminSize       :: X                -- ^ minimal X size of the whole cave-  , cYminSize       :: Y                -- ^ minimal Y size of the whole cave-  , ccellSize       :: Dice.DiceXY      -- ^ size of a map cell holding a place-  , cminPlaceSize   :: Dice.DiceXY      -- ^ minimal size of places; for merging-  , cmaxPlaceSize   :: Dice.DiceXY      -- ^ maximal size of places; for growing-  , cdarkOdds       :: Dice.Dice        -- ^ the odds a place is dark+  { csymbol       :: Char             -- ^ a symbol+  , cname         :: Text             -- ^ short description+  , cfreq         :: Freqs CaveKind   -- ^ frequency within groups+  , cXminSize     :: X                -- ^ minimal X size of the whole cave+  , cYminSize     :: Y                -- ^ minimal Y size of the whole cave+  , ccellSize     :: Dice.DiceXY      -- ^ size of a map cell holding a place+  , cminPlaceSize :: Dice.DiceXY      -- ^ minimal size of places; for merging+  , cmaxPlaceSize :: Dice.DiceXY      -- ^ maximal size of places; for growing+  , cdarkOdds     :: Dice.Dice        -- ^ the odds a place is dark                                         --   (level-scaled dice roll > 50)-  , cnightOdds      :: Dice.Dice        -- ^ the odds the cave is dark+  , cnightOdds    :: Dice.Dice        -- ^ the odds the cave is dark                                         --   (level-scaled dice roll > 50)-  , cauxConnects    :: Rational         -- ^ a proportion of extra connections-  , cmaxVoid        :: Rational+  , cauxConnects  :: Rational         -- ^ a proportion of extra connections+  , cmaxVoid      :: Rational       -- ^ at most this proportion of rooms may be void-  , cdoorChance     :: Chance           -- ^ the chance of a door in an opening-  , copenChance     :: Chance           -- ^ if there's a door, is it open?-  , chidden         :: Int              -- ^ if not open, hidden one in n times-  , cactorCoeff     :: Int              -- ^ the lower, the more monsters spawn-  , cactorFreq      :: Freqs ItemKind   -- ^ actor groups to consider-  , citemNum        :: Dice.Dice        -- ^ number of initial items in the cave-  , citemFreq       :: Freqs ItemKind   -- ^ item groups to consider-  , cplaceFreq      :: Freqs PlaceKind  -- ^ place groups to consider-  , cpassable       :: Bool+  , cdoorChance   :: Chance           -- ^ the chance of a door in an opening+  , copenChance   :: Chance           -- ^ if there's a door, is it open?+  , chidden       :: Int              -- ^ if not open, hidden one in n times+  , cactorCoeff   :: Int              -- ^ the lower, the more monsters spawn+  , cactorFreq    :: Freqs ItemKind   -- ^ actor groups to consider+  , citemNum      :: Dice.Dice        -- ^ number of initial items in the cave+  , citemFreq     :: Freqs ItemKind   -- ^ item groups to consider;+      -- note that the groups are flattened; e.g., if an item is moved to another+      -- included group with the same weight, the outcome doesn't change+  , cplaceFreq    :: Freqs PlaceKind  -- ^ place groups to consider+  , cpassable     :: Bool       -- ^ are passable default tiles permitted-  , labyrinth       :: Bool                -- ^ waste of time for AI to explore-  , cdefTile        :: GroupName TileKind  -- ^ the default cave tile-  , cdarkCorTile    :: GroupName TileKind  -- ^ the dark cave corridor tile-  , clitCorTile     :: GroupName TileKind  -- ^ the lit cave corridor tile-  , cwallTile       :: GroupName TileKind  -- ^ the tile used for @FWall@ fence-  , ccornerTile     :: GroupName TileKind  -- ^ tile used for the fence corners-  , cfenceTileN     :: GroupName TileKind  -- ^ the outer fence N wall-  , cfenceTileE     :: GroupName TileKind  -- ^ the outer fence E wall-  , cfenceTileS     :: GroupName TileKind  -- ^ the outer fence S wall-  , cfenceTileW     :: GroupName TileKind  -- ^ the outer fence W wall-  , cfenceApart     :: Bool                -- ^ are places touching fence banned-  , clegendDarkTile :: GroupName TileKind  -- ^ the dark place plan legend-  , clegendLitTile  :: GroupName TileKind  -- ^ the lit place plan legend-  , cminStairDist   :: Int                 -- ^ minimal distance between stairs-  , cmaxStairsNum   :: Dice.Dice           -- ^ maximum number of stairs-  , cescapeFreq     :: Freqs PlaceKind     -- ^ escape groups, if any-  , cstairFreq      :: Freqs PlaceKind     -- ^ place groups for created stairs-  , cstairAllowed   :: Freqs PlaceKind     -- ^ extra groups for inherited-  , cskip           :: [Int]  -- ^ which faction starting positions to skip-  , cdesc           :: Text   -- ^ full cave description+  , labyrinth     :: Bool                -- ^ waste of time for AI to explore+  , cdefTile      :: GroupName TileKind  -- ^ the default cave tile+  , cdarkCorTile  :: GroupName TileKind  -- ^ the dark cave corridor tile+  , clitCorTile   :: GroupName TileKind  -- ^ the lit cave corridor tile+  , cwallTile     :: GroupName TileKind  -- ^ the tile used for @FWall@ fence+  , ccornerTile   :: GroupName TileKind  -- ^ tile used for the fence corners+  , cfenceTileN   :: GroupName TileKind  -- ^ the outer fence N wall+  , cfenceTileE   :: GroupName TileKind  -- ^ the outer fence E wall+  , cfenceTileS   :: GroupName TileKind  -- ^ the outer fence S wall+  , cfenceTileW   :: GroupName TileKind  -- ^ the outer fence W wall+  , cfenceApart   :: Bool                -- ^ are places touching fence banned+  , cminStairDist :: Int                 -- ^ minimal distance between stairs+  , cmaxStairsNum :: Dice.Dice           -- ^ maximum number of stairs+  , cescapeFreq   :: Freqs PlaceKind     -- ^ escape groups, if any+  , cstairFreq    :: Freqs PlaceKind     -- ^ place groups for created stairs+  , cstairAllowed :: Freqs PlaceKind     -- ^ extra groups for inherited+  , cskip         :: [Int]  -- ^ which faction starting positions to skip+  , cdesc         :: Text   -- ^ full cave description   }   deriving Show  -- No Eq and Ord to make extending logically sound 

@@ -7,16 +7,18 @@   , ItemKind(..), makeData   , Aspect(..), Effect(..), Condition(..), DetectKind(..)   , TimerDice, ThrowMod(..)+  , ItemSymbolsUsedInEngine(..), emptyItemSymbolsUsedInEngine   , boostItemKindList, forApplyEffect, forDamageEffect, isDamagingKind   , strengthOnCombine, strengthOnSmash, getDropOrgans   , getMandatoryPresentAsFromKind, isEffEscape, isEffEscapeOrAscend   , timeoutAspect, orEffect, onSmashEffect, onCombineEffect, alwaysDudEffect   , damageUsefulness, verbMsgNoLonger, verbMsgLess, toVelocity, toLinger   , timerNone, isTimerNone, foldTimer, toOrganBad, toOrganGood, toOrganNoTimer+  , validateSingle #ifdef EXPOSE_INTERNAL     -- * Internal operations   , boostItemKind, onSmashOrCombineEffect-  , validateSingle, validateAll, validateDups, validateDamage+  , validateAll, validateDups, validateDamage   , mandatoryGroups, mandatoryGroupsSingleton #endif   ) where@@ -36,6 +38,7 @@ import qualified Game.LambdaHack.Definition.Ability as Ability import           Game.LambdaHack.Definition.ContentData import           Game.LambdaHack.Definition.Defs+import           Game.LambdaHack.Definition.DefsInternal import           Game.LambdaHack.Definition.Flavour  -- * Mandatory item groups@@ -100,7 +103,8 @@ -- Of these, aspects and effects are jointly called item powers. -- Note that this type is mutually recursive with 'Effect' and `Aspect`. data ItemKind = ItemKind-  { isymbol  :: Char            -- ^ map symbol+  { isymbol  :: ContentSymbol ItemKind+                                -- ^ map symbol   , iname    :: Text            -- ^ generic name; is pluralized if needed   , ifreq    :: Freqs ItemKind  -- ^ frequency within groups   , iflavour :: [Flavour]       -- ^ possible flavours@@ -317,6 +321,51 @@  instance Hashable ThrowMod +data ItemSymbolsUsedInEngine = ItemSymbolsUsedInEngine+  { rsymbolProjectile :: ContentSymbol ItemKind+  , rsymbolLight      :: ContentSymbol ItemKind+  , rsymbolTool       :: ContentSymbol ItemKind+  , rsymbolSpecial    :: ContentSymbol ItemKind+  , rsymbolGold       :: ContentSymbol ItemKind+  , rsymbolNecklace   :: ContentSymbol ItemKind+  , rsymbolRing       :: ContentSymbol ItemKind+  , rsymbolPotion     :: ContentSymbol ItemKind+  , rsymbolFlask      :: ContentSymbol ItemKind+  , rsymbolScroll     :: ContentSymbol ItemKind+  , rsymbolTorsoArmor :: ContentSymbol ItemKind+  , rsymbolMiscArmor  :: ContentSymbol ItemKind+  , rsymbolClothes    :: ContentSymbol ItemKind+  , rsymbolShield     :: ContentSymbol ItemKind+  , rsymbolPolearm    :: ContentSymbol ItemKind+  , rsymbolEdged      :: ContentSymbol ItemKind+  , rsymbolHafted     :: ContentSymbol ItemKind+  , rsymbolWand       :: ContentSymbol ItemKind+  , rsymbolFood       :: ContentSymbol ItemKind+  }++emptyItemSymbolsUsedInEngine :: ItemSymbolsUsedInEngine+emptyItemSymbolsUsedInEngine = ItemSymbolsUsedInEngine+  { rsymbolProjectile = toContentSymbol '0'+  , rsymbolLight      = toContentSymbol '0'+  , rsymbolTool       = toContentSymbol '0'+  , rsymbolSpecial    = toContentSymbol '0'+  , rsymbolGold       = toContentSymbol '0'+  , rsymbolNecklace   = toContentSymbol '0'+  , rsymbolRing       = toContentSymbol '0'+  , rsymbolPotion     = toContentSymbol '0'+  , rsymbolFlask      = toContentSymbol '0'+  , rsymbolScroll     = toContentSymbol '0'+  , rsymbolTorsoArmor = toContentSymbol '0'+  , rsymbolMiscArmor  = toContentSymbol '0'+  , rsymbolClothes    = toContentSymbol '0'+  , rsymbolShield     = toContentSymbol '0'+  , rsymbolPolearm    = toContentSymbol '0'+  , rsymbolEdged      = toContentSymbol '0'+  , rsymbolHafted     = toContentSymbol '0'+  , rsymbolWand       = toContentSymbol '0'+  , rsymbolFood       = toContentSymbol '0'+  }+ boostItemKindList :: SM.SMGen -> [ItemKind] -> [ItemKind] boostItemKindList _ [] = [] boostItemKindList initialGen l =@@ -505,8 +554,8 @@ toOrganNoTimer grp = CreateItem Nothing COrgan grp TimerNone  -- | Catch invalid item kind definitions.-validateSingle :: ItemKind -> [Text]-validateSingle ik@ItemKind{..} =+validateSingle :: ItemSymbolsUsedInEngine -> ItemKind -> [Text]+validateSingle itemSymbols ik@ItemKind{..} =   ["iname longer than 23" | T.length iname > 23]   ++ ["icount < 0" | Dice.infDice icount < 0]   ++ validateRarity irarity@@ -526,7 +575,10 @@           likelyTemplate = case ifreq of             [(grp, 1)] -> "unknown" `T.isSuffixOf` fromGroupName grp             _ -> False-          likelyException = isymbol `elem` [',', '"', '-'] || likelyTemplate+          likelyException = isymbol `elem` [ rsymbolFood itemSymbols+                                           , rsymbolNecklace itemSymbols+                                           , rsymbolWand itemSymbols ]+                            || likelyTemplate       in [ "EqpSlot specified but not Equipable nor Meleeable"          | length ts == 1 && not equipable && not meleeable ]          ++ [ "EqpSlot not specified but Equipable or Meleeable and not a likely organ or necklace or template"@@ -696,14 +748,16 @@   in [ "PresentAs groups not singletons:" <+> tshow wrongPresentAsGroups      | not $ null wrongPresentAsGroups ] -makeData :: [ItemKind] -> [GroupName ItemKind] -> [GroupName ItemKind]+makeData :: ItemSymbolsUsedInEngine+         -> [ItemKind] -> [GroupName ItemKind] -> [GroupName ItemKind]          -> ContentData ItemKind-makeData content groupNamesSingleton groupNames =+makeData itemSymbols content groupNamesSingleton groupNames =   let allGroupNamesTooLong = filter ((> 23) . T.length . fromGroupName)                              $ groupNamesSingleton ++ groupNames   in assert (null allGroupNamesTooLong              `blame` "ItemKind: some item group names too long"              `swith` allGroupNamesTooLong) $-     makeContentData "ItemKind" iname ifreq validateSingle validateAll content+     makeContentData "ItemKind" iname ifreq+                     (validateSingle itemSymbols) validateAll content                      (mandatoryGroupsSingleton ++ groupNamesSingleton)                      (mandatoryGroups ++ groupNames)

@@ -5,7 +5,7 @@   , ModeKind(..), makeData   , Caves, Roster(..), TeamContinuity(..), Outcome(..)   , HiCondPoly, HiSummand, HiPolynomial, HiIndeterminant(..)-  , Player(..), LeaderMode(..), AutoLeader(..)+  , Player(..), AutoLeader(..)   , teamExplorer, victoryOutcomes, deafeatOutcomes, nameOutcomePast   , nameOutcomeVerb, endMessageOutcome, screensave #ifdef EXPOSE_INTERNAL@@ -29,6 +29,7 @@ import qualified Game.LambdaHack.Definition.Ability as Ability import           Game.LambdaHack.Definition.ContentData import           Game.LambdaHack.Definition.Defs+import           Game.LambdaHack.Definition.DefsInternal  -- | Game mode specification. data ModeKind = ModeKind@@ -118,23 +119,17 @@   , fdoctrine    :: Ability.Doctrine                                 -- ^ non-leaders behave according to this                                 --   doctrine; can be changed during the game-  , fleaderMode  :: LeaderMode  -- ^ the mode of switching the leader+  , fleaderMode  :: Maybe AutoLeader+                                -- ^ whether the faction can have a leader+                                --   and what's its switching mode;   , fhasUI       :: Bool        -- ^ does the faction have a UI client                                 --   (for control or passive observation)+  , funderAI     :: Bool        -- ^ is the faction under AI control   }   deriving (Show, Eq, Generic)  instance Binary Player --- | If a faction with @LeaderUI@ and @LeaderAI@ has any actor, it has a leader.-data LeaderMode =-    LeaderNull  -- ^ faction can have no leader, is whole under AI control-  | LeaderAI AutoLeader -- ^ leader under AI control-  | LeaderUI AutoLeader -- ^ leader under UI control, assumes @fhasUI@-  deriving (Show, Eq, Generic)--instance Binary LeaderMode- data AutoLeader = AutoLeader   { autoDungeon :: Bool       -- ^ leader switching between levels is automatically done by the server@@ -196,9 +191,12 @@  screensave :: AutoLeader -> ModeKind -> ModeKind screensave auto mk =-  let f x@(Player{fleaderMode = LeaderAI{}}, _, _) = x+  let f x@(Player{funderAI=True}, _, _) = x       f (player, teamContinuity, initial) =-          (player {fleaderMode = LeaderAI auto}, teamContinuity, initial)+          ( player { funderAI = True+                   , fleaderMode = Just auto }+          , teamContinuity+          , initial )   in mk { mroster = (mroster mk) {rosterList = map f $ rosterList $ mroster mk}         , mreason = "This is one of the screensaver scenarios, not available from the main menu, with all factions controlled by AI. Feel free to take over or relinquish control at any moment, but to register a legitimate high score, choose a standard scenario instead.\n" <> mreason mk         }@@ -237,19 +235,21 @@      in concatMap (checkDipl "rosterEnemy") rosterEnemy         ++ concatMap (checkDipl "rosterAlly") rosterAlly   ++ let keys = concatMap fst caves+         minD = minimum keys+         maxD = maximum keys          f (_, _, l) = concatMap g l          g i3@(ln, _, _) =            [ "initial actor levels not among caves:" <+> tshow i3            | ln `notElem` keys ]      in concatMap f rosterList+        ++ [ "player confused by both positive and negative level numbers"+           | signum minD /= signum maxD ]+        ++ [ "player confused by level numer zero"+           | any (== 0) keys ]  validateSinglePlayer :: Player -> [Text] validateSinglePlayer Player{..} =   [ "fname empty:" <+> fname | T.null fname ]-  ++ [ "no UI client, but UI leader:" <+> fname-     | not fhasUI && case fleaderMode of-                       LeaderUI _ -> True-                       _ -> False ]   ++ [ "fskillsOther not negative:" <+> fname      | any ((>= 0) . snd) $ Ability.skillsToList fskillsOther ] 

@@ -4,7 +4,7 @@ module Game.LambdaHack.Content.PlaceKind   ( PlaceKind(..), makeData   , Cover(..), Fence(..)-  , PlaceEntry(..), deadEndId+  , PlaceEntry(..), deadEndId, overridePlaceKind, override2PlaceKind #ifdef EXPOSE_INTERNAL     -- * Internal operations   , validateSingle, validateAll@@ -16,24 +16,26 @@ import Game.LambdaHack.Core.Prelude  import           Data.Binary+import qualified Data.EnumMap.Strict as EM import qualified Data.Text as T import           GHC.Generics (Generic)  import Game.LambdaHack.Content.TileKind (TileKind) import Game.LambdaHack.Definition.ContentData import Game.LambdaHack.Definition.Defs+import Game.LambdaHack.Definition.DefsInternal  -- | Parameters for the generation of small areas within a dungeon level. data PlaceKind = PlaceKind-  { psymbol       :: Char          -- ^ a symbol-  , pname         :: Text          -- ^ short description, singular or plural-  , pfreq         :: Freqs PlaceKind  -- ^ frequency within groups-  , prarity       :: Rarity        -- ^ rarity on given depths-  , pcover        :: Cover         -- ^ how to fill whole place using the corner-  , pfence        :: Fence         -- ^ whether to fence place with solid border-  , ptopLeft      :: [Text]        -- ^ plan of the top-left corner of the place-  , poverrideDark :: [(Char, GroupName TileKind)]  -- ^ dark legend override-  , poverrideLit  :: [(Char, GroupName TileKind)]  -- ^ lit legend override+  { psymbol     :: Char          -- ^ a symbol+  , pname       :: Text          -- ^ short description, singular or plural+  , pfreq       :: Freqs PlaceKind  -- ^ frequency within groups+  , prarity     :: Rarity        -- ^ rarity on given depths+  , pcover      :: Cover         -- ^ how to fill whole place using the corner+  , pfence      :: Fence         -- ^ whether to fence place with solid border+  , ptopLeft    :: [Text]        -- ^ plan of the top-left corner of the place+  , plegendDark :: EM.EnumMap Char (GroupName TileKind)  -- ^ dark legend+  , plegendLit  :: EM.EnumMap Char (GroupName TileKind)  -- ^ lit legend   }   deriving Show  -- No Eq and Ord to make extending logically sound @@ -56,6 +58,14 @@   | FNone   -- ^ skip the fence and fill all with the place proper   deriving (Show, Eq) +-- | Places are rooms and other dungeon features, their names can be seen+-- on a level map by aiming at a position that is an entry to the place+-- (an individual entrance point, an approach area around the place+-- or a phantom entry not on the map, but only used for statistics+-- to witness the place exists). Entries are proxies for initial places+-- created on the level (which may be otherwise eradicated by burrowing+-- the walls, etc.) and so used for dungeon statistics.+-- The statistics are presented in the @Dashboard/displace place lore@ menu. data PlaceEntry =     PEntry (ContentId PlaceKind)   | PAround (ContentId PlaceKind)@@ -68,32 +78,49 @@ {-# INLINE deadEndId #-} deadEndId = toContentId 0 -validateOverride :: [(Char, GroupName TileKind)] -> [Text]-validateOverride ov =-  let symbols = sort $ map fst ov-      duplicated = filter (uncurry (==)) $ zip symbols ('\0' : symbols)-  in [ "duplicated override symbols:"-        <+> T.pack (intersperse ' ' $ map fst duplicated)-     | not (null duplicated) ]+overridePlaceKind :: [(Char, GroupName TileKind)] -> PlaceKind -> PlaceKind+overridePlaceKind l pk = pk+  { plegendDark = EM.fromList l `EM.union` plegendDark pk+  , plegendLit = EM.fromList l `EM.union` plegendLit pk } +override2PlaceKind :: [(Char, GroupName TileKind)]+                   -> [(Char, GroupName TileKind)]+                   -> PlaceKind+                   -> PlaceKind+override2PlaceKind lDark lLit pk = pk+  { plegendDark = EM.fromList lDark `EM.union` plegendDark pk+  , plegendLit = EM.fromList lLit `EM.union` plegendLit pk }+ -- | Catch invalid place kind definitions. In particular, verify that -- the top-left corner map is rectangular and not empty.-validateSingle :: PlaceKind -> [Text]-validateSingle PlaceKind{..} =+validateSingle :: ContentData TileKind -> PlaceKind -> [Text]+validateSingle cotile PlaceKind{..} =   let dxcorner = case ptopLeft of         [] -> 0         l : _ -> T.length l+      inLegend :: Text -> EM.EnumMap Char (GroupName TileKind) -> Char -> [Text]+      inLegend _ _ 'X' = []  -- special placeholder symbol; TODO: unhardwire+      inLegend legendName m c = case EM.lookup c m of+        Nothing -> [tshow c <+> "tile code not found in" <+> legendName]+        Just grp -> [ tshow c <+> "tile code has group"+                      <+> displayGroupName grp+                      <+> "with null frequency in tile content"+                    | not $ oexistsGroup cotile grp ]+      inLegendAll legendName m = concatMap (inLegend legendName m)+                                           (concatMap T.unpack ptopLeft)   in [ "top-left corner empty" | dxcorner == 0 ]      ++ [ "top-left corner not rectangular"         | any (/= dxcorner) (map T.length ptopLeft) ]+     ++ inLegendAll "plegendDark" plegendDark+     ++ inLegendAll "plegendLit" plegendLit      ++ validateRarity prarity-     ++ validateOverride poverrideDark-     ++ validateOverride poverrideLit  -- | Validate all place kinds. validateAll :: [PlaceKind] -> ContentData PlaceKind -> [Text] validateAll _ _ = []  -- so far, always valid -makeData :: [PlaceKind] -> [GroupName PlaceKind] -> [GroupName PlaceKind]+makeData :: ContentData TileKind+         -> [PlaceKind] -> [GroupName PlaceKind] -> [GroupName PlaceKind]          -> ContentData PlaceKind-makeData = makeContentData "PlaceKind" pname pfreq validateSingle validateAll+makeData cotile = makeContentData "PlaceKind" pname pfreq+                                  (validateSingle cotile) validateAll

@@ -15,14 +15,16 @@ import qualified Data.Ini.Types as Ini import           Data.Version +import Game.LambdaHack.Content.ItemKind+  (ItemSymbolsUsedInEngine, emptyItemSymbolsUsedInEngine) import Game.LambdaHack.Definition.Defs  -- | The type of game rules and assorted game data. data RuleContent = RuleContent   { rtitle            :: String    -- ^ title of the game (not lib)-  , rXmax             :: X         -- ^ maximum level width; for now,+  , rWidthMax         :: X         -- ^ maximum level width; for now,                                    --   keep equal to ScreenContent.rwidth-  , rYmax             :: Y         -- ^ maximum level height; for now,+  , rHeightMax        :: Y         -- ^ maximum level height; for now,                                    --   keep equal to ScreenContent.rheight - 3   , rexeVersion       :: Version   -- ^ version of the game   , rcfgUIName        :: FilePath  -- ^ name of the UI config file@@ -34,14 +36,15 @@   , rnearby           :: Int       -- ^ what is a close distance between actors   , rstairWordCarried :: [Text]    -- ^ words that can't be dropped from stair                                    --   name as it goes through levels-  , rsymbolProjectile :: Char+  , ritemSymbols      :: ItemSymbolsUsedInEngine+                                   -- ^ item symbols treated specially in engine   }  emptyRuleContent :: RuleContent emptyRuleContent = RuleContent   { rtitle = ""-  , rXmax = 0-  , rYmax = 0+  , rWidthMax = 0+  , rHeightMax = 0   , rexeVersion = makeVersion []   , rcfgUIName = ""   , rcfgUIDefault = ("", Ini.emptyConfig)@@ -50,7 +53,7 @@   , rscoresFile = ""   , rnearby = 0   , rstairWordCarried = []-  , rsymbolProjectile = '0'+  , ritemSymbols = emptyItemSymbolsUsedInEngine   }  -- | Catch invalid rule kind definitions.

@@ -1,7 +1,7 @@ -- | The type of tile kinds. Every terrain tile in the game is -- an instantiated tile kind. module Game.LambdaHack.Content.TileKind-  ( pattern S_UNKNOWN_SPACE, pattern LEGEND_LIT, pattern LEGEND_DARK, pattern S_UNKNOWN_OUTER_FENCE, pattern S_BASIC_OUTER_FENCE, pattern AQUATIC+  ( pattern S_UNKNOWN_SPACE, pattern S_UNKNOWN_OUTER_FENCE, pattern S_BASIC_OUTER_FENCE, pattern AQUATIC   , TileKind(..), ProjectileTriggers(..), Feature(..)   , makeData   , isUknownSpace, unknownId@@ -24,6 +24,7 @@ import Game.LambdaHack.Definition.Color import Game.LambdaHack.Definition.ContentData import Game.LambdaHack.Definition.Defs+import Game.LambdaHack.Definition.DefsInternal  -- | The type of kinds of terrain tiles. See @Tile.hs@ for explanation -- of the absence of a corresponding type @Tile@ that would hold@@ -189,16 +190,11 @@ pattern S_UNKNOWN_SPACE, S_UNKNOWN_OUTER_FENCE, S_BASIC_OUTER_FENCE :: GroupName TileKind  mandatoryGroups :: [GroupName TileKind]-mandatoryGroups =-       [LEGEND_LIT, LEGEND_DARK]--pattern LEGEND_LIT, LEGEND_DARK :: GroupName TileKind+mandatoryGroups = []  pattern S_UNKNOWN_SPACE = GroupName "unknown space" pattern S_UNKNOWN_OUTER_FENCE = GroupName "unknown outer fence" pattern S_BASIC_OUTER_FENCE = GroupName "basic outer fence"-pattern LEGEND_LIT = GroupName "legendLit"-pattern LEGEND_DARK = GroupName "legendDark"  -- * Optional item groups @@ -237,7 +233,7 @@ talterForStairs = 3  floorSymbol :: Char-floorSymbol = '\x00B7'+floorSymbol = '·'  -- '\x00B7'  -- Alter skill schema: -- 0  can be altered by everybody (escape)

@@ -12,7 +12,7 @@   , module Control.Exception.Assert.Sugar    , Text, (<+>), tshow, divUp, sum, (<$$>), partitionM, length, null, comparing-  , intCast, fromIntegralWrap, toIntegralCrash, intToDouble, int64ToDouble+  , into, fromIntegralWrap, toIntegralCrash, intToDouble, int64ToDouble   , mapM_, forM_    , (***), (&&&), first, second@@ -49,7 +49,6 @@ import           Data.Hashable import qualified Data.HashMap.Strict as HM import           Data.Int (Int64)-import           Data.IntCast (intCast) import           Data.Key import           Data.List.Compat hiding (foldl, foldl1, length, null, sum) import qualified Data.List.Compat as List@@ -62,6 +61,7 @@ import           NLP.Miniutter.English ((<+>)) import qualified NLP.Miniutter.English as MU import qualified Prelude.Compat+import           Witch (into)  -- | Show and pack the result. tshow :: Show a => a -> Text

@@ -4,7 +4,7 @@     Rnd     -- * Random operations   , randomR, randomR0, nextRandom, randomWord32-  , oneOf, shuffle, shuffleExcept, frequency+  , oneOf, shuffle, invalidInformationCode, shuffleExcept, frequency     -- * Fractional chance   , Chance, chance     -- * Casting dice scaled with level@@ -56,18 +56,15 @@ -- to keep it working for arbitrary fixed number of bits. nextRandom :: forall a. (Integral a) => a -> SM.SMGen -> (a, SM.SMGen) {-# INLINE nextRandom #-}-nextRandom h g = assert ((intCast :: a -> Integer) h-                         <= (intCast :: Int32 -> Integer) maxBound) $+nextRandom h g = assert (toInteger h+                         <= (toInteger :: Int32 -> Integer) maxBound) $   let (w32, g') = SM.bitmaskWithRejection32'                     ((fromIntegralWrap :: a -> Word32) h) g       -- `fromIntegralWrap` is fine here, because wrapping is OK.       x = (fromIntegralWrap :: Word32 -> a) w32   in if x > h      then error $ "nextRandom internal error"-                  `showFailure`-                    ( (intCast :: a -> Integer) x-                    , (intCast :: a -> Integer) h-                    , w32 )+                  `showFailure` (toInteger x, toInteger h, w32)      else (x, g')  -- | Get a random 'Word32' using full range.@@ -90,16 +87,23 @@   x <- oneOf l   (x :) <$> shuffle (delete x l) +-- | Code that means the information (e.g., flavour or hidden kind index)+-- should be regenerated, because it could not be transferred from+-- previous playthrough (it's random in each playthrough or there was+-- no previous playthrough).+invalidInformationCode :: Word16+invalidInformationCode = maxBound+ -- | Generates a random permutation, except for the existing mapping. shuffleExcept :: U.Vector Word16 -> Int -> [Word16] -> Rnd [Word16] shuffleExcept v len l0 = assert (len == length l0) $-  shuffleE 0 (l0 \\ filter (/= maxBound) (U.toList v))+  shuffleE 0 (l0 \\ filter (/= invalidInformationCode) (U.toList v))  where   shuffleE :: Int -> [Word16] -> Rnd [Word16]   shuffleE i _ | i == len = return []   shuffleE i l = do     let a0 = v U.! i-    if a0 == maxBound then do+    if a0 == invalidInformationCode then do       a <- oneOf l       (a :) <$> shuffleE (succ i) (delete a l)     else

@@ -1,4 +1,4 @@-{-# LANGUAGE DeriveGeneric, GeneralizedNewtypeDeriving, MagicHash #-}+{-# LANGUAGE DeriveGeneric, GeneralizedNewtypeDeriving #-} -- | Colours and text attributes. module Game.LambdaHack.Definition.Color   ( -- * Colours@@ -27,10 +27,7 @@ import           Data.Binary import           Data.Bits (unsafeShiftL, unsafeShiftR, (.&.)) import qualified Data.Char as Char-import           GHC.Exts (Int (I#)) import           GHC.Generics (Generic)-import           GHC.Prim (int2Word#)-import           GHC.Word (Word32 (W32#))  -- | Colours supported by the major frontends. data Color =@@ -143,10 +140,12 @@ -- | Additional map cell highlight, e.g., a colorful square around the cell -- or a colorful background. ----- Note: the highlight underscored by the terminal cursor is--- the maximal element of this type present of this screen.+-- Warning: the highlight underscored by the terminal cursor is+-- the maximal element of this type present on a screen,+-- so don't add new highlights to the end. data Highlight =     HighlightNone+  | HighlightBackground   | HighlightGreen   | HighlightBlue   | HighlightBrown@@ -164,6 +163,7 @@ highlightToColor :: Highlight -> Color highlightToColor hi = case hi of   HighlightNone -> Black  -- should be transparent, but is OK in web frontend+  HighlightBackground -> BrBlack  -- gets a special colour, but as a background   HighlightGreen -> Green   HighlightBlue -> Blue   HighlightBrown -> Brown@@ -175,7 +175,7 @@   HighlightYellow -> BrYellow  -- obscures, but mostly used around bright white   HighlightYellowAim -> BrYellow   HighlightRedAim -> Red-  HighlightNoneCursor -> Black  -- used in vty for cursor via @maxIndexByA@+  HighlightNoneCursor -> Black  -- used in ANSI for cursor via @maxIndexByA@  -- | Text attributes: foreground color and highlight. data Attr = Attr@@ -242,18 +242,23 @@  attrChar2ToW32 :: Color -> Char -> AttrCharW32 {-# INLINE attrChar2ToW32 #-}-attrChar2ToW32 fg acChar =-  case unsafeShiftL (fromEnum fg) 8 + unsafeShiftL (Char.ord acChar) 16 of-    I# i -> AttrCharW32 $ W32# (int2Word# i)-{- the hacks save one allocation (?) (before fits-in-32bits check) compared to-  AttrCharW32 $ toEnum-  $ unsafeShiftL (fromEnum fg) 8 + unsafeShiftL (Char.ord acChar) 16--}+attrChar2ToW32 fg =+  let fgNum = unsafeShiftL (fromEnum fg) 8+  in \acChar -> AttrCharW32 $ toEnum $ fgNum + unsafeShiftL (Char.ord acChar) 16+--+-- These hacks save one allocation (?) (before fits-in-32bits check) compared+-- to the above, but they fail in GHC 9.2.0 and possibly don't do anything+-- for JS, which is the only real bottleneck, so disabled:+--+--import GHC.Prim (int2Word#)+--  case unsafeShiftL (fromEnum fg) 8 + unsafeShiftL (Char.ord acChar) 16 of+--    I# i -> AttrCharW32 $ W32# (int2Word# i)  attrChar1ToW32 :: Char -> AttrCharW32 {-# INLINE attrChar1ToW32 #-} attrChar1ToW32 =   let fgNum = unsafeShiftL (fromEnum White) 8-  in \acChar ->-    case fgNum + unsafeShiftL (Char.ord acChar) 16 of-      I# i -> AttrCharW32 $ W32# (int2Word# i)+  in \acChar -> AttrCharW32 $ toEnum $ fgNum + unsafeShiftL (Char.ord acChar) 16+--+--    case fgNum + unsafeShiftL (Char.ord acChar) 16 of+--      I# i -> AttrCharW32 $ W32# (int2Word# i)

@@ -11,7 +11,7 @@   ( ContentData   , validateRarity, validFreqs   , emptyContentData, makeContentData-  , okind, omemberGroup, oisSingletonGroup, ouniqGroup, opick+  , okind, omemberGroup, oexistsGroup, oisSingletonGroup, ouniqGroup, opick   , ofoldlWithKey', ofoldlGroup', omapVector, oimapVector, olength   ) where @@ -28,6 +28,7 @@ import Game.LambdaHack.Core.Frequency import Game.LambdaHack.Core.Random import Game.LambdaHack.Definition.Defs+import Game.LambdaHack.Definition.DefsInternal  -- | Verified and preprocessed content data of a particular kind. data ContentData c = ContentData@@ -149,6 +150,11 @@  omemberGroup :: ContentData a -> GroupName a -> Bool omemberGroup ContentData{groupFreq} cgroup = cgroup `M.member` groupFreq++oexistsGroup :: ContentData a -> GroupName a -> Bool+oexistsGroup ContentData{groupFreq} cgroup = case M.lookup cgroup groupFreq of+  Nothing -> False+  Just l -> all ((> 0) . fst) l  oisSingletonGroup :: ContentData a -> GroupName a -> Bool oisSingletonGroup ContentData{groupFreq} cgroup =

@@ -1,9 +1,12 @@-{-# LANGUAGE DeriveGeneric, GeneralizedNewtypeDeriving #-}+{-# LANGUAGE DeriveGeneric #-} -- | Basic types for content definitions. module Game.LambdaHack.Definition.Defs-  ( X, Y, GroupName(..)-  , Freqs, Rarity, linearInterpolation-  , ContentId, toContentId, fromContentId, contentIdIndex+  ( GroupName, displayGroupName+  , ContentId, contentIdIndex+  , ContentSymbol, displayContentSymbol+  , X, Y+  , Freqs, renameFreqs+  , Rarity, linearInterpolation   , CStore(..), ppCStore, ppCStoreIn, verbCStore   , SLore(..), ItemDialogMode(..), ppSLore, headingSLore   , ppItemDialogMode, ppItemDialogModeIn, ppItemDialogModeFrom@@ -16,26 +19,24 @@  import Control.DeepSeq import Data.Binary-import Data.Hashable import GHC.Generics (Generic) +import Game.LambdaHack.Definition.DefsInternal+ -- | X spacial dimension for points and vectors. type X = Int  -- | Y xpacial dimension for points and vectors. type Y = Int --- If ever needed, we can use a symbol table here, since content--- is never serialized. But we'd need to cover the few cases--- (e.g., @litemFreq@) where @GroupName@ goes into savegame.-newtype GroupName a = GroupName {fromGroupName :: Text}-  deriving (Show, Eq, Ord, Hashable, Binary, NFData)- -- | For each group that the kind belongs to, denoted by a @GroupName@ -- in the first component of a pair, the second component of a pair shows -- how common the kind is within the group.-type Freqs a = [(GroupName a, Int)]+type Freqs c = [(GroupName c, Int)] +renameFreqs :: (Text -> Text) -> Freqs c -> Freqs c+renameFreqs f = map (first (GroupName . f . fromGroupName))+ -- | Rarity on given depths. The first element of the pair is normally -- in (0, 10] interval and, e.g., if there are 20 levels, 0.5 represents -- the first level and 10 the last. Exceptionally, it may be larger than 10,@@ -87,22 +88,6 @@   in y1 + ceiling             (intToDouble (y2 - y1) * (levelDepth10 - x1 * totalDepth)              / ((x2 - x1) * totalDepth))---- | Content identifiers for the content type @c@.-newtype ContentId c = ContentId Word16-  deriving (Show, Eq, Ord, Enum, Hashable, Binary)--toContentId :: Word16 -> ContentId c-{-# INLINE toContentId #-}-toContentId = ContentId--fromContentId :: ContentId c -> Word16-{-# INLINE fromContentId #-}-fromContentId (ContentId k) = k--contentIdIndex :: ContentId k -> Int-{-# INLINE contentIdIndex #-}-contentIdIndex (ContentId k) = fromEnum k  -- | Actor's item stores. data CStore =

@@ -0,0 +1,74 @@+{-# LANGUAGE GeneralizedNewtypeDeriving #-}+-- | Very basic types for content definitions with their internals exposed.+module Game.LambdaHack.Definition.DefsInternal+  ( GroupName(..), displayGroupName+  , ContentId, toContentId, fromContentId, contentIdIndex+  , ContentSymbol, toContentSymbol, displayContentSymbol+  ) where++import Prelude ()++import Game.LambdaHack.Core.Prelude++import Control.DeepSeq+import Data.Binary+import Data.Hashable++-- If ever needed, we can use a symbol table here, since content+-- is never serialized. But we'd need to cover the few cases+-- (e.g., @litemFreq@) where @GroupName@ goes into savegame.+newtype GroupName c = GroupName {fromGroupName :: Text}+  deriving (Show, Eq, Ord, Hashable, Binary, NFData)++-- | This does not need to be 1-1, so should not be used in place of the+-- 'Eq' instance, etc.+displayGroupName :: GroupName c -> Text+displayGroupName = fromGroupName++-- | Content identifiers for the content type @c@.+newtype ContentId c = ContentId Word16+  deriving (Show, Eq, Ord, Enum, Hashable, Binary)++toContentId :: Word16 -> ContentId c+{-# INLINE toContentId #-}+toContentId = ContentId++fromContentId :: ContentId c -> Word16+{-# INLINE fromContentId #-}+fromContentId (ContentId k) = k++contentIdIndex :: ContentId c -> Int+{-# INLINE contentIdIndex #-}+contentIdIndex (ContentId k) = fromEnum k++-- TODO: temporary, not to break compilation too soon:+type ContentSymbol c = Char+toContentSymbol :: Char -> ContentSymbol c+toContentSymbol = id+displayContentSymbol :: ContentSymbol c -> Char+displayContentSymbol = id++-- TODO: The intended definitions. Error they are going to cause will+-- point out all the remaining item symbols hardwired in the engine+-- and make any future accidental hardwiring harder.+-- TODO2: extend to other content kinds than item kinds.+{-+-- | An abstract view on the symbol of a content item definition.+-- Hiding the constructor prevents hardwiring symbols inside the engine+-- by accident (this is still possible via conversion functions,+-- if one insists, so the abstraction is leaky, but that's fine).+newtype ContentSymbol c = ContentSymbol Char+  deriving (Show, Eq, Ord, Generic, Binary, NFData)++-- | This is a 1-1 inclusion. Don't use, if an equal named symbol already+-- exists in rules content.+toContentSymbol :: Char -> ContentSymbol c+{-# INLINE toContentSymbol #-}+toContentSymbol = ContentSymbol++-- | This does not need to be 1-1, so should not be used in place of the+-- 'Eq' instance, etc.+displayContentSymbol :: ContentSymbol c -> Char+{-# INLINE displayContentSymbol #-}+displayContentSymbol (ContentSymbol c) = c+--}

@@ -2,9 +2,10 @@ -- | The appearance of in-game items, as communicated to the player. module Game.LambdaHack.Definition.Flavour   ( -- * The @Flavour@ type-    Flavour(Flavour)+    Flavour   , -- * Constructors     zipPlain, zipFancy, zipLiquid, zipGlassPlain, zipGlassFancy, zipStory+  , dummyFlavour, stdFlavList   , -- * Accessors     flavourToColor, flavourToName     -- * Assorted@@ -43,7 +44,13 @@  instance Binary Flavour where   put = put . (toIntegralCrash :: Int -> Word16) . fromEnum-  get = fmap (toEnum . (intCast :: Word16 -> Int)) get+  get = fmap (toEnum . (into :: Word16 -> Int)) get  -- @Int doesn't suffice++dummyFlavour :: Flavour+dummyFlavour = Flavour Story Black++stdFlavList :: [Flavour]+stdFlavList = [Flavour fn bc | fn <- [minBound..maxBound], bc <- stdCol]  -- | Turn a colour set into a flavour set. zipPlain, zipFancy, zipLiquid, zipGlassPlain, zipGlassFancy, zipStory :: [Color] -> [Flavour]

@@ -56,7 +56,7 @@   | SfxAtomic SfxAtomic  -- ^ atomic special effects   deriving Show --- TODO: needed in the future, if efect, to save undo information:+-- TODO: needed in the future, if ever, to save undo information: -- --  deriving (Show, Eq, Generic) --@@ -135,6 +135,7 @@   | UpdWriteSave   | UpdHearFid FactionId (Maybe Int) HearMsg       -- in @UpdAtomic@ to let AI analyze and count+  | UpdMuteMessages FactionId Bool   deriving Show  -- | Symbolic representation of text messages about heard noises,@@ -275,6 +276,7 @@   UpdKillExit{} -> Nothing   UpdWriteSave -> Nothing   UpdHearFid{} -> Nothing+  UpdMuteMessages fid b -> Just $ UpdMuteMessages fid $ not b  undoSfxAtomic :: SfxAtomic -> SfxAtomic undoSfxAtomic cmd = case cmd of

@@ -132,6 +132,7 @@   UpdKillExit{} -> return ()   UpdWriteSave -> return ()   UpdHearFid{} -> return ()+  UpdMuteMessages{} -> return ()  -- Actor's items may or may not be already present in @sitemD@, -- regardless if they are already present otherwise in the dungeon.@@ -452,7 +453,7 @@                -> m () updLeadFaction fid source target = assert (source /= target) $ do   fact <- getsState $ (EM.! fid) . sfactionD-  let !_A = assert (fleaderMode (gplayer fact) /= LeaderNull) ()+  let !_A = assert (fleaderMode (gplayer fact) /= Nothing) ()     -- @PosNone@ ensures this   mtb <- getsState $ \s -> flip getActorBody s <$> target   let !_A = assert (maybe True (not . bproj) mtb

@@ -169,6 +169,7 @@   UpdKillExit fid -> return $! PosFid fid   UpdWriteSave -> return PosAll   UpdHearFid fid _ _ -> return $! PosFid fid+  UpdMuteMessages fid _ -> return $! PosFid fid  -- | Produce the positions where the atomic special effect takes place. posSfxAtomic :: MonadStateRead m => SfxAtomic -> m PosAtomic@@ -255,6 +256,7 @@   UpdKillExit{} -> []   UpdWriteSave -> []   UpdHearFid{} -> []+  UpdMuteMessages{} -> []  -- | All items introduced by the atomic special effect, to be used in it. iidSfxAtomic :: SfxAtomic -> [ItemId]

@@ -14,7 +14,7 @@   , Response (..)     -- * Re-exported from "Game.LambdaHack.Client.UI"   , CCUI-  , UIOptions, applyUIOptions, uCmdline, mkUIOptions+  , UIOptions, applyUIOptions, uOverrideCmdline, mkUIOptions   ) where  import Prelude ()

@@ -32,7 +32,7 @@ -- faction is under human or computer control). queryAI :: MonadClient m => ActorId -> m RequestAI queryAI aid = do-  -- @sleader@ may be different from @gleader@ due to @stopPlayBack@,+  -- @sleader@ may be different from @gleader@ due to @restoreLeaderFromRun@,   -- but only leaders may change faction leader, so we fix that beforehand:   body <- getsState $ getActorBody aid   foeAssocs <- getsState $ foeRegularAssocs (bfid body) (blid body)

@@ -50,7 +50,7 @@ import           Game.LambdaHack.Common.Vector import qualified Game.LambdaHack.Content.ItemKind as IK import           Game.LambdaHack.Content.ModeKind-import           Game.LambdaHack.Content.RuleKind+import qualified Game.LambdaHack.Content.RuleKind as RK import qualified Game.LambdaHack.Core.Dice as Dice import qualified Game.LambdaHack.Definition.Ability as Ability import           Game.LambdaHack.Definition.Defs@@ -59,7 +59,7 @@ -- used in the strict monadic computations they are in.  -- | Require that a target enemy is visible by the party.-condAimEnemyTargetedM :: MonadClient m => ActorId -> m Bool+condAimEnemyTargetedM :: MonadClientRead m => ActorId -> m Bool condAimEnemyTargetedM aid = do   btarget <- getsClient $ getTarget aid   return $ case btarget of@@ -67,7 +67,7 @@     _ -> False  -- | Require that a target enemy or enemy stash is visible by the party.-condAimEnemyOrStashM :: MonadClient m => ActorId -> m Bool+condAimEnemyOrStashM :: MonadClientRead m => ActorId -> m Bool condAimEnemyOrStashM aid = do   btarget <- getsClient $ getTarget aid   return $ case btarget of@@ -76,7 +76,7 @@     _ -> False  -- | Require that a target enemy is remembered on the actor's level.-condAimEnemyOrRememberedM :: MonadClient m => ActorId -> m Bool+condAimEnemyOrRememberedM :: MonadClientRead m => ActorId -> m Bool condAimEnemyOrRememberedM aid = do   b <- getsState $ getActorBody aid   btarget <- getsClient $ getTarget aid@@ -87,7 +87,7 @@     _ -> False  -- | Require that a target non-enemy is visible by the party.-condAimNonEnemyPresentM :: MonadClient m => ActorId -> m Bool+condAimNonEnemyPresentM :: MonadClientRead m => ActorId -> m Bool condAimNonEnemyPresentM aid = do   btarget <- getsClient $ getTarget aid   return $ case btarget of@@ -96,7 +96,7 @@  -- | Require that the target is crucial to success, e.g., an item, -- or that it's not too far away and so the changes to get it are high.-condAimCrucialM :: MonadClient m => ActorId -> m Bool+condAimCrucialM :: MonadClientRead m => ActorId -> m Bool condAimCrucialM aid = do   b <- getsState $ getActorBody aid   mtgtMPath <- getsClient $ EM.lookup aid . stargetD@@ -114,7 +114,7 @@     _ -> False  -- includes the case of target with no path  -- | Check if the target is a nonmoving enemy.-condTgtNonmovingEnemyM :: MonadClient m => ActorId -> m Bool+condTgtNonmovingEnemyM :: MonadClientRead m => ActorId -> m Bool condTgtNonmovingEnemyM aid = do   btarget <- getsClient $ getTarget aid   case btarget of@@ -125,7 +125,7 @@  -- | Require the actor stands on or adjacent to a triggerable tile -- (e.g., stairs).-condAdjTriggerableM :: MonadClient m => Ability.Skills -> ActorId -> m Bool+condAdjTriggerableM :: MonadStateRead m => Ability.Skills -> ActorId -> m Bool condAdjTriggerableM actorSk aid = do   COps{coTileSpeedup} <- getsState scops   b <- getsState $ getActorBody aid@@ -164,7 +164,7 @@   in sortBy (comparing fst) $ map addDist allThreats  -- | Require the actor blocks the paths of any of his party members.-condBlocksFriendsM :: MonadClient m => ActorId -> m Bool+condBlocksFriendsM :: MonadClientRead m => ActorId -> m Bool condBlocksFriendsM aid = do   b <- getsState $ getActorBody aid   targetD <- getsClient stargetD@@ -189,10 +189,10 @@     getsState (fullAssocs aid [CEqp])  -- | Require that the actor can project any items.-condCanProjectM :: MonadClient m => Int -> ActorId -> m Bool+condCanProjectM :: MonadClientRead m => Int -> ActorId -> m Bool condCanProjectM skill aid = do   side <- getsClient sside-  curChal <- getsClient $ scurChal+  curChal <- getsClient scurChal   fact <- getsState $ (EM.! side) . sfactionD   if skill < 1      || ckeeper curChal && fhasUI (gplayer fact)@@ -203,7 +203,7 @@     -- is reached.     not . null <$> condProjectListM skill aid -condProjectListM :: MonadClient m+condProjectListM :: MonadClientRead m                  => Int -> ActorId                  -> m [(Double, CStore, ItemId, ItemFull, ItemQuant)] condProjectListM skill aid = do@@ -280,12 +280,12 @@         && 0 > IA.getSkill Ability.SkHurtMelee arItem  -- | Require that the actor stands over a desirable item.-condDesirableFloorItemM :: MonadClient m => ActorId -> m Bool+condDesirableFloorItemM :: MonadClientRead m => ActorId -> m Bool condDesirableFloorItemM aid = not . null <$> benGroundItems aid  -- | Produce the list of items on the ground beneath the actor -- that are worth picking up.-benGroundItems :: MonadClient m+benGroundItems :: MonadClientRead m                => ActorId                -> m [(Benefit, CStore, ItemId, ItemFull, ItemQuant)] benGroundItems aid = do@@ -303,12 +303,13 @@  desirableItem :: COps -> Bool -> Double -> IA.AspectRecord -> IK.ItemKind -> Int               -> Bool-desirableItem COps{corule=RuleContent{rsymbolProjectile}}+desirableItem COps{corule}               canEsc benPickup arItem itemKind k =-  let loneProjectile = IK.isymbol itemKind == rsymbolProjectile-                       && k == 1-                       && Dice.infDice (IK.icount itemKind) > 1-                            -- never generated as lone; usually means weak+  let loneProjectile =+        IK.isymbol itemKind == IK.rsymbolProjectile (RK.ritemSymbols corule)+        && k == 1+        && Dice.infDice (IK.icount itemKind) > 1+             -- never generated as lone; usually means weak       useful = if canEsc                then benPickup > 0                     || IA.checkFlag Ability.Precious arItem@@ -318,7 +319,8 @@                  in benPickup > 0 && not preciousNotUseful   in useful && not loneProjectile -condSupport :: MonadClient m => [(ActorId, Actor)] -> Int -> ActorId -> m Bool+condSupport :: MonadClientRead m+            => [(ActorId, Actor)] -> Int -> ActorId -> m Bool {-# INLINE condSupport #-} condSupport friendAssocs param aid = do   mtgtMPath <- getsClient $ EM.lookup aid . stargetD@@ -348,7 +350,7 @@ -- The numbers reflect fleeing AI conditions for non-aggresive actors -- so that actors don't wait for support that is not possible due to not -- enough friends on the level, even counting sleeping ones.-condAloneM :: MonadClient m => [(ActorId, Actor)] -> ActorId -> m Bool+condAloneM :: MonadStateRead m => [(ActorId, Actor)] -> ActorId -> m Bool condAloneM friendAssocs aid = do   b <- getsState $ getActorBody aid   mstash <- getsState $ \s -> gstash $ sfactionD s EM.! bfid b@@ -366,7 +368,7 @@   return $ not aInAmbient  -- tile is dark, so actor could hide  -- | Produce a list of acceptable adjacent points to flee to.-fleeList :: MonadClient m+fleeList :: MonadClientRead m          => [(ActorId, Actor)] -> ActorId -> m ([(Int, Point)], [(Int, Point)]) fleeList foeAssocs aid = do   COps{coTileSpeedup} <- getsState scops

@@ -54,6 +54,7 @@ import           Game.LambdaHack.Definition.Ability import qualified Game.LambdaHack.Definition.Ability as Ability import           Game.LambdaHack.Definition.Defs+import qualified Game.LambdaHack.Definition.DefsInternal as DefsInternal  -- | Pick the most desirable AI ation for the actor. pickAction :: MonadClient m@@ -68,7 +69,7 @@   let !_A = assert (not (bproj body)                     `blame` "AI gets to manually move its projectiles"                     `swith` (aid, bfid body, side)) ()-  stratAction <- actionStrategy foeAssocs friendAssocs aid retry+  stratAction <- actionStrategy foeAssocs friendAssocs (blid body) aid retry   let bestAction = bestVariant stratAction       !_A = assert (not (nullFreq bestAction)  -- equiv to nullStrategy                     `blame` "no AI action for actor"@@ -78,16 +79,36 @@  -- AI strategy based on actor's sight, smell, etc. -- Never empty.-actionStrategy :: forall m. MonadClient m-               => [(ActorId, Actor)] -> [(ActorId, Actor)] -> ActorId -> Bool+actionStrategy :: MonadClient m+               => [(ActorId, Actor)] -> [(ActorId, Actor)]+               -> LevelId -> ActorId -> Bool                -> m (Strategy RequestTimed)-actionStrategy foeAssocs friendAssocs aid retry = do+actionStrategy foeAssocs friendAssocs lid aid retry = do+  condInMelee <- condInMeleeM lid+  randomAggressionThreshold <- rndToAction $ randomR0 10+  actionStrategyRead condInMelee foeAssocs friendAssocs+                     randomAggressionThreshold lid aid retry++-- This is close to being in @MonadClientRead@, but not quite, due to+-- random numbers used explicitly in a couple of places (e.g., weapon choice),+-- which should be fixed and expressed via @Strategy@ instead,+-- and due to recoding the fleeing preference, which should be+-- factored out and done in the @actionStrategy@ wrapper.+--+-- After the AI code is totally rewritten soon, this should be revisited.+actionStrategyRead :: forall m. MonadClient m+                   => Bool+                   -> [(ActorId, Actor)] -> [(ActorId, Actor)]+                   -> Int -> LevelId -> ActorId -> Bool+                   -> m (Strategy RequestTimed)+actionStrategyRead condInMelee foeAssocs friendAssocs+                   randomAggressionThreshold lid aid retry = do   COps{coTileSpeedup} <- getsState scops   mleader <- getsClient sleader   body <- getsState $ getActorBody aid-  lvl <- getLevel (blid body)-  localTime <- getsState $ getLocalTime (blid body)-  condInMelee <- condInMeleeM $ blid body+  let !_A = assert (blid body == lid) ()+  lvl <- getLevel lid+  localTime <- getsState $ getLocalTime lid   condAimEnemyTargeted <- condAimEnemyTargetedM aid   condAimEnemyOrStash <- condAimEnemyOrStashM aid   condAimEnemyOrRemembered <- condAimEnemyOrRememberedM aid@@ -115,14 +136,13 @@   condFloorWeapon <- condFloorWeaponM aid   condDesirableFloorItem <- condDesirableFloorItemM aid   condTgtNonmovingEnemy <- condTgtNonmovingEnemyM aid-  randomAggressionThreshold <- rndToAction $ randomR0 10   explored <- getsClient sexplored   -- This doesn't treat actors guarding stash specially, so on such levels   -- man sleeping actors may reside for a long time. Variety, OK.   let awakeAndNotGuarding (_, b) =         bpos b /= bpos body         && bwatch b /= WSleep-        && Just (blid b, bpos b) /= gstash fact+        && Just (lid, bpos b) /= gstash fact       anyFriendOnLevelAwake = any awakeAndNotGuarding friendAssocs       actorMaxSk = actorMaxSkills EM.! aid       recentlyFled = maybe False (\(_, time) -> timeRecent5 localTime time)@@ -145,7 +165,7 @@                 _ -> False               && mayFallAsleep               && Just aid /= mleader  -- best teammate for a task so stop dozing-      lidExplored = ES.member (blid body) explored+      lidExplored = ES.member lid explored       panicFleeL = fleeL ++ badVic       condHpTooLow = hpTooLow body actorMaxSk       heavilyDistressed =  -- actor hit by a proj or similarly distressed@@ -255,9 +275,9 @@                     || condManyThreatsAdj && not condSupport1 && not condSolo                   | case gstash fact of                       Nothing -> False-                      Just (lid, pos) ->-                        lid == blid body-                        && chessDist pos (bpos body) <= 2 -> False+                      Just (lid2, pos) ->+                        lid2 == lid && chessDist pos (bpos body) <= 2+                        -> False                   | condInMelee -> False                       -- No fleeing when others melee and no critical threat                       -- (otherwise no target nor action would be possible).@@ -340,8 +360,7 @@       -- Note that all monadic actions here are performed when the strategy       -- is being chosen so, e.g., none of them can be @flee@ or the actor       -- would be marked in state as fleeing even when the strategy is-      -- not chosen. TODO: introduce @MonadClientRead@ and so ensure with types-      -- that none of these actions modifie state.+      -- not chosen.       distant :: [([Skill], m (Frequency RequestTimed), Bool)]       distant =         [ ( [SkMoveItem]@@ -375,7 +394,7 @@                               200)             $ chase actorSk aid avoidAmbient retry           , condCanMelee-            && Just (blid body, bpos body) /= gstash fact+            && Just (lid, bpos body) /= gstash fact             && (if condInMelee then condAimEnemyOrStash                 else (condAimEnemyOrRemembered                       || condAimNonEnemyPresent)@@ -410,7 +429,7 @@             && if condInMelee                then condCanMelee && condAimEnemyOrStash                else (not (condThreat 2) || not condMeleeBad)-                    && (Just (blid body, bpos body) /= gstash fact+                    && (Just (lid, bpos body) /= gstash fact                         || heavilyDistressed  -- guard strictly, until harmed                         || length oursExploring <= 1                         || condOurAdj  -- or if teammates adjacent@@ -477,13 +496,13 @@   then return $! returN "sleep" ReqWait   else tryStrategies sums -waitBlockNow :: MonadClient m => m (Strategy RequestTimed)+waitBlockNow :: MonadClientRead m => m (Strategy RequestTimed) waitBlockNow = return $! returN "wait" ReqWait -yellNow :: MonadClient m => m (Strategy RequestTimed)+yellNow :: MonadClientRead m => m (Strategy RequestTimed) yellNow = return $! returN "yell" ReqYell -pickup :: MonadClient m => ActorId -> Bool -> m (Strategy RequestTimed)+pickup :: MonadClientRead m => ActorId -> Bool -> m (Strategy RequestTimed) pickup aid onlyWeapon = do   benItemL <- benGroundItems aid   b <- getsState $ getActorBody aid@@ -515,7 +534,7 @@ -- and with @benInEqp@ (which implies @goesIntoEqp@). -- Such items are moved between any stores, as needed. In this case, -- from stash to eqp.-equipItems :: MonadClient m => ActorId -> m (Strategy RequestTimed)+equipItems :: MonadClientRead m => ActorId -> m (Strategy RequestTimed) equipItems aid = do   body <- getsState $ getActorBody aid   actorMaxSk <- getsState $ getActorMaxSkills aid@@ -586,7 +605,7 @@             then reject             else returN "equipItems" $ ReqMoveItems prepared -yieldUnneeded :: MonadClient m => ActorId -> m (Strategy RequestTimed)+yieldUnneeded :: MonadClientRead m => ActorId -> m (Strategy RequestTimed) yieldUnneeded aid = do   body <- getsState $ getActorBody aid   actorMaxSk <- getsState $ getActorMaxSkills aid@@ -623,7 +642,7 @@  -- This only concerns items that @equipItems@ handles, that is -- with a slot and with @benInEqp@ (which implies @goesIntoEqp@).-unEquipItems :: MonadClient m => ActorId -> m (Strategy RequestTimed)+unEquipItems :: MonadClientRead m => ActorId -> m (Strategy RequestTimed) unEquipItems aid = do   body <- getsState $ getActorBody aid   actorMaxSk <- getsState $ getActorMaxSkills aid@@ -823,7 +842,7 @@ -- TODO: In @actionStrategy@ we require minimal @SkAlter@ even for the case -- of triggerable tile underfoot. Let's say this quirk is a specialization -- of AI actors, because there are usually many, so not all need to trigger.-trigger :: MonadClient m+trigger :: MonadClientRead m         => ActorId -> FleeViaStairsOrEscape         -> m (Strategy RequestTimed) trigger aid fleeVia = do@@ -843,7 +862,7 @@          && not (occupiedProjLvl pos lvl) -- AlterBlockActor          && EM.notMember pos (lfloor lvl) ]  -- AlterBlockItem -projectItem :: MonadClient m+projectItem :: MonadClientRead m             => Ability.Skills -> ActorId -> m (Strategy RequestTimed) projectItem actorSk aid = do   btarget <- getsClient $ getTarget aid@@ -851,7 +870,7 @@   -- We query target, not path, because path is not needed for flinging.   -- Even if unknown tiles exist between us and the target, we assume   -- they are walkable and not just transparent and we happily try to shoot.-  mfpos <- getsState $ aidTgtToPos aid (blid b) btarget+  mfpos <- getsState $ aidTgtToPos (Just aid) (blid b) btarget   case (btarget, mfpos) of     (_, Just fpos) | adjacent (bpos b) fpos -> return reject     (Just (TEnemy aidE), Just fpos) -> do@@ -893,10 +912,11 @@ data ApplyItemGroup = ApplyAll | ApplyFirstAid   deriving Eq -applyItem :: MonadClient m+applyItem :: MonadClientRead m           => Ability.Skills -> ActorId -> ApplyItemGroup           -> m (Strategy RequestTimed) applyItem actorSk aid applyGroup = do+  COps{corule} <- getsState scops   b <- getsState $ getActorBody aid   fact <- getsState $ (EM.! bfid b) . sfactionD   condShineWouldBetray <- condShineWouldBetrayM aid@@ -915,7 +935,7 @@       canEsc = fcanEscape (gplayer fact)       permittedActor cstore itemFull kit =         fromRight False-        $ permittedApply localTime skill calmE cstore itemFull kit+        $ permittedApply corule localTime skill calmE cstore itemFull kit       disqualify :: Bool -> IK.Effect -> Bool       -- These effects tweak items, which is only situationally beneficial       -- and not really the best idea while in combat.@@ -962,9 +982,9 @@         let itemKind = getKind iid         in if maybe False (> 0) $ lookup IK.CONDITION $ IK.ifreq itemKind            then Just $ if benInEqp (discoBenefit EM.! iid)-                       then Right $ GroupName $ IK.iname itemKind+                       then Right $ DefsInternal.GroupName $ IK.iname itemKind                          -- conveniently, @iname@ matches @ifreq@-                       else Left $ GroupName $ IK.iname itemKind+                       else Left $ DefsInternal.GroupName $ IK.iname itemKind            else Nothing) (EM.keys $ borgan b)       fTool benAv@( Benefit{benApply}, cstore, iid                   , itemFull@ItemFull{itemKind}, _ ) =@@ -1059,7 +1079,7 @@  -- The result of all these conditions is that AI displaces rarely, -- but it can't be helped as long as the enemy is smart enough to form fronts.-displaceFoe :: MonadClient m => ActorId -> m (Strategy RequestTimed)+displaceFoe :: MonadClientRead m => ActorId -> m (Strategy RequestTimed) displaceFoe aid = do   COps{coTileSpeedup} <- getsState scops   b <- getsState $ getActorBody aid@@ -1093,7 +1113,7 @@   foes <- mapM qualifyActor adjFoes   return $! liftFrequency $ toFreq "displaceFoe" $ catMaybes foes -displaceBlocker :: MonadClient m => ActorId -> Bool -> m (Strategy RequestTimed)+displaceBlocker :: MonadClientRead m => ActorId -> Bool -> m (Strategy RequestTimed) displaceBlocker aid retry = do   b <- getsState $ getActorBody aid   mtgtMPath <- getsClient $ EM.lookup aid . stargetD@@ -1109,7 +1129,7 @@         displaceTgt aid q retry     _ -> return reject  -- goal reached -displaceTgt :: MonadClient m+displaceTgt :: MonadClientRead m             => ActorId -> Point -> Bool -> m (Strategy RequestTimed) displaceTgt source tpos retry = do   COps{coTileSpeedup} <- getsState scops@@ -1165,14 +1185,14 @@                  else reject     _ -> return reject  -- DisplaceProjectiles and no blocker at all -chase :: MonadClient m+chase :: MonadClientRead m       => Ability.Skills -> ActorId -> Bool -> Bool -> m (Strategy RequestTimed) chase actorSk aid avoidAmbient retry = do   body <- getsState $ getActorBody aid   fact <- getsState $ (EM.! bfid body) . sfactionD   mtgtMPath <- getsClient $ EM.lookup aid . stargetD   let -- With no leader, the goal is vague, so permit arbitrary detours.-      relaxed = fleaderMode (gplayer fact) == LeaderNull+      relaxed = isNothing $ fleaderMode (gplayer fact)       strAmbient avoid = case mtgtMPath of         Just TgtAndPath{tapPath=Just AndPath{pathList=q : _, ..}} ->           if pathGoal == bpos body@@ -1185,7 +1205,7 @@          else return strAvoided   mapStrategyM (moveOrRunAid actorSk aid) str -moveTowards :: MonadClient m+moveTowards :: MonadClientRead m             => Ability.Skills -> ActorId -> Bool -> Point -> Point -> Bool             -> m (Strategy Vector) moveTowards actorSk aid avoidAmbient target goal relaxed = do@@ -1240,7 +1260,7 @@ -- Actor moves or searches or alters or attacks. -- This function is very general, even though it's often used in contexts -- when only one or two of the many cases can possibly occur.-moveOrRunAid :: MonadClient m+moveOrRunAid :: MonadClientRead m              => Ability.Skills -> ActorId -> Vector -> m (Maybe RequestTimed) moveOrRunAid actorSk source dir = do   COps{coTileSpeedup} <- getsState scops