empi 0.19 → 0.24

data/lib/lib/user_interface/infopane.rb

@@ -0,0 +1,49 @@
+LINE_HEIGHT = 20
+
+# Score, turn and event texts
+class Infopane
+  attr_reader :faction
+  attr_writer :cursor, :text
+
+  def initialize
+    @turn = 0
+    @faction = FACTIONS # so that FAC1 will be then the first active faction
+    @score = [0, 0]
+    @text = 'ready'
+  end
+
+  def update
+  end
+
+  def draw
+    freeroam_text = ""
+    freeroam_text = " (freeroam)" if (@cursor and @cursor.freeroam)
+
+    state = Gosu::Image.from_text(turnscore + freeroam_text, LINE_HEIGHT)
+    state.draw(XTEXT, YTEXT, ZTEXT)
+
+    text = Gosu::Image.from_text("#{@text}", LINE_HEIGHT)
+    text.draw(XTEXT, (TILESIZE / 2) + YTEXT, ZTEXT)
+  end
+
+  def turnscore
+    "Turn: #{@turn}, " \
+    "Faction: FAC#{@faction}, " \
+    "Score: #{@score[0]} - #{@score[1]}"
+  end
+
+  # Increment faction counter (modulo count of factions)
+  def next_faction!
+    @faction += 1
+    @faction = 1 if @faction > FACTIONS # marks the end of turn
+  end
+
+  # Increment turn counter
+  def next_turn!
+    @turn += 1
+  end
+
+  def add_score(to_whom, how_much)
+    @score[to_whom] += how_much
+  end
+end

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

@@ -1,21 +1,31 @@
-SYMBOL_TOWN = 'T'
-SYMBOL_ARMY = 'A'
-SYMBOL_SHIP = 'S'
+require_relative './tile'
+
+require_relative './../units/army'
+require_relative './../units/ship'
+require_relative './../units/town'
 
 class Map
   attr_accessor :name, :mapx, :mapy, :infopane
 
-  def initialize(infopane)
+  def initialize(file, infopane)
     dir_path = File.dirname(__FILE__)
 
     @infopane = infopane
-    load_map(dir_path + '/save/m02.esf')
+    @known_unit_types = Hash[
+      [Army, Ship, Town].collect { |ii| [ii.map_symbol, ii] }
+    ]
+
+    load_map!(dir_path + "/../../save/#{file}.esf")
   end
 
   # Load map from file
-  def load_map(filename)
-    input = File.open(filename, 'r')
-    unit_count = load_head(input.gets)
+  def load_map!(file_path)
+    unless File.file?(file_path)
+      abort("Map.load_map!(): File not found (#{file_path})")
+    end
+
+    input = File.open(file_path, 'r')
+    unit_count = load_head!(input.gets)
 
     # Load tiles
     @tiles = []
@@ -28,7 +38,7 @@ class Map
     }
 
     # Load units
-    unit_count.times { load_unit(input.gets) }
+    unit_count.times { load_unit!(input.gets) }
 
     puts("Save loaded: #{@name} with #{unit_count} units")
     input.close
@@ -36,7 +46,7 @@ class Map
 
   # Load core info from given head row of file
   # Return number of units to be loaded
-  def load_head(row)
+  def load_head!(row)
     head = []
     size = []
 
@@ -51,7 +61,7 @@ class Map
   end
 
   # Load one unit from given row
-  def load_unit(row)
+  def load_unit!(row)
     unit = []
     coords = []
 
@@ -63,34 +73,30 @@ class Map
     coords_y = coords[1].to_i
     if (coords_x < 0 || coords_x >= @mapx ||
         coords_y < 0 || coords_y >= @mapy)
-      abort("map.load_unit(): Unit out of map borders (#{coords_x}-#{coords_y})")
+      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})")
+      abort("map.load_unit!(): Bad faction id (#{fac})")
     end
 
     # Create unit
-    case(unit[0])
-    when SYMBOL_TOWN then
-      Town.new(coords_x, coords_y, fac, self, @infopane)
-    when SYMBOL_ARMY then
-      Army.new(coords_x, coords_y, fac, self, @infopane)
-    when SYMBOL_SHIP then
-      Ship.new(coords_x, coords_y, fac, self, @infopane)
+    unit_type = unit[0]
+    if @known_unit_types.include?(unit_type)
+      @known_unit_types[unit_type].new(coords_x, coords_y, fac, self, @infopane)
     else
-      abort("map.load_unit(): Unknown unit type symbol (#{unit[0]})")
+      abort("map.load_unit!(): Unknown unit type symbol (#{unit_type})")
     end
   end
 
   # Draw all tiles
   def draw_tiles
-    all_tiles.each { |tt| tt.draw}     # TODO combine with draw_units() ?
+    all_tiles.each { |tt| tt.draw}
   end
 
-  # Getter for tile in given coordinates
+  # Getter for tile at given coordinates
   def tile(cc, rr)
     @tiles[rr][cc]
   end
@@ -108,12 +114,12 @@ class Map
     ret
   end
 
-  # Getter for unit in given coordinates
+  # Getter for unit at given coordinates
   def get_unit(cc, rr)
     @tiles[rr][cc].unit
   end
 
