empi 0.22.3 → 0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ad13787b5a8797ab609b5b7a907cf5c496eaeb1e6dd6f6cca7d639eeb8ea806
-  data.tar.gz: 260e7ffb1be2609e55edef0e37fe1d74409a107f15b269472154514ada633f36
+  metadata.gz: d7a7e44ce8aebd925aac9b87c2344c2ddfb75dc7e12b2d2d61d584c6c4ca2477
+  data.tar.gz: edc23d080b7c85249fd869b4571c6c42eff315a2a5ddee93720b5f7c9aa09004
 SHA512:
-  metadata.gz: 138cf192068da984a0a415346d9210ef81e20c968bf86f4c0a37dd71201ec233eb224e1aa400a5199143badbf649e2c45a1dd7fafa33aecc2afcbc8e58a27a19
-  data.tar.gz: 971e0ec6b97089ede1598648cb114cecdcd88a6fceb49a90fd9da162539afc50896569ae08bc394676dda6c5a833db6dedab9216173d4ed6100dc3759daeec00
+  metadata.gz: 22293eedf9f530feafdc018936a37399c2c4ac975c65e00f4b32ffa4c27a79e912d1e2c5e3d0189d464b348b8f0aebc9b5c2955f7b616daadd813afc9f6e5a11
+  data.tar.gz: 4701285d5bb8aa354afd9d766e4b2012489822aaa0e3c59cc3c6b9ae6f9cb3a7c61ab521d142e425bfb582c6fa2c6ef86dc10a5fdb1a785a03ecf2de4a97c4f9

data/lib/empi.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'gosu'
 
 require_relative './lib/game_states/game_state'
-require_relative './lib/game_states/play_state'
+require_relative './lib/game_states/welcome_state'
 
 TILESIZE = 50
 MAPX = 10
@@ -19,11 +19,11 @@ class GameWindow < Gosu::Window
                  height = (MAPY + 2) * TILESIZE, \
                  fullscreen = false)
     super
-    self.caption = 'Empi: Ruby Edition 0.22 dev'
+    self.caption = 'Empi: Ruby Edition 0.23'
 
     # Activate first state
     $window = self
-    GameState.switch!(PlayState.instance)
+    GameState.switch!(WelcomeState.instance)
   end
 
   # Catch the released button

data/lib/lib/game_states/build_state.rb

@@ -52,7 +52,7 @@ class BuildState < GameState
   # 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)
+    @unit.set_function!(FUNCNONE, @unit.faction)
     GameState.switch!(PlayState.instance)
   end
 

data/lib/lib/game_states/play_state.rb

@@ -1,7 +1,7 @@
 require 'singleton'
 
 require_relative './game_state'
-require_relative './escape_state'
+require_relative './welcome_state'
 
 require_relative './../user_interface/cursor'
 require_relative './../user_interface/infopane'
@@ -26,15 +26,24 @@ FUNCBUILD = 'build'
 class PlayState < GameState
   include Singleton
 
+  attr_reader :map
+  attr_writer :desired_new_map
+
   # Load new scenario or resume game
   def after_start
-    unless @infopane and @map and @cursor # is everything set up yet?
-      @infopane = Infopane.new
-      @map = Map.new(@infopane)
-      @cursor = Cursor.new(0, 0, @map, @infopane)
-      help # show help after loading of map
-      new_turn
+    if @desired_new_map
+      load_new_map!
+      help # show help after each loading of a new map
+      @desired_new_map = nil
+
+      next_faction_turn! # so FAC1 will be the first active faction, with announcement
     else
