bcdice 3.3.0 → 3.6.0

data/lib/bcdice/common_command/tally_dice/node.rb

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+require "bcdice/result"
+
+module BCDice
+  module CommonCommand
+    module TallyDice
+      # 個数カウントダイスを表すノードをまとめるモジュール
+      module Node
+        # 個数カウントダイス：コマンドのノード
+        class Command
+          # 最大面数
+          MAX_SIDES = 20
+
+          # @param secret [Boolean] シークレットダイスか
+          # @param notation [Notation] ダイス表記
+          def initialize(secret:, notation:)
+            @secret = secret
+            @notation = notation
+          end
+
+          # @param game_system [Base] ゲームシステム
+          # @param randomizer [Randomizer] ランダマイザ
+          # @return [Result, nil]
+          def eval(game_system, randomizer)
+            dice = @notation.to_dice(game_system.round_type)
+            unless dice.valid?
+              return nil
+            end
+
+            if dice.sides > MAX_SIDES
+              return Result.new("(#{dice}) ＞ 面数は1以上、#{MAX_SIDES}以下としてください")
+            end
+
+            values = dice.roll(randomizer)
+
+            values_str = (game_system.sort_barabara_dice? ? values.sort : values)
+                         .join(",")
+
+            # TODO: Ruby 2.7以降のみサポートするようになった場合
+            # Enumerable#tally で書く
+            values_count = values
+                           .group_by(&:itself)
+                           .transform_values(&:length)
+
+            values_count_strs = (1..dice.sides).map do |v|
+              count = values_count.fetch(v, 0)
+
+              next nil if count == 0 && !dice.show_zeros?
+
+              "[#{v}]×#{values_count.fetch(v, 0)}"
+            end
+
+            sequence = [
+              "(#{dice})",
+              values_str,
+              values_count_strs.compact.join(", "),
+            ].compact
+
+            Result.new.tap do |r|
+              r.secret = @secret
+              r.text = sequence.join(" ＞ ")
+            end
+          end
+        end
+
+        # 個数カウントダイス：ダイス表記のノード
+        class Notation
+          # @return [Integer] 振る回数
+          attr_reader :times
+          # @return [Integer] 面数
+          attr_reader :sides
+          # @return [Boolean] 個数0を表示するか
+          attr_reader :show_zeros
+
+          # @param times [#eval] 振る回数
+          # @param sides [#eval] 面数
+          # @param show_zeros [Boolean] 個数0を表示するか
+          def initialize(times:, sides:, show_zeros:)
+            @times = times
+            @sides = sides
+            @show_zeros = show_zeros
+          end
+
+          # @param round_type [Symbol] 除算の端数処理方法
+          # @return [Dice]
+          def to_dice(round_type)
+            times = @times.eval(round_type)
+            sides = @sides.eval(round_type)
+
+            Dice.new(times: times, sides: sides, show_zeros: @show_zeros)
+          end
+        end
+
+        # 個数カウントダイス：ダイスのノード
+        class Dice
+          # @return [Integer] 振る回数
+          attr_reader :times
+          # @return [Integer] 面数
+          attr_reader :sides
+          # @return [Boolean] 個数0を表示するか
+          attr_reader :show_zeros
+
+          alias show_zeros? show_zeros
+
+          # @param times [Integer] 振る回数
+          # @param sides [Integer] 面数
+          def initialize(times:, sides:, show_zeros:)
+            @times = times
+            @sides = sides
+            @show_zeros = show_zeros
+          end
+
+          # @return [Boolean] ダイスとして有効（振る回数、面数ともに正の数）か
+          def valid?
+            @times > 0 && @sides > 0
+          end
+
+          # ダイスを振る
+          # @param randomizer [BCDice::Randomizer] ランダマイザ
+          # @return [Array<Integer>] 出目の配列
+          def roll(randomizer)
+            randomizer.roll_barabara(@times, @sides)
+          end
+
+          # @return [String]
+          def to_s
+            show_zeros_symbol = @show_zeros ? "Z" : "Y"
+            "#{@times}T#{show_zeros_symbol}#{@sides}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bcdice/common_command/tally_dice/parser.rb

