empi 0.17 → 0.18

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 17a373e0fd7e1d69b026eb9e03e6ae1b74d9001d528fcdd2dc144693749cd534
+  data.tar.gz: 83104dc8fce378e990efac52715be41659e874dbe4ecf8ec8553ceffc5e3cb55
+SHA512:
+  metadata.gz: bd6791f595a7aa71d7e063a9d0e2d7eac6931db0d54c323a464d4967069c4fcb11274067b79e0a5cec05551b0e41e0e6c8dcf5255e08273718da1540ca39eae4
+  data.tar.gz: 7b5406ef092968567a0f503ae3b4bfb532ffb50219a335a8c2b47abd6b7da1a2600bf20529287e66181d201b10a9b675d043f542b8fbc2c2175b7150caac22a0

data/lib/cursor.rb

@@ -1,5 +1,5 @@
 class Cursor
-  attr_accessor :x, :y, :freeroam
+  attr_accessor :x, :y, :freeroam, :unit
 
   def initialize(x, y, map, infopane)
     dir_path = File.dirname(__FILE__)
@@ -11,83 +11,163 @@ class Cursor
   
     @image = Gosu::Image.new(dir_path + '/media/cursor.png')
     @freeroam = false
+
+ #   to_next_unit! # get to the first one
   end
 
   def update(key)
     case key
     # Cardinal directions
     when Gosu::KbLeft, Gosu::KbA then
-      @x -= 1 unless @x <= 0
+      move!(-1, 0) unless @x <= 0
     when Gosu::KbRight, Gosu::KbD then
-      @x += 1 unless @x >= MAPX
+      move!(1, 0) unless @x >= MAPX
     when Gosu::KbUp, Gosu::KbW then
-      @y -= 1 unless @y <= 0
+      move!(0, -1) unless @y <= 0
     when Gosu::KbDown, Gosu::KbX then
-      @y += 1 unless @y >= MAPY
+      move!(0, 1) unless @y >= MAPY
 
     # Intercardinal directions
     when Gosu::KbQ then
-      unless @x <= 0 || @y <= 0
-        @x -= 1
-        @y -= 1
-      end
+      move!(-1, -1) unless @x <= 0 || @y <= 0
     when Gosu::KbE then
-      unless @x >= MAPX || @y <= 0
-        @x += 1
-        @y -= 1
-      end
+      move!(1, -1) unless @x >= MAPX || @y <= 0
     when Gosu::KbZ then
-      unless @x <= 0 || @y >= MAPY
-        @x -= 1
-        @y += 1
-      end
+      move!(-1, 1) unless @x <= 0 || @y >= MAPY
     when Gosu::KbC then
-      unless @x >= MAPX || @y >= MAPY
-        @x += 1
-        @y += 1
-      end
+      move!(1, 1) unless @x >= MAPX || @y >= MAPY
 
     # Functions
     when Gosu::KbS then
-      uu = @map.get_unit(@x, @y)
-      if uu then uu.set_function(FUNCSENTRY) end
+      set_function_to_unit(FUNCSENTRY)
     when Gosu::KbB then
-      uu = @map.get_unit(@x, @y)
-      if uu then uu.set_function(FUNCBUILD) end
-    when Gosu::KbN then
-      uu = @map.get_unit(@x, @y)
-      if uu then uu.set_function(FUNCNONE) end
+      set_function_to_unit(FUNCBUILD)
+     when Gosu::KbN then
+      set_function_to_unit(FUNCNONE)
 
     when Gosu::KbReturn then
       info
     end
+
+    # If in locked mode, stay at current/jump to next movable unit
+    to_next_unit! unless freeroam
   end
 
   def draw
     @image.draw(@x * TILESIZE, (@y + 1) * TILESIZE, ZCURSOR)
   end
 
