rubysketch-solitaire 0.1.0 → 0.1.2

data/lib/rubysketch/solitaire/klondike.rb

@@ -13,6 +13,25 @@ class Klondike < Scene
     super + [*cards, *places].map(&:sprite) + interfaces
   end
 
+  def difficulty()
+    @difficulty ||= :normal
+  end
+
+  def pause()
+    super
+    @prevTime = nil
+    stopTimer :save
+  end
+
+  def resume()
+    super
+    return if !started? || completed?
+    @prevTime = now
+    startInterval :save, 1, now: true do
+      save
+    end
+  end
+
   def draw()
     sprite *places.map(&:sprite)
     sprite *cards.sort {|a, b| a.z <=> b.z}.map(&:sprite)
@@ -25,6 +44,10 @@ class Klondike < Scene
     updateLayout w, h
   end
 
+  def focusChanged(focus)
+    focus ? resume : pause if ios?
+  end
+
   def canDrop?(card)
     case card.place
     when *columns then card.opened?
@@ -70,7 +93,7 @@ class Klondike < Scene
   def save()
     settings['state'] = {
       version:     1,
-      drawCount:   nexts.drawCount,
+      difficulty:  difficulty,
       history:     history.to_h {|o| o.id if o.respond_to? :id},
       score:       score.to_h,
       elapsedTime: elapsedTime,
@@ -87,7 +110,7 @@ class Klondike < Scene
     findAll  = -> id {  all.find {|obj|  obj .id == id} or raise "No object '#{id}'"}
     findCard = -> id {cards.find {|card| card.id == id} or raise "No card '#{id}'"}
 
-    nexts.drawCount = hash['drawCount']
+    @difficulty = hash['difficulty'].intern
 
     self.history = History.load hash['history'] do |id|
       (id.respond_to?('=~') && id =~ /^id:/) ? findAll[id] : nil
@@ -110,7 +133,7 @@ class Klondike < Scene
     raise "Failed to restore state" unless
       places.reduce([]) {|a, place| a + place.cards}.size == 52
 
-    resume
+    start!
   end
 
   def inspect()
@@ -151,22 +174,81 @@ class Klondike < Scene
     }
   end
 
+  def addScore(name)
+    old = score.value
+    score.add name if history.enabled?
+    history.push [:score, score.value, old] if score.value != old
+  end
+
   def bestTime()
-    settings['bestTime'] || 24 * 60 * 60 - 1
+    settings[bestRecordKey :time] || 24 * 60 * 60 - 1
   end
 
   def bestScore()
-    settings['bestScore'] || 0
+    settings[bestRecordKey :score] || 0
+  end
+
+  def dailyBestTime()
+    key = bestRecordKey :time, true
+    settings[key] = nil if settings["#{key}Date"] != today
+    settings[key] || 24 * 60 * 60 - 1
+  end
+
+  def dailyBestScore()
+    key = bestRecordKey :score, true
+    settings[key] = nil if settings["#{key}Date"] != today
+    settings[key] || 0
   end
 
   def updateBests()
-    newTime  = elapsedTime < bestTime
-    newScore = score.value > bestScore
+    newTime       = elapsedTime < bestTime
+    newScore      = score.value > bestScore
+    newDailyTime  = elapsedTime < dailyBestTime
+    newDailyScore = score.value > dailyBestScore
+
+    settings[bestRecordKey :time]  = elapsedTime if newTime
+    settings[bestRecordKey :score] = score.value if newScore
+
+    if newDailyTime
+      settings[bestRecordKey(:time, true)]         = elapsedTime
+      settings[bestRecordKey(:time, true, 'Date')] = today
+    end
+
+    if newDailyScore
+      settings[bestRecordKey(:score, true)]         = score.value
+      settings[bestRecordKey(:score, true, 'Date')] = today
+    end
+
+    return newTime, newScore, newDailyTime, newDailyScore
+  end
+
+  def clearAllTimeBests()
+    %i[time score]
+      .map {|type| bestRecordKey type}
+      .each {|key| settings[key] = nil}
+  end
+
+  def clearDailyBests()
+    %i[time score]
+      .map {|type| ['', 'Date'].map {|s| bestRecordKey type, true, s}}
+      .flatten
+      .each {|key| settings[key] = nil}
+  end
+
+  def bestRecordKey(type, daily = false, suffix = '')
+    difficulty.to_s +
+      (daily ? 'Daily' : '') +
+      'Best' +
+      type.to_s.capitalize +
+      suffix
+  end
 
