Changeset 20680

Timestamp:

10/04/08 16:01:22 (3 months ago)

Author:

mokehehe

Message:

きのこを取って巨大化
花を取ってファイヤー化（ショットはまだ撃てない）

Location:

lang/haskell/nario

Files:

• Actor.hs (modified) (2 diffs)
• Actor/Flower.hs (added)
• Actor/Kinoko.hs (modified) (2 diffs)
• Actor/Nokonoko.hs (modified) (1 diff)
• Event.hs (modified) (1 diff)
• Images.hs (modified) (1 diff)
• Main.hs (modified) (4 diffs)
• Player.hs (modified) (13 diffs)
• README.txt (modified) (2 diffs)

lang/haskell/nario/Actor.hs

@@ -14 +14 @@
 import AppUtil (ImageResource, Rect)
 import Field (Field)
+import Player (Player)
 
 
@@ -25 +26 @@
         getHitRect :: a -> Maybe Rect
         getHitRect _ = Nothing
+
+        onHit :: Player -> a -> (Player, Maybe a)
+        onHit pl ac = (pl, Nothing)
 
 -- ============================================================================

lang/haskell/nario/Actor/Kinoko.hs

@@ -13 +13 @@
 import Images
 import Field
+import Player (PlayerType(..), getPlayerType, setPlayerType)
 
 maxVy = one * 6
@@ -52 +53 @@
                         yy = y self `div` one
 
+        onHit pl self = (setPlayerType nt pl, Nothing)
+                where
+                        nt = case typ of
+                                SmallNario      -> SuperNario
+                                otherwise       -> typ
+                        typ = getPlayerType pl
+
 
 newKinoko :: Int -> Int -> Kinoko

lang/haskell/nario/Actor/Nokonoko.hs

@@ -28 +28 @@
                 return ()
                 where
-                        imgtype = ImgNoko0
+                        imgtype = [ImgNoko0, ImgNoko1] !! (cnt self `mod` 16 `div` 8)
 
 newNokonoko :: Int -> Int -> Nokonoko

lang/haskell/nario/Event.hs

@@ -6 +6 @@
 
 data Event =
-                -- ブロックをたたいた
-                EvHitBlock ImageType Int Int
+                -- ブロックをたたいた x y super?
+                EvHitBlock ImageType Int Int Bool
 
                 -- フィールドを変更

lang/haskell/nario/Images.hs

@@ -1 +1 @@
 module Images (ImageType(..), imageTypes, imageFn) where
 import Maybe (fromJust)
