dopairb 0.2.0 → 0.4.0

data/lib/dopairb/session.rb

@@ -4,35 +4,66 @@ module Dopairb
   # One interactive session: owns the game state and ties the evaluation
   # cycle to the director.
   class Session
-    attr_reader :config, :game, :director, :fx
+    attr_reader :config, :game, :director, :fx, :collected
     attr_accessor :cold_start
 
     def initialize(config)
       @config = config
-      @game = Game.new
-      @director = Director.new(config)
+      # DOPAIRB_SEED makes the luck (crits, jackpots, sparks) repeatable, e.g. for recordings.
+      seed = ENV["DOPAIRB_SEED"]
+      @game = seed ? Game.new(rng: Random.new(seed.to_i)) : Game.new
+      @director = seed ? Director.new(config, rng: Random.new(seed.to_i + 1)) : Director.new(config)
       @fx = InputFx.new(config, @game)
       @finished = false
+      @introduced = false
+      @profile = nil
+      @collected = []
+    end
+
+    # Loaded on first use, and only for interactive sessions.
+    def profile
+      @profile ||= begin
+        prof = active? ? Profile.load : Profile.new
+        @start = { xp: prof.xp, level: prof.level, best_score: prof.best_score, sessions: prof.sessions }
+        @game.career(xp: prof.xp, best_combo: prof.best_combo.positive? ? prof.best_combo : nil) if prof.persistent?
+        prof
+      end
     end
 
     def active?
-      !@config.off? && Term.interactive?
+      !@config.off? && Term.interactive? && (@config.binding_irb || !IrbAdapter.from_binding?)
     end
 
+    # Once per process: from the dopairb command before IRB starts, or for
+    # `Dopairb.enable` in .irbrc right before the first prompt.
     def intro
+      return if @introduced
+      @introduced = true
       return unless active?
+      prof = profile
+      grew = prof.visit
+      prof.save if grew
       Sound.warm_up(@config.duration)
       cold = @cold_start || (Sound.available? && !Sound.ready?(:intro, @config.duration))
       if @config.intro && @config.motion && cold
         @director.loading { Sound.ready?(:intro, @config.duration) }
       end
-      @director.intro
+      @director.intro(prof.persistent? ? { level: prof.level, streak: prof.streak, streak_up: grew && prof.streak >= 2 } : nil)
     end
 
     def finish
       return if @finished
       @finished = true
-      @director.outro(@game.stats) if active? && @game.evals > 0
+      return unless active? && @game.evals > 0
+      prof = profile
+      stats = @game.stats
+      if prof.persistent?
+        stats = stats.merge(xp_before: @start[:xp], level_before: @start[:level], level: @game.level, xp: @game.xp,
+                            best_before: @start[:best_score], first_session: @start[:sessions].zero?)
+      end
+      prof.visit
+      @profile = prof.finish(stats, collected: @collected)
+      @director.outro(stats.merge(gallery: @profile.gallery.size, gallery_total: Gallery::PIECES.size))
     end
 
     def around_eval(code, last_value)
@@ -68,7 +99,9 @@ module Dopairb
       shot = clean ? input : nil
       if outcome == :success
         info = Probe.value(last_value.call, code).merge(out_lines: lines)
+        profile
         event = @game.success(info, code: code, out_lines: lines)
+        award_art(event) if %i[level_up jackpot art_drop].any? { |f| event.flag?(f) } && @game.leveling?
         pre = elapsed > 0.2 || shot.nil? ? 0.0 : [@config.charge, 0.3].min
         @director.play_event(event, input: shot, pre: pre)
       else
@@ -81,6 +114,17 @@ module Dopairb
       Dopairb.debug(e)
     end
 
+    # Level-ups, jackpots and lucky drops pay out a masterpiece, a new one while any are missing.
+    def award_art(event)
+      owned = profile.gallery + @collected
+      piece = Gallery.pick(@director.rng, owned)
+      fresh = !owned.include?(piece.id)
+      @collected << piece.id if fresh
+      event.info[:art] = piece.id
+      event.info[:art_new] = fresh
+      event.info[:gallery] = [(owned + [piece.id]).uniq.size, Gallery::PIECES.size]
+    end
+
     def now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
   end
 end