@@ -0,0 +1,302 @@
+#
+# DO NOT MODIFY!!!!
+# This file is automatically generated by Racc 1.5.1
+# from Racc grammar file "".
+#
+
+require 'racc/parser.rb'
+
+
+require "bcdice/common_command/lexer"
+require "bcdice/common_command/tally_dice/node"
+require "bcdice/arithmetic/node"
+
+module BCDice
+  module CommonCommand
+    module TallyDice
+      class Parser < Racc::Parser
+
+
+def self.parse(source)
+  new.parse(source)
+end
+
+def parse(source)
+  @lexer = Lexer.new(source)
+  do_parse()
+rescue ParseError
+  nil
+end
+
+private
+
+def next_token
+  @lexer.next_token
+end
+##### State transition tables begin ###
+
+racc_action_table = [
+     8,     8,    18,    19,    20,    21,     8,     8,     8,    22,
+    14,    15,     3,     7,     7,    14,    15,    14,    15,     7,
+     7,     7,     8,     4,     8,    35,    33,    34,    36,     8,
+     9,    14,    15,    14,    15,     7,     8,     7,    14,    15,
+    23,    24,     7,    23,    24,    14,    15,    23,    24,     7,
+    10 ]
+
+racc_action_check = [
+     2,     7,    10,    10,    11,    11,    14,    17,    15,    11,
+     7,     7,     0,     2,     7,    14,    14,    15,    15,    14,
+    17,    15,    20,     1,    21,    31,    31,    31,    31,    23,
+     4,    20,    20,    21,    21,    20,    24,    21,    23,    23,
+    12,    12,    23,    28,    28,    24,    24,    29,    29,    24,
+     6 ]
+
+racc_action_pointer = [
+     2,    23,    -2,   nil,    30,   nil,    47,    -1,   nil,   nil,
+    -2,    -7,    27,   nil,     4,     6,   nil,     5,   nil,   nil,
+    20,    22,   nil,    27,    34,   nil,   nil,   nil,    30,    34,
+   nil,    19,   nil,   nil,   nil,   nil,   nil ]
+
+racc_action_default = [
+    -2,   -23,   -23,    -3,   -23,    -1,   -23,   -23,   -22,    37,
+   -23,   -23,    -9,   -12,   -23,   -23,   -20,   -23,    -5,    -6,
+   -23,   -23,   -21,   -23,   -23,   -18,   -19,    -4,    -7,    -8,
+   -10,   -13,   -11,   -14,   -15,   -16,   -17 ]
+
+racc_goto_table = [
+     6,    25,    26,    12,     1,     2,     5,    17,    11,    32,
+    30,    31,   nil,   nil,   nil,    27,    28,    29 ]
+
+racc_goto_check = [
+     4,     8,     8,     7,     1,     2,     3,     5,     6,     9,
+     8,     8,   nil,   nil,   nil,     4,     7,     7 ]
+
+racc_goto_pointer = [
+   nil,     4,     5,     4,    -2,    -3,     1,    -4,   -13,   -22 ]
+
+racc_goto_default = [
+   nil,   nil,   nil,   nil,    16,   nil,   nil,   nil,    13,   nil ]
+
+racc_reduce_table = [
+  0, 0, :racc_error,
+  2, 18, :_reduce_1,
+  0, 19, :_reduce_2,
+  1, 19, :_reduce_3,
+  4, 20, :_reduce_4,
+  1, 22, :_reduce_5,
+  1, 22, :_reduce_6,
+  3, 23, :_reduce_7,
+  3, 23, :_reduce_8,
+  1, 23, :_reduce_none,
+  3, 24, :_reduce_10,
+  4, 24, :_reduce_11,
+  1, 24, :_reduce_none,
+  0, 26, :_reduce_13,
+  1, 26, :_reduce_14,
+  1, 26, :_reduce_15,
+  1, 26, :_reduce_16,
+  1, 26, :_reduce_17,
+  2, 25, :_reduce_18,
+  2, 25, :_reduce_19,
+  1, 25, :_reduce_none,
+  3, 21, :_reduce_21,
+  1, 21, :_reduce_22 ]
+
+racc_reduce_n = 23
+
+racc_shift_n = 37
+
+racc_token_table = {
+  false => 0,
+  :error => 1,
+  :NUMBER => 2,
+  :T => 3,
+  :Y => 4,
+  :Z => 5,
+  :R => 6,
+  :U => 7,
+  :C => 8,
+  :F => 9,
+  :S => 10,
+  :PLUS => 11,
+  :MINUS => 12,
+  :ASTERISK => 13,
+  :SLASH => 14,
+  :PARENL => 15,
+  :PARENR => 16 }
+
+racc_nt_base = 17
+
+racc_use_result_var = true
+
+Racc_arg = [
+  racc_action_table,
+  racc_action_check,
+  racc_action_default,
+  racc_action_pointer,
+  racc_goto_table,
+  racc_goto_check,
+  racc_goto_default,
+  racc_goto_pointer,
+  racc_nt_base,
+  racc_reduce_table,
+  racc_token_table,
+  racc_shift_n,
+  racc_reduce_n,
+  racc_use_result_var ]
+
+Racc_token_to_s_table = [
+  "$end",
+  "error",
+  "NUMBER",
+  "T",
+  "Y",
+  "Z",
+  "R",
+  "U",
+  "C",
+  "F",
+  "S",
+  "PLUS",
+  "MINUS",
+  "ASTERISK",
+  "SLASH",
+  "PARENL",
+  "PARENR",
+  "$start",
+  "expr",
+  "secret",
+  "notation",
+  "term",
+  "show_zeros",
+  "add",
+  "mul",
+  "unary",
+  "round_type" ]
+
+Racc_debug_parser = false
+
+##### State transition tables end #####
+
+# reduce 0 omitted
+
+def _reduce_1(val, _values, result)
+          result = Node::Command.new(
+            secret: val[0],
+            notation: val[1]
+          )
+
+    result
+end
+
+def _reduce_2(val, _values, result)
+ result = false
+    result
+end
+
+def _reduce_3(val, _values, result)
+ result = true
+    result
+end
+
+def _reduce_4(val, _values, result)
+              result = Node::Notation.new(
+                times: val[0],
+                sides: val[3],
+                show_zeros: val[2]
+              )
+
+    result
+end
+
+def _reduce_5(val, _values, result)
+ result = false
+    result
+end
+
+def _reduce_6(val, _values, result)
+ result = true
+    result
+end
+
+def _reduce_7(val, _values, result)
+ result = Arithmetic::Node::BinaryOp.new(val[0], :+, val[2])
+    result
+end
+
+def _reduce_8(val, _values, result)
+ result = Arithmetic::Node::BinaryOp.new(val[0], :-, val[2])
+    result
+end
+
+# reduce 9 omitted
+
+def _reduce_10(val, _values, result)
+ result = Arithmetic::Node::BinaryOp.new(val[0], :*, val[2])
+    result
+end
+
+def _reduce_11(val, _values, result)
+         divied_class = val[3]
+         result = divied_class.new(val[0], val[2])
+
+    result
+end
+
+# reduce 12 omitted
+
+def _reduce_13(val, _values, result)
+ result = Arithmetic::Node::DivideWithGameSystemDefault
+    result
+end
+
+def _reduce_14(val, _values, result)
+ result = Arithmetic::Node::DivideWithCeil
+    result
+end
+
+def _reduce_15(val, _values, result)
+ result = Arithmetic::Node::DivideWithCeil
+    result
+end
+
+def _reduce_16(val, _values, result)
+ result = Arithmetic::Node::DivideWithRound
+    result
+end
+
+def _reduce_17(val, _values, result)
+ result = Arithmetic::Node::DivideWithFloor
+    result
+end
+
+def _reduce_18(val, _values, result)
+ result = val[1]
+    result
+end
+
+def _reduce_19(val, _values, result)
+ result = Arithmetic::Node::Negative.new(val[1])
+    result
+end
+
+# reduce 20 omitted
+
+def _reduce_21(val, _values, result)
+ result = val[1]
+    result
+end
+
+def _reduce_22(val, _values, result)
+ result = Arithmetic::Node::Number.new(val[0])
+    result
+end
+
+def _reduce_none(val, _values, result)
+  val[0]
+end
+
+      end   # class Parser
+    end   # module TallyDice
+  end   # module CommonCommand
+end   # module BCDice