+      # Make sure everything is set up
+      unless @infopane and @map and @cursor
+        abort("PlayState.after_start(): Map parts are not properly loaded
+          (#{@infopane}, #{@map}, #{@cursor})")
+      end
+
       @cursor.info_stopped = false
 
       # Remind player the current status
@@ -56,9 +65,9 @@ class PlayState < GameState
   def update(button)
     case(button)
     when Gosu::KbEscape then
-      GameState.switch!(EscapeState.instance)
+      GameState.switch!(WelcomeState.instance)
     when Gosu::KbPeriod then
-      new_turn
+      next_faction_turn!
     when Gosu::KbH then
       help
     else
@@ -73,27 +82,53 @@ class PlayState < GameState
     @infopane.draw
   end
 
-  # End current turn and start the next one
-  def new_turn
-    puts "=============\n" \
-         "End of turn\n" \
-         "=============\n"
+  # Load the desired map
+  def load_new_map!
+    puts("=============\n" \
+         "=============\n" \
+         "Loading save: #{@desired_new_map}")
+    @infopane = Infopane.new
+    @map = Map.new(@desired_new_map, @infopane)
+    @cursor = Cursor.new(0, 0, @map, @infopane)
+  end
+
+  # End turn of the active faction
+  def next_faction_turn!
+    @infopane.next_faction!
+
+    # Have all factions played this turn so we are now back at the first one?
+    if @infopane.faction == 1
+      puts "=============\n" \
+           "End of turn\n" \
+           "=============\n"
+      @infopane.next_turn!
+    end
+
+    # Announce game state at the start of turn of the next faction
+    # TODO add change-of-active-faction screen
+    puts "-----------\n" + @infopane.turnscore
 
-    functionable_units = @map.all_units.select { |uu| uu.function != FUNCNONE}
-    functionable_units.each { |uu| uu.function! }
+    # Activate functions and reset moves for units of the next faction
+    functionable_faction_units = @map.all_units.select { |uu|
+      uu.faction == @infopane.faction and
+      uu.function != FUNCNONE
+    }
+    functionable_faction_units.each { |uu| uu.function! }
 
-    @map.all_units.each { |uu| uu.reset_moves!}
-    @infopane.next_turn
+    all_faction_units = @map.all_units.select { |uu|
+      uu.faction == @infopane.faction
+    }
+    all_faction_units.each { |uu| uu.reset_moves!}
 
-    @cursor.freeroam = true
-    @cursor.switch_freeroam! # so freeroam = false, with messages
+    # Lock the cursor to the first waiting unit
+    @cursor.reset!
   end
 
   # Printout the controls
   def help
     puts "-----------\n" \
-         "h: help, Esc: end game, Enter: info, j: switch freeroam\n" \
-         "QWEADZXC or arrow keys: movement, .: end turn\n" \
+         "h: help, Esc: menu, Enter: info, j: switch freeroam\n" \
+         "QWEADZXC or arrow keys: movement, .: end your turn\n" \
          "functions: s sentry, b build, n none\n" \
          "-----------\n"
   end

data/lib/lib/game_states/{escape_state.rb → quit_state.rb}

@@ -1,10 +1,10 @@
 require 'singleton'
 
 require_relative './game_state'
-require_relative './play_state'
+require_relative './welcome_state'
 
 # Game state of closing the game window
-class EscapeState < GameState
+class QuitState < GameState
   include Singleton
 
   # What to do just after state gets activated
@@ -13,7 +13,6 @@ class EscapeState < GameState
 
   # What to do just before state gets deactivated
   #def before_end
-  #  TODO hide question?
   #end
 
   # Process given button to cursor
@@ -22,7 +21,7 @@ class EscapeState < GameState
     when Gosu::KbY then
       $window.close
     when Gosu::KbN, Gosu::KbEscape then
-      GameState.switch!(PlayState.instance) # TODO return to state that called you
+      GameState.switch!(WelcomeState.instance)
     end
   end
 

data/lib/lib/game_states/welcome_state.rb

@@ -0,0 +1,64 @@
+require 'singleton'
+
+require_relative './game_state'
+require_relative './play_state'
+require_relative './quit_state'
+
+# Game state of closing the game window
+class WelcomeState < GameState
+  include Singleton
+
+  # What to do just after state gets activated
+  #def after_start
+  #end
+
+  # What to do just before state gets deactivated
+  #def before_end
+  #end
+
+  # Process given button to cursor
+  def update(button)
+    case(button)
+    when Gosu::Kb0, Gosu::KbQ then
+      GameState.switch!(QuitState.instance)
+    when Gosu::KbEscape then
+      if PlayState.instance.map
+        GameState.switch!(PlayState.instance)
+      end
+    when Gosu::Kb1, Gosu::Kb2, Gosu::Kb3 then
+      PlayState.instance.desired_new_map = {
+         Gosu::Kb1 => 'm01',
+         Gosu::Kb2 => 'm02',
+         Gosu::Kb3 => 'm03'
+      }[button]
+      GameState.switch!(PlayState.instance)
+    end
+  end
+
+  def draw
+    header_text = '
+        /--  ///  /-/  -/-
+        /--  |||  /-/   |
+        /--  |||  |    -/-'
+
+    if PlayState.instance.map # some map is loaded
+      space_text = "\n\n\n"
+      options_text = "
+        Esc – Resume"
+    else
+      space_text = "\n\n\n\n"
+      options_text = ""
+    end
+
+    options_text += "
+        1 – Start New: Map 01
+        2 – Start New: Map 02
+        3 – Start New: Map 03\n
+        0, Q – Quit"
+
+    menu = Gosu::Image.from_text(
+      header_text + space_text + options_text, 20)
+
+    menu.draw((3*TILESIZE) + XTEXT, (2*TILESIZE) + YTEXT, ZTEXT)
+  end
+end

data/lib/lib/units/town.rb

@@ -26,7 +26,7 @@ class Town < Unit
     @parts_built = 0
     @parts_needed = 0
 
-    set_function!(FUNCBUILD) unless @faction == 0
+    set_function!(FUNCBUILD, @faction) unless @faction == 0
   end
 
   def can_build?
@@ -51,14 +51,14 @@ class Town < Unit
     @project = nil
     @parts_built = 0
 
-    set_function!(FUNCBUILD)
+    set_function!(FUNCBUILD, @faction)
   end
 
   # Set desired function and possibly also project
-  def set_function!(func)
+  def set_function!(func, commanding_faction)
     super
 
-    if @faction != 0 and func == FUNCBUILD # neutral towns don't need projects
+    if @faction != 0 and commanding_faction == @faction and func == FUNCBUILD
       # Set starting project once or ask player about next project
       if @starting_project
          set_project!(@starting_project)

data/lib/lib/units/unit.rb

@@ -6,6 +6,7 @@ class Unit
     attr_reader :name, :map_symbol, :price, :value
   end
 
+  attr_reader :armor_left
   attr_accessor :x, :y, :faction, :function, :cargo, :cargo_max
 
   def initialize(x, y, faction, map, infopane)
@@ -78,6 +79,8 @@ class Unit
 
   # Add <value> to the other faction and remove links to given unit
   def destroy!
+    @armor_left = 0 # for non-attack damage
+
     # If you are transporting somebody, destroy them first
     @cargo.each { |uu| uu.destroy! }
 
@@ -160,12 +163,17 @@ class Unit
     end
   end
 
-
   def draw
     @image.draw(@x * TILESIZE, (@y + 1) * TILESIZE, ZUNIT,
                 scale_x = 1, scale_y = 1, color = COLOUR[@faction])
   end
 
+  def is_waiting_for_commands?
+    @faction == @infopane.faction and
+    function == FUNCNONE and
+    can_move?
+  end
+
   def can_move?
     (can_fly? || can_sail? || can_ride?) && @moves_left > 0
   end
@@ -232,22 +240,31 @@ class Unit
   end
 
   # Set desired function
-  def set_function!(func)
+  def set_function!(func, commanding_faction)
+    # Check your neutrality
     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
+      puts PROMPT + to_s + ": neutral units can't have functions set"
+      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
-        @function.func = func
-        puts PROMPT + to_s + ": function set to #{@function.func}"
-      end
+    # Check origin of command
+    if commanding_faction != @faction
+      puts PROMPT + to_s + ": this unit does not take commands from other factions"
+      return
+    end
+
+    # Check your abilities
+    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
+      @function.func = func
+      puts PROMPT + to_s + ": function set to #{@function.func}"
     end
   end
 

data/lib/lib/user_interface/cursor.rb

@@ -1,5 +1,5 @@
 class Cursor
-  attr_accessor :x, :y, :freeroam, :info_stopped, :unit
+  attr_accessor :freeroam, :info_stopped
 
   def initialize(x, y, map, infopane)
     dir_path = File.dirname(__FILE__)
@@ -12,6 +12,12 @@ class Cursor
     @image = Gosu::Image.new(dir_path + '/../../media/cursor.png')
     @freeroam = false
     @info_stopped = false
+
+    # Give to Infopane link to yourself (for freeroam marker)
+    if !@infopane
+      abort("Cursor.initialize!(): Infopane is not set")
+    end
+    @infopane.cursor = self
   end
 
   def update(button)
@@ -41,7 +47,7 @@ class Cursor
       set_function_to_unit(FUNCSENTRY)
     when Gosu::KbB then
       set_function_to_unit(FUNCBUILD)
-     when Gosu::KbN then
+    when Gosu::KbN then
       set_function_to_unit(FUNCNONE)
 
     # The rest
@@ -52,18 +58,18 @@ class Cursor
     end
 
     # If in locked mode, stay at current/jump to next movable unit
-    to_next_unit! unless freeroam
+    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
+  # Move to coordinates of unit the cursor is locked to
+  def warp_to_locked!()
+    @x = @locked_to.x
+    @y = @locked_to.y
+    @local_unit = @locked_to
   end
 
   # Move by given change of coordinates
@@ -71,94 +77,104 @@ class Cursor
     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})")
