game_2d 0.0.1 → 0.0.2

data/lib/game_2d/version.rb

@@ -1,3 +1,3 @@
 module Game2d
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/game_2d/zorder.rb

@@ -1,3 +1,3 @@
 module ZOrder
-  Background, Objects, Pellet, Player, Highlight, Text, Cursor = *0..6
+  Background, Teleporter, Destination, Objects, Pellet, Player, Highlight, Text, Cursor = *0..8
 end

data/spec/client_engine_spec.rb

@@ -1,8 +1,9 @@
-$LOAD_PATH << '.'
-require 'game'
-require 'server_port'
-require 'client_engine'
-require 'client_connection'
+require 'set'
+require 'game_2d/game'
+require 'game_2d/game_client'
+require 'game_2d/server_port'
+require 'game_2d/client_engine'
+require 'game_2d/client_connection'
 
 IP_ADDRESS = '1.1.1.1'
 CONNECTION_ID = 666
@@ -61,9 +62,12 @@ class FakeENetConnection
   def initialize(*args)
     $stderr.puts "FakeENetConnection.new(#{args.inspect})"
     @queue = []
+    @online = false
   end
+  def online?; @online; end
   def connect(timeout)
     $stderr.puts "FakeENetConnection.connect(#{timeout})"
+    @online = true
     $fake_server_port.on_connection(CONNECTION_ID, IP_ADDRESS)
     $fake_client_conn.on_connect
   end
@@ -101,28 +105,38 @@ class FakeClientConnection < ClientConnection
 end
 
 class FakeGameWindow
-  attr_accessor :player_id, :conn, :engine
-
-  def initialize(host, port, player_name)
-    @conn = FakeClientConnection.new(host, port, self, player_name)
-    @conn.engine = @engine = ClientEngine.new(self)
+  include GameClient
+  attr_accessor :player_id, :conn, :engine, :text_input, :mouse_x, :mouse_y
+
+  def initialize(opts = {})
+    initialize_from_hash(opts)
+    @mouse_x = @mouse_y = @camera_x = @camera_y = 0
+    @dialog = nil
+    @buttons_down = Set.new
   end
 
-  def space
-    @engine.space
+  def _make_client_connection(*args)
+    FakeClientConnection.new(*args)
   end
 
-  def player
-    space[@player_id]
+  def display_message(*lines)
+    puts lines.collect {|l| "DISPLAY> #{l}"}.join("\n")
   end
+  def display_message!(*lines); display_message(*lines); end
+  def caption=(c); puts "WINDOW CAPTION => '#{c}'"; end
+
+  def width; SCREEN_WIDTH; end
 
-  def update
-    @conn.update
-    @engine.update
+  def press_button!(button)
+    @buttons_down << button
+    button_down(button)
+  end
+  def release_button!(button)
+    @buttons_down.delete button
   end
 
-  def generate_move(move)
-    @conn.send_move move
+  def button_down?(button)
+    @buttons_down.include?(button)
   end
 end
 
@@ -137,6 +151,8 @@ describe FakeGame do
   let(:cell_height) { 3 }
   let(:self_check) { false }
   let(:profile) { false }
+  let(:registry_broadcast_every) { nil }
+  let(:password_hash) { "0123456789abcdef" }
 
   let(:game) { FakeGame.new(
     :port                     => port_number,
@@ -149,87 +165,162 @@ describe FakeGame do
     :profile                  => profile,
     :registry_broadcast_every => registry_broadcast_every
   ) }
-  let(:window) { game; FakeGameWindow.new(hostname, port_number, player_name) }
+  let(:key_size) { 128 }
+  let(:window) {
+    game
+    w = FakeGameWindow.new(:hostname => hostname, :port => port_number, :name => player_name, :key_size => key_size)
+    w.conn.start(password_hash).join
+    w
+  }
 
   def update_both
     game.update
+#   $stderr.puts "SERVER updated, TICK #{game.tick}"
     window.update
+#   $stderr.puts "CLIENT updated"
   end
 
+# require 'pry'
   def expect_spaces_to_match
+#   [
+#     game.space, window.space,
+#     game.space.instance_variable_get(:@grid),
+#     window.space.instance_variable_get(:@grid)
+#   ].pry unless window.space == game.space
     expect(window.space).to eq(game.space)
   end
 
