keep_calm_and_balance 0.3.1 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b1cf6c0ef25e6512d61ee5b7bd15b8ad59f18d65281584ebdc2f0e7b2f3b688
-  data.tar.gz: be31cb72b8de471cd7ac05fc01e027c70670de785f60e61a73c07a44841a976c
+  metadata.gz: 72de35bfb0bdfdc35b79adc3dd6e3bd40e4bff42210bf8e6556dc2eade4ddc99
+  data.tar.gz: 01e0cb0378d78ed993fb0b309bbd6ff9bf12fe2a41cc5151979f0e6479ab496d
 SHA512:
-  metadata.gz: 9f3d538772c525359c27f9e72773d7720615ca337ba716c9c33a857159ffa430980f71c44aeeb00f10dbea0181f7462b7b89d57b4207c7c13b59ea6a860fa2bd
-  data.tar.gz: d1f94241fcc75c676f5007182cedc308c31be6b9e57cd8b07d19646ef7f97d1365ce4ee26efe886477e7c03fe009adf21c33440e83abeed4056020abb0a0bfd5
+  metadata.gz: b50ac0264d12a23d0baefd75008484a2b5b71e8a5f0c329ee2c772e9d2d96e7a7a9002b4ee53799d4a93b777ff412f11aa4e84a1f289d2f0a3e8e2e02fecb809
+  data.tar.gz: b6a9327ef6efc84174a744a8c07b740ed5314938bfbc8efd7d9b3c7454e3690be1e28a0c5f32056e00bc018a85eef3ac0437d55ba6a1cb04248e6d4d049d0ec5

data/lib/CHANGELOG.md

@@ -9,7 +9,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 
 
-## [v3](../../tags/v3) – 2021-10-21
+## [v4](../../tags/v4) – 2021-10-24
+### Added
+- effect dealer
+- wind effect
+- show counter of effects
+- show latest effect
+
+### Changed
+- timer is now aligned to the centre
+- effects moved to a separate folder
+
+
+## [v3.1](../../tags/v3.1) – 2021-10-21
 ### Added
 - timer
 - deceleration when on seasaw

data/lib/keep_calm_and_balance.gemspec

@@ -2,8 +2,8 @@ require 'rake'
 
 Gem::Specification.new do |spec|
   spec.name        = 'keep_calm_and_balance'
-  spec.version     = '0.3.1'
-  spec.date        = '2021-10-21'
+  spec.version     = '0.4'
+  spec.date        = '2021-10-24'
   spec.license     = 'CC-BY-SA-3.0'
 
   spec.summary = "An action balancing game"

data/lib/keep_calm_and_balance.rb

@@ -5,6 +5,6 @@ require_relative './lib/user_interface/game_window'
 
 PROMPT = '> '
 
-version = '0.3.1'
+version = '0.4'
 $window = GameWindow.new(version)
 $window.show

data/lib/lib/effects/effect_dealer.rb

@@ -0,0 +1,89 @@
+require_relative './wind_effect'
+
+FIRST_EFFECT_TIME = 2 # seconds til the first effect
+NEXT_EFFECT_TIME = 3 # seconds til the next effect
+SHOW_LATEST_TIME = 1.0 # seconds to show the latest effect for (float needed!)
+
+class EffectDealer
+  #attr_reader :active # TODO nothing?
+
+  def initialize(infopane, seasaw, barrel)
+    @infopane = infopane
+    @seasaw = seasaw
+    @barrel = barrel
+
+    @known = [WindEffect] # TODO not used
+    reset!
+  end
+
+  # Load default setup
+  def reset!
+    @available = [WindEffect]
+    @active = []
+    @latest = nil
+    @latest_at = nil
+    @next_at = FIRST_EFFECT_TIME
+  end
+
+  def update
+    @active.each { |ee| ee.update }
+
+    if time_for_next?
+      @latest = @available.sample.new(@infopane, @seasaw, @barrel) # pick random one
+      @active.push(@latest)
+      @latest_at = @infopane.time
+    end
+  end
+
+  def draw
+    @active.each { |ee| ee.draw }
+    draw_latest
+    draw_counter
+  end
+
+  def draw_latest
+    if @latest and @infopane.time < (@latest_at + SHOW_LATEST_TIME)
+      latest = Gosu::Image.from_text(
+        "+#{@latest.name.capitalize}", LINE_HEIGHT,
+        {:width => WINDOW_WIDTH, :align => :left}
+      )
+      latest.draw(0, 0, ZTEXT)
+    end
+  end
+
+  def draw_counter
+    counter_text = ""
+    counts_of_effects.each { | kk, vv | counter_text += "#{vv}x #{kk.capitalize}\n"}
+
+    counter = Gosu::Image.from_text(
+      counter_text, LINE_HEIGHT,
+      {:width => WINDOW_WIDTH, :align => :right}
+    )
+    counter.draw(0, 0, ZTEXT)
+  end
+
+  # Return count of each active variant of effect, sorted alphabetically
+  def counts_of_effects
+    counts = {}
+
+    @active.each { |ee|
+      if counts[ee.name]
+        counts[ee.name] += 1
+      else
+        counts[ee.name] = 1
+      end
+    }
+
+    return counts.sort.to_h
+  end
+
+  # Is it time to activate the next effect?
+  def time_for_next?
+    if @infopane.time > @next_at # equality is not safe enough as update() can just miss the mark
+      @next_at += NEXT_EFFECT_TIME
+      return true
+    else
+      return false
+    end
+  end
+end