+      @local_unit = @map.get_unit(@x, @y)
+    else
+      check_unit
+
+      # Move the unit first
+      @locked_to.x += xx
+      @locked_to.y += yy
+      @locked_to.check_movement(@x, @y) # cursor coordinates work like old_x, old_y
+
+      # Is the unit still alive?
+      if @locked_to.armor_left > 0
+        warp_to_locked! # whether it moved or not
+      else
+        # It got destroyed so clear last links then so that (object of)
+        # given unit can be truly destroyed
+        @local_unit = nil
+        @locked_to = nil
+      end
     end
+  end
 
-    @unit.x += xx
-    @unit.y += yy
-    @unit.check_movement(@x, @y) # cursor coordinates work like old_x, old_y
+  # Tries to set function <func> to local unit
+  def set_function_to_unit(func)
+    check_unit
 
-    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
+    if @local_unit
+      @local_unit.set_function!(func, @infopane.faction)
+    else
+      puts "no unit to set that function to (at #{@x}-#{@y})"
     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
+  # Reset to locked mode
+  def reset!
+    @freeroam = true
+    switch_freeroam!
+    @local_unit = nil
+    @locked_to = nil
+    to_next_unit!
   end
 
-  # Find next unit to target with cursor
+  # Find next unit which is still waiting for commands and lock to it
+  # (local -> last locked to -> next waiting) or switch (back) to freeroaming
   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'
