bcdice 3.1.3 → 3.5.0

data/lib/bcdice/game_system/Elric.rb

@@ -16,20 +16,24 @@ module BCDice
       HELP_MESSAGE = "貫通、クリティカル、ファンブルの自動判定を行います。\n"
 
       # ゲーム別成功度判定(1d100)
-      def check_1D100(total, _dice_total, cmp_op, target)
-        return '' if target == '?'
-        return '' unless cmp_op == :<=
-
-        # 1は常に貫通
-        return " ＞ 貫通" if total <= 1
-        # 100は常に致命的失敗
-        return " ＞ 致命的失敗" if total >= 100
-
-        return " ＞ 決定的成功" if total <= (target / 5 + 0.9)
-        return " ＞ 成功" if total <= target
-        return " ＞ 致命的失敗" if (total >= 99) && (target < 100)
-
-        return " ＞ 失敗"
+      def result_1d100(total, _dice_total, cmp_op, target)
+        return nil unless cmp_op == :<=
+
+        if total <= 1
+          Result.critical("貫通") # 1は常に貫通
+        elsif total >= 100
+          Result.fumble("致命的失敗")  # 100は常に致命的失敗
+        elsif target == '?'
+          Result.nothing
+        elsif total <= (target / 5.0).ceil
+          Result.critical("決定的成功")
+        elsif total <= target
+          Result.success("成功")
+        elsif (total >= 99) && (target < 100)
+          Result.fumble("致命的失敗")
+        else
+          Result.failure("失敗")
+        end
       end
     end
   end

data/lib/bcdice/game_system/Elysion.rb

@@ -1205,7 +1205,7 @@ module BCDice
         'RBT', 'SBT', 'BBT', 'CBT', 'DBT', 'IBT', 'FBT', 'LBT', 'PBT', 'NBT', 'ABT', 'VBT', 'GBT', 'HBT',
         'BFT', 'FWT', 'FT',
         'SRT', 'ORT', 'DRT', 'URT',
-        'NJ\d+', 'BS\d+', TABLES.keys
+        'NJ', 'BS', TABLES.keys
       )
     end
   end

data/lib/bcdice/game_system/EmbryoMachine.rb

@@ -24,7 +24,7 @@ module BCDice
         　・射撃攻撃ファンブル表　SFT
       INFO_MESSAGE_TEXT
 
-      register_prefix('EM\d+', 'HLT', 'MFT', 'SFT', '2R10')
+      register_prefix('EM', 'HLT', 'MFT', 'SFT', '2R10')
 
       def initialize(command)
         super(command)
@@ -45,18 +45,19 @@ module BCDice
       end
 
       # ゲーム別成功度判定(nD10)
-      def check_nD10(total, dice_total, _dice_list, cmp_op, target)
-        return '' if target == '?'
-        return '' unless cmp_op == :>=
+      def result_nd10(total, dice_total, _dice_list, cmp_op, target)
+        return nil unless cmp_op == :>=
 
         if dice_total <= 2
-          " ＞ ファンブル"
+          Result.fumble("ファンブル")
         elsif dice_total >= 20
-          " ＞ クリティカル"
+          Result.critical("クリティカル")
+        elsif target == "?"
+          Result.nothing
         elsif total >= target
-          " ＞ 成功"
+          Result.success("成功")
         else
-          " ＞ 失敗"
+          Result.failure("失敗")
         end
       end
 

data/lib/bcdice/game_system/Emoklore.rb

@@ -7,13 +7,13 @@ module BCDice
       ID = "Emoklore"
 
       # ゲームシステム名
-      NAME = "エモクロア"
+      NAME = "エモクロアTRPG"
 
       # ゲームシステム名の読みがな
       #
       # 「ゲームシステム名の読みがなの設定方法」（docs/dicebot_sort_key.md）を参考にして
       # 設定してください
