rubysketch-solitaire 0.1.0 → 0.1.2

data/lib/rubysketch/solitaire/places.rb

@@ -8,8 +8,8 @@ class CardPlace
 
   extend Forwardable
 
-  def initialize(name, linkCards: false)
-    @name, @linkCards = name.intern, linkCards
+  def initialize(game, name, linkCards: false)
+    @game, @name, @linkCards = game, name.intern, linkCards
     @cards = []
   end
 
@@ -56,11 +56,19 @@ class CardPlace
     createVector *pos.to_a(2), self.z + index + 1
   end
 
+  def updateCards(seconds = 0.2, excludes: [])
+    cards.each.with_index do |card, index|
+      next if excludes.include? card
+      pos = posFor card, index
+      move card, pos, seconds if pos != card.pos
+    end
+  end
+
   def sprite()
-    @sprite ||= Sprite.new(0, 0, *Card.spriteSize).tap do |sp|
+    @sprite ||= Sprite.new(0, 0, *skin.cardSpriteSize).tap do |sp|
       sp.draw do
         noStroke
-        fill 0, 20
+        fill *skin.translucentBackgroundColor
         rect 0, 0, sp.w, sp.h, 4
       end
     end
@@ -77,101 +85,3 @@ class CardPlace
   end
 
 end# CardPlace
-
-
-class NextsPlace < CardPlace
-
-  def initialize(*args, **kwargs, &block)
-    super
-    @drawCount = 1
-  end
-
-  attr_reader :drawCount
-
-  def add(*cards, **kwargs)
-    super
-    updateCards excludes: cards
-  end
-
-  def pop(*args)
-    super
-    updateCards
-  end
-
-  def updateCards(excludes: [])
-    cards.each.with_index do |card, index|
-      next if excludes.include? card
-      pos = posFor card, index
-      move card, pos, 0.2 if pos != card.pos
-    end
-  end
-
-  def drawCount=(count)
-    raise 'invalid drawCount' unless count
-
-    @drawCount = count
-
-    w       = Card.spriteSize[0] + overlap * (count - 1)
-    self.x -= w - self.w
-    self.w  = w
-  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()
-    Card.spriteSize[0] * 0.4
-  end
-
-end# NextsPlace
-
-
-class 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# MarkPlace
-
-
-class 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 &&
-        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# ColumnPlace

data/lib/rubysketch/solitaire/skin.rb