data/lib/lib/effects/wind_effect.rb

@@ -0,0 +1,26 @@
+WEST = 'west' # blowing to the right
+EAST = 'east' # blowing to the left
+
+class WindEffect
+  attr_reader :name
+
+  def initialize(infopane, seasaw, barrel)
+    @infopane = infopane
+    @seasaw = seasaw # not utilized
+    @barrel = barrel
+
+    @direction = [WEST, EAST].sample
+    @name = "#{@direction} wind"
+  end
+
+  def update
+    @strength = rand(5)
+    @speed = {WEST => 1, EAST => -1}[@direction] * @strength * ACCELERATION
+
+    @barrel.speed = (@barrel.speed + @speed).round(SPEED_PRECISION)
+  end
+
+  def draw
+    # TODO nothing?
+  end
+end

data/lib/lib/items/barrel.rb

@@ -6,6 +6,7 @@ FALLING_ACCELERATION = 9.8 # gravity-like
 
 class Barrel
   attr_reader :x, :y
+  attr_accessor :speed
 
   def initialize(seesaw)
     dir_path = File.dirname(__FILE__)

data/lib/lib/user_interface/game_window.rb

@@ -1,9 +1,11 @@
 require_relative './background'
-require_relative './timer'
+require_relative './infopane'
 
 require_relative './../items/barrel'
 require_relative './../items/seesaw'
 
+require_relative './../effects/effect_dealer'
+
 TILESIZE = 50
 MAPX = 10
 MAPY = MAPX
@@ -33,10 +35,12 @@ class GameWindow < Gosu::Window
     reset!
 
     @background = Background.new()
-    @timer = Timer.new(self)
+    @infopane = Infopane.new(self)
 
     @seesaw = Seesaw.new()
     @barrel = Barrel.new(@seesaw)
+
+    @effect_dealer = EffectDealer.new(@infopane, @seesaw, @barrel)
   end
 
   # Start processing the pushed button
@@ -60,12 +64,13 @@ class GameWindow < Gosu::Window
 
   # Update game state
   def update
-    @timer.update
+    @infopane.update
 
     unless @loss
       @seesaw.update(@button)
       @barrel.update # let seesaw update first
       check_loss
+      @effect_dealer.update
     end
   end
 
@@ -83,16 +88,18 @@ class GameWindow < Gosu::Window
   def draw
     @background.draw
     @barrel.draw
+    @effect_dealer.draw
+    @infopane.draw
     @seesaw.draw
-    @timer.draw
   end
 
   # Reset scene
   def reset
     reset!
     @barrel.reset!
+    @effect_dealer.reset!
+    @infopane.reset!
     @seesaw.reset!
-    @timer.reset!
   end
 
   # Load default setup
@@ -103,6 +110,5 @@ class GameWindow < Gosu::Window
   # Switch debug flag
   def switch_debug!
     $debug = !$debug
-    puts $debug
   end
 end

data/lib/lib/user_interface/infopane.rb

@@ -0,0 +1,34 @@
+class Infopane
+  attr_reader :time
+
+  def initialize(window)
+    @window = window
+    reset!
+  end
+
+  # Load default setup
+  def reset!
+    @starttime = Gosu.milliseconds
+    @time = 0
+  end
+
+  def update()
+    unless @window.loss
+      @time = (Gosu.milliseconds - @starttime) / 1000.0
+    end
+  end
+
+  def draw
+    text = "#{@time}s"
+
+    if @window.loss
+      text += "\nBackspace to restart"
+    end
+
+    text = Gosu::Image.from_text(
+      text, LINE_HEIGHT,
+      {:width => WINDOW_WIDTH, :align => :center}
+    )
+    text.draw(0, 0, ZTEXT)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: keep_calm_and_balance
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: '0.4'
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -50,12 +50,16 @@ files:
 - lib/README.md
 - lib/keep_calm_and_balance.gemspec
 - lib/keep_calm_and_balance.rb
+- lib/lib/effects/effect_dealer.rb
+- lib/lib/effects/wind_effect.rb
 - lib/lib/items/barrel.rb
 - lib/lib/items/seesaw.rb
 - lib/lib/user_interface/background.rb
 - lib/lib/user_interface/game_window.rb
-- lib/lib/user_interface/timer.rb
+- lib/lib/user_interface/infopane.rb
+- lib/media/KCaB 0.3.1.png
 - lib/media/circle.png
+- lib/media/logo.png
 - lib/media/square.png
 homepage: https://rasunadon.itch.io/keep-calm-and-balance
 licenses:

data/lib/lib/user_interface/timer.rb

@@ -1,32 +0,0 @@
-class Timer
-  def initialize(window)
-    @window = window
-    reset!
-  end
-
-  # Load default setup
-  def reset!
-    @starttime = Gosu.milliseconds
-    @time = 0
-  end
-
-  def update()
-    unless @window.loss
-      @time = (Gosu.milliseconds - @starttime) / 1000.0
-    end
-  end
-
-  def draw
-    info = Gosu::Image.from_text("#{@time}s", LINE_HEIGHT)
-    info.draw(0, 0, ZTEXT)
-
-    if @window.loss
-      restart_text = "Backspace to restart"
-      restart = Gosu::Image.from_text(
-        restart_text, LINE_HEIGHT,
-        {:width => WINDOW_WIDTH, :align => :center}
-      )
-      restart.draw(0, LINE_HEIGHT, ZTEXT)
-    end
-  end
-end