-      SORT_KEY = "えもくろあ"
+      SORT_KEY = "えもくろあTRPG"
 
       # ダイスボットの使い方
       HELP_MESSAGE = <<~MESSAGETEXT
@@ -30,7 +30,7 @@ module BCDice
       MESSAGETEXT
 
       # ダイスボットで使用するコマンドを配列で列挙する
-      register_prefix('\d*DM<=\d+', '(B|\d*)DA\d+')
+      register_prefix('\d*DM<=', '(B|\d*)DA')
 
       CRITICAL_VALUE = 1
       FUMBLE_VALUE = 10
@@ -53,7 +53,7 @@ module BCDice
       # ダイスロールの共通処理
       # @param [Integer] num_dice
       # @param [Integer] success_threshold
-      # @return [String]
+      # @return [Result]
       def dice_roll(num_dice, success_threshold)
         # ダイスを振った結果を配列として取得
         values = @randomizer.roll_barabara(num_dice, 10)
@@ -65,33 +65,35 @@ module BCDice
 
         # 成功値
         success_value = 2 * critical + success - fumble
+        result = compare_result(success_value)
 
-        "#{values} ＞ #{success_value} ＞ #{result_text(success_value)}"
+        result.text = "#{values} ＞ #{success_value} ＞ 成功数#{success_value} #{result.text}"
+        return result
       end
 
       # @param [Integer] success
-      # @return [String]
-      def result_text(success)
+      # @return [Result]
+      def compare_result(success)
         if success < 0
-          "ファンブル!"
+          Result.fumble("ファンブル!")
         elsif success == 0
-          "失敗!"
+          Result.failure("失敗!")
         elsif success == 1
-          "成功!"
+          Result.success("成功!")
         elsif success == 2
-          "ダブル!"
+          Result.critical("ダブル!")
         elsif success == 3
-          "トリプル!"
+          Result.critical("トリプル!")
         elsif success <= 9
-          "ミラクル!"
+          Result.critical("ミラクル!")
         else
-          "カタストロフ!"
+          Result.critical("カタストロフ!")
         end
       end
 
       # 技能判定
       # @param [String] command コマンド
-      # @return [String, nil] コマンドの結果
+      # @return [Result, nil] コマンドの結果
       def roll_dm(command)
         m = /^(\d+)?DM<=(\d+)$/.match(command)
         unless m
@@ -105,14 +107,15 @@ module BCDice
         end
 
         # ダイスロール本体
-        ret_str = dice_roll(num_dice, success_threshold)
+        result = dice_roll(num_dice, success_threshold)
 
-        return "(#{num_dice}DM<=#{success_threshold}) ＞ #{ret_str}"
+        result.text = "(#{num_dice}DM<=#{success_threshold}) ＞ #{result.text}"
+        return result
       end
 
       # 取得技能判定
       # @param [String] command コマンド
-      # @return [String, nil] コマンドの結果
+      # @return [Result, nil] コマンドの結果
       def roll_da(command)
         m = /^(B|\d+)?DA(\d+)(\+\d+)?$/.match(command)
         unless m
@@ -123,8 +126,10 @@ module BCDice
         num_dice = (m[1] == "B" ? 1 : (m[1]&.to_i || 1)) + bonus
         success_threshold = m[1].to_i + m[2].to_i
 
-        ret_str = dice_roll(num_dice, success_threshold)
-        "(#{command}) ＞ (#{num_dice}DM<=#{success_threshold}) ＞ #{ret_str}"
+        result = dice_roll(num_dice, success_threshold)
+
+        result.text = "(#{command}) ＞ (#{num_dice}DM<=#{success_threshold}) ＞ #{result.text}"
+        return result
       end
     end
   end

