minesweeprb 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 16bc74524f23df3a1ab558f120560e152b2a1c7551379a6237eefac7cf48962b
-  data.tar.gz: f879f2d59af8c486aa34114fcc77995a7a1951edeac59026d9c54ecbdeda09af
+  metadata.gz: d8570b88e453c2b2831d7b4d155ece9b35191aa989b38c3df409cde3258af522
+  data.tar.gz: b4d5c63637d268285cc2a0a08d9b3011b9ceed0aaeabfb36fb63004b90938f82
 SHA512:
-  metadata.gz: 73cfcc1a3d6e6099f122eb340b567d7517d1853b7654d93ef00df9da1c08ba5ace35a36dbf54d8ec49651c9e5a97f3d09d7cec0255d9f910892aad26589400ec
-  data.tar.gz: aae8f678ed0182f6d76cee2df5491c007a57b91ba1f45625e593a5ffc02d2b1e0d4eb96ea859f5d2b1107d78c1bbbbfe6f2cd4afffecd87a7f8e30cf539fb2ec
+  metadata.gz: 0250dbc2b118b525aad974cf1ab17001cff0484abdf4b2c49961d02e7f040a5f9dfdcb687473e3514f030899369ef650d61011cd68b9bf17c0ca0c36afa9ef7b
+  data.tar.gz: ecdb3eacfb7288c3f8383ac6936d782947c7c1fb06fcc57c80dba1e9b404508ff51526bebec7a793beee00e6d2e55e469354d3cae95cfebf5afce23c7727f990

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2020-02-08 0.3.0
+
+* Add mouse support
+
 ### 2020-02-08 0.2.0
 
 * Use curses for gameboard to reduce flickering

data/lib/minesweeprb/game.rb

@@ -50,8 +50,8 @@ module Minesweeprb
       },
     ].freeze
 
-    attr_reader :active_square,
-      :flagged_squares,
+    attr_accessor :active_square
+    attr_reader :flagged_squares,
       :marked_squares,
       :mined_squares,
       :revealed_squares,
@@ -165,10 +165,10 @@ module Minesweeprb
             SPRITES[:mine]
           elsif flagged_squares.include?(pos)
             SPRITES[:flag]
-          elsif marked_squares.include?(pos)
-            SPRITES[:mark]
           elsif revealed_squares[pos]
             SPRITES[:clues][revealed_squares[pos]]
+          elsif marked_squares.include?(pos)
+            SPRITES[:mark]
           else
             SPRITES[:square]
           end
@@ -222,6 +222,7 @@ module Minesweeprb
     end
 
     def reveal_square(square)
+      return if over? || flagged_squares.include?(active_square)
       start_game if revealed_squares.empty?
       return if revealed_squares.keys.include?(square)
       return lose! if mined_squares.include?(square)

data/lib/minesweeprb/gameboard.rb

@@ -6,16 +6,18 @@ require_relative './game'
 
 module Minesweeprb
   class Gameboard
+    include Curses
+
     RESTART = ['r'].freeze
-    REVEAL = [10, Curses::KEY_ENTER].freeze
+    REVEAL = [10, KEY_ENTER].freeze
     FLAG = ['f', ' '].freeze
     QUIT = ['q', 27].freeze
 
     MOVE = {
-      Curses::KEY_UP => :up,
-      Curses::KEY_DOWN => :down,
-      Curses::KEY_LEFT => :left,
-      Curses::KEY_RIGHT => :right,
+      KEY_UP => :up,
+      KEY_DOWN => :down,
+      KEY_LEFT => :left,
+      KEY_RIGHT => :right,
       'k' => :up,
       'j' => :down,
       'h' => :left,
@@ -23,38 +25,38 @@ module Minesweeprb
     }.freeze
 
     COLORS = {
-      win: [Curses::A_BOLD | Curses::COLOR_GREEN],
-      lose: [Curses::A_BOLD | Curses::COLOR_MAGENTA],
-      Game::SPRITES[:clock] => [Curses::A_BOLD | Curses::COLOR_CYAN],
-      Game::SPRITES[:win_face] => [Curses::A_BOLD | Curses::COLOR_YELLOW],
-      Game::SPRITES[:lose_face] => [Curses::A_BOLD | Curses::COLOR_RED],
-      Game::SPRITES[:play_face] => [Curses::A_BOLD | Curses::COLOR_CYAN],
-
-      Game::SPRITES[:mine] => [Curses::A_BOLD | Curses::COLOR_RED],
-      Game::SPRITES[:flag] => [Curses::A_BOLD | Curses::COLOR_RED],
-      Game::SPRITES[:mark] => [Curses::A_BOLD | Curses::COLOR_MAGENTA],
-      Game::SPRITES[:clues][0] => [Curses::COLOR_BLACK],
-      Game::SPRITES[:clues][1] => [Curses::COLOR_BLUE],
-      Game::SPRITES[:clues][2] => [Curses::COLOR_GREEN],
-      Game::SPRITES[:clues][3] => [Curses::COLOR_MAGENTA],
-      Game::SPRITES[:clues][4] => [Curses::COLOR_CYAN],
-      Game::SPRITES[:clues][5] => [Curses::COLOR_RED],
-      Game::SPRITES[:clues][6] => [Curses::COLOR_YELLOW],
-      Game::SPRITES[:clues][7] => [Curses::A_BOLD | Curses::COLOR_MAGENTA],
-      Game::SPRITES[:clues][8] => [Curses::A_BOLD | Curses::COLOR_RED],
+      win: [A_BOLD | COLOR_GREEN],
+      lose: [A_BOLD | COLOR_MAGENTA],
+      Game::SPRITES[:clock] => [A_BOLD | COLOR_CYAN],
+      Game::SPRITES[:win_face] => [A_BOLD | COLOR_YELLOW],
+      Game::SPRITES[:lose_face] => [A_BOLD | COLOR_RED],
+      Game::SPRITES[:play_face] => [A_BOLD | COLOR_CYAN],
+
+      Game::SPRITES[:mine] => [A_BOLD | COLOR_RED],
+      Game::SPRITES[:flag] => [A_BOLD | COLOR_RED],
+      Game::SPRITES[:mark] => [A_BOLD | COLOR_MAGENTA],
+      Game::SPRITES[:clues][0] => [COLOR_BLACK],
+      Game::SPRITES[:clues][1] => [COLOR_BLUE],
+      Game::SPRITES[:clues][2] => [COLOR_GREEN],
+      Game::SPRITES[:clues][3] => [COLOR_MAGENTA],
+      Game::SPRITES[:clues][4] => [COLOR_CYAN],
+      Game::SPRITES[:clues][5] => [COLOR_RED],
+      Game::SPRITES[:clues][6] => [COLOR_YELLOW],
+      Game::SPRITES[:clues][7] => [A_BOLD | COLOR_MAGENTA],
+      Game::SPRITES[:clues][8] => [A_BOLD | COLOR_RED],
     }.freeze
 
     COLOR_PAIRS = COLORS.keys.freeze
 