+    if @local_unit and @local_unit.is_waiting_for_commands?
+      # Lock to such unit (though it may have already been locked)
+      @locked_to = @local_unit
+    else
+      unless @locked_to and @locked_to.is_waiting_for_commands?
+        waiting = @map.all_units.select { |uu| uu.is_waiting_for_commands? }
+
+        # Are there still some units of active faction waiting for commands?
+        if waiting.size <= 0 # == would be enough
+          puts 'all movable units without functions moved'
+          switch_freeroam!
+          return
+        end
 
-        switch_freeroam!
-        return
+        @locked_to = waiting[0] # newly selected one
       end
-
-      @unit = movable_units[0] # newly selected one
     end
 
-    warp_to!(@unit) # stay at old or go to new
+    warp_to_locked! # stay at old or go to new
     info unless @info_stopped # due to switching out of the play game state
   end
 
+  # When cursor is in locked mode there needs to be a local unit it is locked to
+  # When cursor is in freeroam mode the local unit should still be loaded
+  def check_unit
+    if !@freeroam and !@local_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
+  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
+    check_unit
 
-    if uu
-      @infopane.text = uu.info
-      puts uu.info
+    unless !@local_unit
+      @infopane.text = @local_unit.info
+      puts @local_unit.info
 
-      if uu.is_transporting?
-        uu.cargo.each { |uu| puts '- cargo: ' + uu.info }
+      if @local_unit.is_transporting?
+        @local_unit.cargo.each { |uu| puts '- cargo: ' + uu.info }
       end
     else
       @infopane.text = ''

data/lib/lib/user_interface/infopane.rb

@@ -2,12 +2,13 @@ LINE_HEIGHT = 20
 
 # Score, turn and event texts
 class Infopane
-  attr_writer :text, :act_fact
+  attr_reader :faction
+  attr_writer :cursor, :text
 
   def initialize
-    @score = [0, 0]
     @turn = 0
-    @act_fact = 0 # active faction
+    @faction = FACTIONS # so that FAC1 will be then the first active faction
+    @score = [0, 0]
     @text = 'ready'
   end
 
@@ -15,21 +16,31 @@ class Infopane
   end
 
   def draw
-    turnscore = Gosu::Image.from_text(
-      "Turn: #{@turn}, Score: #{@score[0]} - #{@score[1]}", LINE_HEIGHT)
-    turnscore.draw(XTEXT, YTEXT, ZTEXT)
+    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 next_faction
-    # TODO active faction switching
+  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
 
-  def next_turn
+  # Increment turn counter
+  def next_turn!
     @turn += 1
-    puts "Turn: #{@turn}, Score: #{@score[0]} - #{@score[1]}"
   end
 
   def add_score(to_whom, how_much)

data/lib/lib/user_interface/map.rb

@@ -7,7 +7,7 @@ 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
@@ -15,14 +15,17 @@ class Map
       [Army, Ship, Town].collect { |ii| [ii.map_symbol, ii] }
     ]
 
-    # TODO selectable starting scenario
-    load_map(dir_path + '/../../save/m02.esf')
+    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 = []
@@ -35,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
@@ -43,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 = []
 
@@ -58,7 +61,7 @@ class Map
   end
 
   # Load one unit from given row
-  def load_unit(row)
+  def load_unit!(row)
     unit = []
     coords = []
 
@@ -70,13 +73,13 @@ 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
@@ -84,7 +87,7 @@ class Map
     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})")
+      abort("map.load_unit!(): Unknown unit type symbol (#{unit_type})")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: empi
 version: !ruby/object:Gem::Version
-  version: 0.22.3
+  version: '0.23'
 platform: ruby
 authors:
 - Detros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-05 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
@@ -48,9 +48,10 @@ extra_rdoc_files: []
 files:
 - lib/empi.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/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