Changeset 20223 for lang/haskell

Timestamp:

09/29/08 21:34:45 (2 months ago)

Author:

mokehehe

Message:

画面の縦のサイズを224ドットに修正

Location:

lang/haskell/nario

Files:

• Const.hs (modified) (4 diffs)
• Field.hs (modified) (1 diff)
• Main.hs (modified) (2 diffs)
• Player.hs (modified) (3 diffs)
• data/stage0.map (modified) (1 diff)

lang/haskell/nario/Const.hs

@@ -13 +13 @@
 -- 画像
 data ImageType =
-          ImgNario00 | ImgNario01 | ImgNario02 | ImgNario03 | ImgNario04
-        | ImgNario10 | ImgNario11 | ImgNario12 | ImgNario13 | ImgNario14
+          ImgNarioLStand | ImgNarioLWalk1 | ImgNarioLWalk2 | ImgNarioLWalk3 | ImgNarioLJump
+        | ImgNarioRStand | ImgNarioRWalk1 | ImgNarioRWalk2 | ImgNarioRWalk3 | ImgNarioRJump
         | ImgBlock1 | ImgBlock2 | ImgBlock3 | ImgBlock4 | ImgBlock5
         | ImgMt02 | ImgMt11 | ImgMt12 | ImgMt13 | ImgMt22
@@ -21 +21 @@
         | ImgGrass00 | ImgGrass01 | ImgGrass02
         | ImgFont
+        | ImgTitle
         deriving Eq
 
 
-imageFn ImgNario00 = "nario00.bmp"
-imageFn ImgNario01 = "nario01.bmp"
-imageFn ImgNario02 = "nario02.bmp"
-imageFn ImgNario03 = "nario03.bmp"
-imageFn ImgNario04 = "nario04.bmp"
-imageFn ImgNario10 = "nario10.bmp"
-imageFn ImgNario11 = "nario11.bmp"
-imageFn ImgNario12 = "nario12.bmp"
-imageFn ImgNario13 = "nario13.bmp"
-imageFn ImgNario14 = "nario14.bmp"
+imageFn ImgNarioLStand = "narioLStand.bmp"
+imageFn ImgNarioLWalk1 = "narioLWalk1.bmp"
+imageFn ImgNarioLWalk2 = "narioLWalk2.bmp"
+imageFn ImgNarioLWalk3 = "narioLWalk3.bmp"
+imageFn ImgNarioLJump = "narioLJump.bmp"
+imageFn ImgNarioRStand = "narioRStand.bmp"
+imageFn ImgNarioRWalk1 = "narioRWalk1.bmp"
+imageFn ImgNarioRWalk2 = "narioRWalk2.bmp"
+imageFn ImgNarioRWalk3 = "narioRWalk3.bmp"
+imageFn ImgNarioRJump = "narioRJump.bmp"
 imageFn ImgBlock1 = "block1.bmp"
 imageFn ImgBlock2 = "block2.bmp"
@@ -58 +59 @@
 imageFn ImgGrass02 = "grass02.bmp"
 imageFn ImgFont = "font.bmp"
+imageFn ImgTitle = "title.bmp"
 
 images = [
-        ImgNario00, ImgNario01, ImgNario02, ImgNario03, ImgNario04,
-        ImgNario10, ImgNario11, ImgNario12, ImgNario13, ImgNario14,
+        ImgNarioLStand, ImgNarioLWalk1, ImgNarioLWalk2, ImgNarioLWalk3, ImgNarioLJump,
+        ImgNarioRStand, ImgNarioRWalk1, ImgNarioRWalk2, ImgNarioRWalk3, ImgNarioRJump,
         ImgBlock1, ImgBlock2, ImgBlock3, ImgBlock4, ImgBlock5,
         ImgMt02, ImgMt11, ImgMt12, ImgMt13, ImgMt22,
@@ -67 +69 @@
         ImgDk00, ImgDk01, ImgDk10, ImgDk11,
         ImgGrass00, ImgGrass01, ImgGrass02,
-        ImgFont
+        ImgFont,
+        ImgTitle
         ]

lang/haskell/nario/Field.hs

@@ -71 +71 @@
                 cellProc _ (_, ' ') = return ()
                 cellProc y (x, c) = putchr x y c >> return ()