-data ImageType = ImgBlock1 | ImgBlock2 | ImgBlock3 | ImgBlock4 | ImgBlock5 | ImgCloud00 | ImgCloud01 | ImgCloud02 | ImgCloud10 | ImgCloud11 | ImgCloud12 | ImgDk00 | ImgDk01 | ImgDk10 | ImgDk11 | ImgFlag | ImgFont | ImgGrass0 | ImgGrass1 | ImgGrass2 | ImgKinoko | ImgKuri0 | ImgKuri1 | ImgMt02 | ImgMt11 | ImgMt12 | ImgMt13 | ImgMt22 | ImgNarioDie | ImgNarioLJump | ImgNarioLSlip | ImgNarioLStand | ImgNarioLWalk1 | ImgNarioLWalk2 | ImgNarioLWalk3 | ImgNarioRJump | ImgNarioRSlip | ImgNarioRStand | ImgNarioRWalk1 | ImgNarioRWalk2 | ImgNarioRWalk3 | ImgNoko0 | ImgPole0 | ImgPole1 | ImgSnarioLJump | ImgSnarioLStand | ImgSnarioLWalk1 | ImgSnarioLWalk2 | ImgSnarioLWalk3 | ImgSnarioRJump | ImgSnarioRStand | ImgSnarioRWalk1 | ImgSnarioRWalk2 | ImgSnarioRWalk3 | ImgTitle        deriving (Eq)
-imageTypes = [ImgBlock1, ImgBlock2, ImgBlock3, ImgBlock4, ImgBlock5, ImgCloud00, ImgCloud01, ImgCloud02, ImgCloud10, ImgCloud11, ImgCloud12, ImgDk00, ImgDk01, ImgDk10, ImgDk11, ImgFlag, ImgFont, ImgGrass0, ImgGrass1, ImgGrass2, ImgKinoko, ImgKuri0, ImgKuri1, ImgMt02, ImgMt11, ImgMt12, ImgMt13, ImgMt22, ImgNarioDie, ImgNarioLJump, ImgNarioLSlip, ImgNarioLStand, ImgNarioLWalk1, ImgNarioLWalk2, ImgNarioLWalk3, ImgNarioRJump, ImgNarioRSlip, ImgNarioRStand, ImgNarioRWalk1, ImgNarioRWalk2, ImgNarioRWalk3, ImgNoko0, ImgPole0, ImgPole1, ImgSnarioLJump, ImgSnarioLStand, ImgSnarioLWalk1, ImgSnarioLWalk2, ImgSnarioLWalk3, ImgSnarioRJump, ImgSnarioRStand, ImgSnarioRWalk1, ImgSnarioRWalk2, ImgSnarioRWalk3, ImgTitle]
-imageFilenames = ["block1.bmp", "block2.bmp", "block3.bmp", "block4.bmp", "block5.bmp", "cloud00.bmp", "cloud01.bmp", "cloud02.bmp", "cloud10.bmp", "cloud11.bmp", "cloud12.bmp", "dk00.bmp", "dk01.bmp", "dk10.bmp", "dk11.bmp", "flag.bmp", "font.bmp", "grass0.bmp", "grass1.bmp", "grass2.bmp", "kinoko.bmp", "kuri0.bmp", "kuri1.bmp", "mt02.bmp", "mt11.bmp", "mt12.bmp", "mt13.bmp", "mt22.bmp", "narioDie.bmp", "narioLJump.bmp", "narioLSlip.bmp", "narioLStand.bmp", "narioLWalk1.bmp", "narioLWalk2.bmp", "narioLWalk3.bmp", "narioRJump.bmp", "narioRSlip.bmp", "narioRStand.bmp", "narioRWalk1.bmp", "narioRWalk2.bmp", "narioRWalk3.bmp", "noko0.bmp", "pole0.bmp", "pole1.bmp", "snarioLJump.bmp", "snarioLStand.bmp", "snarioLWalk1.bmp", "snarioLWalk2.bmp", "snarioLWalk3.bmp", "snarioRJump.bmp", "snarioRStand.bmp", "snarioRWalk1.bmp", "snarioRWalk2.bmp", "snarioRWalk3.bmp", "title.bmp"]
+data ImageType = ImgBlock1 | ImgBlock2 | ImgBlock3 | ImgBlock4 | ImgBlock5 | ImgCloud00 | ImgCloud01 | ImgCloud02 | ImgCloud10 | ImgCloud11 | ImgCloud12 | ImgDk00 | ImgDk01 | ImgDk10 | ImgDk11 | ImgFlag | ImgFlower | ImgFNarioLJump | ImgFNarioLShot | ImgFNarioLSit | ImgFNarioLSlip | ImgFNarioLStand | ImgFNarioLWalk1 | ImgFNarioLWalk2 | ImgFNarioLWalk3 | ImgFNarioRJump | ImgFNarioRShot | ImgFNarioRSit | ImgFNarioRSlip | ImgFNarioRStand | ImgFNarioRWalk1 | ImgFNarioRWalk2 | ImgFNarioRWalk3 | ImgFont | ImgGrass0 | ImgGrass1 | ImgGrass2 | ImgKinoko | ImgKuri0 | ImgKuri1 | ImgMt02 | ImgMt11 | ImgMt12 | ImgMt13 | ImgMt22 | ImgNarioDie | ImgNarioLJump | ImgNarioLSlip | ImgNarioLStand | ImgNarioLWalk1 | ImgNarioLWalk2 | ImgNarioLWalk3 | ImgNarioRJump | ImgNarioRSlip | ImgNarioRStand | ImgNarioRWalk1 | ImgNarioRWalk2 | ImgNarioRWalk3 | ImgNoko0 | ImgNoko1 | ImgPole0 | ImgPole1 | ImgSNarioLJump | ImgSNarioLSit | ImgSNarioLSlip | ImgSNarioLStand | ImgSNarioLWalk1 | ImgSNarioLWalk2 | ImgSNarioLWalk3 | ImgSNarioRJump | ImgSNarioRSit | ImgSNarioRSlip | ImgSNarioRStand | ImgSNarioRWalk1 | ImgSNarioRWalk2 | ImgSNarioRWalk3 | ImgTitle deriving (Eq)
+imageTypes = [ImgBlock1, ImgBlock2, ImgBlock3, ImgBlock4, ImgBlock5, ImgCloud00, ImgCloud01, ImgCloud02, ImgCloud10, ImgCloud11, ImgCloud12, ImgDk00, ImgDk01, ImgDk10, ImgDk11, ImgFlag, ImgFlower, ImgFNarioLJump, ImgFNarioLShot, ImgFNarioLSit, ImgFNarioLSlip, ImgFNarioLStand, ImgFNarioLWalk1, ImgFNarioLWalk2, ImgFNarioLWalk3, ImgFNarioRJump, ImgFNarioRShot, ImgFNarioRSit, ImgFNarioRSlip, ImgFNarioRStand, ImgFNarioRWalk1, ImgFNarioRWalk2, ImgFNarioRWalk3, ImgFont, ImgGrass0, ImgGrass1, ImgGrass2, ImgKinoko, ImgKuri0, ImgKuri1, ImgMt02, ImgMt11, ImgMt12, ImgMt13, ImgMt22, ImgNarioDie, ImgNarioLJump, ImgNarioLSlip, ImgNarioLStand, ImgNarioLWalk1, ImgNarioLWalk2, ImgNarioLWalk3, ImgNarioRJump, ImgNarioRSlip, ImgNarioRStand, ImgNarioRWalk1, ImgNarioRWalk2, ImgNarioRWalk3, ImgNoko0, ImgNoko1, ImgPole0, ImgPole1, ImgSNarioLJump, ImgSNarioLSit, ImgSNarioLSlip, ImgSNarioLStand, ImgSNarioLWalk1, ImgSNarioLWalk2, ImgSNarioLWalk3, ImgSNarioRJump, ImgSNarioRSit, ImgSNarioRSlip, ImgSNarioRStand, ImgSNarioRWalk1, ImgSNarioRWalk2, ImgSNarioRWalk3, ImgTitle]
+imageFilenames = ["block1.bmp", "block2.bmp", "block3.bmp", "block4.bmp", "block5.bmp", "cloud00.bmp", "cloud01.bmp", "cloud02.bmp", "cloud10.bmp", "cloud11.bmp", "cloud12.bmp", "dk00.bmp", "dk01.bmp", "dk10.bmp", "dk11.bmp", "flag.bmp", "flower.bmp", "fNarioLJump.bmp", "fNarioLShot.bmp", "fNarioLSit.bmp", "fNarioLSlip.bmp", "fNarioLStand.bmp", "fNarioLWalk1.bmp", "fNarioLWalk2.bmp", "fNarioLWalk3.bmp", "fNarioRJump.bmp", "fNarioRShot.bmp", "fNarioRSit.bmp", "fNarioRSlip.bmp", "fNarioRStand.bmp", "fNarioRWalk1.bmp", "fNarioRWalk2.bmp", "fNarioRWalk3.bmp", "font.bmp", "grass0.bmp", "grass1.bmp", "grass2.bmp", "kinoko.bmp", "kuri0.bmp", "kuri1.bmp", "mt02.bmp", "mt11.bmp", "mt12.bmp", "mt13.bmp", "mt22.bmp", "narioDie.bmp", "narioLJump.bmp", "narioLSlip.bmp", "narioLStand.bmp", "narioLWalk1.bmp", "narioLWalk2.bmp", "narioLWalk3.bmp", "narioRJump.bmp", "narioRSlip.bmp", "narioRStand.bmp", "narioRWalk1.bmp", "narioRWalk2.bmp", "narioRWalk3.bmp", "noko0.bmp", "noko1.bmp", "pole0.bmp", "pole1.bmp", "sNarioLJump.bmp", "sNarioLSit.bmp", "sNarioLSlip.bmp", "sNarioLStand.bmp", "sNarioLWalk1.bmp", "sNarioLWalk2.bmp", "sNarioLWalk3.bmp", "sNarioRJump.bmp", "sNarioRSit.bmp", "sNarioRSlip.bmp", "sNarioRStand.bmp", "sNarioRWalk1.bmp", "sNarioRWalk2.bmp", "sNarioRWalk3.bmp", "title.bmp"]
 imageFn = fromJust . flip lookup (zip imageTypes imageFilenames)