-  context "with default registry syncs" do
-    let(:registry_broadcast_every) { nil }
-    it "is in sync after one update" do
-      window
+  it "is in sync after one update" do
+    window
 
-      update_both
+    # server sends its public key
+    # client sends encrypted password hash
+    update_both
+    expect(window.space).to be_nil
+
+    # server sends response to login
+    update_both
+
+    expect(game.tick).to eq(window.engine.tick)
+    expect_spaces_to_match
+  end
+
+  def player_on_server
+    game.space.players.first
+  end
+
+  it "is in sync after a fall and a build" do
+    window
+
+    expect(game.tick).to eq(-1)
+    expect(window.engine.tick).to be_nil
 
+    # server sends its public key
+    # client sends encrypted password hash
+    update_both
+    expect(window.space).to be_nil
+
+    # server sends response to login in time for tick 1
+    27.times do |n|
+      update_both
+      expect(game.tick).to eq(n+1)
+      expect(window.engine.tick).to eq(n+1)
       expect_spaces_to_match
     end
-    it "is in sync after a fall and a build" do
-      window
 
-      expect(game.tick).to eq(-1)
-      expect(window.engine.tick).to be_nil
+    # Command generated at tick 28, scheduled for tick 34
+    window.press_button! Gosu::KbDown
 
-      28.times do |n|
-        update_both
-        expect(game.tick).to eq(n)
-        expect(window.engine.tick).to eq(n)
-        expect_spaces_to_match
-      end
+    update_both
+    expect_spaces_to_match
+    expect(game.space.players.size).to eq(1)
+    expect(game.space.npcs.size).to eq(0)
 
-      expect(game.space.players.size).to eq(1)
+    plr = player_on_server
+    expect(plr.y).to eq(800)
+    expect(plr.falling?).to be false
+
+    5.times do # ticks 29 - 33
+      update_both
+      expect_spaces_to_match
       expect(game.space.npcs.size).to eq(0)
+    end
 
-      plr = game.space.players.first
-      expect(plr.y).to eq(800)
+    # tick 34
+    window.release_button! Gosu::KbDown
+    update_both
+    expect(game.tick).to eq(34)
+    expect(game.space.npcs.size).to eq(1)
 
-      # Command generated at tick 27, scheduled for tick 33
-      window.generate_move :build
+    expect_spaces_to_match
 
-      5.times do # ticks 28 - 32
-        update_both
-        expect_spaces_to_match
-        expect(game.space.npcs.size).to eq(0)
-      end
+    # Command generated at tick 35, scheduled for tick 41
+    window.press_button! Gosu::KbUp
+    6.times do # ticks 35 - 40
+      update_both
+      expect_spaces_to_match
+      expect(plr.y).to eq(800)
+    end
+    window.release_button! Gosu::KbUp
+    41.times do |n| # ticks 41 - 81
+      update_both
+      expect(plr.y).to eq(800 - (10 * n))
+      cplr = window.engine.space.players.first
+      binding.pry unless cplr == plr
+      expect(cplr).to eq(plr)
+      expect_spaces_to_match
+    end
+  end
 
-      # tick 33
+  it "stays in sync during a block-move" do
+    window
+    update_both
+    loop do
       update_both
-      expect(game.tick).to eq(33)
-      expect(game.space.npcs.size).to eq(1)
+      break if player_on_server.y == 800
+    end
 
-      expect_spaces_to_match
+    window.press_button! Gosu::KbDown
+    update_both
+    window.release_button! Gosu::KbDown
+    window.press_button! Gosu::KbLeft
 
-      # Command generated at tick 33, scheduled for tick 39
-      window.generate_move :rise_up
-      5.times do # ticks 34 - 38
-        update_both
-        $stderr.puts "TICK ##{game.tick}"
-        expect_spaces_to_match
-        expect(plr.y).to eq(800)
-      end
-      41.times do |n| # ticks 39 - 79
-        update_both
-        $stderr.puts "TICK ##{game.tick}"
-        expect(plr.y).to eq(800 - (10 * n))
-        cplr = window.engine.space.players.first
-        binding.pry unless cplr == plr
-        expect(cplr).to eq(plr)
-        expect_spaces_to_match
-      end
+    30.times do
+      update_both
     end
