bcdice 3.1.2 → 3.4.0

data/lib/bcdice/game_system/RuneQuest.rb

@@ -18,8 +18,8 @@ module BCDice
       INFO_MESSAGE_TEXT
 
       # ゲーム別成功度判定(1d100)
-      def check_1D100(total, _dice_total, cmp_op, target)
-        return '' if target == '?'
+      def result_1d100(total, _dice_total, cmp_op, target)
+        return Result.nothing if target == '?'
         return nil unless cmp_op == :<=
 
         # RuneQuest QUICK-START RULESを元に修正
@@ -28,18 +28,18 @@ module BCDice
 
         if (total <= 1) || (total <= critical_value)
           # 1は常に決定的成功
-          " ＞ 決定的成功"
+          Result.critical("決定的成功")
         elsif total >= 100
           # 100は常に致命的失敗
-          " ＞ 致命的失敗"
+          Result.fumble("致命的失敗")
         elsif total <= (target.to_f / 5).round
-          " ＞ 効果的成功"
+          Result.success("効果的成功")
         elsif total <= target
-          " ＞ 成功"
+          Result.success("成功")
         elsif total >= 95 + critical_value
-          " ＞ 致命的失敗"
+          Result.fumble("致命的失敗")
         else
-          " ＞ 失敗"
+          Result.failure("失敗")
         end
       end
     end

data/lib/bcdice/game_system/Ryutama.rb

@@ -21,7 +21,7 @@ module BCDice
         例）R8,6>=13
       INFO_MESSAGE_TEXT
 
-      register_prefix('R\d+')
+      register_prefix('R')
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/SRS.rb

@@ -219,7 +219,7 @@ module BCDice
 
       # 固有のダイスロールコマンドを実行する
       # @param [String] command 入力されたコマンド
-      # @return [String, nil] ダイスロールコマンドの実行結果
+      # @return [Result, nil] ダイスロールコマンドの実行結果
       def eval_game_system_specific_command(command)
         alias_replaced_with_2d6 = replace_alias_for_srs_roll_with_2d6(command)
 
@@ -297,7 +297,7 @@ module BCDice
 
       # 成功判定を実行する
       # @param [SRSRollNode] srs_roll 成功判定ノード
-      # @return [String] 成功判定結果
+      # @return [Result] 成功判定結果
       def execute_srs_roll(srs_roll)
         dice_list = @randomizer.roll_barabara(2, 6)
         dice_list.sort! if @sort_add_dice
@@ -307,35 +307,36 @@ module BCDice
 
         modified_sum = sum + srs_roll.modifier
 
+        result = compare_result(srs_roll, sum, modified_sum)
+
         parts = [
           "(#{srs_roll})",
           "#{sum}[#{dice_str}]#{Format.modifier(srs_roll.modifier)}",
           modified_sum,
-          compare_result(srs_roll, sum, modified_sum)
+          result.text
         ]
 
-        return parts.compact.join(' ＞ ')
+        result.text = parts.compact.join(' ＞ ')
+        result
       end
 
       # ダイスロール結果を目標値、クリティカル値、ファンブル値と比較する
       # @param [SRSRollNode] srs_roll 成功判定ノード
       # @param [Integer] sum 出目の合計
       # @param [Integer] modified_sum 修正後の値
-      # @return [String, nil] 比較結果
+      # @return [Result] 比較結果
       def compare_result(srs_roll, sum, modified_sum)
         if sum >= srs_roll.critical_value
-          return '自動成功'
-        end
-
-        if sum <= srs_roll.fumble_value
-          return '自動失敗'
-        end
-
-        if srs_roll.target_value
-          return modified_sum >= srs_roll.target_value ? '成功' : '失敗'
+          Result.critical("自動成功")
+        elsif sum <= srs_roll.fumble_value
+          Result.fumble("自動失敗")
+        elsif srs_roll.target_value.nil?
+          Result.new
+        elsif modified_sum >= srs_roll.target_value
+          Result.success("成功")
+        else
+          Result.failure("失敗")
         end
-
-        return nil
       end
     end
   end

data/lib/bcdice/game_system/SamsaraBallad.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'bcdice/base'
+
 module BCDice
   module GameSystem
     class SamsaraBallad < Base
@@ -59,38 +61,63 @@ module BCDice
           total = 100 if total == 0
         end
 
