asterism-games 0.19.1 → 0.21.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (41) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +66 -0
  3. data/README.md +129 -18
  4. data/VERSION +1 -1
  5. data/lib/asterism_games/commentate/assets/SOUNDS_LICENSE.txt +63 -0
  6. data/lib/asterism_games/commentate/assets/commentate.css +9 -4
  7. data/lib/asterism_games/commentate/assets/commentate.js +298 -7
  8. data/lib/asterism_games/commentate/assets/index.html +5 -3
  9. data/lib/asterism_games/commentate/assets/sounds/after_the_rain.mp3 +0 -0
  10. data/lib/asterism_games/commentate/assets/sounds/chi.wav +0 -0
  11. data/lib/asterism_games/commentate/assets/sounds/discard.wav +0 -0
  12. data/lib/asterism_games/commentate/assets/sounds/discard_other.wav +0 -0
  13. data/lib/asterism_games/commentate/assets/sounds/draw.wav +0 -0
  14. data/lib/asterism_games/commentate/assets/sounds/encounter.mp3 +0 -0
  15. data/lib/asterism_games/commentate/assets/sounds/fanfare1.wav +0 -0
  16. data/lib/asterism_games/commentate/assets/sounds/fanfare2.wav +0 -0
  17. data/lib/asterism_games/commentate/assets/sounds/fanfare3.wav +0 -0
  18. data/lib/asterism_games/commentate/assets/sounds/fanfare4.wav +0 -0
  19. data/lib/asterism_games/commentate/assets/sounds/kan.wav +0 -0
  20. data/lib/asterism_games/commentate/assets/sounds/kyuushu.wav +0 -0
  21. data/lib/asterism_games/commentate/assets/sounds/points.wav +0 -0
  22. data/lib/asterism_games/commentate/assets/sounds/pon.wav +0 -0
  23. data/lib/asterism_games/commentate/assets/sounds/riichi.wav +0 -0
  24. data/lib/asterism_games/commentate/assets/sounds/ron.wav +0 -0
  25. data/lib/asterism_games/commentate/assets/sounds/round.wav +0 -0
  26. data/lib/asterism_games/commentate/assets/sounds/ryuukyoku.wav +0 -0
  27. data/lib/asterism_games/commentate/assets/sounds/sounds.json +335 -0
  28. data/lib/asterism_games/commentate/assets/sounds/spring_thing.mp3 +0 -0
  29. data/lib/asterism_games/commentate/assets/sounds/tsumo.wav +0 -0
  30. data/lib/asterism_games/commentate/assets/sounds/turn.wav +0 -0
  31. data/lib/asterism_games/commentate/assets/sounds/yaku.wav +0 -0
  32. data/lib/asterism_games/commentate/mahjong.rb +11 -4
  33. data/lib/asterism_games/commentate/mahjong_sounds.rb +118 -0
  34. data/lib/asterism_games/commentate/server.rb +14 -2
  35. data/lib/asterism_games/commentate.rb +8 -2
  36. data/lib/asterism_games/host.rb +1 -1
  37. data/lib/asterism_games/othello/table.rb +13 -10
  38. data/lib/asterism_games/play/mahjong.rb +25 -10
  39. data/lib/asterism_games/play/mahjong_screen.rb +33 -12
  40. data/lib/asterism_games/play/mahjong_text.rb +47 -6
  41. metadata +27 -2
@@ -21,7 +21,8 @@ module AsterismGames
21
21
  On a terminal it reads keys, as the table app does: Left/Right choose a tile,
22
22
  Enter or Space discards it; R riichi, T tsumo/ron, P pon, C V B chi, K L J kan,
23
23
  N nine kinds, Esc pass, Enter the result's OK; in the lobby 1-4 sit, S stand,
24
- C CPUs, Enter start; Q or Ctrl+C quits; : (or /) opens a line for a command.
24
+ C CPUs, A then 1-4 a seat's CPU or AI player, Enter start, W a watch game;
25
+ Q or Ctrl+C quits; : (or /) opens a line for a command.
25
26
  Mahjong commands (one per line, or after :):
