bcdice 3.1.0 → 3.3.0

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

data/lib/bcdice/game_system/GranCrest.rb

@@ -46,29 +46,36 @@ module BCDice
       end
 
       # ゲーム別成功度判定(nD6)
-      def check_nD6(total, _dice_total, dice_list, cmp_op, target)
-        result = ''
+      def result_nd6(total, _dice_total, dice_list, cmp_op, target)
+        return nil unless cmp_op == :>=
+
+        result = Result.new
+        sequence = []
 
         if dice_list.count(6) >= 2
           total += 10
-          result = "（クリティカル） ＞ #{total}"
+          result.critical = true
+          sequence.push("（クリティカル）", total.to_s)
         end
 
-        if cmp_op != :>= || target == '?'
-          return result
+        if target != '?'
+          if total >= target
+            sequence.push("成功")
+            result.success = true
+          else
+            sequence.push("失敗")
+            result.failure = true
+          end
         end
 
-        if total >= target
-          result += " ＞ 成功"
-        else
-          result += " ＞ 失敗"
+        if sequence.empty?
+          return nil
         end
 
+        result.text = sequence.join(" ＞ ")
         return result
       end
 
-      alias check_2D6 check_nD6
-
       def eval_game_system_specific_command(command)
         debug("eval_game_system_specific_command command", command)
 

data/lib/bcdice/game_system/Gundog.rb

@@ -24,14 +24,15 @@ module BCDice
       end
 
       # ゲーム別成功度判定(1d100)
-      def check_1D100(total, _dice_total, cmp_op, target)
-        return '' if target == '?'
-        return '' unless cmp_op == :<=
+      def result_1d100(total, _dice_total, cmp_op, target)
+        return nil unless cmp_op == :<=
 
         if total >= 100
-          " ＞ ファンブル"
+          Result.fumble("ファンブル")
         elsif total <= 1
-          " ＞ 絶対成功(達成値1+SL)"
+          Result.critical("絶対成功(達成値1+SL)")
+        elsif target == "?"
+          Result.nothing
         elsif total <= target
           dig10 = total / 10
           dig1 = total - dig10 * 10
@@ -39,12 +40,12 @@ module BCDice
           dig1 = 0 if dig1 >= 10 # 条件的にはあり得ない(笑
 
           if dig1 <= 0
-            " ＞ クリティカル(達成値20+SL)"
+            Result.critical("クリティカル(達成値20+SL)")
           else
-            " ＞ 成功(達成値#{dig10 + dig1}+SL)"
+            Result.success("成功(達成値#{dig10 + dig1}+SL)")
           end
         else
-          " ＞ 失敗"
+          Result.failure("失敗")
         end
       end
     end

data/lib/bcdice/game_system/GundogRevised.rb

@@ -26,7 +26,7 @@ module BCDice
         　修正を後ろに書くことも出来ます。
       INFO_MESSAGE_TEXT
 
-      register_prefix('(.DPT|.FT)(\+|\-)?\d*')
+      register_prefix('.DPT', '.FT')
 
       def initialize(command)
         super(command)
@@ -35,14 +35,15 @@ module BCDice
 
       # ---- 以降、Gundog.rbよりほぼコピペ（絶対成功→ベアリーに用語変更対応の為、継承だと不都合）
       # ゲーム別成功度判定(1d100)
-      def check_1D100(total, _dice_total, cmp_op, target)
-        return '' if target == '?'
-        return '' unless cmp_op == :<=
+      def result_1d100(total, _dice_total, cmp_op, target)
+        return nil unless cmp_op == :<=
 
         if total >= 100
-          " ＞ ファンブル"
+          Result.fumble("ファンブル")
         elsif total <= 1
-          " ＞ ベアリー(達成値1+SL)"
+          Result.critical("ベアリー(達成値1+SL)")
+        elsif target == "?"
+          Result.nothing
         elsif total <= target
           dig10 = total / 10
           dig1 = total - dig10 * 10
@@ -50,12 +51,12 @@ module BCDice
           dig1 = 0 if dig1 >= 10 # 条件的にはあり得ない(笑
 
           if dig1 <= 0
-            " ＞ クリティカル(達成値20+SL)"
+            Result.critical("クリティカル(達成値20+SL)")
           else