data/lib/bcdice/common_command/tally_dice.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "bcdice/common_command/tally_dice/parser"
+
+module BCDice
+  module CommonCommand
+    # 個数カウントダイスのモジュール
+    module TallyDice
+      PREFIX_PATTERN = /\d+T[YZ]\d+/.freeze
+
+      class << self
+        def eval(command, game_system, randomizer)
+          cmd = Parser.parse(command)
+          cmd&.eval(game_system, randomizer)
+        end
+      end
+    end
+  end
+end

data/lib/bcdice/common_command.rb

@@ -2,6 +2,7 @@
 
 require "bcdice/common_command/add_dice"
 require "bcdice/common_command/barabara_dice"
+require "bcdice/common_command/tally_dice"
 require "bcdice/common_command/calc"
 require "bcdice/common_command/choice"
 require "bcdice/common_command/d66_dice"
@@ -15,6 +16,7 @@ module BCDice
     COMMANDS = [
       AddDice,
       BarabaraDice,
+      TallyDice,
       Calc,
       Choice,
       D66Dice,

data/lib/bcdice/dice_table/d66_left_range_table.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "bcdice/dice_table/d66_table"
+
+module BCDice
+  module DiceTable
+    # 左側（十の位）のみ Range を用いる D66 表
+    class D66LeftRangeTable < D66Table
+      # @param name [String] 表の名前
+      # @param sort_type [Symbol] 出目入れ替えの方式 BCDice::D66SortType
+      # @param items [Array<(Range, Array<String>)>] 表の項目の配列
+      def initialize(name, sort_type, items)
+        expanded_items = {}
+        items.each do |item|
+          range, right_items = item
+
+          range.each do |left_value|
+            right_items.each_with_index do |right_item, right_value|
+              key = left_value * 10 + (right_value + 1)
+              expanded_items[key] = right_item
+            end
+          end
+        end
+
+        super(name, sort_type, expanded_items)
+      end
+    end
+  end
+end

data/lib/bcdice/dice_table/d66_parity_table.rb

@@ -4,6 +4,14 @@ module BCDice
   module DiceTable
     # 出目の偶奇による場合分け機能をもつD66表
     class D66ParityTable
+      # @param key [String]
+      # @param locale [Symbol]
+      # @return [D66ParityTable]
+      def self.from_i18n(key, locale)
+        table = I18n.t(key, locale: locale, raise: true)
+        new(table[:name], table[:odd], table[:even])
+      end
+
       # @param name [String] 表の名前
       # @param odd [Array<String>] 左ダイスが奇数だったときの次層テーブル（サイズ６）
       # @param even [Array<String>] 左ダイスが偶数だったときの次層テーブル（サイズ６）

data/lib/bcdice/dice_table/d66_table.rb

@@ -39,7 +39,11 @@ module BCDice
         key = dice[0] * 10 + dice[1]
         chosen = @items[key]
         chosen = chosen.roll(randomizer) if chosen.respond_to?(:roll)
-        return RollResult.new(@name, key, chosen)
+        RollResult.new(@name, key, chosen)
+      end
+
+      def choice(key)
+        RollResult.new(@name, key, @items[key])
       end
     end
   end

data/lib/bcdice/dice_table.rb

@@ -5,6 +5,7 @@ require "bcdice/dice_table/chain_table"
 require "bcdice/dice_table/d66_grid_table"
 require "bcdice/dice_table/d66_half_grid_table"
 require "bcdice/dice_table/d66_one_third_table"
+require "bcdice/dice_table/d66_left_range_table"
 require "bcdice/dice_table/d66_parity_table"
 require "bcdice/dice_table/d66_range_table"
 require "bcdice/dice_table/d66_table"

data/lib/bcdice/game_system/AngelGear.rb

@@ -48,17 +48,22 @@ module BCDice
         dice_text = dice.join(",")
         modify_n = 0
         success = 0
-
         if skill_value
           success = dice.count { |val| val <= skill_value }
           modify_n = Arithmetic.eval(modify, RoundType::FLOOR) unless modify.empty?
         end
 
-        output = "(#{command}) ＞ #{success}[#{dice_text}]#{format('%+d', modify_n)} ＞ 成功数: #{success + modify_n}"
+        gospel = '(福音発生)' if success + modify_n >= 100
+
+        output = "(#{command}) ＞ #{success}[#{dice_text}]#{format('%+d', modify_n)} ＞ 成功数: #{success + modify_n}#{gospel}"
+
         if success + modify_n >= 100
-          output += "(福音発生)"
+          Result.critical(output)
+        elsif 0 < success + modify_n
+          Result.success(output)
+        else
+          Result.failure(output)
         end
-        return output
       end
 
       TABLES = {

data/lib/bcdice/game_system/Aoharubaan.rb

@@ -0,0 +1,91 @@
+# frozen_string_literal: true
+
+module BCDice
+  module GameSystem
+    class Aoharubaan < Base
+      # ゲームシステムの識別子
+      ID = 'Aoharubaan'
+
+      # ゲームシステム名
+      NAME = 'あおはるばーんっ'
+
+      # ゲームシステム名の読みがな
+      SORT_KEY = 'あおはるはあんつ'
+
+      # ダイスボットの使い方
+      HELP_MESSAGE = <<~HELP
+        カレカノ反応表（ KR, KReaction ）
+      HELP
+
+      JUDGE_ROLL_REG = /^(1d6?|d6)(\+\d+)?(>=|=>)(\d+)$/i.freeze
+      register_prefix('(1d6?|d6)(\+\d+)?(>=|=>)(\d+)')
+
+      def eval_game_system_specific_command(command)
+        command = ALIAS[command] || command
+
+        if (m = JUDGE_ROLL_REG.match(command))
+          roll_judge(m[2], m[4])
+        else
+          roll_tables(command, TABLES)
+        end
+      end
+
+      private
+
+      def roll_judge(modifier_expression, border_expression)
+        modifier = modifier_expression ? Arithmetic.eval(modifier_expression, RoundType::FLOOR) : nil
+        border = border_expression.to_i
+
+        command_text = make_command_text(modifier, border)
+
+        dice = @randomizer.roll_once(6)
+        score = dice + modifier.to_i
+
+        is_success = score >= border # 「成功」か？
+        is_right = is_success && score == border # 「ピタリ賞」か？
+        is_excellent = is_success && score >= 7 # 「限界突破」か？
+
+        result_elements = []
+        result_elements << (is_success ? '成功' : '失敗')
+        result_elements << "ピタリ賞" if is_right
+        result_elements << "限界突破" if is_excellent
+
+        message_elements = []
+        message_elements << command_text
+        message_elements << "#{dice}+#{modifier}" if modifier
+        message_elements << score
+        message_elements << result_elements.join(" ＆ ")
+
+        Result.new(message_elements.join(' ＞ ')).tap do |r|
+          r.condition = is_success
+          r.critical = is_right || is_excellent
+        end
+      end
+
+      def make_command_text(modifier, border)
+        command = "1D6"
+        command = "#{command}+#{modifier}" if modifier
+        command = "#{command}>=#{border}"
+        "(#{command})"
+      end
+
+      ALIAS = {
+        "KR" => "KReaction",
+      }.transform_keys(&:upcase).transform_values(&:upcase).freeze
+
+      TABLES = {
+        "KReaction" => DiceTable::RangeTable.new(
+          "カレカノ反応表",
+          "1D6",
+          [
+            [1..2, "何となく素っ気ない気がする。"],
+            [3..4, "いつもと変わらない安心感。"],
+            [5..6, "何故だかすごくデレてきた！　嬉しくて〈テンション〉１回復。"],
+          ]
+        ),
+      }.transform_keys(&:upcase).freeze
+
+      register_prefix(ALIAS.keys, TABLES.keys)
+    end
+  end
+end