game_2d 0.0.2 → 0.0.3

data/spec/client_engine_spec.rb

@@ -209,7 +209,7 @@ describe FakeGame do
     game.space.players.first
   end
 
-  it "is in sync after a fall and a build" do
+  it "is in sync after a fall, slide left, and build" do
     window
 
     expect(game.tick).to eq(-1)
@@ -218,61 +218,78 @@ describe FakeGame do
     # server sends its public key
     # client sends encrypted password hash
     update_both
+    expected_tick = 0
+    expect(game.tick).to eq(expected_tick)
     expect(window.space).to be_nil
+    expect(game.space.players.size).to eq(0)
+    expect(game.space.npcs.size).to eq(1) # the starter Base
 
     # server sends response to login in time for tick 1
-    27.times do |n|
+    # The base is still falling, and the player falls with it
+    loop do
       update_both
-      expect(game.tick).to eq(n+1)
-      expect(window.engine.tick).to eq(n+1)
+      expected_tick += 1
+      expect(game.tick).to eq(expected_tick)
+      expect(window.engine.tick).to eq(expected_tick)
       expect_spaces_to_match
+      expect(game.space.players.size).to eq(1)
+      expect(game.space.npcs.size).to eq(1)
+      break if player_on_server.y == 800
+      expect(player_on_server.should_fall?).to be true
+    end
+    expect(player_on_server.should_fall?).to be false
+
+    # We can't build where the base is
+    # So slide into the space on the left
+    window.press_button! Gosu::KbLeft
+    27.times do
+      update_both
+      expect_spaces_to_match
+    end
+    window.release_button! Gosu::KbLeft
+    loop do
+      update_both
+      expect_spaces_to_match
+      break if player_on_server.x == 0
     end
 
-    # Command generated at tick 28, scheduled for tick 34
     window.press_button! Gosu::KbDown
 
     update_both
     expect_spaces_to_match
-    expect(game.space.players.size).to eq(1)
-    expect(game.space.npcs.size).to eq(0)
-
-    plr = player_on_server
-    expect(plr.y).to eq(800)
-    expect(plr.falling?).to be false
+    # Does not take effect immediately, but only after 6 ticks
+    expect(game.space.npcs.size).to eq(1) # the starter Base
+    window.release_button! Gosu::KbLeft
 
-    5.times do # ticks 29 - 33
+    5.times do # waiting for the 6-tick delay to transpire
       update_both
       expect_spaces_to_match
-      expect(game.space.npcs.size).to eq(0)
+      expect(game.space.npcs.size).to eq(1)
     end
 
-    # tick 34
-    window.release_button! Gosu::KbDown
     update_both
-    expect(game.tick).to eq(34)
-    expect(game.space.npcs.size).to eq(1)
+    expect(game.space.npcs.size).to eq(2)
 
     expect_spaces_to_match
 
-    # Command generated at tick 35, scheduled for tick 41
     window.press_button! Gosu::KbUp
-    6.times do # ticks 35 - 40
+    6.times do # waiting for this command to go through
       update_both
       expect_spaces_to_match
-      expect(plr.y).to eq(800)
+      expect(player_on_server.y).to eq(800)
     end
     window.release_button! Gosu::KbUp
-    41.times do |n| # ticks 41 - 81
+    41.times do |n|
       update_both
-      expect(plr.y).to eq(800 - (10 * n))
+      expect(player_on_server.y).to eq(800 - (10 * n))
       cplr = window.engine.space.players.first
-      binding.pry unless cplr == plr
-      expect(cplr).to eq(plr)
+      binding.pry unless cplr == player_on_server
+      expect(cplr).to eq(player_on_server)
       expect_spaces_to_match
     end
   end
 
-  it "stays in sync during a block-move" do
+  it "stays in sync during a base-move" do
     window
     update_both
     loop do
@@ -280,23 +297,18 @@ describe FakeGame do
       break if player_on_server.y == 800
     end
 
-    window.press_button! Gosu::KbDown
-    update_both
-    window.release_button! Gosu::KbDown
     window.press_button! Gosu::KbLeft
-
-    30.times do
-      update_both
-    end
+    27.times { update_both }
     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])
+    base = window.engine.space.npcs.first
+    expect([base.x, base.y]).to eq([400,800])
 
     window.mouse_x, window.mouse_y = 50, 90
     expect(window.mouse_entity_location).to eq([300, 700])
@@ -311,9 +323,9 @@ describe FakeGame do
       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
+      base = window.engine.space.npcs.first
+      $stderr.puts "step ##{n}: base is at #{base.x},#{base.y} moving #{base.x_vel},#{base.y_vel}"
+      if base.x == 300 && base.y == 700
         in_a_row += 1
       else
         in_a_row = 0

data/spec/game_space_spec.rb