26
27
  a .. n discard that tile of the hand (the drawn tile is the last letter)
27
28
  6s, 0p, 東 discard that tile (0: the red five; 1z..7z for the honours too)
@@ -33,7 +34,8 @@ module AsterismGames
33
34
  ok the result's OK (an empty line too); at the end, the owner: back to the lobby
34
35
  sit [1-4], stand, cpu [1-4] (empty seats to CPUs; the owner), nocpu 1-4,
35
36
  ai 1-4 KIND (an AI player, when the lobby offers one), tonpuu, hanchan,
36
- rule ITEM VALUE (README "Local rules"), start (the owner)
37
+ rule ITEM VALUE (README "Local rules"), start (the owner),
38
+ watch (the owner: the four seats CPUs or AI players, a game only watched)
37
39
  auto let the client play for you (wins, passes, discards the drawn tile,
38
40
  OKs the results); again to stop
39
41
  tables, view, help, quit
@@ -50,8 +52,8 @@ module AsterismGames
50
52
  TIMER_EVERY_S = 1.0
51
53
 
52
54
  # --commands that only work in the lobby, and those of the owner.
53
- LOBBY_WORDS = %w[sit stand cpu nocpu ai start tonpuu hanchan rule].freeze
54
- OWNER_WORDS = %w[cpu nocpu ai start tonpuu hanchan rule].freeze
55
+ LOBBY_WORDS = %w[sit stand cpu nocpu ai start watch tonpuu hanchan rule].freeze
56
+ OWNER_WORDS = %w[cpu nocpu ai start watch tonpuu hanchan rule].freeze
55
57
 
56
58
  REASONS = {
57
59
  "token" => "卓の人ではない", "not seated" => "席に着いていない", "stale" => "画面が古い: 読み直し中",
@@ -60,7 +62,8 @@ module AsterismGames
60
62
  "not owner" => "卓の主だけができる", "seats" => "4 席がそろっていない", "no human" => "人が 1 人もいない",
61
63
  "no change" => "変わらない", "full" => "卓が満員", "spectators" => "観戦の人数が上限",
62
64
  "value" => "選べない値", "no rule" => "その項目は無い", "no ai" => "その AI は今は出せない",
63
- "identity" => "この部屋での名乗りが合わない"
65
+ "identity" => "この部屋での名乗りが合わない", "human" => "人が座っている (観戦対局は 4 席とも CPU か AI)",
66
+ "ai limit" => MahjongText::WATCH_AI_NOTE
64
67
  }.freeze
65
68
 
66
69
  # The whole run: connect, find the table, play until quit (or over).
@@ -120,6 +123,7 @@ module AsterismGames
120
123
  @keys = keys
121
124
  @sel = -1
122
125
  @pick = false
126
+ @ai_pick = false # A in the lobby: a seat's number comes next
123
127
  @typing = false
124
128
  @path = path
125
129
  @name = name
@@ -233,7 +237,8 @@ module AsterismGames
233
237
  # One key (Play.key_loop); false to quit, :line for a line to type.
234
238
  def key(k)
235
239
  v = @view.is_a?(Hash) ? @view : nil
236
- r = MahjongText.key_command(k, v, sel: @sel, pick: @pick)
240
+ r = MahjongText.key_command(k, v, sel: @sel, pick: @pick, ai_pick: @ai_pick)
241
+ @ai_pick = false unless r[0] == :ai_pick
237
242
  case r[0]
238
243
  when :quit then return false
239
244
  when :line then return :line
@@ -248,6 +253,12 @@ module AsterismGames
248
253
  @note = ""
249
254
  draw
250
255
  end
256
+ when :ai_pick
257
+ @lock.synchronize do
258
+ @ai_pick = r[1]
259
+ @note = ""
260
+ draw
261
+ end
251
262
  when :act
252
263
  answer = act(r[1], r[2])
253
264
  say(answer == "ok" ? "" : answer)
@@ -315,9 +326,12 @@ module AsterismGames
315
326
  return "画面を待っています" unless v.is_a?(Hash) && !v["error"]