-        cmp_result = compare(total, cmd)
+        result = compare(total, cmd)
+
+        result_str =
+          if result.failure?
+            "失敗"
+          elsif result.success?
+            "成功"
+          end
+
+        additional_str =
+          if result.fumble?
+            "ファンブル"
+          elsif result.critical?
+            "クリティカル"
+          end
 
         sequence = [
           "(D100#{cmd.cmp_op}#{cmd.target_number})",
           places_text,
           total.to_s,
-          cmp_result,
+          result_str,
+          additional_str,
         ].compact
 
-        return sequence.join(" ＞ ")
+        result.text = sequence.join(" ＞ ")
+
+        return result
       end
 
       private
 
-      # @return [String]
-      # @return [nil]
+      # @return [Result]
       def compare(total, cmd)
         if [:<=, :<].include?(cmd.cmp_op)
           if !total.send(cmd.cmp_op, cmd.target_number)
-            "失敗"
+            Result.failure(nil)
           elsif fumble_?(total, cmd.fumble)
-            "ファンブル"
+            Result.new.tap do |r|
+              r.success = true
+              r.fumble = true
+            end
           elsif critical_?(total, cmd.critical)
-            "クリティカル"
+            Result.critical(nil)
           else
-            "成功"
+            Result.success(nil)
           end
         elsif fumble_?(total, cmd.fumble)
           # ファンブル優先
-          "ファンブル"
+          Result.new.tap do |r|
+            r.fumble = true
+          end
         elsif critical_?(total, cmd.critical)
-          "クリティカル"
+          Result.new.tap do |r|
+            r.critical = true
+          end
+        else
+          Result.new
         end
       end
 

data/lib/bcdice/game_system/Satasupe.rb

@@ -49,7 +49,7 @@ module BCDice
         ・D66ダイスあり
       INFO_MESSAGE_TEXT
 
-      register_prefix('\d+R', 'SR\d+', 'TAGT', 'GETSST', 'NPCT', TABLES.keys, ALIASES.keys)
+      register_prefix('\d+R', 'SR', 'TAGT', 'GETSST', 'NPCT', TABLES.keys, ALIASES.keys)
 
       CREATE_ARMS_STRUCT = Struct.new(:base_parts, :accessory_parts, :parts_effect, :hit, :damage, :life, :kutibeni, :kiba, :abilities)
 
@@ -64,7 +64,7 @@ module BCDice
         debug("eval_game_system_specific_command begin string", command)
 
         result = checkRoll(command)
-        return result unless result.empty?
+        return result unless result.nil?
 
         debug("判定ロールではなかった")
 
@@ -81,13 +81,13 @@ module BCDice
         debug("checkRoll begin string", string)
 
         m = /^(\d+)R>=(\d+)(\[(\d+)?(,|,\d+)?(,\d+(S)?)?\])?$/i.match(string)
-        return '' unless m
+        return nil unless m
 
         roll_times = m[1].to_i
         target = m[2].to_i
         params = m[3]
 
-        min_suc, fumble, critical, isCriticalStop = getRollParams(params)
+        min_suc, fumble, critical, is_critical_stop = get_roll_params(params)
 
         result = ""
 
@@ -104,8 +104,8 @@ module BCDice
         end
 
         if fumble >= 6
-          result += "#{getJudgeInfo(target, fumble, critical)} ＞ ファンブル率が6を超えたため自動失敗！"
-          return result
+          result += "#{get_judge_info(target, fumble, critical)} ＞ ファンブル率が6を超えたため自動失敗！"
+          return Result.failure(result)
         end
 
         if target < 5
@@ -113,23 +113,30 @@ module BCDice
           target = 5
         end
 
-        dice_str, total_suc, isCritical, isFumble = checkRollLoop(roll_times, min_suc, target, critical, fumble, isCriticalStop)
+        dice_str, total_suc, is_critical, is_fumble = check_roll_loop(roll_times, min_suc, target, critical, fumble, is_critical_stop)
 
-        result += "#{getJudgeInfo(target, fumble, critical)} ＞ #{dice_str} ＞ 成功度#{total_suc}"
+        result += "#{get_judge_info(target, fumble, critical)} ＞ #{dice_str} ＞ 成功度#{total_suc}"
 
-        if isFumble
+        if is_fumble
           result += " ＞ ファンブル"
         end
 