data/lib/bcdice/game_system/FateCoreSystem.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+module BCDice
+  module GameSystem
+    class FateCoreSystem < Base
+      # ゲームシステムの識別子
+      ID = 'FateCoreSystem'
+
+      # ゲームシステム名
+      NAME = 'Fate Core System'
+
+      # ゲームシステム名の読みがな
+      SORT_KEY = 'ふえいとこあしすてむ'
+
+      # ダイスボットの使い方
+      HELP_MESSAGE = <<~MESSAGETEXT
+        ■ ファッジダイスによる判定 (xDF+y>=t)
+          ファッジダイスをx個ダイスロールし、結果を判定します。
+          x: ダイス数
+          y: 修正値（省略可）
+          t: 目標値値（省略可）
+          例）4DF, 4DF>=3, 4DF+1>=3
+      MESSAGETEXT
+
+      register_prefix('\d+DF')
+
+      def eval_game_system_specific_command(command)
+        roll_df(command)
+      end
+
+      private
+
+      def roll_df(command)
+        parser = Command::Parser.new("DF", round_type: @round_type)
+                                .enable_prefix_number()
+                                .restrict_cmp_op_to(:>=, nil)
+
+        parsed = parser.parse(command)
+        unless parsed
+          return nil
+        end
+
+        dice_list = roll_fate_dice(parsed.prefix_number)
+        total = dice_list.sum() + parsed.modify_number
+
+        fate_dice_list = dice_list.map do |i|
+          if i.zero?
+            "[ ]"
+          elsif i.positive?
+            "[+]"
+          else
+            "[-]"
+          end
+        end
+
+        result = outcome(total, parsed.target_number)
+        sequence = [
+          "(#{parsed})",
+          "#{fate_dice_list.join()}#{Format.modifier(parsed.modify_number)}",
+          result_ladder(total),
+          result.text,
+        ]
+
+        result.text = sequence.compact.join(" ＞ ")
+        return result
+      end
+
+      def roll_fate_dice(times)
+        @randomizer.roll_barabara(times, 3).map { |i| i - 2 }
+      end
+
+      def result_ladder(total)
+        ladder =
+          case total.clamp(-2, 8)
+          when 8
+            "Legendary"
+          when 7
+            "Epic"
+          when 6
+            "Fantastic"
+          when 5
+            "Superb"
+          when 4
+            "Great"
+          when 3
+            "Good"
+          when 2
+            "Fair"
+          when 1
+            "Average"
+          when 0
+            "Mediocre"
+          when -1
+            "Poor"
+          else
+            "Terrible"
+          end
+
+        return "#{ladder}(#{format('%+d', total)})"
+      end
+
+      def outcome(total, target)
+        if target.nil?
+          Result.new
+        elsif total == target
+          Result.success("Tie")
+        elsif total >= target + 3
+          Result.critical("Succeed with Style")
+        elsif total >= target
+          Result.success("Succeed")
+        else
+          Result.failure("Fail")
+        end
+      end
+    end
+  end
+end

data/lib/bcdice/game_system/Fiasco.rb

@@ -20,7 +20,7 @@ module BCDice
       ※ WとBは片方指定(Bx, Wx)、入替指定(WxBx,BxWx)可能
 INFO_MESSAGE_TEXT
 
-      register_prefix('FS\d+', '[WB]\d+')
+      register_prefix('FS', 'W', 'B')
 
       def eval_game_system_specific_command(command)
         roll_fs(command) || roll_white_black(command) || roll_white_black_single(command)

data/lib/bcdice/game_system/FilledWith.rb

@@ -121,6 +121,10 @@ module BCDice
       class FW
         attr_accessor :dice_count, :target, :critical, :fumble
 
+        def initialize
+          @target = nil
+        end
+
         def self.roll(command, randomizer)
           fw = parse(command)
 

data/lib/bcdice/game_system/FutariSousa.rb

@@ -72,16 +72,17 @@ module BCDice
 
         result =
           if max <= 1
-            translate("FutariSousa.DT.fumble")
+            Result.fumble(translate("FutariSousa.DT.fumble"))
           elsif dice_list.include?(SPECIAL_DICE)
