empi 0.21 → 0.25

data/lib/lib/user_interface/tile.rb

@@ -0,0 +1,56 @@
+require_relative './../game_states/set_state'
+
+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) if SetState.instance.settings['axis_top'] # TODO 0 -> viewport.y
+    draw_axis_tick(@x, @y, MAPY) if SetState.instance.settings['axis_bottom']
+    draw_axis_tick(@y, @x, 0) if SetState.instance.settings['axis_left'] # TODO 0 -> viewport.x
+    draw_axis_tick(@y, @x, MAPX) if SetState.instance.settings['axis_right']
+  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.21'
+  version: '0.25'
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-13 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -38,22 +38,32 @@ 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/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/game_state.rb
+- lib/lib/game_states/play_state.rb
+- lib/lib/game_states/quit_state.rb
+- lib/lib/game_states/set_state.rb
+- lib/lib/game_states/welcome_state.rb
+- lib/lib/game_states/win_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/unit_function.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 +71,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
@@ -99,5 +103,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/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

data/lib/cursor.rb

@@ -1,167 +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
-  end
-
-  def update(button)
-    case button
-    # Cardinal directions
-    when Gosu::KbLeft, Gosu::KbA, Gosu::KB_NUMPAD_4 then
-      move!(-1, 0) unless @x <= 0
-    when Gosu::KbRight, Gosu::KbD, Gosu::KB_NUMPAD_6 then
-      move!(1, 0) unless @x >= MAPX
-    when Gosu::KbUp, Gosu::KbW, Gosu::KB_NUMPAD_8 then
-      move!(0, -1) unless @y <= 0
-    when Gosu::KbDown, Gosu::KbX, Gosu::KB_NUMPAD_2 then
-      move!(0, 1) unless @y >= MAPY
-
-    # Intercardinal directions
-    when Gosu::KbQ, Gosu::KB_NUMPAD_7 then
-      move!(-1, -1) unless @x <= 0 || @y <= 0
-    when Gosu::KbE, Gosu::KB_NUMPAD_9 then
-      move!(1, -1) unless @x >= MAPX || @y <= 0
-    when Gosu::KbZ, Gosu::KB_NUMPAD_1 then
-      move!(-1, 1) unless @x <= 0 || @y >= MAPY
-    when Gosu::KbC, Gosu::KB_NUMPAD_3 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)
-
-    # The rest
-    when Gosu::KbJ, Gosu::KB_NUMPAD_0 then
-      switch_freeroam!
-    when Gosu::KbReturn, Gosu::KB_NUMPAD_5 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

data/lib/infopane.rb

@@ -1,38 +0,0 @@
-LINE_HEIGHT = 20
-
-# Score, turn and event texts
-class Infopane
-  attr_writer :text, :act_fact
-
-  def initialize
-    @score = [0, 0]
-    @turn = 0
-    @act_fact = 0 # active faction
-    @text = 'ready'
-  end
-
-  def update
-  end
-
-  def draw
-    turnscore = Gosu::Image.from_text(
-      "Turn: #{@turn}, Score: #{@score[0]} - #{@score[1]}", LINE_HEIGHT)
-    turnscore.draw(XTEXT, YTEXT, ZTEXT)
-
-    text = Gosu::Image.from_text("#{@text}", LINE_HEIGHT)
-    text.draw(XTEXT, (TILESIZE / 2) + YTEXT, ZTEXT)
-  end
-
-  def next_faction
-    # TODO active faction switching
-  end
-
-  def next_turn
-    @turn += 1
-    puts "Turn: #{@turn}, Score: #{@score[0]} - #{@score[1]}"
-  end
-
-  def add_score(to_whom, how_much)
-    @score[to_whom] += how_much
-  end
-end

data/lib/map.rb

@@ -1,153 +0,0 @@
-require_relative './army'
-require_relative './ship'
-require_relative './tile'
-require_relative './town'
-
-class Map
-  attr_accessor :name, :mapx, :mapy, :infopane
-
-  def initialize(infopane)
-    dir_path = File.dirname(__FILE__)
-
-    @infopane = infopane
-    @known_unit_types = Hash[
-      [Army, Ship, Town].collect { |ii| [ii.map_symbol, ii] }
-    ]
-
-    # TODO selectable starting scenario
-    load_map(dir_path + '/save/m02.esf')
-  end
-
-  # Load map from file
-  def load_map(filename)
-    input = File.open(filename, 'r')
-    unit_count = load_head(input.gets)
-
-    # Load tiles
-    @tiles = []
-    0.upto(@mapy - 1) { |rr|
-      @tiles[rr] = []
-      map_row = input.gets
-      0.upto(@mapx - 1) { |cc|
-        @tiles[rr][cc] = Tile.new(cc, rr, map_row[cc], @infopane)
-      }
-    }
-
-    # Load units
-    unit_count.times { load_unit(input.gets) }
-
-    puts("Save loaded: #{@name} with #{unit_count} units")
-    input.close
-  end
-
-  # Load core info from given head row of file
-  # Return number of units to be loaded
-  def load_head(row)
-    head = []
-    size = []
-
-    head = row.split(' ')
-    size = head[1].split('x')
-
-    @name = head[0]
-    @mapx = size[0].to_i
-    @mapy = size[1].to_i
-
-    head[2].to_i # unit_count
-  end
-
-  # Load one unit from given row
-  def load_unit(row)
-    unit = []
-    coords = []
-
-    unit = row.split(' ')
-
-    # 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 ||
-        coords_y < 0 || coords_y >= @mapy)
-      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
-    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_type})")
-    end
-  end
-
-  # Draw all tiles
-  def draw_tiles
-    all_tiles.each { |tt| tt.draw}
-  end
-
-  # Getter for tile at given coordinates
-  def tile(cc, rr)
-    @tiles[rr][cc]
-  end
-
-  # Return all tiles
-  def all_tiles
-    ret = []
-    ii = 0
-    0.upto(MAPX) { |rr|
-      0.upto(MAPX) { |cc|
-        ret[ii] = @tiles[rr][cc]
-        ii += 1
-      }
-    }
-    ret
-  end
-
-  # Getter for unit at given coordinates
-  def get_unit(cc, rr)
-    @tiles[rr][cc].unit
-  end
-
-  # Setter for unit at given coordinates
-  def set_unit(cc, rr, uu)
-    @tiles[rr][cc].unit = uu
-  end
-
-  # Return both map units and transported units
-  def all_units
-    all_map_units + all_transported_units
-  end
-
-  # Return only units directly on map
-  def all_map_units
-    ret = []
-    ii = 0
-    0.upto(MAPX) { |rr|
-      0.upto(MAPX) { |cc|
-        if get_unit(cc, rr)
-          ret[ii] = get_unit(cc, rr)
-          ii += 1
-        end
-      }
-    }
-    ret
-  end
-
-  # Return only units transported by other units
-  def all_transported_units
-    ret = []
-    all_map_units.each { |uu|
-      if uu.is_transporting?
-        ret += uu.cargo
-      end
-    }
-    ret
-  end
-end