Changeset 9917

Timestamp:

04/19/08 23:24:09 (5 years ago)

Author:

authorNari

Message:

normal game flow make

Location:

lang/ruby/mariobros

Files:

• main.rb (modified) (1 diff)
• mario/gamestart.rb (modified) (4 diffs)
• mario/scene.rb (modified) (4 diffs)
• mario/scene/flowworld.rb (modified) (1 diff)
• mario/scene/title.rb (modified) (1 diff)

lang/ruby/mariobros/main.rb

@@ -14 +14 @@
 
 
-$test = true
+$test = false
 require 'gamestart' unless $test
 require 'test' if $test
-
-#scratch
-#title.screen_build(@screen) {
-#  background
-#  floor
-#}

lang/ruby/mariobros/mario/gamestart.rb

@@ -5 +5 @@
 #
 
+require 'sdl'
+require 'lib/fpstimer'
+require 'lib/input'
+require 'mario/scene'
+require 'mario/material'
+require 'mario/life'
 
 class Input
@@ -32 +38 @@
 
   map[:map_1].screen_build {
-    background Material::BackGround.new_fill_image(0, 0, 6000, 800, SDL::Surface.load("mario/image/out_sky.png"))
-    floor Material::BackGround.new_fill_image(0, 600, 6000, 300, SDL::Surface.load("mario/image/floor_block.png"))
+    background Material::BackGround.new_color(0, 0, 10000, 800, [0x00, 0x99, 0xff])
+    floor Material::Floor.new_fill_image(0, 600, 200, 300, SDL::Surface.load("mario/image/floor_block.png"))
+    floor Material::Floor.new_fill_image(350, 600, 500, 300, SDL::Surface.load("mario/image/floor_block.png"))
+    floor Material::Floor.new_fill_image(900, 600, 500, 300, SDL::Surface.load("mario/image/floor_block.png"))
+    floor Material::Floor.new_fill_image(1500, 600, 200, 300, SDL::Surface.load("mario/image/floor_block.png"))
+    floor Material::Floor.new_fill_image(1800, 600, 400, 300, SDL::Surface.load("mario/image/floor_block.png"))
+    floor Material::Floor.new_fill_image(2600, 600, 400, 300, SDL::Surface.load("mario/image/floor_block.png"))
+    floor Material::Floor.new_fill_image(3200, 600, 400, 300, SDL::Surface.load("mario/image/floor_block.png"))
+    floor Material::Floor.new_fill_image(3800, 600, 400, 300, SDL::Surface.load("mario/image/floor_block.png"))
+    floor Material::Floor.new_fill_image(4400, 600, 400, 300, SDL::Surface.load("mario/image/floor_block.png"))
+    floor Material::Floor.new_fill_image(5000, 600, 400, 300, SDL::Surface.load("mario/image/floor_block.png"))
+    enemy Life::Kuribo.new(500, 200)
+    player Life::Mario.new(40, 200)
   }
 
@@ -46 +63 @@
   if defined?(SDL::RELEASE_MODE)
     SDL::Mouse.hide
-    @screen = SDL.set_video_mode(760, 670, 16, SDL::HWSURFACE|SDL::DOUBLEBUF|SDL::FULLSCREEN)
+    screen = SDL.set_video_mode(Scene::SCREEN_WIDTH, Scene::SCREEN_HIGHT, 16, SDL::HWSURFACE|SDL::DOUBLEBUF|SDL::FULLSCREEN)
   else
-    @screen = SDL.set_video_mode(760, 670, 16, SDL::SWSURFACE|SDL::DOUBLEBUF)
+    screen = SDL.set_video_mode(Scene::SCREEN_WIDTH, Scene::SCREEN_HIGHT, 16, SDL::SWSURFACE|SDL::DOUBLEBUF)
   end
 
-  @input = Input.new
-  @font = SDL::TTF.open("image/boxfont2.ttf", 14)
-  @bgm = SDL::Mixer::Music.load("sound/famipop3.it")
+  input = Input.new
 
-  map = map_init(@screen)
+  map = map_init(screen)
 
   scene = map[:title]
@@ -61 +76 @@
   timer.reset
   loop do
-    @input.poll
-    break if @input[:exit]
+    input.poll
+    break if input[:exit]
 
-    s_next = scene.act(@input)
-    scene = map[s_next] if s_next
-    scene.render(@screen)
-    timer.wait_frame{ @screen.flip }
+    s_next = scene.act(input)
+    scene.render(screen)
+    scene = map[s_next].rebuild if s_next
+    timer.wait_frame{
+      if defined?(SDL::RELEASE_MODE)
+        screen.flip
+      else
+        screen.update_rect(0, 0, Scene::SCREEN_WIDTH, Scene::SCREEN_HIGHT)
+      end
+    }
   end
 end

lang/ruby/mariobros/mario/scene.rb

@@ -16 +16 @@
 
     def initialize(&block)
+      init
+      instance_eval(&block)
+    end
+
+    def init
+      @backgrounds = []
       @actions = []
       @blocks = []
@@ -22 +28 @@
       @player = nil
       @renders = [@actions, @blocks, @enemys, @flows]
-      instance_eval(&block)
+    end
+
+    def rebuild
+      init
+      instance_eval(&@build_code)
+      self
     end
 
@@ -34 +45 @@
 
     def screen_build(&block)
+      @build_code = block
       instance_eval(&block)
       self
@@ -39 +51 @@
 
     def background(bg)
+      @backgrounds << bg
       @flows << bg
     end

lang/ruby/mariobros/mario/scene/flowworld.rb

@@ -12 +12 @@
       flow_right
       garbage_sweep if(@player.frame % 100).zero?
+      return :title if @player.y > SCREEN_HIGHT*2
+      nil
     end
 

lang/ruby/mariobros/mario/scene/title.rb

@@ -10 +10 @@
     def render(screen)
       @backgrounds.each{|bg| bg.put_screen(screen) }
-      @floors.each{|fl| fl.put_screen(screen) }
     end
   end