empi 0.21 → 0.22.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2a8c4d275198c690e2abe8ccaa6cc4fa6d636fa48a7aa5ddcf4cfd5e67a4e1b
-  data.tar.gz: 92d1bed4b5219e8ed122fa0abf5bb2065db2df87c6ac27698cc4c9c27750a935
+  metadata.gz: 6ad13787b5a8797ab609b5b7a907cf5c496eaeb1e6dd6f6cca7d639eeb8ea806
+  data.tar.gz: 260e7ffb1be2609e55edef0e37fe1d74409a107f15b269472154514ada633f36
 SHA512:
-  metadata.gz: 4c925aebb1925ccecbef7fa18e9bd1b18ec65d0066bfcd2b1ebc3e0f3476877c3f7b3dcd48f6d926057a85756591b70ec38d783134ba65e03b4436f9daf512dd
-  data.tar.gz: ab0dde3dd38a74a7639104601d6b972a824095f2b242acf81a5d8dc69b55e0be4eae0f3125f804b9106576c3cea185353b16ec0db1200d4c49ecf15c1dc67e80
+  metadata.gz: 138cf192068da984a0a415346d9210ef81e20c968bf86f4c0a37dd71201ec233eb224e1aa400a5199143badbf649e2c45a1dd7fafa33aecc2afcbc8e58a27a19
+  data.tar.gz: 971e0ec6b97089ede1598648cb114cecdcd88a6fceb49a90fd9da162539afc50896569ae08bc394676dda6c5a833db6dedab9216173d4ed6100dc3759daeec00

data/lib/empi.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'gosu'
 
-require_relative './game_state'
-require_relative './play_state'
+require_relative './lib/game_states/game_state'
+require_relative './lib/game_states/play_state'
 
 TILESIZE = 50
 MAPX = 10
@@ -19,7 +19,7 @@ class GameWindow < Gosu::Window
                  height = (MAPY + 2) * TILESIZE, \
                  fullscreen = false)
     super
-    self.caption = 'Empi: Ruby Edition 0.21 dev'
+    self.caption = 'Empi: Ruby Edition 0.22 dev'
 
     # Activate first state
     $window = self

data/lib/lib/game_states/build_state.rb