-  # Move to given coordinates
-  def warp(x, y)
-    @x = x
-    @y = y
+  # Move to coordinates of given unit
+  def warp_to!(uu)
+    @x = uu.x
+    @y = uu.y
+    @unit = uu
+  end
+
+  # Move by given change of coordinates
+  def move!(xx, yy)
+    if freeroam
+      @x += xx
+      @y += yy
+      @unit = @map.get_unit(@x, @y)
+      return
+    end
+
+    # If in locked mode
+    if !@unit
+      abort("cursor.move!(): Cursor is in locked mode but there is no unit it is locked to (at #{@x} - #{@y})")
+    end
+
+    @unit.x += xx
+    @unit.y += yy
+    @unit.check_movement(@x, @y) # cursor coordinates work like old_x, old_y
+
+    uu = @map.get_unit(@unit.x, @unit.y)
+    if !uu # it got destroyed
+      @unit = nil # clear the last links so that (object of) given unit can be truly destroyed
+      return
+    end
+
+    warp_to!(@unit) # whether it moved or not, unless it got destroyed
+  end
+
+  # Tries to set function <func> to currently selected unit
+  def set_function_to_unit(func)
+      if freeroam
+        uu = @map.get_unit(@x, @y)
+      else
+        # If in locked mode
+        if !@unit
+          abort("cursor.set_function_to_unit(): Cursor is in locked mode but there is no unit it is locked to (at #{@x} - #{@y})")
+        end
+        uu = @unit
+      end
+      
+      uu.set_function(func) unless !uu
+  end
+
+  # Find next unit to target with cursor
+  def to_next_unit!
+    if @unit
+      puts 'current unit is there'
+    else
+      puts 'nothing hereeee'
+    end
+
+    if @unit && @unit.can_move?
+      puts 'current unit can move'
+    end
+
+    if @unit && @unit.function == FUNCNONE
+      puts 'current unit has no function set'
+    end
+
+    unless @unit && @unit.can_move? && @unit.function == FUNCNONE # unless the current one is still movable
+puts 'searching'
+      movable_units = @map.all_units.select { |uu| uu.can_move? && uu.function == FUNCNONE}
+
+      # If there are no more movable units without function, switch to freeroam mode
+      if movable_units.size <= 0 # == would be enough
+        puts 'all movable units without functions moved'
+
+        switch_freeroam!
+        return
+      end
+
+      @unit = movable_units[0] # newly selected one
+    end
+puts 'ready'
+    
+    warp_to!(@unit) # stay at old or go to new
+    info
   end
 
   # Switch between being attached to unit and being able to freeroam
-  def switch_freeroam
-    if freeroam == true
+  def switch_freeroam!
+    if freeroam
       @infopane.text = 'freeroam disabled'
       puts 'freeroam disabled'
+      @freeroam = false
+      to_next_unit!
     else
       @infopane.text = 'freeroam enabled'
       puts 'freeroam enabled'
+      @freeroam = true
+      @unit = nil
     end
-    @freeroam = !@freeroam
   end
 
   # Find some info about units on the current tile
   def info
-    uu = @map.get_unit(@x, @y)
+    if freeroam
+      uu = @map.get_unit(@x, @y)
+    else
+      if !@unit
+        abort("cursor.info(): Cursor is in locked mode but there is no unit it is locked to (at #{@x} - #{@y})")
+      end
+      uu = @unit
+    end
+
     if uu
       @infopane.text = uu.info
       puts uu.info

data/lib/docu/info.txt

@@ -1,9 +1,66 @@
 /--  ///  /-/  -/-
-/--  |||  /-/   | 
+/--  |||  /-/   |
 /--  |||  |    -/-
 
 Empi: Ruby Edition
 ====================
+CC-BY-SA 3.0, Detros
+http://www.bay12forums.com/smf/index.php?topic=157538
+rasunadon@seznam.cz
+
+
+v18 dev
+=========
+- help is now listing all keys
+- help shown after the first load of new map
+- units use all left moves when loaded, unless they are loaded into towns
+- even units with 0 moves left show their moves in their info
+- added "End of turn" marker
+- added licensing/contact info also to this info file and not just to gem specs
+- several exception handlers added to Cursor
+- units stored in Tile class
+  fixed: units are still stored via Map class instead of Tile one
+- movement and function keys processed in Cursor, movement checked in Unit
+  fixed: units are still accessed via Window class instead of Cursor one
+- moving of cursor stores the current unit so it can possibly get moved (again)
+- function setting of units separated to its own method
+- autodisabling of freeroam mode on each end of turn moved to the start of next turn
+
+! help should be shown after each load of new map
+! transported units can't get commands from freeroaming cursor
+! transported units don't function properly, their transports secretly function instead of them
+! unit info shown twice at the start of the first turn
+! units which can't build can still have function set to build (though they do protest)
+
+empi.rb
+  help shown at the start of game
+  "End of turn" marker
+  removed calling of @map.draw_units
+  removed search for next movable unit
+
+map.rb
+  all_map_units() uses indirect access via get_unit()
+  get_unit(), set_unit() access given coordinates of @tiles
+  draw_units() and @units removed
+
+unit.rb
+  removed processing of movement and function keys
+  info() uses @moves_max > 0 instead of can_move()
+  check_movement() sets @moves_left to 1 when unit is loaded so it then gets lowered to 0
+
+cursor.rb
+  switch_freeroam() renamed to switch_freeroam!()
+  +move! - Move by given change of coordinates
+  +to_next_unit! - Find next unit to target with cursor
+  @unit
+  +set_function_to_unit(func) - Tries to set function <func> to currently selected unit
+
+tile.rb
+  @unit
+
+infopane.rb
+  removed one space from score output
+
 
 v17 dev
 =========