@@ -0,0 +1,151 @@
+using RubySketch
+
+
+class Skin
+
+  def self.setup()
+    ncolumns         = 7
+    size             = [width, height].min
+    @margin          = size * 0.02
+    @cardSpriteWidth = (size - @margin * (ncolumns + 1)) / ncolumns
+  end
+
+  def initialize(index = 0)
+    @index = index % self.class.offsets.size
+  end
+
+  attr_reader :index
+
+  def pauseIcon()
+    @pauseIcon ||= self.class.getAssetImage 0, 192, 64, 64
+  end
+
+  def menuIcon()
+    @menuIcon ||= self.class.getAssetImage 64, 192, 64, 64
+  end
+
+  def settingsIcon()
+    @settingsIcon ||= self.class.getAssetImage 128, 192, 64, 64
+  end
+
+  def closedImage()
+    @closedImage ||= self.class.closedImages[index]
+  end
+
+  def openedImage(mark, number)
+    (@openedImages ||= {})[[mark, number]] ||= createOpenedImage mark, number
+  end
+
+  def cardSpriteSize()
+    @cardSpriteSize ||= self.class.cardSpriteSize
+  end
+
+  def backgroundCheckerColors()
+    @backgroundColors ||= self.class.colors[index][0, 2]
+  end
+
+  def redColor()
+    @redColor ||= self.class.colors[index][2]
+  end
+
+  def blackColor()
+    @blackColor ||= self.class.colors[index][3]
+  end
+
+  def buttonColor()
+    @buttonColor ||= self.class.colors[index][4]
+  end
+
+  def translucentBackgroundColor()
+    [0, 0, 0, 64]
+  end
+
+  def margin()
+    self.class.margin
+  end
+
+  def markColor(mark)
+    Card::MARKS[0, 2].include?(mark) ? redColor : blackColor
+  end
+
+  private
+
+  def createOpenedImage(mark, number)
+    c = self.class
+    createGraphics(*c.cardImageSize).tap do |g|
+      w, h, m        = g.width, g.height, 16# margin
+      image          = c.assetImage
+      nx, ny, nw, nh = c.numberRect number
+      mx, my, mw, mh = c.markRect mark
+      mnh            = m + nh
+      mxx, myy       = (w - mw) / 2, mnh + ((h - mnh) - mh) / 2
+      g.beginDraw do
+        g.angleMode DEGREES
+        g.translate  w / 2,  h / 2
+        g.rotate 180
+        g.translate -w / 2, -h / 2
+        g.copy image, 896,  0, w,  h,  0,   0,   w,  h
+        g.tint *markColor(mark)
+        g.copy image, nx, ny,  nw, nh, m,   m,   nw, nh
+        g.copy image, mx, my,  mw, mh, mxx, myy, mw, mh
+      end
+    end
+  end
+
+  def self.assetImage()
+    @assetImage ||= loadImage dataPath 'card.png'
+  end
+
+  def self.margin()
+    @margin
+  end
+
+  def self.markRect(mark)
+    w = h = 128
+    [Card::MARKS.index(mark) * w, 0, w, h]
+  end
+
+  def self.numberRect(number)
+    w = h = 64
+    [(number - 1) * w, 128, w, h]
+  end
+
+  def self.closedImages()
+    @closedImages ||= offsets.map do |x|
+      getAssetImage x, 256, *cardImageSize
+    end
+  end
+
+  def self.getAssetImage(x, y, w, h)
+    createGraphics(w, h).tap do |g|
+      g.beginDraw do
+        w, h = g.width, g.height
+        g.copy assetImage, x, y, w, h, 0, 0, w, h
+      end
+    end
+  end
+
+  def self.colors()
+    @colors ||= offsets.map do |x|
+      5.times
+        .map {|n| [x + n * 48 + 10, 512 + 10]}
+        .map {|xx, yy| assetImage.get xx, yy}
+        .map {|c| [red(c), green(c), blue(c), alpha(c)]}
+    end
+  end
+
+  def self.offsets()
+    (0..3).map {|n| n * 256}
+  end
+
+  def self.cardImageSize()
+    [164, 252]
+  end
+
+  def self.cardSpriteSize()
+    cardImageSize.then do |cw, ch|
+      [@cardSpriteWidth, @cardSpriteWidth * (ch.to_f / cw.to_f)]
+    end
+  end
+
+end# Skin

data/lib/rubysketch/solitaire.rb

@@ -1,4 +1,6 @@
 require 'forwardable'
+require 'rbconfig'
+require 'uri'
 require 'json'
 require 'rubysketch'
 
@@ -16,6 +18,7 @@ require 'rubysketch/solitaire/common/dialog'
 require 'rubysketch/solitaire/common/transitions'
 require 'rubysketch/solitaire/common/button'
 
+require 'rubysketch/solitaire/skin'
 require 'rubysketch/solitaire/card'
 require 'rubysketch/solitaire/places'
 
@@ -27,36 +30,57 @@ require 'rubysketch/solitaire/klondike'
 using RubySketch
 
 
+def debug?()
+  $debug || ENV['DEBUG'] || false
+end
+
+def sendCommand(type, *args)
+  $command = [type, *args].map {|s| URI.encode_www_form_component s}.join ':'
+end
+
 def settings()
   $settings ||= Settings.new 'solitaire.json'
 end
 
-def centerPos()
-  [
-    (displayWidth  - windowWidth)  / 2,
-    (displayHeight - windowHeight) / 2
-  ]
+def skin(index = nil)
+  $skin = nil if index != nil && index != $skin.index
+  $skin ||= Skin.new index || settings['skinIndex'] || 0
+end
+
+def backgroundScene()
+  $backgroundScene ||= Background.new
+end
+
+def checkFocus()
+  $prevFocused = focused if $prevFocused == nil
+  $root.focusChanged focused if focused != $prevFocused
+  $prevFocused = focused
 end
 
 setup do
   setTitle "Solitaire"
