scorched_earth 5.0.1.pre-java → 5.0.2.pre-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfa1221f5544042db555d173cf834a693e8f45b2
-  data.tar.gz: d1a2e0323a1e430ff7c3d6d31091c7147e34e8f1
+  metadata.gz: 28ec71507af5b6c4c986dfe98825053cd5020e57
+  data.tar.gz: 3a437e2bf60c1461586f239789ac9b2cb4228a1d
 SHA512:
-  metadata.gz: ef23bc10966526eb981726d24ef69312758bf2bf87e2dc105b69477e158b385557206d42c2fd6333e8ac425f175425ea1323e6f6f1f78b7fc17a85fc97bc6a9d
-  data.tar.gz: 4e9fb4f997f614af6c8dfd71ce123acca2a2dc4963d8e652606f5a239fac0eb0dccaa9e8feb7faababf3cb4d4394e557b51e49917b84b1cc1274978bd5cca213
+  metadata.gz: 9c5eb534155f895af79fa11b1dde3812d3e6e26b891df7c36ae18ef843ace49f7d1234c305fad0558503204ed296e99bf70394bcbd29ca085393f0b73b8350cd
+  data.tar.gz: 383e0c02b970496f8ed3be4d4ee11460ac30ff7f436f9cdda2a0727fc65303278c857437453f7cb3360cfe72ee6357ae461f54bf7af21ef1f6ea2d50458a47be

data/lib/scorched_earth/color_palette.rb

@@ -15,8 +15,8 @@ module ScorchedEarth
     end
 
     def get(key)
-      cache.fetch(key) do |key|
-        cache[key] = first
+      cache[key] ||= begin
+        first
       end
     end
 
@@ -24,7 +24,7 @@ module ScorchedEarth
       return enum_for(:each) unless block_given?
 
       loop do
-        color = strategy.color(colors)
+        color = strategy.color colors
         yield color
       end
     end

data/lib/scorched_earth/event_runner.rb

@@ -1,24 +1,25 @@
 module ScorchedEarth
   class EventRunner
-    attr_reader :events, :subscribers
+    attr_reader :queue, :subscribers
 
     def initialize
-      @events      = Queue.new
+      @queue      = Queue.new
       @subscribers = []
     end
 
     def publish(event)
-      events << event
+      queue << event
     end
 
     def subscribe(klass, &block)
       subscribers << [klass, block]
     end
 
-    def process_events!
-      until events.empty?
-        event = events.pop
+    def process!
+      processing = queue.size.times.map { queue.pop }
 
+      processing.each do |event|
+        puts event.inspect
         subscribers.each do |klass, block|
           block.call event if event.is_a? klass
         end

data/lib/scorched_earth/events/entity_destroyed.rb

@@ -0,0 +1,5 @@
+module ScorchedEarth
+  module Events
+    EntityDestroyed = Struct.new(:entity)
+  end
+end

data/lib/scorched_earth/game.rb

@@ -1,3 +1,7 @@
+include Java
+
+import java.awt.Color
+
 require 'scorched_earth/helpers'
 require 'scorched_earth/terrain'
 require 'scorched_earth/player'
@@ -7,12 +11,9 @@ require 'scorched_earth/mouse'
 require 'scorched_earth/color_palette'
 require 'scorched_earth/event_runner'
 require 'scorched_earth/events/entity_created'
+require 'scorched_earth/events/entity_destroyed'
 require 'scorched_earth/events/game_ending'
 
-include Java
-
-import java.awt.Color
-
 module ScorchedEarth
   class Game
     include Helpers
@@ -27,30 +28,23 @@ module ScorchedEarth
     end
 
     def setup
-      @color_palette = ColorPalette.new Color::RED, Color::YELLOW, Color::WHITE
+      @color_palette = ColorPalette.new Color.red, Color.yellow, Color.white
       @entities      = []
       @event_runner  = EventRunner.new
       @players       = Array.new(2) { |index| Player.new rand(width), color_palette.get("player_#{index}") }
       @terrain       = Terrain.new width, height, rand(10), color_palette.get('terrain')
       @mouse         = Mouse.new event_runner, players, terrain
 
-      event_runner.subscribe(Events::EntityCreated) { |event| entities << event.entity }
-      event_runner.subscribe(Events::GameEnding)    { |event| event.time < Time.now ? setup : event_runner.publish(event) }
+      register_events
     end
 
     def update(delta)
-      event_runner.process_events!
-
-      radius = 50
-      @entities.each { |entity| entity.update delta }
-      @entities, @dead = *@entities.partition { |entity| terrain.fetch(entity.x, 0) < entity.y }
-      @dead
-        .select { |entity| entity.is_a? Shot }
-        .select { |entity| entity.x < terrain.width && entity.x > 0 }
-        .each   { |entity| terrain.bite entity.x, radius }
-        .each   { |entity| event_runner.publish Events::EntityCreated.new(Explosion.new(entity.x, entity.y)) }
-        .select { |entity| players.any? { |player| inside_radius? entity.x - player.x, 0, radius } }
-        .each   { event_runner.publish Events::GameEnding.new(Time.now + 1) }
+      event_runner.process!
+
+      @entities
+        .each   { |entity| entity.update delta }
+        .reject { |entity| terrain.fetch(entity.x, 0) < entity.y }
+        .each   { |entity| event_runner.publish Events::EntityDestroyed.new(entity) }
     end
 
     def render(graphics)