@@ -60,7 +117,7 @@ army.rb
 
 town.rb
   can be captured
-   
+
 save/m02.esf
   +two ships, one for each faction
 
@@ -77,8 +134,8 @@ v16 dev
 ! hardcoded unit type to be built
 - units can transport other units
 - newly built units are stored in town instead of map
-  fixes: new units are saved in map instead of the towns that built them
-! transported units are not drawn
+  fixed: new units are saved in map instead of the towns that built them
+! transported units are never drawn
 ! transported units show only info of their transport instead when selected
 ! all units can capture and visit towns
 
@@ -113,7 +170,7 @@ ship.rb
 
 unitFunction.rb
   +FUNCBUILD case in func!()
-  FUNCSENTRY case in func!() sets "ret" even when unit keeps sentrying 
+  FUNCSENTRY case in func!() sets "ret" even when unit keeps sentrying
 
 
 v15 dev
@@ -180,8 +237,9 @@ older versions
 - rudimentary terrain checking after move
 - capturing of units
 - turn and score counting
-- commmand line and screen text output
-- next avaiable unit / freeroam cursor
+- command line and screen text output
+- next available unit / freeroam cursor
+
 
 current state
 ===============
@@ -206,14 +264,19 @@ new problems
 ! hardcoded save file name
 ! hardcoded map size
 ! hardcoded unit type to be built
-! transported units are not drawn
+! transported units are never drawn
 !x transported units show only info of their transport instead when selected
 !x all units can capture and visit towns
-! units are still stored via Map class instead of Tile one
-! units are still accessed via Window class instead of Cursor one
+!x units are still stored via Map class instead of Tile one
+!x units are still accessed via Window class instead of Cursor one
 ! damaged units are destroyed
 ! transported units show in infopane info of their transport instead when selected
 ! capturing town with units leaves those enemy units inside
+! help should be shown after each load of new map
+! transported units can't get commands from freeroaming cursor
+! transported units don't function properly, their transports secretly function instead of them
+! unit info shown twice at the start of the first turn
+! units which can't build can still have function set to build (though they do protest)
 
 (! thing to fix, !x fixed thing)
 

data/lib/empi.rb

@@ -36,19 +36,24 @@ class GameWindow < Gosu::Window
                  height = (MAPY + 2) * TILESIZE, \
                  fullscreen = false)
     super
-    self.caption = 'Empi: Ruby Edition 0.17 dev'
+    self.caption = 'Empi: Ruby Edition 0.18 dev'
 
     @infopane = Infopane.new
     @map = Map.new(@infopane)
-    @cursor = Cursor.new(5, 5, @map, @infopane)
-
+    @cursor = Cursor.new(0, 0, @map, @infopane)
+    help # show help after loading of map
     new_turn
   end
 
   def button_up(key)
     @button = key
+  end
 
-    case(key)
+  # Process given button to cursor
+  def update
+    case(@button)
+    when -1 then # no keys pressed
+      return
     when Gosu::KbEscape then
       close
     when Gosu::KbPeriod then
@@ -56,46 +61,9 @@ class GameWindow < Gosu::Window
     when Gosu::KbH then
       help
     when Gosu::KbJ then