data/lib/dopairb/sound.rb

@@ -181,6 +181,51 @@ module Dopairb
         [Synth.seq(sweep, chord), 0.3]
       },
       result: -> { [Synth.seq(Synth.arp([784, 988, 1175, 1568], 0.08, wave: :triangle, vol: 0.2, decay: 0.06), Synth.tone(2093, 0.4, wave: :triangle, vol: 0.18, decay: 0.2)), 0] },
+      bits: lambda {
+        up = Synth.arp([523, 659, 784, 1047, 1319, 1568, 2093], 0.035, vol: 0.13, decay: 0.03)
+        [Synth.seq(up, Synth.tone(2093, 0.18, vol: 0.1, vibrato: 0.02, decay: 0.08)), 0]
+      },
+      crit: lambda {
+        shing = Synth.tone(2400, 0.1, wave: :saw, vol: 0.12, slide_to: 5200, decay: 0.05)
+        thud = Synth.mix(Synth.noise(0.12, vol: 0.55, decay: 0.03), Synth.tone(140, 0.25, wave: :sine, vol: 0.7, slide_to: 60, decay: 0.08))
+        sting = Synth.mix(*[880, 1109, 1319].map { |f| Synth.tone(f, 0.3, wave: :square, vol: 0.06, decay: 0.12) })
+        [Synth.mix(shing, Synth.at(0.1, thud), Synth.at(0.12, sting)), 0.1]
+      },
+      jackpot: lambda {
+        r = Random.new(9)
+        buf = []
+        t = 0.0
+        while t < 0.95
+          Synth.add(buf, t, Synth.tone(700 + r.rand(500), 0.02, vol: 0.1, decay: 0.008))
+          t += 0.045
+        end
+        [0.45, 0.7, 0.95].each_with_index do |at, i|
+          Synth.add(buf, at, Synth.mix(Synth.noise(0.05, vol: 0.4, decay: 0.015, rng: r), Synth.tone(160 + i * 40, 0.15, wave: :sine, vol: 0.5, slide_to: 80, decay: 0.05)))
+          Synth.add(buf, at, Synth.tone([784, 988, 1175][i], 0.12, wave: :triangle, vol: 0.18, decay: 0.06))
+        end
+        Synth.add(buf, 0.95, Synth.boom(0.8, vol: 0.6, low: 75))
+        Synth.add(buf, 1.0, Synth.arp([1047, 1319, 1568, 2093, 1568, 2093, 2637], 0.07, vol: 0.12, decay: 0.05))
+        40.times { Synth.add(buf, 1.0 + r.rand * 1.2, Synth.tone(2600 + r.rand(1800), 0.06, wave: :sine, vol: 0.08, decay: 0.02)) }
+        [buf, 0.95]
+      },
+      levelup: lambda {
+        buf = []
+        Synth.add(buf, 0, Synth.tone(150, 0.22, wave: :saw, vol: 0.12, slide_to: 900))
+        Synth.add(buf, 0.22, Synth.boom(0.7, vol: 0.6))
+        fan = Synth.arp([523, 659, 784, 1047, 784, 1047, 1319, 1568], 0.06, vol: 0.13, decay: 0.05)
+        Synth.add(buf, 0.24, fan)
+        [1047, 1319, 1568, 2093].each { |f| Synth.add(buf, 0.72, Synth.tone(f, 0.5, vol: 0.06, vibrato: 0.015, decay: 0.3)) }
+        # the unveiling: a gong and a shimmering chord
+        Synth.add(buf, 1.0, Synth.tone(98, 1.6, wave: :sine, vol: 0.45, decay: 0.7, vibrato: 0.004))
+        Synth.add(buf, 1.0, Synth.tone(196, 1.2, wave: :triangle, vol: 0.12, decay: 0.5))
+        Synth.add(buf, 1.45, Synth.noise(0.5, vol: 0.25, decay: 0.15, smooth: 0.5))
+        [523, 659, 784, 1047, 1319].each_with_index do |f, i|
+          Synth.add(buf, 1.45 + i * 0.05, Synth.tone(f, 1.4, vol: 0.05, vibrato: 0.01, decay: 0.6))
+        end
+        r = Random.new(4)
+        16.times { Synth.add(buf, 1.6 + r.rand * 1.4, Synth.tone(3000 + r.rand(2000), 0.05, wave: :sine, vol: 0.06, decay: 0.015)) }
+        [buf, 0.22]
+      },
       finale: ->(k = 1.0) { Sound.finale(k) },
     })
 