-  end
-  context "with no registry syncs" do
-    let(:registry_broadcast_every) { 0 }
-    it "is in sync after one update" do
-      window
+    window.release_button! Gosu::KbLeft
+    loop do
       update_both
+      break if player_on_server.x == 0
+    end
+    expect_spaces_to_match
+
+    blk = window.engine.space.npcs.first
+    expect([blk.x, blk.y]).to eq([400,800])
+
+    window.mouse_x, window.mouse_y = 50, 90
+    expect(window.mouse_entity_location).to eq([300, 700])
 
+    window.press_button! Gosu::MsRight
+    update_both
+    window.release_button! Gosu::MsRight
+    expect_spaces_to_match
+
+    in_a_row = 0
+    99.times do |n|
+      update_both
       expect_spaces_to_match
+
+      blk = window.engine.space.npcs.first
+      $stderr.puts "step ##{n}: blk is at #{blk.x},#{blk.y} moving #{blk.x_vel},#{blk.y_vel}"
+      if blk.x == 400 && blk.y == 700
+        in_a_row += 1
+      else
+        in_a_row = 0
+      end
+      break if in_a_row > 3
     end
+    expect(in_a_row).to eq(4)
   end
+
 end

data/spec/game_space_spec.rb

@@ -1,6 +1,5 @@
 require 'set'
-$LOAD_PATH << '.'
-require 'game_space'
+require 'game_2d/game_space'
 
 describe GameSpace do
   subject { GameSpace.new(nil).establish_world('lump', nil, 3, 3) }
@@ -59,18 +58,18 @@ describe GameSpace do
     end
   end
 
-  describe "#cell_at_point" do
+  describe "#cell_location_at_point" do
     it "translates from a point to a cell" do
-      expect(subject.cell_at_point(399,399)).to eq([0,0])
-      expect(subject.cell_at_point(399,400)).to eq([0,1])
-      expect(subject.cell_at_point(401,399)).to eq([1,0])
-      expect(subject.cell_at_point(799,800)).to eq([1,2])
+      expect(subject.cell_location_at_point(399,399)).to eq([0,0])
+      expect(subject.cell_location_at_point(399,400)).to eq([0,1])
+      expect(subject.cell_location_at_point(401,399)).to eq([1,0])
+      expect(subject.cell_location_at_point(799,800)).to eq([1,2])
     end
   end
 
-  describe "#cells_at_points" do
+  describe "#cell_locations_at_points" do
     it "translates from points to cells" do
-      expect(subject.cells_at_points(
+      expect(subject.cell_locations_at_points(
         [
           [399,399],
           [399,400],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: game_2d
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-25 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -175,24 +175,31 @@ files:
 - lib/game_2d/client_connection.rb
 - lib/game_2d/client_engine.rb
 - lib/game_2d/complex_move.rb
+- lib/game_2d/encryption.rb
 - lib/game_2d/entity.rb
 - lib/game_2d/entity/block.rb
+- lib/game_2d/entity/destination.rb
 - lib/game_2d/entity/owned_entity.rb
 - lib/game_2d/entity/pellet.rb
+- lib/game_2d/entity/teleporter.rb
 - lib/game_2d/entity/titanium.rb
 - lib/game_2d/entity_constants.rb
 - lib/game_2d/game.rb
+- lib/game_2d/game_client.rb
 - lib/game_2d/game_space.rb
 - lib/game_2d/game_window.rb
 - lib/game_2d/hash.rb
 - lib/game_2d/menu.rb
+- lib/game_2d/message.rb
 - lib/game_2d/move/rise_up.rb
+- lib/game_2d/password_dialog.rb
 - lib/game_2d/player.rb
 - lib/game_2d/registerable.rb
 - lib/game_2d/serializable.rb
 - lib/game_2d/server_connection.rb
 - lib/game_2d/server_port.rb
 - lib/game_2d/storage.rb
+- lib/game_2d/transparency.rb
 - lib/game_2d/version.rb
 - lib/game_2d/wall.rb
 - lib/game_2d/zorder.rb
@@ -203,6 +210,8 @@ files:
 - media/brick.gif
 - media/cement.gif
 - media/crosshair.gif
+- media/destination.png
+- media/destination.xcf
 - media/dirt.gif
 - media/pellet.png
 - media/pellet.xcf