Changeset 20294 for lang/ruby

Timestamp:

09/30/08 19:16:43 (2 months ago)

Author:

authorNari

Message:

refactoring. add DEBUG_PLAYER_MODE.

Location:

lang/ruby/nario

Files:

• nario.rb (modified) (1 diff)
• nario/factor.rb (modified) (2 diffs)
• nario/gamestart.rb (modified) (1 diff)
• nario/life.rb (modified) (2 diffs)
• nario/life/enemy.rb (modified) (2 diffs)
• nario/life/nario.rb (modified) (1 diff)
• nario/scene/flowworld.rb (modified) (1 diff)

lang/ruby/nario/nario.rb

@@ -18 +18 @@
 $GC_BURDEN_MODE = false
 $TEST_MODE = false
+$DEBUG_EVENT_WATCH_MODE = false
+$DEBUG_PLAYER_WATCH_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('--debug-event', "debug: event watch mode") {|v| $DEBUG_EVENT_WATCH_MODE = true}
+opt.on('--debug-player', "debug: player watch mode") {|v| $DEBUG_PLAYER_WATCH_MODE = true}
 opt.parse!(ARGV)
 

lang/ruby/nario/nario/factor.rb

@@ -24 +24 @@
     event = nil
     return event unless collision_maybe? collide
-    return event_call(event, collide) if event = is_collision(foot_range, collide.head_range)
-    return event_call(event, collide) if event = is_collision(head_range, collide.foot_range)
-    return event_call(event, collide) if event = is_collision(leftside_range, collide.rightside_range)
-    return event_call(event, collide) if event = is_collision(rightside_range, collide.leftside_range)
+    return event_call(event, collide) if event = have_event_range(foot_range, collide.head_range)
+    return event_call(event, collide) if event = have_event_range(head_range, collide.foot_range)
+    return event_call(event, collide) if event = have_event_range(leftside_range, collide.rightside_range)
+    return event_call(event, collide) if event = have_event_range(rightside_range, collide.leftside_range)
   end
 
@@ -95 +95 @@
   end
 
-  def event_call(event, collide)
-    is_or_dead = (@is_dead or collide.is_dead)
-    # debug
-    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
+  def event_call(event, other)
+    is_or_dead = (@is_dead or other.is_dead)
+    puts "event! #{self.class}\##{event[:self_event]} <--> #{other.class}\##{event[:other_event]}" if $DEBUG_EVENT_WATCH_MODE
+    other.send(event[:self_event], self) if other.methods.map{|a| a.to_s}.include? event[:self_event].to_s and !is_or_dead
+    send(event[:other_event], other) if methods.map{|b| b.to_s}.include? event[:other_event].to_s and !is_or_dead
   end
 
-  def is_collision(self_r, collide_r)
+  def have_event_range(self_range, other_range)
     e = false
-    return e unless self_r and collide_r
-    self_r[:x_range].each{|i| break e = true if collide_r[:x_range].include? i}
+    return e unless self_range and other_range
+    self_range[:x_range].each{|i| break e = true if other_range[:x_range].include? i}
     return e unless e
     e = false
-    self_r[:y_range].each{|i| break e = true if collide_r[:y_range].include? i}
-    [self_r[:event], collide_r[:event]] if e
+    self_range[:y_range].each{|i| break e = true if other_range[:y_range].include? i}
+    {:self_event => self_range[:event], :other_event => other_range[:event]} if e
   end
 

lang/ruby/nario/nario/gamestart.rb

@@ -44 +44 @@
 end
 
+@stop = false
 def stop?(input, screen)
   if input.start

lang/ruby/nario/nario/life.rb

@@ -91 +91 @@
 
     #collision event
-    def collide_floor_head(f); stand_up(f); end
-    def collide_floor_left(f); @x = (f.x - @w); @dash_speed = 0; end
-    def collide_floor_right(f); @x = f.x + f.w; @dash_speed = 0; end
+    def collide_floor_head(f) stand_up(f) end
+    def collide_floor_left(f) @x = (f.x - @w); @dash_speed = 0; end
+    def collide_floor_right(f) @x = f.x + f.w; @dash_speed = 0; end
     alias collide_weakblock_head collide_floor_head
     alias collide_weakblock_left collide_floor_left
@@ -109 +109 @@
 
     private
-    # frame % ? == 0;  get ? parameter
+    # frame % ? == 0:  get ? parameter
     def get_dash_frame(dash_speed)
       step_rate = 4

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

@@ -2 +2 @@
   class Enemy < Life
     #collision events
-    def collide_strongblock_left(s); set_direction(-1); end
-    def collide_strongblock_right(s); set_direction(1); end
-    def collide_floor_head(f); stand_up(f); end
+    def collide_strongblock_left(s)  set_direction(-1) end
+    def collide_strongblock_right(s) set_direction(1)  end
+    def collide_floor_head(f)        stand_up(f)       end
+
+    def collide_carapace_left(c)
+      return clash(c) if c.violence?
+      collide_strongblock_left(c)
+    end
+
+    def collide_carapace_right(c)
+      return clash(c) if c.violence?
+      collide_strongblock_right(c)
+    end
+
     alias collide_weakblock_head collide_floor_head
     alias collide_itembox_head collide_weakblock_head
@@ -13 +24 @@
     alias collide_pipe_left collide_strongblock_left
     alias collide_pipe_right collide_strongblock_right
-    def collide_carapace_left(c); return clash(c) if c.violence?; collide_strongblock_left(c); end;
-    def collide_carapace_right(c); return clash(c) if c.violence?; collide_strongblock_right(c); end;
 
     def clash(carapace)

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

@@ -29 +29 @@
 
     # collision event
-    def collide_can_right(k); @movie_event = :movie_die; end;
+    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
+    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;
-    def collide_weakblock_foot(w); force_fall(w); end
+    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
+    def collide_weakblock_foot(w) force_fall(w) end
     alias collide_itembox_foot collide_weakblock_foot
-    def collide_goal_right(c); @is_goal = true; end
+    def collide_goal_right(c) @is_goal = true end
     alias collide_goal_left collide_goal_right
     alias collide_goal_head collide_goal_right
     alias collide_goal_foot collide_goal_right
-    def collide_pole_left(p); @movie_event = :movie_goal unless @movie_event; @x = p.x-40; end
+    def collide_pole_left(p) @movie_event = :movie_goal unless @movie_event; @x = p.x-40; end
 
     # collision range
-    def foot_range; {:x_range => (@x+@w/4)..(@x+@w-@w/4), :y_range => (@y+@h-@h/6)..(@y+@h), :event => :collide_nario_foot}; end
+    def foot_range
+      {:x_range => (@x+@w/6)..(@x+@w-@w/6), :y_range => (@y+@h-@h/6)..(@y+@h), :event => :collide_nario_foot}
+    end
 
     # relation controller

lang/ruby/nario/nario/scene/flowworld.rb

@@ -17 +17 @@
     def render(screen)
       @renders.each{|re| re.each{|o| o.put_screen(screen) if o.x < SCREEN_WIDTH } }
+      puts "player: x -> #{@player.x} y -> #{@player.y}" if $DEBUG_PLAYER_WATCH_MODE
       @player.put_screen(screen)
     end