upwords 0.1.1 → 0.2.1

data/lib/upwords/version.rb

@@ -1,3 +1,3 @@
 module Upwords
-  VERSION = "0.1.1"
+  VERSION = "0.2.1"
 end

data/lib/upwords/word.rb

@@ -1,12 +1,10 @@
 module Upwords
   class Word
-    
-    # MIN_WORD_LENGTH = 2
-
     attr_reader :score, :length
 
     def initialize(posns, board) 
       posns = posns.uniq if posns.is_a?(Array)
+      
       @text = Word.make_string(board, posns)
       @score = Word.calc_score(board, posns)
       @length = @text.length
@@ -20,11 +18,14 @@ module Upwords
       dict.legal_word?(self.to_s)
     end
     
-    # A word's score is the sum of the tile heights of its letters
-    # However, if all of a word's tile heights are exactly 1, then the score is double the word's length
-    #          also add two points for each 'Qu' if all words are 1 tile high
-    # Add 20 points if a player uses all their letters to form a word (this logic is in the MoveManager class,
-    #          because it requires the player as an input
+    # Calculate the score of word on board
+    # NOTE: this method assumes that the word has already been played on the board
+    #
+    # A word's score is calculated as follows:
+    # - Sum tile heights of all positions in word
+    # - Multiple score by 2 if all positions in word are only 1 tile high
+    # - Add two points for all 'Qu' tiles in word, if all positions in word are only 1 tile high (somewhat strange rule but whatever)
+    # NOTE: players get a 20 point bonus for using all of their tiles in a move -> this logic is in a separate class
     def self.calc_score(board, posns)
       stack_heights = posns.map{|row, col| board.stack_height(row, col)}
 
@@ -46,5 +47,5 @@ module Upwords
       posns.map{|row, col| board.top_letter(row, col)}.join
     end
 
-    end
   end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: upwords
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Maxim Pertsov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-05 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -118,13 +118,13 @@ files:
 - lib/upwords/cursor.rb
 - lib/upwords/dictionary.rb
 - lib/upwords/game.rb
-- lib/upwords/graphics.rb
 - lib/upwords/letter_bank.rb
 - lib/upwords/letter_rack.rb
 - lib/upwords/move.rb
 - lib/upwords/move_manager.rb
 - lib/upwords/player.rb
 - lib/upwords/shape.rb
+- lib/upwords/ui.rb
 - lib/upwords/version.rb
 - lib/upwords/word.rb
 - upwords.gemspec

data/lib/upwords/graphics.rb

@@ -1,149 +0,0 @@
-# require 'colored'
-
-module Upwords
-  class Graphics < Curses::Window
-    
-    def initialize(game)
-      super(0,0,0,0)
-      @game = game
-      @board = @game.board
-      @cursor = @game.cursor 
-      @message = ''
-      @rack_visibility = false
-    end
-    
-    def refresh
-      clear
-      self << self.to_s
-      super
-    end
-    
-    def to_s
-      (draw_board + draw_message).zip(draw_stats).map do |board_row, stats_row|
-        (board_row.to_s) + (stats_row.to_s)
-      end.join("\n")
-    end
-
-    def message=(new_message)
-      if new_message.nil?
-        @message = ""
-      else
-        @message = new_message 
-      end
-    end
-
-    def show_rack
-      @rack_visibility = true
-    end
-
-    def hide_rack
-      @rack_visibility = false
-    end
-
-    def toggle_rack_visibility
-      @rack_visibility = !@rack_visibility
-    end
-
-    private
-    
-    def format_letter(row, col)
-      letter = @board.top_letter(row, col)
-      if letter.nil?
-        letter = "  "
-      # add blank space after all other letters except Qu
-      elsif letter != "Qu"
-        letter += " "
-      end
-      letter
-    end
-
-    def draw_player_name
-      "#{@game.current_player.name}'s turn"
-    end
-
-    def draw_score(player)
-      "#{player.name}'s Score: #{player.score}" 
-    end
-
-    def draw_last_turn(player)
-      "Last Move: #{player.last_turn}"
-    end
-
-    def draw_letter_rack
-      "Letters: #{@game.current_player.show_rack(!@rack_visibility)} "
-    end
-
-    def draw_space(row, col, cursor_posn)
-      cursor = cursor_posn == [row, col] ? "*" : " "
-      "#{cursor}#{format_letter(row, col)} "
-    end
-
-    def draw_row(row, cursor_posn)
-      ["|",
-       (0...@board.num_columns).map do |col|
-         draw_space(row, col, cursor_posn)
-       end.join("|"),
-       "|"].join
-    end
-
-    # This will also display the stack height for now
-    def draw_divider(row, col, show_height=true)
-      height = @board.stack_height(row, col)
-      if show_height && height > 0
-        height = height.to_s
-      else
-        height = "-"
-      end
-      "---#{height}"
-    end
-
-    def draw_row_divider(row, show_height=true)
-      ["+",
-       (0...@board.num_columns).map do |col|
-         draw_divider(row, col, show_height)
-       end.join("+"),
-       "+"].join
-    end
-    
-    # print grid of top letter on each stack and stack height
-    def draw_board
-      b = [draw_row_divider(0, false)]
-      
-      (0...@board.num_rows).each do |i|
-        b << draw_row(i, @cursor.posn)
-        b << draw_row_divider(i)
-      end
-
-      b.to_a
-    end
-    
-    def draw_message
-      ["", @message.to_s]
-    end
-
-    def draw_stats
-      ["--------------------",
-       draw_score(@game.players[0]),
-       "",
-       draw_letter_rack,
-       "--------------------",
-       "",
-       @game.player_count > 1 ?draw_score(@game.players[1]) : "",
-       "",         
-       @game.player_count > 2 ? draw_score(@game.players[2]) : "",
-       "",
-       @game.player_count > 3 ? draw_score(@game.players[3]) : "",
-       "",
-       "----------------------",
-       "|      Controls      |",
-       "----------------------",
-       "Show Letters   [SPACE]",
-       "Undo Last Move [DEL]",
-       "Submit Move    [ENTER]",
-       "Swap Letter    [+]",
-       "Skip Turn      [-]",
-       "Quit Game      [SHIFT+Q]"].map{|s| "   #{s}"} # Left padding
-    end
-
-  end
-end