Changeset 20291 for lang/ruby

Timestamp:

09/30/08 18:08:13 (2 months ago)

Author:

authorNari

Message:

もっとクリーンなnarioへ...もっとクリーンな日本へ

Location:

lang/ruby/nario

Files:

• TAGS (added)
• nario.rb (modified) (2 diffs)
• nario/factor.rb (modified) (1 diff)
• nario/gamestart.rb (modified) (6 diffs)
• nario/image/can.bmp (added)
• nario/image/dustbin.bmp (added)
• nario/image/kuribo.bmp (deleted)
• nario/image/nokonoko.bmp (deleted)
• nario/image/stop.bmp (added)
• nario/life.rb (modified) (1 diff)
• nario/life/can.rb (added)
• nario/life/carapace.rb (modified) (2 diffs)
• nario/life/dustbin.rb (added)
• nario/life/enemy.rb (modified) (1 diff)
• nario/life/kuribo.rb (deleted)
• nario/life/nario.rb (modified) (1 diff)
• nario/life/nokonoko.rb (deleted)
• nario/map/map1_1.rb (modified) (1 diff)
• nario/material.rb (modified) (1 diff)
• nario/material/itemblock.rb (modified) (1 diff)
• nario/material/itembox.rb (modified) (1 diff)
• nario/scene.rb (modified) (9 diffs)
• nario/scene/builder.rb (deleted)
• nario/test.rb (modified) (3 diffs)

lang/ruby/nario/nario.rb

@@ -16 +16 @@
 require 'optparse'
 
-@gc_burden_mode = false
-@test_mode = false
+$GC_BURDEN_MODE = false
+$TEST_MODE = false
 opt = OptionParser.new
 opt.version = "1.0.0"
-opt.on('-g', '--gc', "To stop the world. and gc stop grafical mode :)") {|v| @gc_burden_mode = true}
-opt.on('-t', '--test', "test mode") {|v| @test_mode = true}
+opt.on('-g', '--gc', "To stop the world. and gc stop grafical mode :)") {|v| $GC_BURDEN_MODE = true}
+opt.on('-t', '--test', "test mode") {|v| $TEST_MODE = true}
 opt.parse!(ARGV)
 
 # burden to nario and gc :)
-if @gc_burden_mode
+if $GC_BURDEN_MODE
   @@arry = []
   3000000.times{@@arry << Array.new}
@@ -41 +41 @@
     @@skip += 1
   end
-else
-  def gc_start(screen)
-  end
 end
 
-require 'gamestart' unless @test_mode
-require 'test' if @test_mode
+require 'gamestart' unless $TEST_MODE
+require 'test' if $TEST_MODE

lang/ruby/nario/nario/factor.rb

@@ -98 +98 @@
     is_or_dead = (@is_dead or collide.is_dead)
     # debug
-    #pp event if event[1].to_s == "collide_nario_head"
+    puts "event! #{self}.#{event[0]} <--> #{collide}.#{event[1]}" if $DEBUG
     collide.send(event[0], self) if collide.methods.map{|a| a.to_s}.include? event[0].to_s and !is_or_dead
     send(event[1], collide) if methods.map{|b| b.to_s}.include? event[1].to_s and !is_or_dead

lang/ruby/nario/nario/gamestart.rb

@@ -16 +16 @@
 class Input
   define_key SDL::Key::ESCAPE, :exit
+  define_key SDL::Key::Q, :exit
   define_key SDL::Key::LEFT, :left
   define_key SDL::Key::RIGHT, :right
@@ -23 +24 @@
   define_key SDL::Key::A, :a
   define_key SDL::Key::B, :b
+  define_key SDL::Key::S, :start
+  define_key SDL::Key::G, :go
 end
 
@@ -29 +32 @@
   world = {}
   world[:title] = ::Scene::Title.new { success :map1_1 }