-  # Setter for unit in given coordinates
+  # Setter for unit at given coordinates
   def set_unit(cc, rr, uu)
     @tiles[rr][cc].unit = uu
   end

data/lib/lib/user_interface/tile.rb

@@ -0,0 +1,52 @@
+TILE_SEA = 0
+TILE_GROUND = 1
+
+SYMBOL_SEA = '.'
+SYMBOL_GROUND = '#'
+
+class Tile
+  attr_accessor :terrain, :infopane, :unit
+
+  def initialize(x, y, loaded_symbol, infopane)
+    dir_path = File.dirname(__FILE__)
+
+    @x = x
+    @y = y
+    @infopane = infopane
+
+    case(loaded_symbol)
+    when SYMBOL_SEA then
+      @terrain = TILE_SEA
+      @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')
+    else
+      abort("tile.initialize(): Unknown terrain symbol (#{loaded_symbol})")
+    end
+  end
+
+  def draw
+    # 1) terrain
+    @image.draw(@x * TILESIZE, (@y + 1) * TILESIZE, ZTILE)
+
+    # 2) unit
+    if @unit
+      @unit.draw
+    end
+
+    # 3) axes
+    draw_axis_tick(@x, @y, 0) # TODO 0 -> viewport.y
+    draw_axis_tick(@y, @x, 0) # TODO 0 -> viewport.x
+  end
+
+  # Draw one tick of axis for appropriate tiles
+  def draw_axis_tick(draw_coord, test_coord, test_against)
+    # TODO appropriatness can be changed (show axes: no/top/left/bottom/right)
+    if test_coord == test_against
+      tick = Gosu::Image.from_text(draw_coord, 20)
+      tick.draw(@x * TILESIZE, (@y + 1) * TILESIZE, ZTEXT)
+      # ^^ TODO substract test_against of viewport from @x and @y here?
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: empi
 version: !ruby/object:Gem::Version
-  version: '0.19'
+  version: '0.24'
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2020-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -38,21 +38,31 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-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.'
+description: |-
+  Empi: Ruby Edition is a turn-based wargame with hotseat
+    multiplayer, currently in alpha development state. The game is inspired by
+    Classic Empire, originally from 1977.
 email: rasunadon@seznam.cz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/army.rb
-- lib/cursor.rb
-- lib/docu/Empi v18.png
-- lib/docu/info.txt
 - lib/empi.rb
-- lib/infopane.rb
-- lib/map.rb
+- lib/lib/game_states/build_state.rb
+- lib/lib/game_states/game_state.rb
+- lib/lib/game_states/play_state.rb
+- lib/lib/game_states/quit_state.rb
+- lib/lib/game_states/welcome_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
 - lib/media/ground.png
@@ -63,15 +73,15 @@ files:
 - 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
-metadata: {}
+metadata:
+  source_code_uri: https://gitlab.com/rasunadon/empi
+  bug_tracker_uri: https://gitlab.com/rasunadon/empi/issues
+  documentation_uri: https://gitlab.com/rasunadon/empi/blob/master/README.md
+  changelog_uri: https://gitlab.com/rasunadon/empi/blob/master/CHANGELOG.md
+  homepage_uri: http://www.bay12forums.com/smf/index.php?topic=157538
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -91,5 +101,5 @@ rubyforge_project:
 rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Turn-based wargame
+summary: A turn-based wargame
 test_files: []

data/lib/cursor.rb

@@ -1,166 +0,0 @@
-class Cursor
-  attr_accessor :x, :y, :freeroam, :unit
-
-  def initialize(x, y, map, infopane)
-    dir_path = File.dirname(__FILE__)
-
-    @x = x
-    @y = y
-    @map = map
-    @infopane = infopane
-
-    @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
-      move!(-1, 0) unless @x <= 0
-    when Gosu::KbRight, Gosu::KbD then
-      move!(1, 0) unless @x >= MAPX
-    when Gosu::KbUp, Gosu::KbW then
-      move!(0, -1) unless @y <= 0
-    when Gosu::KbDown, Gosu::KbX then
-      move!(0, 1) unless @y >= MAPY
-
-    # Intercardinal directions
-    when Gosu::KbQ then
-      move!(-1, -1) unless @x <= 0 || @y <= 0
-    when Gosu::KbE then
-      move!(1, -1) unless @x >= MAPX || @y <= 0
-    when Gosu::KbZ then
-      move!(-1, 1) unless @x <= 0 || @y >= MAPY
-    when Gosu::KbC then
-      move!(1, 1) unless @x >= MAPX || @y >= MAPY
-
-    # Functions
-    when Gosu::KbS then
-      set_function_to_unit(FUNCSENTRY)
-    when Gosu::KbB then
-      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 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 # 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!
-    unless @unit && @unit.can_move? && @unit.function == FUNCNONE # unless the current one is still movable
-      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
-
-    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
-      @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
-  end
-
-  # Find some info about units on the current tile
-  def info
-    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
-
-      if uu.is_transporting?
-        uu.cargo.each { |uu| puts '- cargo: ' + uu.info }
-      end
-    else
-      @infopane.text = ''
-      puts 'nothing here'
-    end
-  end
-end