diff --git a/CONTRIBUTING b/CONTRIBUTING --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -6,49 +6,43 @@ =========================================== +0. Get haskell, via your system repositories or -1. Get Haskell and Darcs, from your repos or from: - https://www.haskell.org/downloads/#minimal - http://darcs.net + https://www.haskell.org/ghcup/ -2. Clone the code with `darcs get https://hub.darcs.net/ffaf/venzone` +1. Check the code at -3. Modify the game, add features. + http://www.ariis.it/static/repos/stagit/venzone + and follow instructions in there to clone it. + +2. Modify the game, add features. + lentil src/ test/ # to see open issues # no lentil? `cabal new-install lentil` to get it. -4. If needed, update your package list: +3. If needed, update your package list: - cabal new-update + cabal update -5. Build your executable: +4. Build your executable: - cabal new-build venzone + cabal build venzone # when it finishes, you will find your executable in `release/`. # Use --allow-newer if cabal cannot solve the dependency tree -6. Run the tests with: +5. Run the tests with: - cabal new-run test - # you might get a `missing hspec-discover` error, in that case - # run `cabal new-install hspec-discover`. + cabal run test # if you want to watch the replay of a specific test, do `cabal new-repl test` and then λ> narrateGymnasium "test/records/ladder-exit.vr" -7. send me a diff or patch in any format you prefer. With darcs the - usual workflow is to set up a repo at https://hub.darcs.net/ , - push your patches there and let me know. - If you prefer plain email: - - darcs record # records your changes - darcs send -o some-change.dpatch # creates a textual patch - # and then write to me () - # with some-change.dpatch attached. +6. Upload your modifications somwehere (gitlab, sourcehout, …) and + send me a message () so I can pull them. -8. if you compiled venzone for a new system and want to send me a release +7. If you compiled venzone for a new system and want to send me a release of it just type: cabal new-run -f crea-release packerino @@ -56,7 +50,7 @@ and a .zip will be automatically created. -If you get stuck, don't hesitate to contact me: +Stuck? don't hesitate to contact me: http://ariis.it/static/articles/mail/page.html diff --git a/NEWS b/NEWS --- a/NEWS +++ b/NEWS @@ -1,3 +1,13 @@ +1.1.1.1 +- Switch to git +- dom 19 mar 2023, 11:15:21 + +1.1.1.0 +- Made The Orcolat slightly easier by eliminating a Longana in + “West Face”. +- Reworked initial story for a gentler learning slope. +- Tweaked editor level art. + 1.1.0.1 - gio 18 nov 2021, 20:27:04 - Made `venzone` build with last a-t-g (1.7.*) diff --git a/assets/readme.txt b/assets/readme.txt --- a/assets/readme.txt +++ b/assets/readme.txt @@ -1,5 +1,5 @@ ============ -Venzone v1.0 +Venzone v1.1 ============ Friuli, 1748. diff --git a/stories/a_first-stroll.vns b/stories/a_first-stroll.vns --- a/stories/a_first-stroll.vns +++ b/stories/a_first-stroll.vns @@ -1,113 +1,148 @@ story_name: First stroll -room_size: 24 79 -start_room: Cradle +room_size: 20 60 +start_room: Abandoned hut -# Cradle -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC - - -- -i -- -i -- + ----- -i -- --- ----------------------- -i -------------------------- -i -i GGG GGG ® Go ® -i ® Controls: WASD. ® GGGGG GGGGG ®East® -i ® Tap *once* to start ® GGGGGGG GGGGGGG -i ® moving. ® GGGGGGG GGGGGGG -i ® Tap again or Space ® GGGGGGG GGGGGGG -i ® to stop. ® GGGGGGG GGGGGGG -i GGGGGGG GGGGGGG -::::::::: GGGGGGG GGGGGGG -:::::::::: @ GGGGG GGGGG ::::::: -:::::::::::::: RRR RRR ::::::::: -:::::::::::::::::::: RRR RRR ::::::::::::::: -::::::::::::::::::::: RRR RRR ::::::::::::::::: -:::::::::::::::::::::: :::: :::::::::::::::::::::::::::::::::::::::::::::::::: -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::®Cradle®: ->>> E -> Stinging nettle +# Abandoned hut +-------- C C -------- +------ C C ------ +---- C C ® Controls: WASD ® ---- +-- C @ C C ® Tap *once* to ® -- +-- ----- C ® move, tap again ® -- +--------------------- ® or Space to stop.® -- +------- ----------- - -- +-- - ----------- - -- +-- ---------------------------------------- -- +-- -- +-- ® Practice ® -- +-- ® Then | stop ® ® moving a ® -- +-- ® here V and ® ® bit! ® -- +-- ® climb down. ® -- +-- -- +-- -- +----------|------------------------------------------------- +----------|------------------------------------------------- +-- | -- +-- | ®Abandoned hut®-- +>>> S -> Basement -# Stinging nettle -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC - - - - ** --------------------- ------------------------------------------- - ------------------ - - - ®Remember, tap® - ®again or Space® - ® to stop! ® - - - - ,,,,,,,,,,,,,, -:: ::::::::::::::::::: -:: :::::::::::::::::::,,,,,,,,,,,,,,,, -:: :::::::::::::::::::::::::::::::::::::::: -:: ::::::::::::::::::::::::::::::::::::::::::,,,,,,,,,,,,,,,,,,,, : -:: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::®Stinging nettle®: ->>> W -> Cradle (revisited) ->>> E -> Ladder +# Basement +-- | -- +-- | -- +-- | ® Some stinging nettles ® -- +-- | ® have grown downstairs. ® -- +-- | -- +-- | ® Better be careful! ® -- +----------------------------- -- +--------------------------- RRR -- +-- RRRRR -- +-- RRRRR -- +-- RRRRR -- +-- -------------------------------- +-- ® Remember, tap ® ----------------------------== +-- ® again or Space ® C C +-- ® to stop. ® C C +-- C C +-- C C C +-- ,,,,,,,,,,,, ,,,,,,,,,, C +-------------------------------:::::::::::::::::::::::::::== +----------------------------------------::::::::®Basement®:: +>>> N -> Abandoned hut +>>> E -> Poplar trees -# Ladder -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC::::::: -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC::::::: - ::::::: - :::::: - :::::: - ,,,, ,,,,, ,,,, ,,,,, :::::: ----------------------------------------------------------------------|----::::: - | ::::: - | ::::: - | :::: - | :::: - | :::: - | :::: - | :::: - | :::: - -------- | :::: - | :::: - ------------------ --- | :::: - | ::::: - | ::::: - ::::::wwwwwwwwwwwwwwwwwwwwwwwwwwwww::::::::::::::::::::::: | :::::: -:::::::::::::::wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww:::::::::::::::::::::::::::::: -:::::::::::::::::wwwwwwwwwwwwwwwwwwwwwwwwwwwww::::::::::::::::::::::::::::::::: -::::::::::::::::::::wwwwwwwwwwwwwwwwwwwwwwwww:::::::::::::::::::::::::®Ladder®: ->>> W -> Stinging nettle +# Poplar trees +--BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB +-- +--BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB +-- +-- GGG GGG +-- GGGGG GGGGG +-- GGGGGGG GGGGGGG +-- GGGGGGG GGGGGGG +-- GGGGGGG GGGGGGG +-- GGGGGGG GGGGGGG ®Lovely weather® +-- GGGGGGG GGGGGGG ® outside! ® +-- GGGGGGG GGGGGGG +== GGGGGGG GGGGGGG + GGGGGGG GGGGGGG + GGGGG GGGGG + RRR RRR + RRR RRR + RRR RRR +==:::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +::::::::::::::::::::::::::::::::::::::::::::®Poplar trees®:: +>>> W -> Basement +>>> E -> Pile of wood -# Cradle (revisited) -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC - - -- -i ®Very good! Catch the® -- -i ®firefly to conclude ® -- + ----- -i ® this story! ® -- --- ----------------------- -i ---------------------------- -i -i ® Happy adventures! ® GGG GGG -i GGGGG GGGGG -i GGGGGGG GGGGGGG -i GGGGGGG GGGGGGG -i GGGGGGG GGGGGGG -i GGGGGGG GGGGGGG -i GGGGGGG GGGGGGG -::::::::: GGGGGGG GGGGGGG -:::::::::: @ GGGGG GGGGG ::::::: -:::::::::::::: RRR RRR ::::::::: -:::::::::::::::::::: RRR RRR ::::::::::::::: -::::::::::::::::::::: RRR RRR ::::::::::::::::: -:::::::::::::::::::::: :::: :::::::::::::::::::::::::::::::::::::::::::::::::: -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::®Cradle®: ->>> E -> Stinging nettle +# Pile of wood +BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + +BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB + + + ** + ::::::::::::::::::: + :::::::::::::: + + ®Stop and® + ® try it ® + ® here. ® + ® To jump, first ® ® | ® + ® tap W, then D. ® ® | ® + ® v ® + == == + =========== + ============= +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +::::::::::::::::::::::::::::::::::::::::::::®Pile of wood®:: +>>> W -> Poplar trees +>>> E -> Flock of wrens + +# Flock of wrens +BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB|BBBBBBBBBBBBBBBBBBBBBBBi + | i +BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB|BBBBBBBBBBBBBBBBBBBBBBBi + | i + | i + ® V ® | i + ® V ® | i + ® V ® | i + ® V ® | i + ® v ® | i + ® ® | i + | i + | i + ============= i + i + ========= ========= G i + GG i + :::::::::::::::::::wwwwwwwwwwwwwwwwwwww::::::::: +:::::::::::::::::::::::::::::::::wwwwwwwwwwwwwwww::::::::::: +::::::::::::::::::::::::::::::::::::::::::®Flock of wrens®:: +>>> N -> Glimpse of forest +>>> W -> Pile of wood + +# Glimpse of forest + BBB x +® A® BBB i + ®/ \® BBB i +® / \ A ® B i +® / \ / \ ® BB i +® | / \ : ® ® Happy ® i +®,_*.| / \ .:. ® ®adventures!® i +® \_ | c ,:, ® + B i +® \| cSs ,:, ® B i +® \_ s|s .:. ® ::::::::::::::::::::|: i +® \*_|___|__ ® :::::::::::::::::::| i +® jr\® BB | i + BBB BBBB | i + B ® Catch the ®BB BBB | i + BB ® firefly to ® BBB ::|:::::::::::::|::: i +BB ®conclude the® :::|:::::::::::::::: i + ® story. ® | i + | i + | i + | ®Glimpse of forest® i +>>> S -> Flock of wrens + +@@@ cambia libello editor diff --git a/stories/orcolat.vns b/stories/orcolat.vns --- a/stories/orcolat.vns +++ b/stories/orcolat.vns @@ -417,7 +417,7 @@ :: | ::X | :CCCCCCCCCCCCCCCCCCCCCCC | CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC -:: | X +:: | : CCCCCCCCCCCCCCCCCCCCC | CCCCCCCCCCCCCCCCCCCCCCCCCC C :: | :::: A: f| :::: diff --git a/stories/z_editor.vns b/stories/z_editor.vns --- a/stories/z_editor.vns +++ b/stories/z_editor.vns @@ -150,19 +150,19 @@ # Editor two -® A ® -® / \ ® -® / \ A ® -® / \ / \ Happy writing! ® -® | / \ : ® -®,_*.| / \ .:. ® -® \_ | c ,:, ® -® \| cSs ,:, ® -® \_ s|s .:. ® -® \*__|___|___ ® : -® \ ® :: - :: - :: + + +® ® +® ® +® A_ ® +® /\ \_ Happy writing! ® +® /... .\ ® +® /../.. \\__ ® +® _//... ....\ ® +® _/ /... \ ® +® / / |\ ® +® // \ ® : +® ® :: + :: ::: -|----------------::: @@ -172,7 +172,7 @@ | ** ::: | ::: :::::::::::::::::::::::::::::::::::::::::::::::: -::::::::::::::::::::::::::::®Glimpse of forest®: +:::::::::::::::::::::::::::::::®Monte Amariana®: >>> W -> Editor one @@ diff --git a/test/ParseSpec.hs b/test/ParseSpec.hs --- a/test/ParseSpec.hs +++ b/test/ParseSpec.hs @@ -45,7 +45,7 @@ describe "pstory" $ do it "parse a story" $ (^. rooms . to length) <$> - readStory "stories/a_first-stroll.vns" `shouldReturn` 4 + readStory "stories/a_first-stroll.vns" `shouldReturn` 6 it "can end on EOF" $ let tt = init . unlines $ ["story_name: test", diff --git a/test/records/playthrough/first-stroll.vr b/test/records/playthrough/first-stroll.vr Binary files a/test/records/playthrough/first-stroll.vr and b/test/records/playthrough/first-stroll.vr differ diff --git a/venzone.cabal b/venzone.cabal --- a/venzone.cabal +++ b/venzone.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: venzone -version: 1.1.0.1 +version: 1.1.1.1 synopsis: ASCII platform-adventure game description: Steal the Earthquake Poleaxe from the Orcolat and save your valley. Binaries and more info in the @@ -17,15 +17,15 @@ assets/readme.txt, test/records/*.vr, test/records/playthrough/*.vr, - CONTRIBUTING, - README, - NEWS, stack.yaml +extra-doc-files: CONTRIBUTING, + README, + NEWS data-files: stories/*.vns source-repository head type: darcs - location: https://hub.darcs.net/ffaf/venzone + location: http://www.ariis.it/static/repos/stagit/venzone/ flag crea-release description: Build release script @@ -122,6 +122,7 @@ -- the above + hspec/quickcheck , hspec >= 2.7.0 && < 2.9, QuickCheck > 2.13 && < 2.15 + build-tool-depends: hspec-discover:hspec-discover hs-source-dirs: src, test default-language: Haskell2010 type: exitcode-stdio-1.0