316
327
  return "待ち合わせを待っています" unless v["st"] == "wait"
317
328
  return nil unless OWNER_WORDS.include?(w)
318
- return "席に着くのを待っています" unless v["me"].to_i >= 0
319
- return "卓の主を待っています" unless v["ow"] == v["me"]
320
- return "4 席がそろうのを待っています" if w == "start" && (v["sk"] || [0]).any?(&:zero?)
329
+ unless MahjongText.owner?(v)
330
+ # Seated or not, the role is someone else's (since games 0.20.0
331
+ # an owner may be unseated): wait for it to come here.
332
+ return "卓の主ではありません。卓の主の役が回ってくるのを待っています"
333
+ end
334
+ return "4 席がそろうのを待っています" if %w[start watch].include?(w) && (v["sk"] || [0]).any?(&:zero?)
321
335
  nil
322
336
  end
323
337
 
@@ -394,6 +408,7 @@ module AsterismGames
394
408
  when "nocpu" then args.empty? ? "nocpu 1-4" : reason(@table.cpu(@token, seat_arg(args), false))
395
409
  when "ai" then args.size < 2 ? "ai 1-4 KIND" : reason(@table.cpu(@token, seat_arg(args), args[1]))
396
410
  when "start" then reason(@table.start(@token))
411
+ when "watch" then reason(@table.watch(@token))
397
412
  when "tonpuu" then reason(@table.rule(@token, 0, 1))
398
413
  when "hanchan" then reason(@table.rule(@token, 0, 0))
399
414
  when "rule"
@@ -453,7 +468,7 @@ module AsterismGames
453
468
 
454
469
  # What the screen needs of the keys (nil: commands are typed).
455
470
  def key_state
456
- @keys && !@typing ? { sel: @sel, pick: @pick } : nil
471
+ @keys && !@typing ? { sel: @sel, pick: @pick, ai_pick: @ai_pick } : nil
457
472
  end
458
473
 
459
474
  # The countdown on a terminal (the move's time and the bank, the
@@ -157,6 +157,7 @@ module AsterismGames
157
157
  def lobby
158
158
  v = @v