lang/haskell/nario/Main.hs

@@ -22 +22 @@
 import Actor.Nokonoko
 import Actor.Kinoko
+import Actor.Flower
 
 -- 背景色
@@ -140 +141 @@
                                 nothingHappened = (pl, ac ++ [ActorWrapper a])
                                 plrc = getPlayerHitRect player
-                                pl' = pl
-                                ac' = ac
+                                (pl', a') = onHit pl a
+                                ac' = case a' of
+                                        Just a''        -> ac ++ [ActorWrapper a'']
+                                        Nothing         -> ac
 
 
@@ -186 +189 @@
 procEvent gs ev = foldl proc gs ev
         where
-                proc gs (EvHitBlock imgtype cx cy)
-                        | hardBlock c   = gs
-                        | otherwise             = gs { fld = fld', actors = actors' }
+                proc gs (EvHitBlock imgtype cx cy bSuper)
+                        | hardBlock c                   = gs
+                        | bSuper && breakable c = gs { fld = fieldSet (fld gs) cx cy ' ' }
+                        | otherwise                             = gs { fld = fld', actors = actors' }
                         where
                                 c = fieldRef (fld gs) cx cy
                                 items
-                                        | c == 'K'      = [ActorWrapper $ newKinoko cx cy]
+                                        | c == 'K'      = if not bSuper then [ActorWrapper $ newKinoko cx cy] else [ActorWrapper $ newFlower cx cy]
                                         | otherwise     = []
                                 actors' = actors gs ++ [ActorWrapper $ newAnimBlock cx cy $ fieldRef (fld gs) cx cy] ++ items
                                 fld' = fieldSet (fld gs) cx cy '*'