-  world[:title].build_map &Map::TITLE
+  world[:title].build_scene &Map::TITLE
   world[:map1_1] = ::Scene::FlowWorld.new { success :title; miss :title }
-  world[:map1_1].build_map &Map::MAP1_1
+  world[:map1_1].build_scene &Map::MAP1_1
   world
 end
@@ -39 +42 @@
   SDL::TTF.init
   SDL.set_video_mode(Scene::SCREEN_WIDTH, Scene::SCREEN_HIGHT, 16, SDL::HWSURFACE|SDL::DOUBLEBUF)
+end
+
+def stop?(input, screen)
+  if input.start
+    screen.put(SDL::Surface.load("nario/image/stop.bmp"), 270, 270)
+    screen.update_rect(0, 0, Scene::SCREEN_WIDTH, Scene::SCREEN_HIGHT)
+    @stop = true
+  end
+  if input.go
+    @stop = false
+  end
+  return @stop
 end
 
@@ -54 +69 @@
     input.poll
     break if input[:exit]
+    redo if stop?(input, screen)
 
     s_next = scene.act(input)
@@ -59 +75 @@
     scene = world[s_next].rebuild if s_next
     timer.wait_frame {
-      gc_start(screen)
+      gc_start if $GC_BURDEN_MODE
       screen.update_rect(0, 0, Scene::SCREEN_WIDTH, Scene::SCREEN_HIGHT)
     }

lang/ruby/nario/nario/life.rb

@@ -159 +159 @@
   autoload :Nario, "life/nario"
   autoload :Enemy, "life/enemy"
-  autoload :Kuribo, "life/kuribo"
-  autoload :NokoNoko, "life/nokonoko"
+  autoload :Can, "life/can"
+  autoload :Dustbin, "life/dustbin"
   autoload :Carapace, "life/carapace"
 end

lang/ruby/nario/nario/life/carapace.rb

@@ -26 +26 @@
 
     # collision parts
-    def head_range; {:x_range => (@x+@w/2-10)..(@x+@w/2+10), :y_range => (@y+10)..(@y+@h/2), :event => :collide_kuribo_head}; end
+    def head_range; {:x_range => (@x+@w/2-10)..(@x+@w/2+10), :y_range => (@y+10)..(@y+@h/2), :event => :collide_can_head}; end
 
     # collision event
@@ -32 +32 @@
     def collide_nario_right(m); set_direction(1); end
     def collide_nario_left(m); set_direction(-1); end
-    undef collide_kuribo_left
-    undef collide_kuribo_right
+    undef collide_can_left
+    undef collide_can_right
     undef collide_nokonoko_left
     undef collide_nokonoko_right

lang/ruby/nario/nario/life/enemy.rb

@@ -7 +7 @@
     alias collide_weakblock_head collide_floor_head
     alias collide_itembox_head collide_weakblock_head
-    alias collide_kuribo_left collide_strongblock_left
-    alias collide_kuribo_right collide_strongblock_right
-    alias collide_nokonoko_left collide_strongblock_left
-    alias collide_nokonoko_right collide_strongblock_right
+    alias collide_can_left collide_strongblock_left
+    alias collide_can_right collide_strongblock_right
+    alias collide_dustbin_left collide_strongblock_left
+    alias collide_dustbin_right collide_strongblock_right
     alias collide_pipe_left collide_strongblock_left
     alias collide_pipe_right collide_strongblock_right

lang/ruby/nario/nario/life/nario.rb

@@ -29 +29 @@
 
     # collision event