-            " ＞ 成功(達成値#{dig10 + dig1}+SL)"
+            Result.success("成功(達成値#{dig10 + dig1}+SL)")
           end
         else
-          " ＞ 失敗"
+          Result.failure("失敗")
         end
       end
 

data/lib/bcdice/game_system/GundogZero.rb

@@ -26,7 +26,7 @@ module BCDice
         　修正を後ろに書くことも出来ます。
       INFO_MESSAGE_TEXT
 
-      register_prefix('(.DPT|.FT)\d*')
+      register_prefix('.DPT', '.FT')
 
       def eval_game_system_specific_command(command)
         string = command.upcase

data/lib/bcdice/game_system/GurpsFW.rb

@@ -55,18 +55,18 @@ module BCDice
         'FMB',
         'MFMB',
         'HIT',
-        'FEAR((\+)?\d*)',
-        'REACT((\+|\-)?\d*)',
-        'TRAP(E|N|H|L)',
-        'TRS((E|N|H|L)\d+)((\+|\-)?\d*)',
-        'RAND(E|N|H|L)[1-6]?',
-        'RENC(E|N|H|L)[1-6]?',
+        'FEAR',
+        'REACT',
+        'TRAP[ENHL]',
+        'TRS[ENHL]',
+        'RAND[ENHL]',
+        'RENC[ENHL]',
         'AREA',
-        'DROP(N)?((\+)?\d)?',
+        'DROPN?',
         'HST',
         'KHST',
         'RANDOP',
-        'LOT(N|P)'
+        'LOT[NP]'
       )
 
       def initialize(command)
@@ -75,14 +75,14 @@ module BCDice
         @d66_sort_type = D66SortType::NO_SORT
       end
 
-      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 Result.nothing if target == '?'
+        return nil unless dice_list.size == 3 && cmp_op == :<=
 
         success = target - total # 成功度
-        crt_string = " ＞ クリティカル(成功度：#{success})"
-        fmb_string = " ＞ ファンブル(失敗度：#{success})"
-        fail_string = " ＞ 自動失敗(失敗度：#{success})"
+        crt_string = Result.critical("クリティカル(成功度：#{success})")
+        fmb_string = Result.fumble("ファンブル(失敗度：#{success})")
+        fail_string = Result.failure("自動失敗(失敗度：#{success})")
 
         # クリティカル
         if (dice_total <= 6) && (target >= 16)
@@ -105,9 +105,9 @@ module BCDice
         end
 
         if total <= target
-          return " ＞ 成功(成功度：#{success})"
+          return Result.success("成功(成功度：#{success})")
         else
-          return " ＞ 失敗(失敗度：#{success})"
+          return Result.failure("失敗(失敗度：#{success})")
         end
       end
 

data/lib/bcdice/game_system/HarnMaster.rb

@@ -21,32 +21,25 @@ module BCDice
         ・人型用　中段命中部位表 (SLH)／上段命中部位 (SLHU)／上段命中部位 (SLHD)
       MESSAGETEXT
 
-      register_prefix('SHK\d+', 'SLH', 'SLHU', 'SLHD')
-
-      def check_1D100(total, _dice_total, cmp_op, target)
-        return '' if target == '?'
-        return '' unless cmp_op == :<=
-
-        result = getCheckResult(total, target)
-        return " ＞ #{result}"
-      end
-
-      def getCheckResult(total, diff)
-        return getFailResult(total) if total > diff
-
-        return getSuccessResult(total)
-      end
-
-      def getFailResult(total)
-        return "致命的失敗" if (total % 5) == 0
-
-        return "失敗"
-      end
-
-      def getSuccessResult(total)
-        return "決定的成功" if (total % 5) == 0
-
-        return "成功"
+      register_prefix('SHK', 'SLH', 'SLHU', 'SLHD')
+
+      def result_1d100(total, _dice_total, cmp_op, target)
+        return Result.nothing if target == '?'
+        return nil unless cmp_op == :<=
+
+        if total <= target
+          if total % 5 == 0
+            Result.critical("決定的成功")
+          else
+            Result.success("成功")
+          end
+        else
+          if total % 5 == 0
+            Result.fumble("致命的失敗")
+          else
+            Result.failure("失敗")
+          end
+        end
       end
 
       def eval_game_system_specific_command(command)