scroll 1.20150323 → 1.20151219

raw patch · 20 files changed

+50/−8 lines, 20 files

Files

• CHANGELOG +7/−0
• Control.hs +1/−0
• Curses.hs +1/−0
• DeepCopy.hs +1/−0
• Level/Border.hs +1/−0
• Level/Tutorial.hs +1/−1
• Makefile +3/−0
• Peruser.hs +2/−1
• Player.hs +1/−0
• Player/Move.hs +3/−0
• Poison.hs +2/−1
• Rand.hs +1/−0
• Spell.hs +2/−1
• TODO +9/−0
• Unicode.hs +3/−1
• View.hs +1/−0
• World.hs +1/−0
• WorldSetup.hs +2/−1
• scroll.cabal +7/−2
• unix/Pager.hs +1/−0

@@ -1,3 +1,10 @@+scroll (1.20151219) unstable; urgency=medium++  * Fix copyright statement; scroll is GPL2++  * Fix to build under ghc 7.10.++ -- Joey Hess <id@joeyh.name>  Sat, 19 Dec 2015 17:24:23 -0400+ scroll (1.20150323) unstable; urgency=medium    * Fix a minor bug when moving over punctuation that was not swallowed.

@@ -5,6 +5,7 @@ import qualified Data.Map as M import Data.Maybe import Control.Applicative+import Prelude  import Types import Status

@@ -5,6 +5,7 @@ import qualified Data.Vector as V import Data.Vector ((!)) import Control.Applicative+import Prelude  import Types import View

@@ -5,6 +5,7 @@ import qualified Data.Vector as V import Control.Monad.State.Strict import Control.Applicative+import Prelude  import Types 

@@ -10,6 +10,7 @@ import Data.Monoid import Data.Char import Control.Applicative+import Prelude  import Types 

@@ -10,7 +10,7 @@ 	, "                   ~ ~ ~ ~ ~" 	, " *                                                   *" 	, " * And yes, that's the license of Scroll!            *"-	, " * Copyright 2015 by Joey Hess, licensed under GPL3+ *"+	, " * Copyright 2015 by Joey Hess, licensed under GPL2+ *" 	, " *                                                   *" 	, "                   ~ ~ ~ ~ ~" 	, ""

@@ -6,3 +6,6 @@ hackage: 	@cabal sdist 	@cabal upload dist/*.tar.gz++clean:+	cabal clean

@@ -3,8 +3,9 @@ import Control.Monad.State.Strict import qualified Data.Vector.Mutable as MV import qualified Data.Vector as V-import Control.Applicative import Control.Monad.IfElse+import Control.Applicative+import Prelude  import Types import Status

@@ -4,6 +4,7 @@ import qualified Data.Vector.Mutable as MV import Control.Applicative import Data.Maybe+import Prelude  import Types import Level.Border

@@ -1,9 +1,12 @@+{-# LANGUAGE FlexibleContexts #-}+ module Player.Move where  import Control.Monad.State.Strict import Data.Char import Data.Maybe import Control.Applicative+import Prelude  import Types import World

@@ -3,9 +3,10 @@ import Control.Monad.State.Strict import qualified Data.CaseInsensitive as CI import qualified Data.Map as M-import Control.Applicative import Data.Char import Data.Maybe+import Control.Applicative+import Prelude  import Types import Rand

@@ -11,6 +11,7 @@ import System.Random import Control.Applicative import Control.Monad.State.Strict+import Prelude  import Types 

@@ -7,9 +7,10 @@ import qualified Data.Vector.Mutable as MV import Data.Char import Data.Maybe-import Control.Applicative import Control.Monad.IfElse import UI.NCurses (Event(..))+import Control.Applicative+import Prelude  import Spell.Enum import CharMap

@@ -8,3 +8,12 @@ scroll: ./Data/Vector/Generic/Mutable.hs:590 (read): index out of bounds (6,6)  The typescript fileG0A3Np on clam should show this happening.+as should filecobD95 and fileOlHEMR on elephant.++"Game exploded when I maximized the terminal window." -- tmp/fileBQE03e++"I think I went into a dream while stunned, and came out permenantly+stunned." -- tmp/filehgwH0C on clam++Casting a spell should only use 1 of each spell component even when+multiple are swallowed. This would allow stacking spells (eg, "new new x")

@@ -59,10 +59,12 @@  unicodeCharDesc :: Char -> String unicodeCharDesc c-	| l1 `elem` "AEIOU" = "an " ++ s+	| l1 `elem` vowel = "an " ++ s 	| otherwise = "a " ++ s   where   	s@(l1:_) = unicodeCharString c+	vowel :: String+	vowel = "AEIOU"  unicodeCharString :: Char -> String unicodeCharString c = maybe [c] B.unpack (unicodeCharName c)

@@ -3,6 +3,7 @@ import qualified Data.Vector as V import Control.Applicative import Control.Monad.ST+import Prelude  import Types 

@@ -6,6 +6,7 @@ import Control.Monad.State.Strict import qualified Data.Vector.Mutable as MV import Control.Applicative+import Prelude  import Types 

@@ -5,8 +5,9 @@ import qualified Data.Vector as V import qualified Data.Set as S import Data.Vector ((!))-import Control.Applicative import Data.Default+import Control.Applicative+import Prelude  import Types import Level

@@ -1,5 +1,5 @@ Name: scroll-Version: 1.20150323+Version: 1.20151219 Cabal-Version: >= 1.6 License: GPL-2 Maintainer: Joey Hess <id@joeyh.name>@@ -10,6 +10,7 @@ Category: Game Synopsis: scroll(6), a roguelike game Homepage: https://joeyh.name/code/scroll/+License-File: GPL.hs Extra-Source-Files:   CHANGELOG   TODO@@ -24,7 +25,7 @@  Executable scroll   Main-Is: Main.hs-  GHC-Options: -Wall -threaded -O2+  GHC-Options: -threaded -Wall -fno-warn-tabs   Build-Depends: base >= 4.5, base < 5, vector, bytestring, mtl,     containers, ncurses, data-default, random, monad-loops, IfElse,     case-insensitive, optparse-applicative, text@@ -73,3 +74,7 @@     View     World     WorldSetup++source-repository head+  type: git+  location: git://git.joeyh.name/scroll.git

@@ -4,6 +4,7 @@ import System.Posix.IO import System.Posix.Terminal import Control.Applicative+import Prelude  -- If stdin is not connected to a tty, we're being used as a pager with -- output piped in. The content of stdin is sucked in and returned for