-    def collide_kuribo_right(k); @movie_event = :movie_die; end;
-    alias collide_kuribo_left collide_kuribo_right
-    alias collide_kuribo_foot collide_kuribo_right
-    def collide_kuribo_head(k);  force_jump; end
-    alias collide_nokonoko_right collide_kuribo_right
-    alias collide_nokonoko_left collide_kuribo_left
-    alias collide_nokonoko_foot collide_kuribo_foot
-    alias collide_nokonoko_head collide_kuribo_head
+    def collide_can_right(k); @movie_event = :movie_die; end;
+    alias collide_can_left collide_can_right
+    alias collide_can_foot collide_can_right
+    def collide_can_head(k);  force_jump; end
+    alias collide_dustbin_right collide_can_right
+    alias collide_dustbin_left collide_can_left
+    alias collide_dustbin_foot collide_can_foot
+    alias collide_dustbin_head collide_can_head
     def collide_carapace_right(c); @movie_event = :movie_die if c.violence?; c.x-=10; end;
     def collide_carapace_left(c); @movie_event = :movie_die if c.violence?; c.x+=10; end;

lang/ruby/nario/nario/map/map1_1.rb

@@ -69 +69 @@
     goal 9860
 
-    enemy Life::Kuribo.new(900, 550)
-    enemy Life::Kuribo.new(2000, 550)
-    enemy Life::Kuribo.new(2500, 550)
-    enemy Life::Kuribo.new(2560, 550)
-    enemy Life::Kuribo.new(3830, 200)
-    enemy Life::Kuribo.new(3890, 200)
-    enemy Life::Kuribo.new(4670, 550)
-    enemy Life::Kuribo.new(4730, 550)
-    enemy Life::NokoNoko.new(5100, 550)
-    enemy Life::Kuribo.new(5430, 550)
-    enemy Life::Kuribo.new(5490, 550)
-    enemy Life::Kuribo.new(5750, 550)
-    enemy Life::Kuribo.new(5810, 550)
-    enemy Life::Kuribo.new(6100, 550)
-    enemy Life::Kuribo.new(6160, 550)
-    enemy Life::Kuribo.new(8300, 550)
-    enemy Life::Kuribo.new(8360, 550)
+    enemy Life::Can.new(900, 550)
+    enemy Life::Can.new(2000, 550)
+    enemy Life::Can.new(2500, 550)
+    enemy Life::Can.new(2560, 550)
+    enemy Life::Can.new(3830, 200)
+    enemy Life::Can.new(3890, 200)
+    enemy Life::Can.new(4670, 550)
+    enemy Life::Can.new(4730, 550)
+    enemy Life::Dustbin.new(5100, 550)
+    enemy Life::Can.new(5430, 550)
+    enemy Life::Can.new(5490, 550)
+    enemy Life::Can.new(5750, 550)
+    enemy Life::Can.new(5810, 550)
+    enemy Life::Can.new(6100, 550)
+    enemy Life::Can.new(6160, 550)
+    enemy Life::Can.new(8300, 550)
+    enemy Life::Can.new(8360, 550)
 
     player Life::Nario.new(200, 550)

lang/ruby/nario/nario/material.rb

@@ -6 +6 @@
 
     def initialize(x, y, w, h, img=nil, color=nil)
+      @fill_mtls = nil
+      @img = nil
       img.set_color_key(SDL::SRCCOLORKEY, [255, 255, 255]) if img
       super(x, y, w, h, img)

lang/ruby/nario/nario/material/itemblock.rb

@@ -20 +20 @@
       @bound_prev_y = @y
       @frame = 0
-      @now_scene.item(@item)
+      @now_scene.in(:item, @item)
       undef :collide_nario_head
     end

lang/ruby/nario/nario/material/itembox.rb

@@ -26 +26 @@
       @frame = 0
       @item = JumpCoin.new(@x + 7, @y - 70)
-      @now_scene.item(@item)
+      @now_scene.in(:item, @item)
       @empyt_item = true
     end

lang/ruby/nario/nario/scene.rb

@@ -31 +31 @@
       @player = nil
       @renders = [@flows]
-      @deploy_table = []
-    end
-
+      @lazy_deploys = []
+    end
+
+    def success(nxt)
+      @success = nxt
+    end
+
+    def miss(nxt)
+      @miss = nxt
+    end
+
+    def in(type, *args)
+      send(type, *args)
+    end
+    
     def rebuild
       init