-        if isCritical && (total_suc > 0)
+        if is_critical && (total_suc > 0)
           result += " ＞ 必殺発動可能！"
         end
 
         debug('checkRoll result result', result)
-        return result
+
+        return Result.new.tap do |r|
+          r.text = result
+          r.success = !is_fumble && min_suc > 0 && total_suc >= min_suc
+          r.failure = is_fumble
+          r.critical = is_critical
+          r.fumble = is_fumble
+        end
       end
 
-      def getRollParams(params)
+      def get_roll_params(params)
         min_suc = 0
         fumble = 1
         critical = 13
@@ -154,19 +161,14 @@ module BCDice
         return min_suc, fumble, critical, isCriticalStop
       end
 
-      def getJudgeInfo(target, fumble, critical)
-        "【難易度#{target}、ファンブル率#{fumble}#{getcriticalString(critical)}】"
+      def get_judge_info(target, fumble, critical)
+        return "【難易度#{target}、ファンブル率#{fumble}、必殺#{critical == 13 ? 'なし' : critical.to_s}】"
       end
 
-      def getcriticalString(critical)
-        criticalString = (critical == 13 ? "なし" : critical.to_s)
-        return "、必殺#{criticalString}"
-      end
-
-      def checkRollLoop(roll_times, min_suc, target, critical, fumble, isCriticalStop)
+      def check_roll_loop(roll_times, min_suc, target, critical, fumble, is_critical_stop)
         dice_str = ''
-        isFumble = false
-        isCritical = false
+        is_fumble = false
+        is_critical = false
         total_suc = 0
 
         roll_times.times do |_i|
@@ -193,38 +195,36 @@ module BCDice
           total_suc += dice_suc
 
           if critical <= d1 + d2
-            isCritical = true
+            is_critical = true
             dice_str += "『必殺！』"
           end
 
           if (d1 == d2) && (d1 <= fumble) # ファンブルの確認
-            isFumble = true
-            isCritical = false
+            is_fumble = true
+            is_critical = false
             break
           end
 
-          if isCritical && isCriticalStop # 必殺止めの確認
+          if is_critical && is_critical_stop # 必殺止めの確認
             break
           end
         end
 
-        return dice_str, total_suc, isCritical, isFumble
+        return dice_str, total_suc, is_critical, is_fumble
       end
 
       def check_seigou(string)
         debug("check_seigou begin string", string)
 
-        m = /^SR(\d+).*$/i.match(string)
-        return '' unless m
-
-        target = m[1].to_i
-        sr_parser = Command::Parser.new(/SR\d+/i, round_type: round_type)
+        sr_parser = Command::Parser.new("SR", round_type: round_type)
+                                   .has_suffix_number
                                    .restrict_cmp_op_to(nil)
         cmd = sr_parser.parse(string)
         return '' unless cmd
 
         dice = @randomizer.roll_sum(2, 6)
         diceTotal = dice + cmd.modify_number
+        target = cmd.suffix_number
 
         seigou = if target < diceTotal
                    "「激」"

data/lib/bcdice/game_system/ScreamHighSchool.rb

@@ -37,8 +37,8 @@ module BCDice
       INFO_MESSAGE_TEXT
 
       register_prefix(
-        '(SH|SHS)(\-?\d+)(\/\d+)?(@\d+)?',
-        '(EM|TR|FE)(\-?\d+)(@\d+)?',
+        '(SH|SHS)',
+        '(EM|TR|FE)',
         'DC(SL|BL|IM|BR|RF|EL).+'
       )
 
@@ -73,13 +73,13 @@ module BCDice
 
         dice_value = @randomizer.roll_once(100)
         result = get_check_result(dice_value, success_rate, critical_border, fumble_border)
-        title, supplementary = get_supplementary(command_type, result)
+        title, supplementary = get_supplementary(command_type, result.text)
         unless supplementary.empty?
           supplementary = "（#{supplementary}）"
         end
 
-        text = "#{title}判定 D100<=#{success_rate}@#{critical_border} ＞ #{dice_value} ＞ #{result}#{supplementary}"
-        return text
+        result.text = "#{title}判定 D100<=#{success_rate}@#{critical_border} ＞ #{dice_value} ＞ #{result.text}#{supplementary}"
+        return result
       end
 
       def get_supplementary(command_type, result)

data/lib/bcdice/game_system/SharedFantasia.rb