-    settings['bestTime']  = elapsedTime if newTime
-    settings['bestScore'] = score.value if newScore
+  def timeToText(time)
+    Time.at(time).strftime('%M:%S')
+  end
 
-    return newTime, newScore
+  def today()
+    Time.now.strftime '%Y%m%d'
   end
 
   def cards()
@@ -180,23 +262,23 @@ class Klondike < Scene
   end
 
   def deck()
-    @deck ||= CardPlace.new(:deck).tap do |deck|
+    @deck ||= CardPlace.new(self, :deck).tap do |deck|
       deck.sprite.mouseClicked {deckClicked}
     end
   end
 
   def nexts()
-    @nexts ||= NextsPlace.new(:nexts).tap do |nexts|
+    @nexts ||= NextsPlace.new(self, :nexts).tap do |nexts|
       nexts.sprite.mouseClicked {nextsClicked}
     end
   end
 
   def marks()
-    @marks ||= Card::MARKS.size.times.map {|i| MarkPlace.new "mark_#{i + 1}"}
+    @marks ||= Card::MARKS.size.times.map {|i| MarkPlace.new self, "mark_#{i + 1}"}
   end
 
   def columns()
-    @culumns ||= 7.times.map.with_index {|i| ColumnPlace.new "column_#{i + 1}"}
+    @culumns ||= 7.times.map.with_index {|i| ColumnPlace.new self, "column_#{i + 1}"}
   end
 
   def dealSound()
@@ -215,12 +297,12 @@ class Klondike < Scene
   end
 
   def interfaces()
-    [undoButton, redoButton, menuButton, finishButton, status, debugButton]
+    [undoButton, redoButton, pauseButton, finishButton, status, debugButton]
   end
 
   def undoButton()
     @undoButton ||= Button.new(
-      '◀', rgb: [120, 140, 160], fontSize: 28, round: [20, 4, 4, 20]
+      '◀', fontSize: 28, round: [20, 4, 4, 20]
     ).tap do |b|
       b.update  {b.enable history.canUndo?}
       b.clicked {history.undo {|action| undo action}}
@@ -229,18 +311,16 @@ class Klondike < Scene
 
   def redoButton()
     @redoButton ||= Button.new(
-      '▶', rgb: [160, 140, 120], fontSize: 28, round: [4, 20, 20, 4]
+      '▶', fontSize: 28, round: [4, 20, 20, 4]
     ).tap do |b|
       b.update  {b.enable history.canRedo?}
       b.clicked {history.redo {|action| self.redo action}}
     end
   end
 
-  def menuButton()
-    @menuButton ||= Button.new(
-      '≡', rgb: [140, 160, 120], fontSize: 36
-    ).tap do |b|
-      b.clicked {showMenuDialog}
+  def pauseButton()
+    @pauseButton ||= Button.new(icon: skin.pauseIcon).tap do |b|
+      b.clicked {showPauseDialog}
     end
   end
 
@@ -248,7 +328,7 @@ class Klondike < Scene
     @status ||= Sprite.new.tap do |sp|
       sp.draw do
         push do
-          fill 0, 20
+          fill *skin.translucentBackgroundColor
           rect 0, 0, sp.w, sp.h, 10
           fill 255
 
@@ -260,7 +340,7 @@ class Klondike < Scene
           }.each do |label, value|
             textSize 12
             textAlign LEFT, TOP
-            text label, x + mx, my, w - mx, sp.h - my * 2
+            text str(label), x + mx, my, w - mx, sp.h - my * 2
             textSize 20
             textAlign LEFT, BOTTOM
             text value, x + mx, my, w - mx, sp.h - my * 2
@@ -282,71 +362,174 @@ class Klondike < Scene
 
   def debugButton()
     @debugButton ||= Button.new(:DEBUG, width: 3).tap do |b|
-      b.hide
-      b.clicked {}
+      b.hide unless debug?
+      b.clicked {showDebugDialog}
     end
   end
 
   def showReadyDialog()
     add Dialog.new(alpha: 50).tap {|d|
-      d.addButton 'EASY', width: 5 do
-        start 1
+      d.addButton str('EASY'), width: 5 do
+        start :easy
         d.close
       end
-      d.addButton 'HARD', width: 5 do
-        start 3
+      d.addButton str('NORMAL'), width: 5 do
+        start :normal
+        d.close
+      end
+      d.addButton str('HARD'), width: 5 do
+        start :hard
         d.close
       end
     }
   end
 