@@ -40 +52 @@
     end
 
-    def success(nxt)
-      @success = nxt
-    end
-
-    def miss(nxt)
-      @miss = nxt
-    end
-
-    def build_map(&block)
+    def build_scene(&block)
       @build_code = block
       instance_eval(&block)
@@ -54 +58 @@
     end
 
+    private
     def background(bg)
       code = lambda {
@@ -60 +65 @@
       }
       @flows << bg
-      @deploy_table << [bg, code]
+      add_lazydeploy(bg, code)
     end
 
@@ -70 +75 @@
       @floors << fl
       @flows << fl
-      @deploy_table << [fl, code]
+      add_lazydeploy(fl, code)
     end
 
@@ -85 +90 @@
       }
       @flows << enemy
-      @deploy_table << [enemy, code]
+      add_lazydeploy(enemy, code)
     end
 
@@ -96 +101 @@
       @floors << block
       @flows << block
-      @deploy_table << [block, code]
+      add_lazydeploy(block, code)
     end
 
@@ -105 +110 @@
         @actions << it
       }
-      @deploy_table << [it, code]
+      add_lazydeploy(it, code)
     end
 
@@ -179 +184 @@
     end
 
-    def act(input); end
-    def render(screen); end
-
-    private
     def deploy
-      @deploy_table.size.times{|i|
-        if @deploy_table[i][0].x < (SCREEN_WIDTH + SCREEN_WIDTH/2)
-          @deploy_table[i][1].call
-          @deploy_table[i] = nil
+      @lazy_deploys.each_with_index {|e, i|
+        if e[:object].x < (SCREEN_WIDTH + SCREEN_WIDTH/2)
+          e[:deploy_code].call
+          @lazy_deploys[i] = nil
         end
       }
-      @deploy_table.compact!
+      @lazy_deploys.compact!
+    end
+
+    def add_lazydeploy(object, deploy_code)
+      @lazy_deploys << {:object => object, :deploy_code => deploy_code}
     end
 

lang/ruby/nario/nario/test.rb

@@ -103 +103 @@
 #  floor Material::Floor.new_color(0, 600, 800, 300, [0xcc, 0x66, 0x66])
 #  floor Material::Floor.new_color(1000, 600, 800, 300, [0xcc, 0x66, 0x66])
-  enemy Life::Kuribo.new(500, 200)
+  enemy Life::Can.new(500, 200)
   player Life::Nario.new(40, 200)
 }
@@ -121 +121 @@
 #  floor Material::Floor.new_color(0, 600, 800, 300, [0xcc, 0x66, 0x66])
 #  floor Material::Floor.new_color(1000, 600, 800, 300, [0xcc, 0x66, 0x66])
-  enemy Life::Kuribo.new(100, 0)
-  enemy Life::Kuribo.new(200, 0)
-  enemy Life::Kuribo.new(300, 0)
-  enemy Life::Kuribo.new(400, 0)
-  enemy Life::Kuribo.new(500, 0)
-  enemy Life::Kuribo.new(600, 0)
-  enemy Life::Kuribo.new(700, 0)
+  enemy Life::Can.new(100, 0)
+  enemy Life::Can.new(200, 0)
+  enemy Life::Can.new(300, 0)
+  enemy Life::Can.new(400, 0)
+  enemy Life::Can.new(500, 0)
+  enemy Life::Can.new(600, 0)
+  enemy Life::Can.new(700, 0)
   player Life::Nario.new(40, 590)
 }
@@ -152 +152 @@
   block Material::WeakBlock.new(376, 500)
   block Material::ItemBox.new(420, 500)
-  enemy Life::NokoNoko.new(300, 0)
+  enemy Life::Dustbin.new(300, 0)
   player Life::Nario.new(40, 590)
 }