-            translate("FutariSousa.DT.special")
+            Result.critical(translate("FutariSousa.DT.special"))
           elsif max >= SUCCESS_THRESHOLD
-            translate("success")
+            Result.success(translate("success"))
           else
-            translate("failure")
+            Result.failure(translate("failure"))
           end
 
-        return "#{command}(#{dice_list.join(',')}) ＞ #{result}"
+        result.text = "#{command}(#{dice_list.join(',')}) ＞ #{result.text}"
+        result
       end
 
       # 助手用判定コマンド AS
@@ -91,16 +92,17 @@ module BCDice
 
         result =
           if max <= 1
-            translate("FutariSousa.AS.fumble")
+            Result.fumble(translate("FutariSousa.AS.fumble"))
           elsif dice_list.include?(SPECIAL_DICE)
-            translate("FutariSousa.AS.special")
+            Result.critical(translate("FutariSousa.AS.special"))
           elsif max >= SUCCESS_THRESHOLD
-            translate("FutariSousa.AS.success")
+            Result.success(translate("FutariSousa.AS.success"))
           else
-            translate("failure")
+            Result.failure(translate("failure"))
           end
 
-        return "#{command}(#{dice_list.join(',')}) ＞ #{result}"
+        result.text = "#{command}(#{dice_list.join(',')}) ＞ #{result.text}"
+        result
       end
 
       class << self

data/lib/bcdice/game_system/GURPS.rb

@@ -32,7 +32,7 @@ module BCDice
         ・D66ダイスあり
       INFO_MESSAGE_TEXT
 
-      register_prefix('FEAR(\+?\d+)?', 'REACT((\+|\-)?\d*)', '[\d\+\-]+\-3D6?[\d\+\-]*')
+      register_prefix('FEAR', 'REACT', '[\d\+\-]+\-3D6?[\d\+\-]*')
 
       def initialize(command)
         super(command)
@@ -41,26 +41,23 @@ module BCDice
       end
 
       # ゲーム別成功度判定(nD6)
-      def check_nD6(total, dice_total, dice_list, cmp_op, target)
-        return '' if target == '?'
-        return '' unless dice_list.size == 3 && cmp_op == :<=
+      def result_nd6(total, dice_total, dice_list, cmp_op, target)
+        return nil if target == "?"
+        return nil unless dice_list.size == 3 && cmp_op == :<=
 
         success = target - total # 成功度
 
-        result =
-          if critical?(dice_total, target)
-            "クリティカル(成功度：#{success})"
-          elsif fumble?(dice_total, target)
-            "ファンブル(失敗度：#{success})"
-          elsif dice_total >= 17
-            "自動失敗(失敗度：#{success})"
-          elsif total <= target
-            "成功(成功度：#{success})"
-          else
-            "失敗(失敗度：#{success})"
-          end
-
-        " ＞ #{result}"
+        if critical?(dice_total, target)
+          Result.critical("クリティカル(成功度：#{success})")
+        elsif fumble?(dice_total, target)
+          Result.fumble("ファンブル(失敗度：#{success})")
+        elsif dice_total >= 17
+          Result.failure("自動失敗(失敗度：#{success})")
+        elsif total <= target
+          Result.success("成功(成功度：#{success})")
+        else
+          Result.failure("失敗(失敗度：#{success})")
+        end
       end
 
       def eval_game_system_specific_command(command)
@@ -85,16 +82,8 @@ module BCDice
         modifier = ArithmeticEvaluator.eval(m[2])
         formated_modifier = Format.modifier(modifier)
 
-        dice_list = @randomizer.roll_barabara(3, 6)
-        dice_total = dice_list.sum()
-        dice_str = dice_list.join(",")
-
-        total = dice_total + modifier
-
-        "(3D6#{formated_modifier}<=#{target_number}) ＞ "\
-        "#{dice_total}[#{dice_str}]#{formated_modifier} ＞ "\
-        "#{total}"\
-        "#{check_nD6(total, dice_total, dice_list, :<=, target_number)}"
+        cmd = "3D6#{formated_modifier}<=#{target_number}"
+        return CommonCommand::AddDice.eval(cmd, self, @randomizer)
       end
 
       def roll_fear(command)