-      unit_to_move = 0
-      @cursor.switch_freeroam
-    end
-  end
-
-  # Process given button to cursor
-  def update
-    if @button == -1 then return end
-
-    movable_units = @map.all_units.select { |uu| uu.can_move? && uu.function == FUNCNONE}
-    # If there are any movable units without functions select one of them with the cursor
-    if @cursor.freeroam == false && movable_units.size > 0
-      unit_to_move = movable_units[0]
-      unit_to_move.update(@button)
-
-      # Can it still move?
-      if unit_to_move.can_move? && unit_to_move.function == FUNCNONE
-       # Move the cursor to it unless it is already there
-        if (@cursor.x != unit_to_move.x \
-            || @cursor.y != unit_to_move.y)
-          @cursor.warp(unit_to_move.x, unit_to_move.y)
-        end
-        @cursor.info
-      else
-        # Was that the last currently avaiable non-function move?
-        movable_units = @map.all_units.select { |uu| uu.can_move? && uu.function == FUNCNONE}
-        if movable_units.size == 0
-          puts 'all movable units without functions moved'
-          @cursor.switch_freeroam
-        else
-          # Move cursor to next avaiable unit
-          unit_to_move = movable_units[0]
-          @cursor.warp(unit_to_move.x, unit_to_move.y)
-          @cursor.info
-        end
-      end
-
+      @cursor.switch_freeroam!
     else
-      # Cursor in freeroam mode
-      @cursor.update(@button) 
+      @cursor.update(@button)
     end
   end
 
@@ -105,38 +73,37 @@ class GameWindow < Gosu::Window
   end
 
   def draw
-    @button = -1 # use each button just once
+    @button = -1 # draw just once after each button press
 
-    # Draw map tiles and units
     @map.draw_tiles
-    @map.draw_units
-# DEBUG    @map.all_units.each { |uu| puts uu.info}
-
     @cursor.draw
     @infopane.draw
 
-    # @message = Gosu::Image.from_text(
-    # self, "Empire", Gosu.default_font_name, 20)
-    # @message.draw(10, 10, 2)
+# DEBUG    @map.all_units.each { |uu| puts uu.info}
   end
 
-  # End current turn and start next one
+  # End current turn and start the next one
   def new_turn
-    @cursor.freeroam = true
-    @cursor.switch_freeroam # so freeroam = false, with messages
+    puts "=============\n" \
+         "End of turn\n" \
+         "=============\n"
 
     functionable_units = @map.all_units.select { |uu| uu.function != FUNCNONE}
     functionable_units.each { |uu| uu.function! }
 
     @map.all_units.each { |uu| uu.reset_moves!}
     @infopane.next_turn
+
+    @cursor.freeroam = true
+    @cursor.switch_freeroam! # so freeroam = false, with messages
   end
 
   def help
-    puts "----------\n" \
-         "QWEADZXC movement, h help, Enter info, j switch freeroam\n" \
+    puts "-----------\n" \
+         "h: help, Esc: end game, Enter: info, j: switch freeroam\n" \
+         "QWEADZXC or arrow keys: movement, .: end turn\n" \
          "functions: s sentry, n none\n" \
-         "----------\n"
+         "-----------\n"
   end
 end
 

data/lib/infopane.rb

@@ -14,7 +14,7 @@ class Infopane
 
   def draw
     turnscore = Gosu::Image.from_text(
-      self, "Turn: #{@turn}, Score: #{@score[0]} -  #{@score[1]}", Gosu.default_font_name, 20)
+      self, "Turn: #{@turn}, Score: #{@score[0]} - #{@score[1]}", Gosu.default_font_name, 20)
     turnscore.draw(XTEXT, YTEXT, ZTEXT)
 
     text = Gosu::Image.from_text(self, "#{@text}", Gosu.default_font_name, 20)
@@ -27,7 +27,7 @@ class Infopane
   
   def next_turn
     @turn += 1
-    puts "Turn: #{@turn}, Score: #{@score[0]} -  #{@score[1]}"
+    puts "Turn: #{@turn}, Score: #{@score[0]} - #{@score[1]}"
   end
 
   def add_score(to_whom, how_much)

data/lib/map.rb

@@ -5,7 +5,6 @@ SYMBOL_SHIP = 'S'
 class Map
   attr_accessor :name, :mapx, :mapy, :infopane
 
-  # Fill tile map and prepare 
   def initialize(infopane)
     dir_path = File.dirname(__FILE__)
 
@@ -20,10 +19,8 @@ class Map
 
     # Load tiles
     @tiles = []