@@ -343,4 +343,38 @@ describe GameSpace do
       expect(subject[:B]).to be_nil
     end
   end
+
+  describe "#copy_from" do
+    it "copies from the original" do
+      thing1a = Entity::Block.new(200, 800)
+      thing1a.registry_id = :A
+      thing1a.hp = 8
+      subject << thing1a
+      thing2a = Entity::Block.new(600, 800)
+      thing2a.registry_id = :B
+      thing2a.hp = 22
+      subject << thing2a
+
+      expect(thing1a.moving).to be true
+      expect(thing2a.moving).to be true
+
+      subject.update
+      expect(thing1a.moving).to be false
+      expect(thing2a.moving).to be false
+
+      copy = GameSpace.new(nil)
+      copy.copy_from(subject)
+
+      # This precludes using << during copy_from, as that
+      # causes neighbors of the new entity to be woken up
+      thing1b = copy.entities_at_point(200, 800).first
+      thing2b = copy.entities_at_point(600, 800).first
+      expect(thing1b.moving).to be false
+      expect(thing2b.moving).to be false
+
+      expect(thing1b).to eq(thing1a)
+      expect(thing2b).to eq(thing2a)
+      expect(copy).to eq(subject)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: game_2d
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -155,7 +155,36 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
-description: Client/server sandbox game using Gosu and REnet
+description: ! 'Built on top of Gosu, an engine for making 2-D games.  Gosu provides
+  the means
+
+  to handle the graphics, sound, and keyboard/mouse events.  It doesn''t provide
+
+  any sort of client/server network architecture for multiplayer games, nor a
+
+  system for tracking objects in game-space.  This gem aims to fill that gap.
+
+
+  Originally I tried using Chipmunk as the physics engine, but its outcomes were
+
+  too unpredictable for the client to anticipate the server.  It was also hard to
+
+  constrain in the ways I wanted.  So I elected to build something integer-based.
+
+
+  In the short term, I''m throwing anything into this gem that interests me.  There
+
+  are reusable elements (GameSpace, Entity, ServerPort), and game-specific
+
+  elements (particular Entity subclasses with custom behaviors).  Longer term, I
+
+  could see splitting it into two gems.  This gem, game_2d, would retain the
+
+  reusable platform classes.  The other classes would move into a new gem specific
+
+  to the game I''m developing, as a sort of reference implementation.
+
+'
 email:
 - cmdr.samvimes@gmail.com
 executables:
@@ -177,10 +206,15 @@ files:
 - lib/game_2d/complex_move.rb
 - lib/game_2d/encryption.rb
 - lib/game_2d/entity.rb
+- lib/game_2d/entity/base.rb
 - lib/game_2d/entity/block.rb
 - lib/game_2d/entity/destination.rb
+- lib/game_2d/entity/gecko.rb
+- lib/game_2d/entity/ghost.rb
+- lib/game_2d/entity/hole.rb
 - lib/game_2d/entity/owned_entity.rb
 - lib/game_2d/entity/pellet.rb
+- lib/game_2d/entity/slime.rb
 - lib/game_2d/entity/teleporter.rb
 - lib/game_2d/entity/titanium.rb
 - lib/game_2d/entity_constants.rb
@@ -192,6 +226,7 @@ files:
 - lib/game_2d/menu.rb
 - lib/game_2d/message.rb
 - lib/game_2d/move/rise_up.rb
+- lib/game_2d/move/spawn.rb
 - lib/game_2d/password_dialog.rb
 - lib/game_2d/player.rb
 - lib/game_2d/registerable.rb
@@ -207,25 +242,34 @@ files:
 - media/Space.png
 - media/Star.png
 - media/Starfighter.bmp
+- media/base.png
+- media/base.xcf
 - media/brick.gif
 - media/cement.gif
 - media/crosshair.gif
 - media/destination.png
 - media/destination.xcf
 - media/dirt.gif
+- media/gecko.png
+- media/gecko.xcf
+- media/ghost.png
+- media/ghost.xcf
+- media/hole.png
+- media/hole.xcf
 - media/pellet.png
 - media/pellet.xcf
-- media/player.png
-- media/player.xcf
 - media/rock.png
 - media/rock.xcf
+- media/slime.png
+- media/slime.xcf
 - media/steel.gif
 - media/tele.gif
 - media/titanium.gif
 - media/unlikelium.gif
+- spec/block_spec.rb
 - spec/client_engine_spec.rb
 - spec/game_space_spec.rb
-homepage: ''
+homepage: https://github.com/sereneiconoclast/game_2d
 licenses:
 - MIT
 post_install_message: 
@@ -251,5 +295,6 @@ signing_key:
 specification_version: 3
 summary: Client/server sandbox game using Gosu and REnet
 test_files:
+- spec/block_spec.rb
 - spec/client_engine_spec.rb
 - spec/game_space_spec.rb