-  def showMenuDialog()
-    pause
-    add Dialog.new.tap {|d|
-      d.addButton 'RESUME', width: 5 do
+  def showPauseDialog()
+    add Dialog.new {|d|
+      d.addLabel "#{str 'Difficulty'}: #{str difficulty.upcase}"
+      d.addLabel "#{str 'Best Time'}: #{timeToText bestTime}"
+      d.addLabel "#{str 'Best Score'}: #{bestScore}"
+      d.addLabel "#{str "Today's Best Time"}: #{timeToText dailyBestTime}"
+      d.addLabel "#{str "Today's Best Score"}: #{dailyBestScore}"
+      d.addSpace 20
+      d.addButton str('Resume'), width: 6 do
+        d.close
+      end
+      d.addButton str('New Game'), width: 6 do
         d.close
-        resume
+        showNewGameDialog
       end
-      d.addButton 'NEW GAME', width: 5 do
+      d.addSpace 10
+      d.group do
+        if ios?
+          d.addButton icon: skin.menuIcon do
+            sendCommand :showMenu
+          end
+        end
+        d.addButton icon: skin.settingsIcon do
+          showSettingsDialog
+        end
+      end
+    }
+  end
+
+  def showNewGameDialog()
+    add Dialog.new(alpha: 180).tap {|d|
+      d.addLabel str("Start New Game?")
+      d.addSpace 20
+      d.addButton str('OK'), width: 4 do
         startNewGame
+        d.close
+      end
+      d.addButton str('Cancel'), width: 4 do
+        d.close
       end
-      d.addSpace 50
-      d.addLabel "Best Time: #{timeToText bestTime}"
-      d.addLabel "Best Score: #{bestScore}"
     }
   end
 
-  def showCompletedDialog(newBestTime = false, newBestScore = false)
-    pause
+  def showSettingsDialog()
+    closedImage = -> {
+      i = skin.closedImage
+      resizeImage i, i.width / 2, i.height / 2
+    }
+    add Dialog.new(alpha: 255).tap {|d|
+      bg        = d.add Background.new backgroundScene.type
+      cardImage = d.addElement Sprite.new image: closedImage.call
+      d.addButton str('Change Card Design'), width: 7 do
+        skin skin.index + 1
+        settings['skinIndex'] = skin.index
+        cardImage.image = closedImage.call
+      end
+      d.addSpace 10
+      author = -> {bg.author&.then {|author| "by #{author}"} || '-'}
+      bgName = bgAuthor = nil
+      d.group :vertical, space: 0 do
+        bgName   = d.addLabel(bg.name, alpha: 0) {sendCommand :openURL, bg.url}
+        bgAuthor = d.addLabel author.call, fontSize: 16, alpha: 0
+      end
+      d.addButton str('Change Background'), width: 7 do
+        bg.set bg.nextType
+        bgName  .label = bg.name
+        bgAuthor.label = author.call
+        backgroundScene.set bg.type
+      end
+      d.addSpace 20
+      d.addButton str('Close'), width: 6 do
+        d.close
+      end
+    }
+  end
+
+  def showCompletedDialog(
+         bestTime = false,      bestScore = false,
+    dailyBestTime = false, dailyBestScore = false)
+
+    suffix = -> allTime, daily do
+      return str '(New Record!)'   if allTime
+      return str "(Today's Best!)" if daily
+      ''
+    end
+
     add Dialog.new.tap {|d|
-      d.addLabel 'Congratulations!', fontSize: 44
+      d.addLabel str('Congratulations!'), fontSize: 44
       d.addLabel(
-        "Time: #{timeToText elapsedTime} #{newBestTime ? '(NEW!)' : ''}",
+        "#{str 'Time'}: #{timeToText elapsedTime} #{suffix.call bestTime, dailyBestTime}",
         fontSize: 28)
       d.addLabel(
-        "Score: #{score.value} #{newBestScore ? '(NEW!)' : ''}",
+        "#{str 'Score'}: #{score.value} #{suffix.call bestScore, dailyBestScore}",
         fontSize: 28)
       d.addSpace 50
-      d.addButton 'NEW GAME', width: 5 do
+      d.addButton str('Start Next Game'), width: 5 do
         startNewGame
       end
     }
   end
 
+  def showDebugDialog()
+    add Dialog.new.tap {|d|
+      d.addButton str('Clear all settings'), width: 6 do
+        settings.clear
+        d.close
+      end
+      d.addButton str('Clear all time bests'), width: 6 do
+        clearAllTimeBests
+        d.close
+      end
+      d.addButton str("Clear today's bests"), width: 6 do
+        clearDailyBests
+        d.close
+      end
+      d.addButton str("One step for completion"), width: 6 do
+        cards.sort.group_by(&:mark).each.with_index do |(mark, cards), index|
+          place = marks[index]
+          place.clear
+          cards.reverse.each.with_index do |card, i|
+            card.z = i
+            place.add card.open
+          end
+        end
+        d.close
+      end
+      d.addButton str('Close'), width: 6 do
+        d.close
+      end
+    }
+  end
+
   def updateLayout(w, h)
     card   = cards.first
     cw, ch = card.then {|c| [c.w, c.h]}
-    mx, my = Card.margin, cw * 0.2 # margin x, y
+    mx, my = skin.margin, cw * 0.2 # margin x, y
     y      = my
 
-    undoButton.pos = [mx, y]
-    redoButton.pos = [undoButton.x + undoButton.w + 2, y]
-    menuButton.pos = [width - (menuButton.w + mx), y]
-    status.pos     = [redoButton.right + mx, y]
-    status.right   = menuButton.left - mx
-    status.height  = menuButton.h
+    undoButton.pos  = [mx, y]
+    redoButton.pos  = [undoButton.x + undoButton.w + 2, y]
+    pauseButton.pos = [width - (pauseButton.w + mx), y]
+    status.pos      = [redoButton.right + mx, y]
+    status.right    = pauseButton.left - mx
+    status.height   = pauseButton.h
 
-    y = undoButton.y + undoButton.h + my
+    y = undoButton.y + undoButton.h + my * 3
 
     deck.pos  = [w - (deck.w + mx), y]
     nexts.pos = [deck.x - (nexts.w + mx), deck.y]
@@ -379,8 +562,9 @@ class Klondike < Scene
     end
   end
 
-  def start(drawCount = 1)
-    nexts.drawCount = drawCount
+  def start(difficulty = :normal)
+    @difficulty = difficulty
+    start!
 
     history.disable
     lasts = columns.map(&:last).compact
@@ -390,7 +574,6 @@ class Klondike < Scene
         if lasts.all? {|card| card.opened?}
           drawNexts
           history.enable
-          resume
         end
       end
     end
@@ -411,7 +594,7 @@ class Klondike < Scene
 
   def firstDistribution()
     n = columns.size
-    (0...n).map { |row| (row...n).map { |col| [col, row] } }.flatten(1)
+    (0...n).map {|row| (row...n).map {|col| [col, row]}}.flatten(1)
   end
 
   def openCard(card, gain: 0.5)
@@ -471,6 +654,19 @@ class Klondike < Scene
     completed          if completed?
   end
 
+  def start!()
+    @started = true
+    [*cards, *places].each do |o|
+      o.started if o.respond_to? :started
+    end
+    places.each {|p| p.updateCards 0}
+    resume
+  end
+
+  def started?()
+    @started ||= false
+  end
+
   def canFinish?()
     deck.empty? && nexts.empty? &&
       columns.any? {|col| !col.empty?} &&
@@ -525,7 +721,7 @@ class Klondike < Scene
 
   def showFinishButton()
     finishButton.tap do |b|
-      m   = Card.margin
+      m   = skin.margin
       b.x = marks.last.then {|mark| mark.x + mark.w} + m * 2
       b.y = -deck.h
       b.w = width - b.x - m
@@ -588,6 +784,7 @@ class Klondike < Scene
   end
 
   def backToPlace(card, vel)
+    return if vel.mag == 0
     vec = vel.dup.normalize * sqrt(vel.mag) / 10 * sqrt(card.count)
     return if vec.mag < 3
     shakeScreen vector: vec
@@ -623,28 +820,6 @@ class Klondike < Scene
     end
   end
 
-  def timeToText(time)
-    Time.at(time).strftime('%M:%S')
-  end
-
-  def pause()
-    @prevTime = nil
-    stopTimer :save
-  end
-
-  def resume()
-    @prevTime = now
-    startInterval :save, 1, now: true do
-      save
-    end
-  end
-
-  def addScore(name)
-    old = score.value
-    score.add name if history.enabled?
-    history.push [:score, score.value, old] if score.value != old
-  end
-
   def undo(action)
     history.disable do
       case action
@@ -670,7 +845,129 @@ class Klondike < Scene
   end
 
   def startNewGame()
-    transition self.class.new, [Fade, Curtain, Pixelate].sample
+    $newGameCount ||= 0
+    $newGameCount  += 1
+    showAd          = $newGameCount % 3 == 0
+    transition self.class.new, [Fade, Curtain, Pixelate].sample, showAd: showAd
+  end
+
+  STRINGS = {
+    OK:     {},
+    Cancel: {ja: 'キャンセル'},
+    Close:  {ja: '閉じる'},
+
+    Time:  {ja: 'タイム'},
+    Score: {ja: 'スコア'},
+    Move:  {ja: '移動回数'},
+
+    Difficulty: {ja: '難易度'},
+    EASY:       {ja: '簡単'},
+    NORMAL:     {ja: '普通'},
+    HARD:       {ja: '難しい'},
+
+    'New Game': {ja: '新規ゲーム'},
+    'Resume': {ja: 'ゲーム再開'},
+
+    'Best Time':          {ja: 'ベストタイム'},
+    'Best Score':         {ja: 'ベストスコア'},
+    "Today's Best Time":  {ja: '本日のベストタイム'},
+    "Today's Best Score": {ja: '本日のベストスコア'},
+
+    "Start New Game?": {ja: '新しいゲームをはじめますか？'},
+    "Start Next Game": {ja: '次のゲームを開始'},
+
+    "Change Card Design": {ja: 'カードデザインを変更'},
+    "Change Background":  {ja: 'ゲーム背景を変更'},
+
+    '(New Record!)':   {ja: '（新記録！）'},
+    "(Today's Best!)": {ja: '（本日のベスト！）'},
+  }
+
+  def str(s, lang: $language)
+    STRINGS.dig(s.intern, lang&.intern) || s.to_s
   end
 
 end# Klondike
+
+
+class Klondike::NextsPlace < CardPlace
+
+  def drawCount()
+    @game.difficulty == :hard ? 3 : 1
+  end
+
+  def started()
+    w       = skin.cardSpriteSize[0] + overlap * (drawCount - 1)
+    self.x -= w - self.w
+    self.w  = w
+  end
+
+  def add(*cards, **kwargs)
+    super
+    updateCards excludes: cards
+  end
+
+  def pop(*args)
+    super
+    updateCards
+  end
+
+  def posFor(card, index = nil)
+    index ||= indexFor card
+    super.tap do |pos|
+      rindex = cards.size - index
+      pos.x += overlap * (drawCount - rindex).clamp(0, drawCount - 1)
+    end
+  end
+
+  def overlap()
+    skin.cardSpriteSize[0] * 0.4
+  end
+
+end# Klondike::NextsPlace
+
+
+class Klondike::MarkPlace < CardPlace
+
+  def mark()
+    last&.mark
+  end
+
+  def accept?(x, y, card)
+    return false if !card || card.closed? || !card.canDrop?
+    hit?(x, y) &&
+      card.last? &&
+      card.opened? &&
+      (!mark || mark == card.mark) &&
+      card.number == last&.number.then {|n| n ? n + 1 : 1}
+  end
+
+end# Klondike::MarkPlace
+
+
+class Klondike::ColumnPlace < CardPlace
+
+  def initialize(*args, **kwargs, &block)
+    super(*args, linkCards: true, **kwargs, &block)
+  end
+
+  def accept?(x, y, card)
+    return false if !card || card.closed? || !card.canDrop?
+    if empty?
+      hit?(x, y) &&
+        card.number == 13
+    else
+      any? {|card| card.hit?(x, y)} &&
+        card.number == last.number - 1 &&
+        (@game.difficulty == :easy || card.color != last.color)
+    end
+  end
+
+  def posFor(card, index = nil)
+    index ||= indexFor card
+    super.tap do |pos|
+      pos.y += self.h * 0.3 * index
+    end
+  end
+
+end# Klondike::ColumnPlace