@@ -260,7 +305,9 @@ module Dopairb
     def backend
       return @backend if defined?(@backend)
       @backend =
-        if (p = which("paplay")) && (ENV["PULSE_SERVER"] || !wsl? || File.exist?("/mnt/wslg/PulseServer"))
+        if (log = ENV["DOPAIRB_SOUND_LOG"]) && !log.empty?
+          [:log, [log]] # recordings: write "<wall clock of impact> <wav>" lines instead of playing
+        elsif (p = which("paplay")) && (ENV["PULSE_SERVER"] || !wsl? || File.exist?("/mnt/wslg/PulseServer"))
           [:fast, [p]]
         elsif (p = which("afplay"))
           [:fast, [p]]
@@ -278,7 +325,7 @@ module Dopairb
     def available? = !backend.nil?
 
     # Per-keystroke sounds only make sense with a low-latency player.
-    def fast? = backend&.first == :fast
+    def fast? = %i[fast log].include?(backend&.first)
 
     @last = {}
     @children = []
@@ -294,6 +341,7 @@ module Dopairb
       return false if @children.size >= 4
       @last[name] = now
       started = now
+      return log_play(argv[0], name, delay, stretch) if kind == :log
       Thread.new do
         Thread.current.report_on_exception = false
         path, impact = file(name, stretch)
@@ -317,6 +365,13 @@ module Dopairb
       false
     end
 
+    def log_play(log, name, delay, stretch)
+      at = Process.clock_gettime(Process::CLOCK_REALTIME) + delay
+      path, impact = file(name, stretch)
+      File.open(log, "a") { |f| f.puts format("%.4f %s", at - impact, path) }
+      true
+    end
+
     def ready?(name, stretch = 1.0) = !cached(key_for(name, stretch)).nil?
 
     # Render every missing sound in the background, the startup sound first.

data/lib/dopairb/term.rb

@@ -85,9 +85,11 @@ module Dopairb
       end
 
       # First candidate that renders one column wide on this terminal.
+      # A nil candidate means "none of the above": glyph("▀", nil) may be nil.
       def glyph(*candidates)
         @glyphs ||= {}
-        @glyphs[candidates] ||= candidates.find { |c| c.ascii_only? || (utf8? && c.each_char.all? { |ch| char_width(ch) == 1 }) } || candidates.last
+        return @glyphs[candidates] if @glyphs.key?(candidates)
+        @glyphs[candidates] = candidates.find { |c| c.nil? || c.ascii_only? || (utf8? && c.each_char.all? { |ch| char_width(ch) == 1 }) } || candidates.last
       end
 
       def reset_glyphs