@@ -73,5 +67,26 @@ module ScorchedEarth
     def publish(event)
       event_runner.publish event
     end
+
+    private
+
+    def register_events
+      event_runner.subscribe Events::MousePressed,    &mouse.method(:mouse_pressed)
+      event_runner.subscribe Events::MouseReleased,   &mouse.method(:mouse_released)
+      event_runner.subscribe Events::MouseMoved,      &mouse.method(:mouse_moved)
+      event_runner.subscribe(Events::GameEnding)      { |event| event.time < Time.now ? setup : event_runner.publish(event) }
+      event_runner.subscribe(Events::EntityCreated)   { |event| entities << event.entity }
+      event_runner.subscribe(Events::EntityDestroyed) { |event| entities.delete event.entity }
+      event_runner.subscribe(Events::EntityDestroyed) do |event|
+        radius = 50
+        [event.entity]
+          .select { |entity| entity.is_a? Shot }
+          .select { |entity| entity.x < terrain.width && entity.x > 0 }
+          .each   { |entity| terrain.bite entity.x, radius }
+          .each   { |entity| event_runner.publish Events::EntityCreated.new(Explosion.new(entity.x, entity.y)) }
+          .select { |entity| players.any? { |player| inside_radius? entity.x - player.x, 0, radius } }
+          .each   { event_runner.publish Events::GameEnding.new(Time.now + 0.25) }
+      end
+    end
   end
 end

data/lib/scorched_earth/mouse.rb

@@ -13,10 +13,6 @@ module ScorchedEarth
       @event_runner = event_runner
       @players      = players
       @terrain      = terrain
-
-      event_runner.subscribe Events::MousePressed,  &method(:mouse_pressed)
-      event_runner.subscribe Events::MouseReleased, &method(:mouse_released)
-      event_runner.subscribe Events::MouseMoved,    &method(:mouse_moved)
     end
 
     def current_player

data/lib/scorched_earth/player.rb

@@ -9,7 +9,7 @@ module ScorchedEarth
 
     def draw(graphics, y)
       height = graphics.destination.height
-      radius = 20
+      radius = 25
 
       graphics.set_color color
       graphics.fill_oval x - radius / 2, height - y - radius / 2, radius, radius

data/lib/scorched_earth/shot.rb

@@ -1,3 +1,7 @@
+include Java
+
+import java.awt.BasicStroke
+
 require 'scorched_earth/helpers'
 
 module ScorchedEarth
@@ -22,13 +26,14 @@ module ScorchedEarth
 
     def draw(graphics)
       height  = graphics.destination.height
-      degrees = angle(velocity_y, velocity_x)
+      degrees = angle velocity_y, velocity_x
       x1      = x
       y1      = height - y
       x2      = x1 + offset_x(degrees, length)
       y2      = y1 + offset_y(degrees, length)
 
       graphics.set_color color
+      graphics.setStroke BasicStroke.new 3
       graphics.draw_line x1, y1, x2, y2
     end
 

data/lib/scorched_earth/terrain.rb

@@ -11,7 +11,7 @@ module ScorchedEarth
     attr_reader :color, :height
 
     def initialize(width, height, cycles, color)
-      @color = color
+      @color  = color
       @height = height
 
       super(width) do |index|
@@ -27,21 +27,6 @@ module ScorchedEarth
       graphics.draw_image cache { _draw(graphics) }, 0, 0, nil
     end
 
-    def _draw(graphics)
-      image = graphics
-              .get_device_configuration
-              .create_compatible_image width, height, Transparency::TRANSLUCENT
-
-      each_with_index do |y, x|
-        image.graphics.tap do |image_graphics|
-          image_graphics.set_color color
-          image_graphics.draw_line x, height - y, x, height
-        end
-      end
-
-      image
-    end
-
     def bite(center_x, radius, center_y = self[center_x])
       circle(radius) do |offset_x, offset_y|
         x = center_x + offset_x
@@ -59,6 +44,21 @@ module ScorchedEarth
 
     private
 
+    def _draw(graphics)
+      image = graphics
+              .get_device_configuration
+              .create_compatible_image width, height, Transparency::TRANSLUCENT
+
+      each_with_index do |y, x|
+        image.graphics.tap do |image_graphics|
+          image_graphics.set_color color
+          image_graphics.draw_line x, height - y, x, height
+        end
+      end
+
+      image
+    end
+
     def cache
       @cache ||= begin
         yield

data/lib/scorched_earth/version.rb

@@ -1,3 +1,3 @@
 module ScorchedEarth
-  VERSION = '5.0.1.pre'.freeze
+  VERSION = '5.0.2.pre'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scorched_earth
 version: !ruby/object:Gem::Version
-  version: 5.0.1.pre
+  version: 5.0.2.pre
 platform: java
 authors:
 - James Moriarty
@@ -102,6 +102,7 @@ files:
 - lib/scorched_earth/color_palette.rb
 - lib/scorched_earth/event_runner.rb
 - lib/scorched_earth/events/entity_created.rb
+- lib/scorched_earth/events/entity_destroyed.rb
 - lib/scorched_earth/events/game_ending.rb
 - lib/scorched_earth/events/mouse_moved.rb
 - lib/scorched_earth/events/mouse_pressed.rb