-  size 375, 667
+  size 375, 667 unless $nosize
   windowMove *windowPos
   windowResizable false
   angleMode DEGREES
   noStroke
 
-  $root = RootScene.new 'Root', Background.new, Start.new
+  Skin.setup
+  $root = RootScene.new 'Root', backgroundScene, Start.new
 end
 
 draw do
+  checkFocus
   fireTimers
   drawShake
-  push { $root.draw }
+  push {$root.draw}
 end
 
 def windowPos()
-  settings['windowPos'] || centerPos
+  settings['windowPos'] || [
+    (displayWidth  - windowWidth)  / 2,
+    (displayHeight - windowHeight) / 2
+  ]
 end
 
 windowMoved do

data/main.rb

@@ -1 +1,2 @@
+$nosize = true
 require 'rubysketch/solitaire'

data/project.yml

@@ -4,7 +4,6 @@ options:
   bundleIdPrefix: org.xord
   deploymentTarget:
     iOS: 14.0
-  developmentLanguage: ja
 
 settingGroups:
   all:
@@ -17,13 +16,21 @@ settingGroups:
 
 settings:
   base:
-    MARKETING_VERSION: 1.0.0
-    CURRENT_PROJECT_VERSION: 1.0.0
-    DEVELOPMENT_TEAM: XXXXXXXXX
+    MARKETING_VERSION: 0.1.2
+    CURRENT_PROJECT_VERSION: 0.1.2
+    DEVELOPMENT_TEAM: $(TEAM_ID)
   configs:
     debug:
       DEBUG_INFORMATION_FORMAT: dwarf-with-dsym
 
+packages:
+  Firebase:
+    url: https://github.com/firebase/firebase-ios-sdk
+    majorVersion: 9.0.0
+  GoogleMobileAds:
+    url: https://github.com/googleads/swift-package-manager-google-mobile-ads.git
+    majorVersion: 9.0.0
+
 targets:
   RubySolitaire:
     type: application
@@ -31,6 +38,16 @@ targets:
     dependencies:
       - framework: CoreMedia.framework
         embed: false
+      - framework: JavaScriptCore.framework
+        embed: false
+      - package: Firebase
+        product: FirebaseAnalyticsSwift
+      - package: Firebase
+        product: FirebaseCrashlytics
+      - package: Firebase
+        product: FirebaseRemoteConfigSwift
+      - package: GoogleMobileAds
+        product: GoogleMobileAds
     sources:
       - RubySolitaire
       - main.rb
@@ -39,12 +56,18 @@ targets:
       - path: data
         type: folder
     settings:
+      base:
+        TARGETED_DEVICE_FAMILY: 1
+        SUPPORTS_MACCATALYST: NO
+        SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD: NO
+        SUPPORTED_PLATFORMS: "iphoneos iphonesimulator"
       groups: [all, app]
     info:
       path: RubySolitaire/Info.plist
       properties:
         CFBundleVersion: $(CURRENT_PROJECT_VERSION)
         CFBundleShortVersionString: $(MARKETING_VERSION)
+        CFBundleDisplayName: Solitaire
         LSRequiresIPhoneOS: YES
         UILaunchScreen: ""
         UIApplicationSupportsIndirectInputEvents: YES
@@ -59,6 +82,64 @@ targets:
           #- UIInterfaceOrientationPortraitUpsideDown
           #- UIInterfaceOrientationLandscapeLeft
           #- UIInterfaceOrientationLandscapeRight