-                putchr x y c = blitSurface (getImageSurface imgres $ chr2img c) Nothing sur $ pt (x*chrSize - rx) (y*chrSize)
+                putchr x y c = blitSurface (getImageSurface imgres $ chr2img c) Nothing sur $ pt (x*chrSize - rx) (y*chrSize - 8)
 
                 -- 表示される部分だけ取り出す

lang/haskell/nario/Main.hs

@@ -15 +15 @@
 import Font
 
-wndTitle = "delayed-stream test"
+wndTitle = "NARIO in Haskell"
 wndWidth = 256
-wndHeight = 240
+wndHeight = 224
 wndBpp = 32
 
@@ -127 +127 @@
 renderInfo gs imgres sur = do
         puts 3 1 "MARIO"
-        puts 3 2 "00000"
+        puts 3 2 "000000"
         puts 11 2 "?*00"
-        puts 19 1 "WORLD"
-        puts 20 2 "1-1"
-        puts 26 1 "TIME"
-        puts 27 2 "255"
+        puts 18 1 "WORLD"
+        puts 19 2 "1-1"
+        puts 25 1 "TIME"
+        puts 26 2 "255"
         where
                 puts = fontPut sur fontsur
                 fontsur = getImageSurface imgres ImgFont
+
+-- タイトル画面
+renderTitle gs imgres sur = do
+        blitSurface (getImageSurface imgres ImgTitle) Nothing sur (pt (5*8) (3*8))
+        puts 13 14 "@1985 NINTENDO"
+        puts 9 17 "> 1 PLAYER GAME"
+        puts 9 19 "  2 PLAYER GAME"
+        puts 12 22 "TOP- 000000"
+        where
+                puts = fontPut sur fontsur
+                fontsur = getImageSurface imgres ImgFont

lang/haskell/nario/Player.hs

@@ -57 +57 @@
 
 imgTable = [
-        [ImgNario00, ImgNario01, ImgNario02, ImgNario03, ImgNario04],
-        [ImgNario10, ImgNario11, ImgNario12, ImgNario13, ImgNario14]
+        [ImgNarioLStand, ImgNarioLWalk1, ImgNarioLWalk2, ImgNarioLWalk3, ImgNarioLJump],
+        [ImgNarioRStand, ImgNarioRWalk1, ImgNarioRWalk2, ImgNarioRWalk3, ImgNarioRJump]
         ]
 
@@ -76 +76 @@
                 vx'
                         | ax /= 0                       = rangeadd (vx player) ax (-maxspd) maxspd
-                        | (stand player)        = friction (vx player) acc
-                        | otherwise                     = friction (vx player) (acc `div` 2)
+                        | stand player          = friction (vx player) acc
+                        | otherwise                     = vx player
                 x' = max xmin $ (x player) + vx'
                 scrx'
@@ -178 +178 @@
         blitSurface (getImageSurface imgres imgtype) Nothing sur pos
         where
-                pos = pt ((x player) `div` one - chrSize `div` 2 - scrx) ((y player) `div` one - chrSize)
+                pos = pt ((x player) `div` one - chrSize `div` 2 - scrx) ((y player) `div` one - chrSize - 8)
                 imgtype = imgTable !! (lr player) !! (pat player)

lang/haskell/nario/data/stage0.map

@@ -1 @@
-                                                                                                                                                                                                                
-                  123               1223                           123              1223                                                                                                              o         
-        123       456      12223    4556                123        456     12223    4556                           123              1223                           123              1223              | 123     
-        456                45556                        456                45556                        123        456     12223    4556                123        456     12223    4556              ! 456     
-                                                                                                        456                45556                        456                45556                      !         
+
+                                                                                                                                                                                                      o         
+                  123               1223                           123              1223                           123              1223                           123              1223              | 123     
+        123       456      12223    4556                123        456     12223    4556                123        456     12223    4556                123        456     12223    4556              ! 456     
+        456                45556                        456                45556                        456                45556                        456                45556                      !         
                       ?                                                         OOOOOOOO   OOO?              ?           OOO    O??O                                                        XX        !         
                                                                                                                                                                                            XXX        !