-    attr_reader :game, :pastel, :window
+    attr_reader :game, :pastel, :window, :game_x, :game_y
 
     def initialize(size)
       @pastel = Pastel.new
       @game = Game.new(size)
       @timers = Timers::Group.new
       @game_timer = @timers.every(0.5) { paint }
-      Thread.new { loop { @timers.wait } }
       setup_curses
+      Thread.new { loop { @timers.wait } }
     end
 
     def draw
@@ -63,28 +65,30 @@ module Minesweeprb
     end
 
     def clear
-      Curses.close_screen
+      close_screen
     end
 
     private 
 
     def setup_curses
-      Curses.init_screen
-      Curses.use_default_colors
-      Curses.start_color
-      Curses.curs_set(0)
-      Curses.noecho
-      Curses.ESCDELAY = 1;
-      @window = Curses::Window.new(0, 0, 0, 0)
+      init_screen
+      use_default_colors
+      start_color
+      curs_set(0)
+      noecho
+      self.ESCDELAY = 1;
+      mousemask(BUTTON1_CLICKED|BUTTON2_CLICKED|BUTTON3_CLICKED|BUTTON4_CLICKED)
+      @window = Window.new(0, 0, 0, 0)
       @window.keypad(true)
       COLOR_PAIRS.each.with_index do |char, index|
         fg, bg = COLORS[char]
-        Curses.init_pair(index + 1, fg, bg || -1)
+        init_pair(index + 1, fg, bg || -1)
       end
     end
 
     def process_input(key)
       case key
+      when KEY_MOUSE then process_mouse(getmouse)
       when *MOVE.keys then game.move(MOVE[key])
       when *REVEAL then game.reveal_active_square
       when *FLAG then game.cycle_flag
@@ -95,6 +99,25 @@ module Minesweeprb
       true
     end
 
+    def process_mouse(m)
+      top = game_y
+      left = game_x
+      bottom = game_y + game.height
+      right = game_x + game.width * 2 - 1
+      on_board = (top..bottom).include?(m.y) &&
+        (left..right).include?(m.x) &&
+        (m.x - game_x).even?
+
+      return if !on_board && !game.over?
+
+      game.active_square = [(m.x - game_x) / 2, m.y - game_y]
+
+      case m.bstate
+        when BUTTON1_CLICKED then game.reveal_active_square
+        when BUTTON2_CLICKED, (BUTTON_CTRL | BUTTON1_CLICKED) then game.cycle_flag
+      end
+    end
+
     def how_to_play
       instructions = []
       instructions << '(←↓↑→ or hjkl)Move' unless game.over?
@@ -111,27 +134,28 @@ module Minesweeprb
       game.header.center(window.maxx - 1).chars.each do |char|
         window.attron(color_for(char)) { window << char }
       end
-      Curses.clrtoeol
+      clrtoeol
       window << "\n"
 
       # COLOR_PAIRS.each do |char|
       #   window.attron(color_for(char)) { window << char }
       # end
-      # Curses.clrtoeol
+      # clrtoeol
       # window << "\n"
 
       padding = (window.maxx - game.width * 2) / 2
       game.squares.each.with_index do |line, row|
         window << ' ' * padding
+        @game_x, @game_y = window.curx, window.cury if row.zero?
         line.each.with_index do |char, col|
           if game.active_square == [col, row]
-            window.attron(color_for(char) | Curses::A_REVERSE) { window << char }
+            window.attron(color_for(char) | A_REVERSE) { window << char }
           else
             window.attron(color_for(char)) { window << char }
           end
           window << ' ' if col < line.length
         end
-        Curses.clrtoeol
+        clrtoeol
         window << "\n"
       end
 
@@ -148,13 +172,13 @@ module Minesweeprb
             window.attron(char_color) { window << char }
           end
         end
-        Curses.clrtoeol
+        clrtoeol
         window << "\n"
       end
 
       window << "\n"
       window << how_to_play.center(window.maxx - 1)
-      Curses.clrtoeol
+      clrtoeol
       window << "\n"
 
       window.refresh
@@ -164,7 +188,7 @@ module Minesweeprb
       pair = COLOR_PAIRS.index(char)
 
       if pair
-        Curses.color_pair(pair + 1)
+        color_pair(pair + 1)
       else
         0
       end

data/lib/minesweeprb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Minesweeprb
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minesweeprb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - scudco
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timers