+        NSCameraUsageDescription:
+          Ruby scripts will be able to retrieve images from the camera.
+        NSUserTrackingUsageDescription:
+          This identifier will be used to deliver personalized ads to you.
+        GADApplicationIdentifier:  ca-app-pub-3940256099942544~1458002511
+        GADGameScreenBottomBanner: ca-app-pub-3940256099942544/2934735716
+        GADGameScreenInterstitial: ca-app-pub-3940256099942544/4411468910
+        SKAdNetworkItems:
+          - SKAdNetworkIdentifier: cstr6suwn9.skadnetwork
+          - SKAdNetworkIdentifier: 4fzdc2evr5.skadnetwork
+          - SKAdNetworkIdentifier: 4pfyvq9l8r.skadnetwork
+          - SKAdNetworkIdentifier: 2fnua5tdw4.skadnetwork
+          - SKAdNetworkIdentifier: ydx93a7ass.skadnetwork
+          - SKAdNetworkIdentifier: 5a6flpkh64.skadnetwork
+          - SKAdNetworkIdentifier: p78axxw29g.skadnetwork
+          - SKAdNetworkIdentifier: v72qych5uu.skadnetwork
+          - SKAdNetworkIdentifier: ludvb6z3bs.skadnetwork
+          - SKAdNetworkIdentifier: cp8zw746q7.skadnetwork
+          - SKAdNetworkIdentifier: c6k4g5qg8m.skadnetwork
+          - SKAdNetworkIdentifier: s39g8k73mm.skadnetwork
+          - SKAdNetworkIdentifier: 3qy4746246.skadnetwork
+          - SKAdNetworkIdentifier: 3sh42y64q3.skadnetwork
+          - SKAdNetworkIdentifier: f38h382jlk.skadnetwork
+          - SKAdNetworkIdentifier: hs6bdukanm.skadnetwork
+          - SKAdNetworkIdentifier: prcb7njmu6.skadnetwork
+          - SKAdNetworkIdentifier: v4nxqhlyqp.skadnetwork
+          - SKAdNetworkIdentifier: wzmmz9fp6w.skadnetwork
+          - SKAdNetworkIdentifier: yclnxrl5pm.skadnetwork
+          - SKAdNetworkIdentifier: t38b2kh725.skadnetwork
+          - SKAdNetworkIdentifier: 7ug5zh24hu.skadnetwork
+          - SKAdNetworkIdentifier: 9rd848q2bz.skadnetwork
+          - SKAdNetworkIdentifier: y5ghdn5j9k.skadnetwork
+          - SKAdNetworkIdentifier: n6fk4nfna4.skadnetwork
+          - SKAdNetworkIdentifier: v9wttpbfk9.skadnetwork
+          - SKAdNetworkIdentifier: n38lu8286q.skadnetwork
+          - SKAdNetworkIdentifier: 47vhws6wlr.skadnetwork
+          - SKAdNetworkIdentifier: kbd757ywx3.skadnetwork
+          - SKAdNetworkIdentifier: 9t245vhmpl.skadnetwork
+          - SKAdNetworkIdentifier: a2p9lx4jpn.skadnetwork
+          - SKAdNetworkIdentifier: 22mmun2rn5.skadnetwork
+          - SKAdNetworkIdentifier: 4468km3ulz.skadnetwork
+          - SKAdNetworkIdentifier: 2u9pt9hc89.skadnetwork
+          - SKAdNetworkIdentifier: 8s468mfl3y.skadnetwork
+          - SKAdNetworkIdentifier: av6w8kgt66.skadnetwork
+          - SKAdNetworkIdentifier: klf5c3l5u5.skadnetwork
+          - SKAdNetworkIdentifier: ppxm28t8ap.skadnetwork
+          - SKAdNetworkIdentifier: 424m5254lk.skadnetwork
+          - SKAdNetworkIdentifier: ecpz2srf59.skadnetwork
+          - SKAdNetworkIdentifier: uw77j35x4d.skadnetwork
+          - SKAdNetworkIdentifier: mlmmfzh3r3.skadnetwork
+          - SKAdNetworkIdentifier: 578prtvx9j.skadnetwork
+          - SKAdNetworkIdentifier: 4dzt52r2t5.skadnetwork
+          - SKAdNetworkIdentifier: gta9lk7p23.skadnetwork
+          - SKAdNetworkIdentifier: e5fvkxwrpn.skadnetwork
+          - SKAdNetworkIdentifier: 8c4e2ghe7u.skadnetwork
+          - SKAdNetworkIdentifier: zq492l623r.skadnetwork
+          - SKAdNetworkIdentifier: 3rd42ekr43.skadnetwork
+          - SKAdNetworkIdentifier: 3qcr597p9d.skadnetwork
 
   RubySolitaireTests:
     type: bundle.unit-test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch-solitaire
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -63,6 +63,8 @@ files:
 - ".github/workflows/test.yml"
 - ".github/workflows/utils.rb"
 - ".gitignore"
