@@ -4,11 +4,12 @@ # Shoes.setup do source "http://code.vying.org" - gem 'vying-pure', "0.7.3" + gem 'vying-pure', "0.8.4" gem 'starbots' end require 'vying' +Bot.require_all class DisplayBoard < Widget attr_reader :game, :width, :height, :offset, @@ -39,7 +40,7 @@ class DisplayBoard < Widget draw @status.text = "" - while ! game.final? && game[game.turn].bot? + while ! game.final? && game[game.turn].user.bot? m, p = game.step slide( m ) end @@ -75,7 +76,7 @@ class DisplayBoard < Widget s, e = cs p = pieces[s.x][s.y] - p.style[:moving] = [] + p.style( :moving => [] ) o, cw, ch, size = offset, cell_width, cell_height, p.size if from_x && from_y @@ -98,16 +99,16 @@ class DisplayBoard < Widget step[1] = [step[1], -4].min if step[1] < 0 until psx == pex && psy == pey - if (psx - pex).abs < step.x.abs + if (psx - pex).abs < step.first.abs psx = pex else - psx += step.x + psx += step.first end - if (pey - psy).abs < step.y.abs + if (pey - psy).abs < step.last.abs psy = pey else - psy += step.y + psy += step.last end p.style[:moving] << [psx, psy] @@ -148,7 +149,7 @@ class DisplayBoard < Widget @moves, @move = nil, nil Thread.new do - while ! game.final? && game[game.turn].bot? + while ! game.final? && game[game.turn].user.bot? m, p = game.step slide( m ) end @@ -188,7 +189,7 @@ class DisplayBoard < Widget @moves, @move = nil, nil Thread.new do - while ! game.final? && game[game.turn].bot? + while ! game.final? && game[game.turn].user.bot? m, p = game.step slide( m ) end @@ -281,6 +282,8 @@ class DisplayBoard < Widget if p = board[x,y] size = imagesize( "#{p}.png" ) + info "size: #{size}" + pieces[x][y] = image "#{p}.png", :left => o + (cw - size[0]) / 2 + x * cw, :top => o + (ch - size[1]) / 2 + y * ch @@ -300,10 +303,10 @@ Shoes.app :width => 900, :height => 560, :title => "Breakthrough" do background "#fff9f2" g = Game.new Breakthrough - g[:white] = Human.new( "You" ) - g[:black] = CapellaBot.new + g[:white].user = Human.new( "You" ) + g[:black].user = CapellaBot.new - db = displayboard( g, :width => 516, :height => 516 ) + db = display_board( g, :width => 516, :height => 516 ) db.canvas.motion do |left, top| self.cursor = db.cursor_for( left, top ) db.move_grabbed( left, top ) @@ -343,8 +346,8 @@ Shoes.app :width => 900, :height => 560, :title => "Breakthrough" do if k == :alt_g db.game = Game.new Breakthrough - db.game[:black] = CapellaBot.new - db.game[:white] = Human.new "You" + db.game[:black].user = CapellaBot.new + db.game[:white].user = Human.new "You" db.start_game end end breakthrough/breakthrough.rb 9ab43d9cb02da0f5ffbf8b9133e360d4352dc867 Eric K Idema eki@vying.org http://github.com/eki/shoesfest/commit/19d4717994160bad3c02a9316877f6a05ebb3101 19d4717994160bad3c02a9316877f6a05ebb3101 2008-12-21T19:40:33-08:00 2008-12-21T19:40:33-08:00 Updates to keep this working in later versions of Shoes. 8846bab59c7f728e290c5fd78d1a262d67413a30 Eric K Idema eki@vying.org