@@ -0,0 +1,82 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './play_state'
+
+require_relative './../units/army'
+require_relative './../units/ship'
+
+# Game state of closing the game window
+class BuildState < GameState
+  include Singleton
+
+  attr_accessor :unit
+
+  # What to do just after state gets activated
+  #def after_start
+  #end
+
+  # What to do just before state gets deactivated
+  #def before_end
+  #  TODO hide question?
+  #end
+
+  # Process given button to cursor
+  def update(button)
+    project = nil
+
+    case(button)
+    when Gosu::KbEscape then
+      # If there was no project selected before then behave same as "none" option
+      unless @unit.project
+        reset_function!()
+      else
+        puts PROMPT + @unit.to_s + ": cancelling, nothing changed"
+        GameState.switch!(PlayState.instance)
+      end
+    when Gosu::Kb0, Gosu::KbN then
+      reset_function!()
+    when Gosu::Kb1, Gosu::KbA then
+      project = Army
+    when Gosu::Kb2, Gosu::KbS then
+      project = Ship
+    end
+
+    # Did we get any proper answer?
+    if project
+      @unit.set_project!(project)
+      GameState.switch!(PlayState.instance)
+    end
+  end
+
+  # If "none" project was selected reset also the function
+  def reset_function!()
+    puts PROMPT + @unit.to_s + ": no project selected, resetting function"
+    @unit.set_function!(FUNCNONE)
+    GameState.switch!(PlayState.instance)
+  end
+
+  def draw
+    # Combine parts according to if there already is some project set
+    unit_text = "Built so far in " + @unit.to_s + ":"
+    if @unit.project
+      project_text = "
+        #{@unit.parts_built} " +
+        "part#{ 's' unless @unit.parts_built == 1 } of " +
+        @unit.project.name + " (" + @unit.build_info + ")"
+    else
+      project_text = "
+        no project selected"
+    end
+
+    options_text = "Select the project:\n
+        1, A – Army (#{ @unit.price_list[Army] } turns)
+        2, S – Ship (#{ @unit.price_list[Ship] } turns)\n
+        0, N – none
+        Esc – cancel project #{ @unit.project ? 'change' : 'setup'}"
+
+    build_project = Gosu::Image.from_text(
+      unit_text + "\n" + project_text + "\n\n" + options_text, 20)
+    build_project.draw((2*TILESIZE) + XTEXT, (2*TILESIZE) + YTEXT, ZTEXT)
+  end
+end

data/lib/{play_state.rb → lib/game_states/play_state.rb}

@@ -3,9 +3,9 @@ require 'singleton'
 require_relative './game_state'
 require_relative './escape_state'
 
-require_relative './cursor'
-require_relative './infopane'
-require_relative './map'
+require_relative './../user_interface/cursor'
+require_relative './../user_interface/infopane'
+require_relative './../user_interface/map'
 
 
 XTEXT = 5
@@ -35,6 +35,8 @@ class PlayState < GameState
       help # show help after loading of map
       new_turn
     else
+      @cursor.info_stopped = false
+
       # Remind player the current status
       if @cursor.freeroam
         @infopane.text = 'freeroam is enabled'
@@ -46,9 +48,9 @@ class PlayState < GameState
   end
 
   # What to do just before state gets deactivated
-  #def before_end
-  #  TODO undraw all parts?
-  #end
+  def before_end
+    @cursor.info_stopped = true
+  end
 
   # Process given button or send it to cursor
   def update(button)

data/lib/{army.rb → lib/units/army.rb}

@@ -9,7 +9,7 @@ class Army < Unit
   def initialize(x, y, faction, map, infopane)
     super
     dir_path = File.dirname(__FILE__)
-    @image = Gosu::Image.new(dir_path + '/media/army.png')
+    @image = Gosu::Image.new(dir_path + '/../../media/army.png')
 
     @armor_left = @armor_max = 3
     @moves_max = 5

data/lib/{ship.rb → lib/units/ship.rb}

@@ -9,7 +9,7 @@ class Ship < Unit
   def initialize(x, y, faction, map, infopane)
     super
     dir_path = File.dirname(__FILE__)
-    @image = Gosu::Image.new(dir_path + '/media/ship.png')
+    @image = Gosu::Image.new(dir_path + '/../../media/ship.png')
 
     @armor_left = @armor_max = 1
     @moves_max = 2

data/lib/{town.rb → lib/units/town.rb}

@@ -1,10 +1,10 @@
-require_relative './game_state'
-require_relative './build_state'
-
 require_relative './army'
 require_relative './ship'
 require_relative './unit'
 
+require_relative './../game_states/game_state'
+require_relative './../game_states/build_state'
+
 class Town < Unit
   @name = 'town'
   @map_symbol = 'T'
@@ -15,7 +15,7 @@ class Town < Unit
   def initialize(x, y, faction, map, infopane)
     super
     dir_path = File.dirname(__FILE__)
-    @image = Gosu::Image.new(dir_path + '/media/town.png')
+    @image = Gosu::Image.new(dir_path + '/../../media/town.png')
 
     @armor_left = @armor_max = 1
     @moves_max = 0
@@ -26,7 +26,7 @@ class Town < Unit
     @parts_built = 0
     @parts_needed = 0
 
-    set_function!(FUNCBUILD)
+    set_function!(FUNCBUILD) unless @faction == 0
   end
 
   def can_build?
@@ -47,8 +47,10 @@ class Town < Unit
     super
 
     # Reset build process
+    @function.func = FUNCNONE
     @project = nil
     @parts_built = 0
+
     set_function!(FUNCBUILD)
   end
 
@@ -57,7 +59,7 @@ class Town < Unit
     super
 
     if @faction != 0 and func == FUNCBUILD # neutral towns don't need projects
-      # Set once starting project or ask player about next project
+      # Set starting project once or ask player about next project
       if @starting_project
          set_project!(@starting_project)
          @starting_project = nil
@@ -70,15 +72,10 @@ class Town < Unit
 
   # Set desired project
   def set_project!(desired_project)
-    # Figure out the price
-    prices = Hash[
-      [Army, Ship].collect { |ii| [ii, ii.price] } # TODO all subclasses of Unit which can_be_built?
-    ]
-
-    unless prices.key?(desired_project)
+    unless price_list.key?(desired_project)
       abort("town.set_project!(): Unknown project (#{desired_project})")
     end
-    @parts_needed = prices[desired_project]
+    @parts_needed = price_list[desired_project]
 
     # Compare new setting with the old one
     if desired_project == @project
@@ -93,8 +90,17 @@ class Town < Unit
       unless lost_parts > 0
         puts new_project_set_text
       else
-        puts new_project_set_text + ", losing #{lost_parts} parts of #{previous_project.name} "
+        puts new_project_set_text + ", losing #{lost_parts} " +
+          "part#{ 's' unless lost_parts == 1 } of #{previous_project.name}"
+
       end
     end
   end
+
+  # Load all prices
+  def price_list
+    prices = Hash[
+      [Army, Ship].collect { |ii| [ii, ii.price] } # TODO all subclasses of Unit which can_be_built?
+    ]
+  end
 end

data/lib/{unit.rb → lib/units/unit.rb}

@@ -6,7 +6,7 @@ class Unit
     attr_reader :name, :map_symbol, :price, :value
   end
 
-  attr_accessor :x, :y, :faction, :function, :cargo
+  attr_accessor :x, :y, :faction, :function, :cargo, :cargo_max
 
   def initialize(x, y, faction, map, infopane)
     @x = x
@@ -101,10 +101,11 @@ class Unit
       oldcoords_unit = @map.get_unit(old_x, old_y)
       newcoords_unit = @map.get_unit(@x, @y)
 
-      # If there is nobody or is there friendly unit with some cargo space
+      # If there is nobody or is there friendly unit with some cargo space (and bigger cargo space)
       if !newcoords_unit || \
         (newcoords_unit.faction == @faction && \
          newcoords_unit.can_transport? && \
+         @cargo_max < newcoords_unit.cargo_max && \
          !newcoords_unit.is_full?)
 
         # Leave old coordinates
@@ -115,7 +116,7 @@ class Unit
         end
 
         # Get to new coordinates
-        if newcoords_unit == nil
+        if !newcoords_unit
           @map.set_unit(@x, @y, self)
           @cargo.each { |uu|
             uu.x = @x
@@ -129,21 +130,25 @@ class Unit
         end
 
       else # if there already is somebody that can't transport you (enemy or full friend)
-          # Stay on your original tile
-          @x = old_x
-          @y = old_y
-
-          # If it was a friend unit
-          if newcoords_unit.faction == @faction
-            if !newcoords_unit.can_transport?
-              puts PROMPT + newcoords_unit.to_s + ' can\'t transport other units'
-            else # newcoords_unit.can_transport?; has to be full then
+        # Stay on your original tile
+        @x = old_x
+        @y = old_y
+
+        # If it was a friend unit
+        if newcoords_unit.faction == @faction
+          if !newcoords_unit.can_transport?
+            puts PROMPT + newcoords_unit.to_s + ' can\'t transport other units'
+          else
+            if @cargo_max >= newcoords_unit.cargo_max
+              puts PROMPT + "#{self.class.name} can\'t fit in #{newcoords_unit.class.name}"
+            else # thus newcoords_unit.is_full? is true
               puts PROMPT + newcoords_unit.to_s + ' is already full'
             end
-          else
-            # Enemy!
-            newcoords_unit.engage!(self)
           end
+        else
+          # Enemy!
+          newcoords_unit.engage!(self)
+        end
       end
       @moves_left -= 1
 
@@ -228,12 +233,15 @@ class Unit
 
   # Set desired function
   def set_function!(func)
-    unless @faction == 0 # neutral towns dom't need functions
+    if @faction == 0
+      puts PROMPT + to_s + ": neutral towns can't have functions set"
+    else
       if func == FUNCBUILD and !can_build?
         puts PROMPT + to_s + ": this unit can't build other units"
         return
       end
 
+      # Check current function and set the new one
       if @function.func == func
         puts PROMPT + to_s + ": function is already set to #{@function.func}"
       else

data/lib/{unitFunction.rb → lib/units/unitFunction.rb}

@@ -12,6 +12,9 @@ class UnitFunction
     when FUNCNONE
       "no function"
     when FUNCBUILD
+      unless @unit.project
+        abort("unitFunction.info(): No project set (" + @unit.to_s + ")")
+      end
       "building #{@unit.project.name} (#{@unit.build_info})"
     when FUNCSENTRY
       "sentrying"
@@ -19,11 +22,13 @@ class UnitFunction
   end
 
   def func!(map, infopane)
-    ret = " didn't actually do anything (ERROR)"
-
     case @func
     # Build given unit
     when FUNCBUILD
+      unless @unit.project
+        abort("unitFunction.func!(): No project set (" + @unit.to_s + ")")
+      end
+
       @unit.parts_built += 1
 
       unless @unit.parts_built >= @unit.parts_needed # just == should be enough
@@ -49,6 +54,10 @@ class UnitFunction
       end
     end
 
+    unless ret
+      abort("unitFunction.func!(): Functionable unit didn't function (" + @unit.to_s + ")")
+    end
+
     ret
   end
 end

data/lib/{cursor.rb → lib/user_interface/cursor.rb}

@@ -1,5 +1,5 @@
 class Cursor
-  attr_accessor :x, :y, :freeroam, :unit
+  attr_accessor :x, :y, :freeroam, :info_stopped, :unit
 
   def initialize(x, y, map, infopane)
     dir_path = File.dirname(__FILE__)
@@ -9,8 +9,9 @@ class Cursor
     @map = map
     @infopane = infopane
 
-    @image = Gosu::Image.new(dir_path + '/media/cursor.png')
+    @image = Gosu::Image.new(dir_path + '/../../media/cursor.png')
     @freeroam = false
+    @info_stopped = false
   end
 
   def update(button)
@@ -123,7 +124,7 @@ class Cursor
     end
 
     warp_to!(@unit) # stay at old or go to new
-    info
+    info unless @info_stopped # due to switching out of the play game state
   end
 
   # Switch between being attached to unit and being able to freeroam

data/lib/{map.rb → lib/user_interface/map.rb}

@@ -1,7 +1,8 @@
-require_relative './army'
-require_relative './ship'
 require_relative './tile'
-require_relative './town'
+
+require_relative './../units/army'
+require_relative './../units/ship'
+require_relative './../units/town'
 
 class Map
   attr_accessor :name, :mapx, :mapy, :infopane
@@ -15,7 +16,7 @@ class Map
     ]
 
     # TODO selectable starting scenario
-    load_map(dir_path + '/save/m02.esf')
+    load_map(dir_path + '/../../save/m02.esf')
   end
 
   # Load map from file

data/lib/{tile.rb → lib/user_interface/tile.rb}

@@ -17,10 +17,10 @@ class Tile
     case(loaded_symbol)
     when SYMBOL_SEA then
       @terrain = TILE_SEA
-      @image = Gosu::Image.new(dir_path + '/media/sea.png')
+      @image = Gosu::Image.new(dir_path + '/../../media/sea.png')
     when SYMBOL_GROUND then
       @terrain = TILE_GROUND
-      @image = Gosu::Image.new(dir_path + '/media/ground.png')
+      @image = Gosu::Image.new(dir_path + '/../../media/ground.png')
     else
       abort("tile.initialize(): Unknown terrain symbol (#{loaded_symbol})")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: empi
 version: !ruby/object:Gem::Version
-  version: '0.21'
+  version: 0.22.3
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2020-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -46,14 +46,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/army.rb
-- lib/build_state.rb
-- lib/cursor.rb
 - lib/empi.rb
-- lib/escape_state.rb
-- lib/game_state.rb
-- lib/infopane.rb
-- lib/map.rb
+- lib/lib/game_states/build_state.rb
+- lib/lib/game_states/escape_state.rb
+- lib/lib/game_states/game_state.rb
+- lib/lib/game_states/play_state.rb
+- lib/lib/units/army.rb
+- lib/lib/units/ship.rb
+- lib/lib/units/town.rb
+- lib/lib/units/unit.rb
+- lib/lib/units/unitFunction.rb
+- lib/lib/user_interface/cursor.rb
+- lib/lib/user_interface/infopane.rb
+- lib/lib/user_interface/map.rb
+- lib/lib/user_interface/tile.rb
 - lib/media/Empi v18.png
 - lib/media/army.png
 - lib/media/cursor.png
@@ -61,16 +67,10 @@ files:
 - lib/media/sea.png
 - lib/media/ship.png
 - lib/media/town.png
-- lib/play_state.rb
 - lib/save/m01.esf
 - lib/save/m02-err.esf
 - lib/save/m02.esf
 - lib/save/m03.esf
-- lib/ship.rb
-- lib/tile.rb
-- lib/town.rb
-- lib/unit.rb
-- lib/unitFunction.rb
 homepage: http://www.bay12forums.com/smf/index.php?topic=157538
 licenses:
 - CC-BY-SA-3.0

data/lib/build_state.rb

@@ -1,54 +0,0 @@
-require 'singleton'
-
-require_relative './game_state'
-require_relative './play_state'
-
-require_relative './army'
-require_relative './ship'
-
-# Game state of closing the game window
-class BuildState < GameState
-  include Singleton
-
-  attr_accessor :unit
-
-  # What to do just after state gets activated
-  #def after_start
-  #end
-
-  # What to do just before state gets deactivated
-  #def before_end
-  #  TODO hide question?
-  #end
-
-  # Process given button to cursor
-  def update(button)
-    project = nil
-
-    case(button)
-    when Gosu::KbN, Gosu::KbEscape then
-      puts PROMPT + @unit.to_s + ": no project selected, resetting function"
-      @unit.set_function!(FUNCNONE)
-      GameState.switch!(PlayState.instance)
-    when Gosu::Kb1, Gosu::KbA then
-      project = Army
-    when Gosu::Kb2, Gosu::KbS then
-      project = Ship
-    end
-
-    # Did we get any proper answer?
-    if project
-      @unit.set_project!(project)
-      GameState.switch!(PlayState.instance)
-    end
-  end
-
-  def draw
-     build_project = Gosu::Image.from_text(
-       "Select the project for " + @unit.to_s + ":\n
-        1, A – Army (3 turns)\n
-        2, S – Ship (5 turns)\n\n
-        N, Esc – none\n", 20)
-     build_project.draw((2*TILESIZE) + XTEXT, (3*TILESIZE) + YTEXT, ZTEXT)
-  end
-end