+- ".hooks/pre-commit"
+- ChangeLog.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -70,24 +72,73 @@ files:
 - Podfile.lock
 - README.md
 - Rakefile
+- RubySolitaire/Ad.swift
 - RubySolitaire/Assets.xcassets/AccentColor.colorset/Contents.json
+- RubySolitaire/Assets.xcassets/AppIcon.appiconset/AppIcon.png
 - RubySolitaire/Assets.xcassets/AppIcon.appiconset/Contents.json
 - RubySolitaire/Assets.xcassets/Contents.json
+- RubySolitaire/Base.lproj/Localizable.strings
 - RubySolitaire/BridgingHeader.h
+- RubySolitaire/Extensions.swift
 - RubySolitaire/GameView.swift
+- RubySolitaire/Helper.swift
+- RubySolitaire/MenuScreen.swift
 - RubySolitaire/Preview Content/Preview Assets.xcassets/Contents.json
 - RubySolitaire/RubySolitaireApp.swift
+- RubySolitaire/SafariView.swift
+- RubySolitaire/Strings.swift
+- RubySolitaire/ja.lproj/InfoPlist.strings
+- RubySolitaire/ja.lproj/Localizable.strings
 - RubySolitaireTests/RubySolitaireTests.swift
 - RubySolitaireUITests/RubySolitaireUITests.swift
 - RubySolitaireUITests/RubySolitaireUITestsLaunchTests.swift
 - VERSION
 - data/button.mp3
 - data/card.png
+- data/classicPSPWave.glsl
+- data/colorfulUnderwaterBubbles2.glsl
+- data/cosmic2.glsl
 - data/deal1.mp3
 - data/deal2.mp3
 - data/deal3.mp3
 - data/flip.mp3
 - data/noop.mp3
+- data/reflectiveHexes.glsl
+- fastlane/Fastfile
+- fastlane/metadata/copyright.txt
+- fastlane/metadata/en-US/apple_tv_privacy_policy.txt
+- fastlane/metadata/en-US/description.txt
+- fastlane/metadata/en-US/keywords.txt
+- fastlane/metadata/en-US/marketing_url.txt
+- fastlane/metadata/en-US/name.txt
+- fastlane/metadata/en-US/privacy_url.txt
+- fastlane/metadata/en-US/promotional_text.txt
+- fastlane/metadata/en-US/release_notes.txt
+- fastlane/metadata/en-US/subtitle.txt
+- fastlane/metadata/en-US/support_url.txt
+- fastlane/metadata/ja/apple_tv_privacy_policy.txt
+- fastlane/metadata/ja/description.txt
+- fastlane/metadata/ja/keywords.txt
+- fastlane/metadata/ja/marketing_url.txt
+- fastlane/metadata/ja/name.txt
+- fastlane/metadata/ja/privacy_url.txt
+- fastlane/metadata/ja/promotional_text.txt
+- fastlane/metadata/ja/release_notes.txt
+- fastlane/metadata/ja/subtitle.txt
+- fastlane/metadata/ja/support_url.txt
+- fastlane/metadata/primary_category.txt
+- fastlane/metadata/primary_first_sub_category.txt
+- fastlane/metadata/primary_second_sub_category.txt
+- fastlane/metadata/review_information/demo_password.txt
+- fastlane/metadata/review_information/demo_user.txt
+- fastlane/metadata/review_information/email_address.txt
+- fastlane/metadata/review_information/first_name.txt
+- fastlane/metadata/review_information/last_name.txt
+- fastlane/metadata/review_information/notes.txt
+- fastlane/metadata/review_information/phone_number.txt
+- fastlane/metadata/secondary_category.txt
+- fastlane/metadata/secondary_first_sub_category.txt
+- fastlane/metadata/secondary_second_sub_category.txt
 - lib/rubysketch/solitaire.rb
 - lib/rubysketch/solitaire/background.rb
 - lib/rubysketch/solitaire/card.rb
@@ -107,6 +158,7 @@ files:
 - lib/rubysketch/solitaire/extension.rb
 - lib/rubysketch/solitaire/klondike.rb
 - lib/rubysketch/solitaire/places.rb
+- lib/rubysketch/solitaire/skin.rb
 - lib/rubysketch/solitaire/start.rb
 - main.rb
 - project.yml