Changeset 13583

Timestamp:

06/09/08 15:55:30 (5 years ago)

Author:

gan2

Message:

家が建つのに少し間を持たせるようにした
複数のキャラが同座標にいるときは合体して1つになるようにした など

Location:

lang/ruby/RogueLike/rogue_like

Files:

• chara.rb (modified) (2 diffs)
• config.rb (modified) (1 diff)
• home.rb (added)
• map.rb (modified) (1 diff)
• model.rb (modified) (5 diffs)
• view.rb (modified) (1 diff)

lang/ruby/RogueLike/rogue_like/chara.rb

@@ -3 +3 @@
 module RogueLike
   class Chara
-    attr_accessor :map_x, :map_y, :mode, :walk_pathes
+    attr_accessor :map_x, :map_y, :mode, :walk_pathes, :strength
 
     def initialize(map_x, map_y)
@@ -10 +10 @@
       @mode        = :waiting
       @walk_pathes = []
-      @strength    = 1
+      @strength    = 5
     end
 

lang/ruby/RogueLike/rogue_like/config.rb

@@ -27 +27 @@
   GAME_TITLE   = 'Rogue Like'
 
-  INIT_CHARA_NUM = 4
+  INIT_CHARA_NUM = 8
 
   # g_random_int_range と同じ

lang/ruby/RogueLike/rogue_like/map.rb

@@ -18 +18 @@
 
     def left_click(x, y)
-      if in?(x, y)
-        map_x = (x - MAP_WINDOW_X) / CELL_W
-        map_y = (y - MAP_WINDOW_Y) / CELL_H
-        @left_click_cell = @data[map_y][map_x]
-      end
+      map_x = (x - MAP_WINDOW_X) / CELL_W
+      map_y = (y - MAP_WINDOW_Y) / CELL_H
+      @left_click_cell = @data[map_y][map_x]
     end
     

lang/ruby/RogueLike/rogue_like/model.rb

@@ -4 +4 @@
 require 'rogue_like/couple'
 require 'rogue_like/chara'
+require 'rogue_like/home'
 require 'rogue_like/astar'
 require 'rogue_like/bstar'
@@ -24 +25 @@
       @debug_mode = nil
       @wp         = Workpile.new # ブロックを受け取りその実行を別スレッドに委託する
+      @home_map   = Array.new(MAP_H) { Array.new(MAP_W) { nil } }
       make_map
       make_charas
@@ -57 +59 @@
         @charas << Chara.new(x, y)
       end
-    end
-    
+      @select_chara = nil
+    end
+
     # 区画を分割できなくなるまで分割する
     def split_rect(parent)
@@ -173 +176 @@
           if chara.walk_pathes.size > 0
             chara.walk
+            if @charas.select {|c| c.x == chara.x and c.y == chara.y }.size > 1
+              @charas.delete(chara)
+              chara2 = @charas.find {|chara2| chara2.x == chara.x and chara2.y == chara.y }
+              chara.strength += chara2.strength
+              @charas.delete(chara2)
+              @charas << chara
+            end
           else
             if @map.data[chara.map_y][chara.map_x] == :room
@@ -181 +191 @@
           end
         when :building
-          @map.data[chara.map_y][chara.map_x] = :home
-          @map.draw_position(chara.map_x, chara.map_y)
-          chara.mode = :waiting
-        end
+          x = chara.map_x
+          y = chara.map_y
+          if @map.data[y][x] == :room
+            @map.data[y][x] = :pre_home
+            @home_map[y][x] = Home.new(x, y)
+          else
+            @home_map[y][x].strength += chara.strength
+            if @home_map[y][x].strength >= 50
+              @map.data[y][x] = :home
+              @map.draw_position(x, y)
+              chara.mode = :waiting
+            end
+          end
+        end
+      end
+    end
+
+    def left_click(x, y)
+      if @map.in?(x, y)
+        @select_chara = @charas.find {|chara| x == chara.x and y == chara.y }
+        @map.left_click(x, y) unless @select_chara
+        p @select_chara
       end
     end

lang/ruby/RogueLike/rogue_like/view.rb

@@ -19 +19 @@
         :road          => Texture.load('images/road'),
         :chara         => Texture.load('images/chara'),
+        :pre_home      => Texture.load('images/room'),
         :home          => Texture.load('images/home'),
         :position      => Texture.load('images/position'),