+                                breakable c = c == 'O'
                 proc gs (EvSetField cx cy c) = gs { fld = fieldSet (fld gs) cx cy c }
                 proc gs (EvAppearEnemy cx cy c) = gs { actors = actors gs ++ [ene] }
@@ -213 +218 @@
         renderField sur imgres scrx (fld gs)
         renderInfo gs imgres sur
+        renderActors imgres scrx sur (actors gs)
         renderPlayer sur imgres scrx (pl gs)
 
-        renderActors imgres scrx sur (actors gs)
         return ()
 

lang/haskell/nario/Player.hs

@@ -3 +3 @@
 module Player (
         Player(..),
+        PlayerType(..),
         newPlayer,
         updatePlayer,
@@ -10 +11 @@
         getPlayerHitRect,
         getPlayerMedal,
-        getPlayerScore
+        getPlayerScore,
+        getPlayerType,
+        setPlayerType
 ) where
 
@@ -32 +35 @@
 gravity2 = one `div` 4          -- Aを長押ししたときの重力
 
+data PlayerType = SmallNario | SuperNario | FireNario
+        deriving (Eq)
+
 data Player = Player {
+        pltype :: PlayerType,
         x :: Int,
         y :: Int,
@@ -49 +56 @@
 
 newPlayer = Player {
+        pltype = SmallNario,
         x = 3 * chrSize * one,
         y = 13 * chrSize * one,
@@ -70 +78 @@
 patJump = patWalk + walkPatNum
 patSlip = patJump + 1
-
-imgTable = [
-        [ImgNarioLStand, ImgNarioLWalk1, ImgNarioLWalk2, ImgNarioLWalk3, ImgNarioLJump, ImgNarioLSlip],
-        [ImgNarioRStand, ImgNarioRWalk1, ImgNarioRWalk2, ImgNarioRWalk3, ImgNarioRJump, ImgNarioRSlip]
+patSit = patSlip + 1
+patShot = patSit + 1
+
+imgTableSmall = [
+        [ImgNarioLStand, ImgNarioLWalk1, ImgNarioLWalk2, ImgNarioLWalk3, ImgNarioLJump, ImgNarioLSlip, ImgNarioLStand],
+        [ImgNarioRStand, ImgNarioRWalk1, ImgNarioRWalk2, ImgNarioRWalk3, ImgNarioRJump, ImgNarioRSlip, ImgNarioRStand]
+        ]
+imgTableSuper = [
+        [ImgSNarioLStand, ImgSNarioLWalk1, ImgSNarioLWalk2, ImgSNarioLWalk3, ImgSNarioLJump, ImgSNarioLSlip, ImgSNarioLSit],
+        [ImgSNarioRStand, ImgSNarioRWalk1, ImgSNarioRWalk2, ImgSNarioRWalk3, ImgSNarioRJump, ImgSNarioRSlip, ImgSNarioRSit]
+        ]
+imgTableFire = [
+        [ImgFNarioLStand, ImgFNarioLWalk1, ImgFNarioLWalk2, ImgFNarioLWalk3, ImgFNarioLJump, ImgFNarioLSlip, ImgFNarioLSit, ImgFNarioLShot],
+        [ImgFNarioRStand, ImgFNarioRWalk1, ImgFNarioRWalk2, ImgFNarioRWalk3, ImgFNarioRJump, ImgFNarioRSlip, ImgFNarioRSit, ImgFNarioRShot]
         ]
 
@@ -79 +97 @@
 -- 横移動
 moveX :: KeyProc -> Player -> Player
-moveX kp player =
-        if (stand player)
-                then player' { lr = lr', pat = pat', anm = anm' }
-                else player'
+moveX kp self =
+        if (stand self)
+                then self' { lr = lr', pat = pat', anm = anm' }
+                else self'
         where
                 ax = (-padl + padr) * acc
                 vx'
-                        | ax /= 0                       = rangeadd (vx player) ax (-maxspd) maxspd
-                        | stand player          = friction (vx player) acc
-                        | otherwise                     = vx player
-                x' = max xmin $ (x player) + vx'
+                        | ax /= 0                       = rangeadd (vx self) ax (-maxspd) maxspd
+                        | stand self            = friction (vx self) acc
+                        | otherwise                     = vx self
+                x' = max xmin $ (x self) + vx'
                 scrx'
-                        | vx' > 0 && (x' - (scrx player)) `div` one > scrollPos = (scrx player) + vx'
-                        | otherwise                                                                                             = (scrx player)
+                        | vx' > 0 && (x' - (scrx self)) `div` one > scrollPos   = (scrx self) + vx'
+                        | otherwise                                                                                             = (scrx self)
 
                 scrollPos = (max vx' 0) * (scrollMaxX - scrollMinX) `div` runVx + scrollMinX
@@ -99 +117 @@
                 padr = if isPressed (kp PadR) then 1 else 0
                 maxspd
-                        | not $ stand player    = walkVx `div` 2
+                        | not $ stand self      = walkVx `div` 2
                         | isPressed (kp PadB)   = walkVx * 2
                         | otherwise                             = walkVx
-                xmin = (scrx player) + chrSize `div` 2 * one
-
-                player' = player { x = x', vx = vx', scrx = scrx' }
+                xmin = (scrx self) + chrSize `div` 2 * one
+
+                self' = self { x = x', vx = vx', scrx = scrx' }
 
                 lr' =
                         case (-padl + padr) of