@@ -24,11 +24,12 @@ module BCDice
       register_prefix('SF', 'ST')
 
       def change_text(string)
-        string.gsub(/SF/i, "2D6").gsub(/ST/i, "2D6")
+        string.gsub(/S[FT]/i, "2D6")
       end
 
-      def check_2D6(total, dice_total, _dice_list, cmp_op, target)
-        return '' if target == '?'
+      def result_2d6(total, dice_total, _dice_list, cmp_op, target)
+        return Result.nothing if target == '?'
+        return nil unless [:>=, :>].include?(cmp_op)
 
         critical = false
         fumble   = false
@@ -39,28 +40,23 @@ module BCDice
           fumble = true
         end
 
-        totalValueBonus = 0
-        if cmp_op == :>=
-          totalValueBonus = 1
-        end
+        totalValueBonus = (cmp_op == :>= ? 1 : 0)
 
-        if [:>=, :>].include?(cmp_op)
-          if (total + totalValueBonus) > target
-            if critical
-              return " ＞ 自動成功(劇的成功)"
-            elsif fumble
-              return " ＞ 自動失敗"
-            else
-              return " ＞ 成功"
-            end
+        if (total + totalValueBonus) > target
+          if critical
+            Result.critical("自動成功(劇的成功)")
+          elsif fumble
+            Result.failure("自動失敗")
+          else
+            Result.success("成功")
+          end
+        else
+          if critical
+            Result.success("自動成功")
+          elsif fumble
+            Result.fumble("自動失敗(致命的失敗)")
           else
-            if critical
-              return " ＞ 自動成功"
-            elsif fumble
-              return " ＞ 自動失敗(致命的失敗)"
-            else
-              return " ＞ 失敗"
-            end
+            Result.failure("失敗")
           end
         end
       end

data/lib/bcdice/game_system/ShinobiGami.rb

@@ -16,12 +16,13 @@ module BCDice
 
       # ダイスボットの使い方
       HELP_MESSAGE = <<~INFO_MESSAGE_TEXT
-        ・行為判定 SG@s#f>=x
-        　2D6の行為判定を行う
+        ・行為判定 nSG@s#f>=x
+        　2D6の行為判定を行う。ダイス数が指定された場合、大きい出目2個を採用する。
+        　n: ダイス数 (省略時 2)
         　s: スペシャル値 (省略時 12)
         　f: ファンブル値 (省略時 2)
         　x: 目標値 (省略可)
-        　例）SG, SG@11, SG@11#3, SG#3>=7
+        　例）SG, SG@11, SG@11#3, SG#3>=7, 3SG>=7
         ・各種表
         　・(無印)シーン表　ST／ファンブル表　FT／感情表　ET
         　　　／変調表　WT／戦場表　BT／異形表　MT
@@ -68,7 +69,7 @@ module BCDice
         end
       end
 
-      register_prefix("SG")
+      register_prefix('\d*SG')
 
       def eval_game_system_specific_command(command)
         result = action_roll(command) || roll_tables(command, TABLES) || RTT.roll_command(@randomizer, command)
@@ -94,17 +95,23 @@ module BCDice
       private
 
       def action_roll(command)
-        parser = Command::Parser.new("SG", round_type: round_type)
+        parser = Command::Parser.new(/\d*SG/, round_type: round_type)
                                 .restrict_cmp_op_to(:>=, nil)
                                 .enable_critical
                                 .enable_fumble
         cmd = parser.parse(command)
         return nil unless cmd
 
+        times = cmd.command.start_with?(/\d/) ? cmd.command.to_i : 2
+        return nil if times <= 1
+
         cmd.critical ||= 12
         cmd.fumble ||= 2
 
-        dice_list = @randomizer.roll_barabara(2, 6).sort
+        dice_list_full = @randomizer.roll_barabara(times, 6).sort
+        dice_list_full_str = "[#{dice_list_full.join(',')}]" if times > 2
+
+        dice_list = dice_list_full[-2, 2]
         dice_total = dice_list.sum()
         total = dice_total + cmd.modify_number
 
@@ -123,6 +130,7 @@ module BCDice
 
         sequence = [
           "(#{cmd.to_s(:after_modify_number)})",
+          dice_list_full_str,
           "#{dice_total}[#{dice_list.join(',')}]#{Format.modifier(cmd.modify_number)}",
           total,
           result.text