159
159
  out = ["#{v['t'] || @path} 待ち合わせ#{" ゲームホスト #{v['hv']}" if v['hv']}"]
160
+ out << " (卓の主: 自分)" if v["mo"] == 1 && @me.negative?
160
161
  sk = v["sk"] || [0, 0, 0, 0]
161
162
  ai = v["ai"] || []
162
163
  4.times do |s|
@@ -169,8 +170,11 @@ module AsterismGames
169
170
  out << " 席#{s + 1} #{n}#{" (#{tags.join(', ')})" unless tags.empty?}"
170
171
  end
171
172
  out << " ルール: #{rules_text}" if v["ru"]
172
- watchers = (v["mb"] || []).select { |m| m[1] == -1 }.map(&:first)
173
+ # Members without a seat; the owner among them (an owner without a
174
+ # seat, README "Watch games") marked.
175
+ watchers = (v["mb"] || []).select { |m| m[1] == -1 }.map { |m| m[2].to_i & 2 == 2 ? "#{m[0]}(卓の主)" : m[0] }
173
176
  out << " 観戦: #{watchers.join(' ')}" unless watchers.empty?
177
+ out << " #{MahjongText::WATCH_AI_NOTE}" if v["wc"] == 2 && MahjongText.owner?(v)
174
178
  out
175
179
  end
176
180
 
@@ -189,6 +193,7 @@ module AsterismGames
189
193
  v = @v
190
194
  r = v["r"] || []
191
195
  out = []
196
+ out << "観戦対局 (CPU と AI だけ)" if v["wm"] == 1
192
197
  if r.size >= 4
193
198
  h = row.text("#{round_name(r)} 供託#{r[3]} 残り#{r[5]} ドラ ")
194
199
  bytes(v["dora"]).each { |t| tile_cell(h, t) }
@@ -463,12 +468,16 @@ module AsterismGames
463
468
  types = opts.map(&:first).uniq
464
469
  case v["st"]
465
470
  when "wait"
466
- return "観戦中: sit で座る、quit で出る" if @me.negative?
467
- owner = v["ow"] == @me
471
+ owner = MahjongText.owner?(v)
472
+ if @me.negative?
473
+ return "観戦中 (卓の主): sit で座る、cpu [席]、ai 席 KIND、watch (観戦で始める)、quit" if owner
474
+ return "観戦中: sit で座る、quit で出る"
475
+ end
468
476
  return "stand、cpu [席] (空きを CPU で)、nocpu 席、tonpuu / hanchan、start、quit" if owner
469
477
  return "4 席がそろったら卓の主が始める (stand、quit)"
470
478
  when "over"
471
479
  return "ok で待ち合わせに戻す (quit で出る)" if types.include?(NEXT)
480
+ return "観戦対局: しばらくすると待ち合わせに戻る (quit で出る)" if v["wm"] == 1
472
481
  return "次へ: 卓の主が待ち合わせに戻す (quit で出る)"
473
482
  when "result"
474
483
  return "ok で次へ" if types.include?(NEXT)
@@ -512,6 +521,7 @@ module AsterismGames
512
521
  when "wait" then return lobby_keys
513
522
  when "over"
514
523
  return "[Enter]待ち合わせに戻す #{COMMON_KEYS}" if types.include?(NEXT)
524
+ return "観戦対局: しばらくすると待ち合わせに戻る #{COMMON_KEYS}" if v["wm"] == 1
515
525
  return "次へ: 卓の主が待ち合わせに戻す #{COMMON_KEYS}"
516
526
  when "result"
517
527
  return "[Enter]OK #{COMMON_KEYS}" if types.include?(NEXT)
@@ -567,26 +577,37 @@ module AsterismGames
567
577
  end
568
578
 
569
579
  # The lobby's keys: 1-4 for the seats that may be taken (empty or a
570
- # CPU's), S stand, C CPUs and Enter start (the owner).
580
+ # CPU's), S stand, C CPUs, A then 1-4 a seat's CPU or AI player,
581
+ # Enter start and W a watch game (the owner; README "Watch games").
571
582
  def lobby_keys
572
583
  v = @v
573
584
  sk = v["sk"] || [0, 0, 0, 0]
585
+ if @keys && @keys[:ai_pick]
586
+ return "AI: [1]-[4] 席を選ぶ (空き→CPU→#{Array(v['ak']).map { |k| AI_LABELS[k] || k }.join('→')}→CPU) " \
587
+ "ほかのキーでやめる"
588
+ end
589
+ owner = MahjongText.owner?(v)
574
590
  free = (0..3).select { |s| sk[s] != 1 && s != @me }.map { |s| "[#{s + 1}]" }
575
591
  words = []
576
592
  words << "#{free.join}座る" unless free.empty?
577
- if @me >= 0
578
- words << "[S]立つ"
579
- if v["ow"] == @me
580
- words << "[C]CPU で埋める" if sk.any?(&:zero?)
581
- words << "[Enter]始める" unless sk.any?(&:zero?)
582
- else
583
- words << "(卓の主が始める)"
593
+ words << "[S]立つ" if @me >= 0
594
+ if owner
595
+ words << "[C]CPU で埋める" if sk.any?(&:zero?)
596
+ words << "[A]AI" unless Array(v["ak"]).empty?
597
+ if v["wc"] == 1
598
+ words << "[W]観戦で始める"
599
+ elsif @me >= 0 && sk.none?(&:zero?)
600
+ words << "[Enter]始める"
584
601
  end
602
+ elsif @me >= 0
603
+ words << "(卓の主が始める)"
585
604
  end
586
605
  words << COMMON_KEYS
587
- "#{@me.negative? ? '観戦中: ' : ''}#{words.join(' ')}"
606
+ "#{@me.negative? ? (owner ? '観戦中 (卓の主): ' : '観戦中: ') : ''}#{words.join(' ')}"
588
607
  end
589
608
 
609
+ AI_LABELS = { "claude" => "Claude", "jev" => "Jev" }.freeze
610
+
590
611
  def turn_text(r)
591
612
  cur = r[6]
592
613
  return "" if cur.nil? || cur.negative? || r[7].to_i >= 2
@@ -378,30 +378,71 @@ module AsterismGames
378
378
  # [:quit]
379
379
  # [:error, text] why not (Japanese, for the screen)
380
380
  # [:none] nothing
381
- def key_command(key, view, sel: -1, pick: false)
381
+ # ai_pick: A was pressed in the lobby, a seat's number comes next
382
+ # ([:ai_pick, on] turns it on or off).
383
+ def key_command(key, view, sel: -1, pick: false, ai_pick: false)
382
384
  k = key.is_a?(String) ? key.downcase : key
383
385
  return [:quit] if QUIT_KEYS.include?(k)
384
386
  return [:line] if LINE_KEYS.include?(k)
385
387
  return [:none] unless view.is_a?(Hash) && !view["error"]
386
388
  me = view["me"].to_i
387
- return lobby_key(k, view, me) if view["st"] == "wait"
389
+ return lobby_key(k, view, me, ai_pick) if view["st"] == "wait"
388
390
  return [:none] if me.negative? || !%w[play result over].include?(view["st"])
389
391
  table_key(k, view, sel, pick)
390
392
  end
391
393
 
392
- # The lobby: 1-4 sit there, S stand, C CPUs into the empty seats and
393
- # Enter start (the owner's).
394
- def lobby_key(k, view, me)
395
- owner = me >= 0 && view["ow"] == me
394
+ # The lobby: 1-4 sit there, S stand, C CPUs into the empty seats,
395
+ # A then 1-4 that seat's next player (CPU, the AI players offered),
396
+ # Enter start and W a watch game (the owner's).
397
+ def lobby_key(k, view, me, ai_pick = false)
398
+ owner = owner?(view)
399
+ if ai_pick
400
+ return [:ai_pick, false] unless %w[1 2 3 4].include?(k)
401
+ return ai_seat_command(view, k.to_i - 1)
402
+ end
396
403
  case k
397
404
  when "1", "2", "3", "4" then [:cmd, "sit", [k]]
398
405
  when "s" then me >= 0 ? [:cmd, "stand", []] : [:none]
399
406
  when "c" then owner ? [:cmd, "cpu", []] : [:error, "卓の主だけができる"]
407
+ when "a"
408
+ return [:error, "卓の主だけができる"] unless owner
409
+ return [:error, "ゲームホストが AI を出していない"] if Array(view["ak"]).empty?
410
+ [:ai_pick, true]
411
+ when "w"
412
+ return [:error, "卓の主だけができる"] unless owner
413
+ return [:error, "このゲームホストは観戦対局ができない"] unless view.key?("wc")
414
+ return [:error, WATCH_AI_NOTE] if view["wc"] == 2
415
+ return [:error, "4 席を CPU か AI で埋めると観戦で始められる"] unless view["wc"] == 1
416
+ [:cmd, "watch", []]
400
417
  when :enter then owner ? [:cmd, "start", []] : [:none]
401
418
  else [:none]
402
419
  end
403
420
  end
404
421
 
422
+ WATCH_AI_NOTE = "観戦対局の AI は Claude 1 席・Jev 4 席まで"
423
+
424
+ # This member is the owner: "mo" (games 0.20.0; an owner without a
425
+ # seat too), or its seat is the owner's.
426
+ def owner?(view)
427
+ return true if view["mo"] == 1
428
+ me = view["me"].to_i
429
+ me >= 0 && view["ow"] == me
430
+ end
431
+
432
+ # A then a seat's number: an empty seat gets a CPU, a CPU the first AI
433
+ # player offered, an AI player the next one, the last back a CPU.
434
+ def ai_seat_command(view, seat)
435
+ sk = view["sk"] || [0, 0, 0, 0]
436
+ return [:error, "その席は人が座っている"] if sk[seat] == 1
437
+ n = (seat + 1).to_s
438
+ return [:cmd, "cpu", [n]] if sk[seat].to_i.zero?
439
+ kinds = Array(view["ak"])
440
+ cur = Array(view["ai"])[seat].to_s
441
+ i = cur.empty? ? -1 : kinds.index(cur)
442
+ nxt = i.nil? ? nil : kinds[i + 1]
443
+ nxt ? [:cmd, "ai", [n, nxt]] : [:cmd, "cpu", [n]]
444
+ end
445
+
405
446
  def table_key(k, view, sel, pick)
406
447
  opts = options(view)
407
448
  has = ->(type) { opts.any? { |t, _| t == type } }
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: asterism-games
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.19.1
4
+ version: 0.21.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Katsuhiko Kageyama
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2026-10-20 00:00:00.000000000 Z
11
+ date: 2026-10-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: asterism
@@ -56,15 +56,40 @@ files:
56
56
  - lib/asterism_games/board/table.rb
57
57
  - lib/asterism_games/commentate.rb
58
58
  - lib/asterism_games/commentate/ai_comment.rb
59
+ - lib/asterism_games/commentate/assets/SOUNDS_LICENSE.txt
59
60
  - lib/asterism_games/commentate/assets/TILES_LICENSE.txt
60
61
  - lib/asterism_games/commentate/assets/commentate.css
61
62
  - lib/asterism_games/commentate/assets/commentate.js
62
63
  - lib/asterism_games/commentate/assets/index.html
64
+ - lib/asterism_games/commentate/assets/sounds/after_the_rain.mp3
65
+ - lib/asterism_games/commentate/assets/sounds/chi.wav
66
+ - lib/asterism_games/commentate/assets/sounds/discard.wav
67
+ - lib/asterism_games/commentate/assets/sounds/discard_other.wav
68
+ - lib/asterism_games/commentate/assets/sounds/draw.wav
69
+ - lib/asterism_games/commentate/assets/sounds/encounter.mp3
70
+ - lib/asterism_games/commentate/assets/sounds/fanfare1.wav
71
+ - lib/asterism_games/commentate/assets/sounds/fanfare2.wav
72
+ - lib/asterism_games/commentate/assets/sounds/fanfare3.wav
73
+ - lib/asterism_games/commentate/assets/sounds/fanfare4.wav
74
+ - lib/asterism_games/commentate/assets/sounds/kan.wav
75
+ - lib/asterism_games/commentate/assets/sounds/kyuushu.wav
76
+ - lib/asterism_games/commentate/assets/sounds/points.wav
77
+ - lib/asterism_games/commentate/assets/sounds/pon.wav
78
+ - lib/asterism_games/commentate/assets/sounds/riichi.wav
79
+ - lib/asterism_games/commentate/assets/sounds/ron.wav
80
+ - lib/asterism_games/commentate/assets/sounds/round.wav
81
+ - lib/asterism_games/commentate/assets/sounds/ryuukyoku.wav
82
+ - lib/asterism_games/commentate/assets/sounds/sounds.json
83
+ - lib/asterism_games/commentate/assets/sounds/spring_thing.mp3
84
+ - lib/asterism_games/commentate/assets/sounds/tsumo.wav
85
+ - lib/asterism_games/commentate/assets/sounds/turn.wav
86
+ - lib/asterism_games/commentate/assets/sounds/yaku.wav
63
87
  - lib/asterism_games/commentate/assets/tiles_hand.bmp
64
88
  - lib/asterism_games/commentate/assets/tiles_river.bmp
65
89
  - lib/asterism_games/commentate/mahjong.rb
66
90
  - lib/asterism_games/commentate/mahjong_events.rb
67
91
  - lib/asterism_games/commentate/mahjong_phrases.rb
92
+ - lib/asterism_games/commentate/mahjong_sounds.rb
68
93
  - lib/asterism_games/commentate/mahjong_voice.yml
69
94
  - lib/asterism_games/commentate/server.rb
70
95
  - lib/asterism_games/commentate/voice.rb