data/lib/bcdice/game_system/Garako.rb

@@ -654,7 +654,7 @@ module BCDice
         )
       }.freeze
 
-      register_prefix('GR', '[CEFAL]D[CT][-+\d]+', 'GHA[-+\d]+', TABLES.keys)
+      register_prefix('GR', '[CEFAL]D[CT]', 'GHA', TABLES.keys)
     end
   end
 end

data/lib/bcdice/game_system/GardenOrder.rb

@@ -26,7 +26,7 @@ module BCDice
       INFO_MESSAGE_TEXT
 
       register_prefix(
-        'GO(\-?\d+)(\/\d+)?(@\d+)?',
+        'GO',
         'DC(SL|BL|IM|BR|RF|EL).+'
       )
 
@@ -58,6 +58,10 @@ module BCDice
 
       def check_roll_repeat_attack(success_rate, repeat_count, critical_border)
         success_rate_per_one = success_rate / repeat_count
+        # 連続攻撃は最終的な成功率が50%以上であることが必要 cf. p217
+        if repeat_count > 1 && success_rate_per_one < 50
+          return "D100<=#{success_rate_per_one}@#{critical_border} ＞ 連続攻撃は成功率が50％以上必要です"
+        end
 
         check_roll(success_rate_per_one, critical_border)
       end
@@ -69,16 +73,17 @@ module BCDice
         dice_value = @randomizer.roll_once(100)
         result = get_check_result(dice_value, success_rate, critical_border, fumble_border)
 
-        text = "D100<=#{success_rate}@#{critical_border} ＞ #{dice_value} ＞ #{result}"
-        return text
+        result.text = "D100<=#{success_rate}@#{critical_border} ＞ #{dice_value} ＞ #{result.text}"
+        return result
       end
 
       def get_check_result(dice_value, success_rate, critical_border, fumble_border)
-        return "クリティカル" if dice_value <= critical_border
-        return "ファンブル" if dice_value >= fumble_border
-        return "成功" if dice_value <= success_rate
+        # クリティカルとファンブルが重なった場合は、ファンブルとなる。 cf. p175
+        return Result.fumble("ファンブル") if dice_value >= fumble_border
+        return Result.critical("クリティカル") if dice_value <= critical_border
+        return Result.success("成功") if dice_value <= success_rate
 
-        return "失敗"
+        return Result.failure("失敗")
       end
 
       def look_up_damage_chart(type, damage_value)

data/lib/bcdice/game_system/GeishaGirlwithKatana.rb

@@ -26,7 +26,7 @@ module BCDice
         　例）GL
       MESSAGETEXT
 
-      register_prefix('GK(#\d+)?', 'GL')
+      register_prefix('GK', 'GL')
 
       def eval_game_system_specific_command(command)
         output = nil

data/lib/bcdice/game_system/GoblinSlayer.rb

@@ -41,7 +41,7 @@ module BCDice
       MESSAGETEXT
 
       # 因果点は共有リソースなのでMCPIはシークレットダイスを無効化
-      register_prefix('GS\(\d+\)', 'GS', '^MCPI.*\$\d+$', 'DB\d+')
+      register_prefix('GS', '^MCPI.*$', 'DB')
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/Gorilla.rb

@@ -28,15 +28,9 @@ module BCDice
         return string
       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)
         if dice_list == [5, 5]
-          " ＞ ゴリティカル（自動的成功）"
-        elsif total.send(cmp_op, target)
-          " ＞ 成功"
-        else
-          " ＞ 失敗"
+          Result.critical("ゴリティカル（自動的成功）")
         end
       end
     end