-                                0       -> lr player
+                                0       -> lr self
                                 -1      -> 0
                                 1       -> 1
@@ -118 +136 @@
                 anm'
                         | vx' == 0              = 0
-                        | otherwise             = ((anm player) + (abs vx')) `mod` (walkPatNum * anmCnt)
+                        | otherwise             = ((anm self) + (abs vx')) `mod` (walkPatNum * anmCnt)
                 anmCnt = walkVx * 3
 
@@ -124 +142 @@
 -- 横移動チェック
 checkX :: Field -> Player -> Player
-checkX fld player
-        | dir == 0      = check (-1) $ check 1 $ player
-        | otherwise = check dir $ player
-        where
-                dir = sgn $ vx player
-                check dx player
-                        | isBlock $ fieldRef fld cx cy  = player { x = (x player) - dx * one, vx = 0 }
-                        | otherwise                                             = player
+checkX fld self
+        | dir == 0      = check (-1) $ check 1 $ self
+        | otherwise = check dir $ self
+        where
+                dir = sgn $ vx self
+                check dx self
+                        | isBlock $ fieldRef fld cx cy  = self { x = (x self) - dx * one, vx = 0 }
+                        | otherwise                                             = self
                         where
-                                cx = cellCrd (x player + ofsx dx)
-                                cy = cellCrd (y player - chrSize `div` 2 * one)
+                                cx = cellCrd (x self + ofsx dx)
+                                cy = cellCrd (y self - chrSize `div` 2 * one)
                                 ofsx (-1) = -6 * one
                                 ofsx   1  =  5 * one
@@ -141 +159 @@
 -- 重力による落下
 fall :: KeyProc -> Player -> Player
-fall kp player
-        | stand player  = player
-        | otherwise             = player { y = y', vy = vy' }
+fall kp self
+        | stand self    = self
+        | otherwise             = self { y = y', vy = vy' }
         where
                 ay
-                        | vy player < 0 && isPressed (kp PadA)  = gravity2
+                        | vy self < 0 && isPressed (kp PadA)    = gravity2
                         | otherwise                                                             = gravity
-                vy' = min maxVy $ vy player + ay
-                y' = y player + vy'
+                vy' = min maxVy $ vy self + ay
+                y' = y self + vy'
 
 
 -- 床をチェック
 checkFloor :: Field -> Player -> Player
-checkFloor fld player
-        | stand'        = player { stand = stand', y = ystand, vy = 0 }
-        | otherwise     = player { stand = stand' }
+checkFloor fld self
+        | stand'        = self { stand = stand', y = ystand, vy = 0 }
+        | otherwise     = self { stand = stand' }
         where
                 stand'
-                        | vy player >= 0        = isGround (-6) || isGround 5
-                        | otherwise                     = stand player
-                ystand = (cellCrd $ y player) * (chrSize * one)
-
-                isGround ofsx = isBlock $ fieldRef fld (cellCrd $ x player + ofsx * one) (cellCrd (y player))
+                        | vy self >= 0  = isGround (-6) || isGround 5
+                        | otherwise                     = stand self
+                ystand = (cellCrd $ y self) * (chrSize * one)
+
+                isGround ofsx = isBlock $ fieldRef fld (cellCrd $ x self + ofsx * one) (cellCrd (y self))
 
 -- 上をチェック
 checkCeil :: Field -> Player -> (Player, [Event])
-checkCeil fld player
-        | stand player || vy player >= 0 || not isCeil  = (player, [])
-        | otherwise = (player { vy = 0, score = (score player) + 10 }, [EvHitBlock ImgBlock2 cx cy])
-        where
-                ytmp = y player - one * chrSize
-
-                cx = cellCrd $ x player
+checkCeil fld self
+        | stand self || vy self >= 0 || not isCeil      = (self, [])
+        | otherwise = (self { vy = 0, score = (score self) + 10 }, [EvHitBlock ImgBlock2 cx cy (pltype self /= SmallNario)])
+        where
+                yofs = case pltype self of
+                        SmallNario      -> 15
+                        SuperNario      -> 30
+                        FireNario       -> 30
+                ytmp = y self - yofs * one
+
+                cx = cellCrd $ x self
                 cy = cellCrd ytmp
                 isCeil = isBlock $ fieldRef fld cx cy
@@ -181 +203 @@
 -- ジャンプする？
 doJump :: KeyProc -> Player -> Player
-doJump kp player
-        | stand player && kp PadA == Pushed     = player { vy = jumpVy, stand = False, pat = patJump }
-        | otherwise                                                     = player
+doJump kp self
+        | stand self && kp PadA == Pushed       = self { vy = jumpVy, stand = False, pat = patJump }
+        | otherwise                                                     = self
 
 
 -- 更新処理
 updatePlayer :: KeyProc -> Field -> Player -> (Player, [Event])
-updatePlayer kp fld player =
-        moveY $ checkX fld $ moveX kp player
+updatePlayer kp fld self =
+        moveY $ checkX fld $ moveX kp self
         where
                 moveY = checkCeil fld . doJump kp . checkFloor fld . fall kp
@@ -195 +217 @@
 -- スクロール位置取得
 getScrollPos :: Player -> Int
-getScrollPos player = (scrx player) `div` one
+getScrollPos self = (scrx self) `div` one
 
 -- Ｙ座標取得
@@ -216 +238 @@
 getPlayerScore = score
 
+-- タイプ取得
+getPlayerType :: Player -> PlayerType
+getPlayerType = pltype
+
+-- タイプ設定
+setPlayerType :: PlayerType -> Player -> Player
+setPlayerType t self = self { pltype = t }
+
 -- 描画
-renderPlayer sur imgres scrx player = do
+renderPlayer sur imgres scrx self = do
         blitSurface (getImageSurface imgres imgtype) Nothing sur pos
         where
-                pos = pt ((x player) `div` one - chrSize `div` 2 - scrx) ((y player) `div` one - chrSize+1 - 8)
-                imgtype = imgTable !! (lr player) !! (pat player)
+                pos = case pltype self of
+                        SmallNario      -> pt sx $ sy - chrSize + 1
+                        otherwise       -> pt sx $ sy - chrSize * 2 + 1
+                imgtype = imgtbl !! lr self !! pat self
+                imgtbl = case pltype self of
+                        SmallNario      -> imgTableSmall
+                        SuperNario      -> imgTableSuper
+                        FireNario       -> imgTableFire
+                sx = x self `div` one - chrSize `div` 2 - scrx
+                sy = y self `div` one - 8

lang/haskell/nario/README.txt

@@ -5 +5 @@
 を Haskell/HSDL で作る
 
-
 HSDL
 http://fxp.hp.infoseek.co.jp/haskell/HSDL/
+
 
 
@@ -33 +33 @@
 
 
+★ビルド
+・必要なもの
+        Haskell コンパイラ
+
+        SDL
+        http://www.libsdl.org/
+
+        HSDL
+        http://fxp.hp.infoseek.co.jp/haskell/HSDL/
+
+　○ビルド
+        make
+
+　○実行
+        できた実行ファイルを入力、または
+        make run