dopairb 0.1.0 → 0.4.0

data/lib/dopairb.rb

@@ -19,18 +19,24 @@ 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"
+require_relative "dopairb/sound"
 require_relative "dopairb/input_fx"
 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.
 #
@@ -42,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}"
@@ -50,14 +59,29 @@ 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)
         OutputTap.install
+        if active?
+          # decided before warming up: the first run shows the loading screen
+          @session.cold_start = Sound.available? && !Sound.ready?(:intro, config.duration)
+          Sound.warm_up(config.duration)
+        end
       else
         warn "dopairb: IRB #{defined?(IRB::VERSION) ? IRB::VERSION : '?'} is not supported; running plain IRB"
       end
@@ -81,33 +105,78 @@ module Dopairb
       "normal" => { intensity: :normal },
       "max" => { intensity: :max },
       "calm" => { intensity: :low, flash: :off, duration: 0.7 },
-      "party" => { intensity: :max, flash: :full, sound: true, duration: 1.0 },
+      "party" => { intensity: :max, flash: :full, sound: :sfx, duration: 1.0 },
     }.freeze
 
     HELP = <<~TXT
       dopa                  show settings and session stats
       dopa off|low|normal|max
       dopa calm             low intensity, no flash, shorter
-      dopa party            max intensity, full-screen flash, bell
+      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"]
         s = @session&.game
         puts "dopairb #{VERSION}  (#{active? ? 'active' : 'inactive: not a terminal or intensity=off'})"
         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?
       elsif words.size == 1 && PRESETS.key?(words[0])
         PRESETS[words[0]].each { |k, v| config.set(k, v) }
+        Sound.warm_up(config.duration) if active?
         puts "dopairb: #{words[0]}"
       else
         words.each do |w|
@@ -115,6 +184,7 @@ module Dopairb
           raise ArgumentError, "expected KEY=VALUE, got #{w.inspect}" unless v
           config.set(k, v)
         end
+        Sound.warm_up(config.duration) if active?
         puts "dopairb: " + words.join(" ")
       end
       nil

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.1.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Koichi Sasada
@@ -72,19 +72,30 @@ 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
 - lib/dopairb/scenes/success.rb
 - lib/dopairb/session.rb
+- 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