-    @units = []
     0.upto(@mapy - 1) { |rr|
       @tiles[rr] = []
-      @units[rr] = []
       map_row = input.gets
       0.upto(@mapx - 1) { |cc|
         @tiles[rr][cc] = Tile.new(cc, rr, map_row[cc], @infopane)
@@ -53,21 +50,15 @@ class Map
     head[2].to_i # unit_count
   end
 
-  # Load one unit from given line
+  # Load one unit from given row
   def load_unit(row)
     unit = []
     coords = []
 
     unit = row.split(' ')
-    coords = unit[2].split('-')
-
-    # Check faction
-    fac = unit[1].to_i
-    if(fac < 0 || fac > FACTIONS)
-      abort("map.load_unit(): Bad faction id (#{fac})")
-    end
 
     # Check coordinates
+    coords = unit[2].split('-')
     coords_x = coords[0].to_i
     coords_y = coords[1].to_i
     if (coords_x < 0 || coords_x >= @mapx ||
@@ -75,6 +66,12 @@ class Map
       abort("map.load_unit(): Unit out of map borders (#{coords_x}-#{coords_y})")
     end
 
+    # Check faction
+    fac = unit[1].to_i
+    if(fac < 0 || fac > FACTIONS)
+      abort("map.load_unit(): Bad faction id (#{fac})")
+    end
+
     # Create unit
     case(unit[0])
     when SYMBOL_TOWN then
@@ -93,11 +90,6 @@ class Map
     all_tiles.each { |tt| tt.draw}     # TODO combine with draw_units() ?
   end
 
-  # Draw all map units
-  def draw_units
-    all_map_units.each { |uu| uu.draw} # TODO do not draw transported units? only draw them on selection (with their tile)?
-  end
-
   # Getter for tile in given coordinates
   def tile(cc, rr)
     @tiles[rr][cc]
@@ -118,12 +110,12 @@ class Map
 
   # Getter for unit in given coordinates
   def get_unit(cc, rr)
-    @units[rr][cc]
+    @tiles[rr][cc].unit
   end
 
-  # Setter for tile type in given coordinates
+  # Setter for unit in given coordinates
   def set_unit(cc, rr, uu)
-    @units[rr][cc] = uu
+    @tiles[rr][cc].unit = uu
   end
 
   # Return both map units and transported units
@@ -137,8 +129,8 @@ class Map
     ii = 0
     0.upto(MAPX) { |rr|
       0.upto(MAPX) { |cc|
-        if @units[rr][cc]
-          ret[ii] = @units[rr][cc]
+        if get_unit(cc, rr)
+          ret[ii] = get_unit(cc, rr)
           ii += 1
         end
       }

data/lib/tile.rb

@@ -5,9 +5,8 @@ SYMBOL_SEA = '.'
 SYMBOL_GROUND = '#'
 
 class Tile
-  attr_accessor :terrain, :infopane
+  attr_accessor :terrain, :infopane, :unit
 
-  # Fill tile map and prepare 
   def initialize(x, y, loaded_symbol, infopane)
     dir_path = File.dirname(__FILE__)
 
@@ -29,5 +28,9 @@ class Tile
 
   def draw
     @image.draw(@x * TILESIZE, (@y + 1) * TILESIZE, ZTILE)
+
+    if @unit
+      @unit.draw
+    end
   end
 end

data/lib/unit.rb

@@ -22,8 +22,6 @@ class Unit
     @cargo_max = 0
     @function = UnitFunction.new(FUNCNONE)
 
-
-
     # Store yourself
     coords_unit = @map.get_unit(@x, @y)
     if !coords_unit
@@ -33,7 +31,7 @@ class Unit
     end
   end
 
-  # Add <value> to the other faction
+  # Add <value> to the other faction and remove links to given unit
   def destroy
     @infopane.add_score(3 - @faction - 1, @value) # TODO more factions?
     # TODO is this deleted enough?
@@ -51,57 +49,9 @@ class Unit
     end
   end
 
-  def update(key)
-    old_x = @x
-    old_y = @y
-
-    case key
-    # Cardinal directions
-    when Gosu::KbLeft, Gosu::KbA then
-      @x -= 1 unless @x <= 0
-    when Gosu::KbRight, Gosu::KbD then
-      @x += 1 unless @x >= MAPX
-    when Gosu::KbUp, Gosu::KbW then
-      @y -= 1 unless @y <= 0
-    when Gosu::KbDown, Gosu::KbX then
-      @y += 1 unless @y >= MAPY
-
-    # Intercardinal directions
-    when Gosu::KbQ then
-      unless @x <= 0 || @y <= 0
-        @x -= 1
-        @y -= 1
-      end
-    when Gosu::KbE then
-      unless @x >= MAPX || @y <= 0
-        @x += 1
-        @y -= 1
-      end
-    when Gosu::KbZ then
-      unless @x <= 0 || @y >= MAPY
-        @x -= 1
-        @y += 1
-      end
-    when Gosu::KbC then
-      unless @x >= MAPX || @y >= MAPY
-        @x += 1
-        @y += 1
-      end
-
-    # Functions
-    when Gosu::KbS then
-      set_function(FUNCSENTRY)
-    when Gosu::KbB then
-      set_function(FUNCBUILD)
-    end
-
-    check_movement(old_x, old_y)
-  end
-
-
   # Processes move of unit and takes care of its (un)loading or attack
   def check_movement(old_x, old_y)
-    if @x != old_x || @y != old_y
+    if @x != old_x || @y != old_y # only if it moved
       if @moves_left <= 0
         abort("unit.check_movement(): Moving unit does not have enough move points (#{@moves_left} moves)")
       end
@@ -133,6 +83,7 @@ class Unit
         else  # if you are going to be transported
           newcoords_unit.cargo.insert(-1, self) # -1 = to the end
           puts PROMPT + to_s + ' got loaded into '+ newcoords_unit.to_s
+          @moves_left = 1 unless newcoords_unit.can_build? # use all your left moves unless you are getting loaded into a town
         end
 
       else # if there already is somebody that can't transport you (enemy or full friend)
@@ -144,7 +95,7 @@ class 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_full?; has to be full then
+            else # newcoords_unit.can_transport?; has to be full then
               puts PROMPT + newcoords_unit.to_s + ' is already full'
             end
           else
@@ -268,7 +219,7 @@ class Unit
   def info
     ret = to_s + ": armor #{@armor_left}/#{@armor_max}"
      
-    if can_move?
+    if @moves_max > 0
       ret = ret + ", moves #{@moves_left}/#{@moves_max}"
     end
 

data/lib/unitFunction.rb

@@ -11,7 +11,7 @@ class UnitFunction
     ret = " didn't actually do anything (ERROR)"
 
     unit = map.get_unit(xx, yy)
-    if unit == nil
+    if !unit
       abort("unitFunction.func!(): Functioning unit not found at given coordinates (#{xx}-#{yy})")
     end
 

metadata

@@ -1,49 +1,44 @@
 --- !ruby/object:Gem::Specification
 name: empi
 version: !ruby/object:Gem::Version
-  version: '0.17'
-  prerelease: 
+  version: '0.18'
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2019-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: ! 'Empi: Ruby Edition is a turn based wargame, currently deep in development.
+description: 'Empi: Ruby Edition is a turn based wargame, currently deep in development.
   While learning Ruby I have found there are hardly any strategic games avaiable.
   So this should be Ruby version of Classic Empire, wargame from old times.'
 email: rasunadon@seznam.cz
@@ -51,50 +46,51 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/army.rb
+- lib/cursor.rb
 - lib/docu/Empi v14.png
+- lib/docu/Empi v18 - printouts.png
+- lib/docu/Empi v18.png
 - lib/docu/info.txt
-- lib/media/town.png
-- lib/media/ship.png
+- lib/empi.rb
+- lib/infopane.rb
+- lib/map.rb
 - lib/media/army.png
 - lib/media/cursor.png
-- lib/media/sea.png
 - lib/media/ground.png
-- lib/save/m02.esf
+- lib/media/sea.png
+- lib/media/ship.png
+- lib/media/town.png
 - lib/save/m01.esf
+- lib/save/m02.esf
 - lib/save/m03.esf
 - lib/ship.rb
 - lib/tile.rb
+- lib/town.rb
 - lib/unit.rb
 - lib/unitFunction.rb
-- lib/town.rb
-- lib/map.rb
-- lib/army.rb
-- lib/cursor.rb
-- lib/infopane.rb
-- lib/empi.rb
 homepage: http://www.bay12forums.com/smf/index.php?topic=157538
 licenses:
-- CC-BY-SA 3.0
+- CC-BY-SA-3.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.7.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Turn-based wargame
 test_files: []