data/lib/dopairb/tour.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module Dopairb
+  # `dopa gallery tour`: a full-screen slideshow of the whole collection.
+  # Pieces you own are shown in color; the rest are silhouettes to hunt for.
+  # → / space: next, ←: back, q: leave. Slides advance on their own.
+  module Tour
+    SLIDE = 4.0
+    REVEAL = 0.35
+    FPS = 30.0
+
+    module_function
+
+    def run(config, owned, start: 0)
+      pieces = Gallery::PIECES
+      depth = Term.depth(config)
+      i = start % pieces.size
+      stage = AltStage.new(Term.rows)
+      Term.raw do
+        stage.open
+        begin
+          loop do
+            step = show(stage, pieces, i, owned, depth, config)
+            break if step == :quit
+            i = (i + step) % pieces.size
+          end
+        ensure
+          stage.close
+        end
+      end
+    rescue Interrupt
+      nil
+    end
+
+    # Animate one slide; => how many slides to move (+1 on timeout) or :quit.
+    def show(stage, pieces, i, owned, depth, config)
+      t0 = now
+      loop do
+        t = now - t0
+        stage.draw(frame(pieces[i], i, pieces.size, owned, depth, [t / REVEAL, 1.0].min, t))
+        step = read_key(t < REVEAL ? 1 / FPS : [SLIDE * config.duration - t, 0.05].max)
+        return step if step
+        return 1 if t >= SLIDE * config.duration
+      end
+    end
+
+    def frame(piece, i, total, owned, depth, reveal, t)
+      rows, cols = Term.size
+      w = cols - 1
+      c = Canvas.new(w, rows)
+      have = owned.include?(piece.id)
+      star = Term.glyph("✦", "*")
+      head = "#{star} DOPA IRB GALLERY #{star}   #{i + 1} / #{total}   collected #{owned.size}"
+      c.put_center(0, head, Color.rainbow(t * 0.3), bold: true)
+      aw, ah = Gallery.fit(piece, w - 6, rows - 6)
+      ax = (w - aw) / 2
+      ay = 2
+      frame_col = have ? Color.mix([255, 240, 170], [190, 130, 30], (Math.sin(t * 3) + 1) / 2) : [70, 70, 90]
+      c.fill_bg(frame_col, ax - 2, ay - 1, aw + 4, ah / 2 + 2)
+      c.fill_bg([20, 20, 28], ax - 1, ay, aw + 2, ah / 2)
+      Gallery.draw(c, piece, ax, ay, aw, ah, reveal: reveal, depth: depth) do |top, bot, _x, _r|
+        have ? [top, bot] : [shadow(top), shadow(bot)]
+      end
+      cap = have ? "\"#{piece.title}\"  #{piece.artist}, #{piece.year}" : "? ? ?   (by #{piece.artist})"
+      c.put_center(ay + ah / 2 + 1, cap, have ? [240, 230, 210] : [150, 150, 175], bold: have)
+      c.put_center(rows - 1, "->/space next   <- back   q quit", [120, 120, 140])
+      c.render(depth)
+    end
+
+    # Uncollected pieces keep their shapes but lose their colors.
+    def shadow(color)
+      Color.mix([12, 12, 22], [80, 80, 110], Color.luminance(color) / 255.0)
+    end
+
+    # Keys can arrive several at once (a held arrow key): all of them count.
+    # => :quit, a step (+n / -n), or nil when nothing was typed.
+    def read_key(timeout)
+      return nil unless Term.input.wait_readable(timeout)
+      s = Term.input.read_nonblock(256, exception: false)
+      return nil unless String === s
+      keys = s.scan(/\e[\[O][\d;]*[A-Za-z~]|\e|./m)
+      return :quit if keys.any? { |k| ["q", "Q", "\e", "\x03"].include?(k) }
+      step = keys.sum { |k| ["\e[D", "\eOD", "h", "p", "b"].include?(k) ? -1 : 1 }
+      step.zero? ? nil : step
+    end
+
+    def now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+  end
+end

data/lib/dopairb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dopairb
-  VERSION = "0.2.0"
+  VERSION = "0.4.0"
 end

data/lib/dopairb.rb

@@ -19,11 +19,14 @@ require_relative "dopairb/fx"
 require_relative "dopairb/stage"
 require_relative "dopairb/game"
 require_relative "dopairb/probe"
+require_relative "dopairb/profile"
+require_relative "dopairb/gallery"
 require_relative "dopairb/scene"
 require_relative "dopairb/scenes/success"
 require_relative "dopairb/scenes/failure"
 require_relative "dopairb/scenes/session"
 require_relative "dopairb/scenes/finale"
+require_relative "dopairb/scenes/bonus"
 require_relative "dopairb/director"
 require_relative "dopairb/output_tap"
 require_relative "dopairb/charge_line"
@@ -33,6 +36,7 @@ require_relative "dopairb/reline_adapter"
 require_relative "dopairb/irb_adapter"
 require_relative "dopairb/session"
 require_relative "dopairb/demo"
+require_relative "dopairb/tour"
 
 # dopairb: IRB where every keystroke, result and exception gets a show.
 #
@@ -44,7 +48,10 @@ module Dopairb
     def config
       @config ||= begin
         c = Config.new
-        c.apply_string(ENV["DOPAIRB"]) if ENV["DOPAIRB"]
+        if ENV["DOPAIRB"]
+          c.apply_string(ENV["DOPAIRB"])
+          overrides << [:string, ENV["DOPAIRB"]]
+        end
         c
       rescue ArgumentError => e
         warn "dopairb: ignoring DOPAIRB=#{ENV['DOPAIRB'].inspect}: #{e.message}"
@@ -52,10 +59,20 @@ module Dopairb
       end
     end
 
+    # Settings for this run only ($DOPAIRB, dopairb options). They win over
+    # Dopairb.enable(...) in .irbrc, which IRB loads after they are applied.
+    def overrides = (@overrides ||= [])
+
+    def override(name, value)
+      name == :string ? config.apply_string(value) : config.set(name, value)
+      overrides << [name, value]
+    end
+
     # Hook into IRB. Safe to call more than once; options are config settings.
     def enable(intro: nil, **settings)
       settings.each { |k, v| config.set(k, v) }
       config.set(:intro, intro) unless intro.nil?
+      overrides.each { |k, v| k == :string ? config.apply_string(v) : config.set(k, v) }
       @session ||= Session.new(config)
       if IrbAdapter.install
         RelineAdapter.install(@session.fx)
@@ -98,11 +115,40 @@ module Dopairb
       dopa party            max intensity, full-screen flash, sound effects
       dopa demo             play every effect once
       dopa loading          show the loading screen
+      dopa gallery          the bonus art you have collected (dopa gallery NAME shows one)
+      dopa gallery tour     a slideshow of all 100 (uncollected ones as silhouettes)
       dopa KEY=VALUE ...    change one setting, e.g. `dopa flash=off duration=0.5`
 
       settings:
     TXT
 
+    def gallery(name)
+      owned = ((@session&.profile&.gallery || []) + (@session&.collected || [])).uniq
+      if name == "tour"
+        return puts("dopairb: the tour needs a terminal") unless Term.interactive?
+        return Tour.run(config, owned)
+      end
+      if name.nil?
+        puts "dopairb gallery: #{owned.size}/#{Gallery::PIECES.size}  (level-ups, jackpots and lucky ART DROPs bring more)"
+        Gallery::PIECES.each do |p|
+          puts format("  %-32s %s -- %s, %s", p.id, p.title, p.artist, p.year) if owned.include?(p.id)
+        end
+        rest = Gallery::PIECES.size - owned.size
+        puts "  ... #{rest} more to discover" if rest > 0
+        puts "  `dopa gallery NAME` shows one; `dopa gallery tour` walks through all #{Gallery::PIECES.size}"
+        return
+      end
+      piece = Gallery.find(name.to_sym) if Gallery.ids.include?(name.to_sym)
+      return puts("dopairb: no such piece #{name.inspect}") unless piece
+      return puts("dopairb: not unlocked yet -- keep playing!") unless owned.include?(piece.id)
+      cols = [Term.cols - 1, 100].min
+      w, h = Gallery.fit(piece, cols, [Term.rows - 4, 30].min)
+      c = Canvas.new(w, h / 2)
+      Gallery.draw(c, piece, 0, 0, w, h, depth: Term.depth(config))
+      puts c.render(Term.depth(config))
+      puts "\"#{piece.title}\"  #{piece.artist}, #{piece.year}"
+    end
+
     def command(arg)
       words = arg.split
       if words.empty? || words == ["status"]
@@ -111,10 +157,20 @@ module Dopairb
         puts config.describe
         puts "  sound player: #{Sound.backend ? Sound.backend[1].first : '(none; bell only)'}   cache: #{Sound.dir}"
         puts "  session: #{s.evals} evals, #{s.successes} hits, #{s.failures} errors, max combo #{s.max_combo}, score #{Fx.number_with_commas(s.score)}" if s
+        prof = @session&.profile
+        if prof&.persistent?
+          lv = s.leveling? ? s.level : prof.level
+          xp = s.leveling? ? s.xp : prof.xp
+          puts "  career: LV #{lv} (#{Fx.number_with_commas(xp)} / #{Fx.number_with_commas(Game.xp_for(lv + 1))} XP), " \
+               "best score #{Fx.number_with_commas(prof.best_score)}, best combo #{prof.best_combo}, day streak #{prof.streak}, " \
+               "gallery #{prof.gallery.size}/#{Gallery::PIECES.size}   (#{prof.path})"
+        end
       elsif words == ["help"]
         puts HELP + config.describe
       elsif words == ["demo"]
         Demo.run(self)
+      elsif words[0] == "gallery"
+        gallery(words[1])
       elsif words == ["loading"]
         t0 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         @session&.director&.loading { Process.clock_gettime(Process::CLOCK_MONOTONIC) - t0 > 2.5 } if active?

data/spec.md

@@ -127,10 +127,10 @@
 
 | 設定 | 内容 |
 | --- | --- |
-| `intensity` | `off` / `low` / `normal` / `max`。初期値 `normal` |
+| `intensity` | `off` / `low` / `normal` / `max`。初期値 `max`（v0.4.0 で `normal` から変更） |
 | `motion` | アニメーションの有無と長さ |
 | `flash` | 全画面フラッシュの有無。初期値は控えめ |
-| `sound` | 端末ベル等を使う場合の明示的な有効化。初期値 `off` |
+| `sound` | `off` / `bell` / `sfx`。初期値 `sfx`（v0.4.0 で `off` から変更。プレイヤーがなければベル） |
 | `hud` | COMBO・CHARGE・SCORE の表示 |
 | `duration` | 各演出時間の倍率 |
 | `color` | 色数と配色。モノクロでも意味が分かる表示 |
@@ -196,7 +196,7 @@ stateDiagram-v2
 
 - 常時 HUD を画面上部に固定するか、プロンプト周辺の一時表示にするか。
 - `puts` などの評価途中の出力をどの範囲まで捕捉・装飾するか。
-- スコアをセッション内だけにするか、記録を保存するか。
+- ~~スコアをセッション内だけにするか、記録を保存するか。~~ → 生涯 XP・レベル・ベスト記録・連続日数・ボーナス絵を `~/.local/state/dopairb/profile.json` に保存する（`DOPAIRB_PROFILE=off` で無効）。
 - 演出素材を Unicode 文字中心にするか、端末によって別の表現を選ぶか。
 - gem の起動コマンドと、通常の `irb` や `.irbrc` から有効化する方法。
 - IRB／Reline の対象バージョンと、毎キー描画に必要な拡張点。

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dopairb
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Koichi Sasada
@@ -72,13 +72,21 @@ files:
 - lib/dopairb/director.rb
 - lib/dopairb/font.rb
 - lib/dopairb/fx.rb
+- lib/dopairb/gallery.rb
+- lib/dopairb/gallery/impressionism.rb
+- lib/dopairb/gallery/japan.rb
+- lib/dopairb/gallery/modern_ancient.rb
+- lib/dopairb/gallery/renaissance.rb
+- lib/dopairb/gallery/romantic.rb
 - lib/dopairb/game.rb
 - lib/dopairb/input_fx.rb
 - lib/dopairb/irb_adapter.rb
 - lib/dopairb/output_tap.rb
 - lib/dopairb/probe.rb
+- lib/dopairb/profile.rb
 - lib/dopairb/reline_adapter.rb
 - lib/dopairb/scene.rb
+- lib/dopairb/scenes/bonus.rb
 - lib/dopairb/scenes/failure.rb
 - lib/dopairb/scenes/finale.rb
 - lib/dopairb/scenes/session.rb
@@ -87,6 +95,7 @@ files:
 - lib/dopairb/sound.rb
 - lib/dopairb/stage.rb
 - lib/dopairb/term.rb
+- lib/dopairb/tour.rb
 - lib/dopairb/version.rb
 - spec.md
 homepage: https://github.com/ko1/dopairb