bcdice 3.1.2 → 3.4.0

data/lib/bcdice/game_system/BeastBindTrinity.rb

@@ -82,16 +82,34 @@ module BCDice
 
           dice_list_org_str = "[#{dice_list_org.join(',')}]" if dice_list_filtered != dice_list_org
 
+          result = result_compare(total)
+          result.critical = critical?
+          result.fumble = fumble?
+
+          dice_status =
+            if result.fumble?
+              "ファンブル"
+            elsif result.critical?
+              "クリティカル"
+            end
+          result_str =
+            if result.success?
+              "成功"
+            elsif result.failure?
+              "失敗"
+            end
+
           sequence = [
             command_expr(),
             dice_list_org_str,
             interim_expr(dice_list_filtered),
-            dice_status(),
+            dice_status,
             total.to_s,
-            result_compare(total)
+            result_str
           ].compact
+          result.text = sequence.join(" ＞ ")
 
-          return sequence.join(" ＞ ")
+          return result
         end
 
         private
@@ -187,14 +205,6 @@ module BCDice
           return expr
         end
 
-        def dice_status
-          if fumble?
-            "ファンブル"
-          elsif critical?
-            "クリティカル"
-          end
-        end
-
         def fumble?
           @dice_total <= @fumble
         end
@@ -220,7 +230,13 @@ module BCDice
 
         def result_compare(total)
           if @cmp_op
-            total.send(@cmp_op, @target_number) ? "成功" : "失敗"
+            if total.send(@cmp_op, @target_number)
+              Result.success(nil)
+            else
+              Result.failure(nil)
+            end
+          else
+            Result.new
           end
         end
       end

data/lib/bcdice/game_system/BeginningIdol.rb

@@ -55,13 +55,13 @@ module BCDice
       INFO_MESSAGE_TEXT
 
       register_prefix(
-        '[1-7]*PD\d+(?:[\+\-]\d+)?',
+        '[1-7]*PD',
         'HW',
         'BWT',
         'LWT',
         'TWT',
         'CWT',
-        'LO\d{0,2}',
+        'LO',
         'SU',
         'WI',
         'NA',
@@ -88,7 +88,7 @@ module BCDice
         'NUR',
         'GUR',
         'BUR',
-        'BT\d*',
+        'BT',
         'SGT',
         'RS',
         'SH',
@@ -110,7 +110,7 @@ module BCDice
         'NCH',
         'GCH',
         'PCH',
-        'IT\d*',
+        'IT',
         'ACT',
         'ACB',
         'ACE',
@@ -124,7 +124,7 @@ module BCDice
         'RU',
         '\d{2}C',
         'BU',
-        '\d+S?A[1-6]*(?:[\+\-]\d+)?',
+        '\d+S?A',
         'SIP',
         'BVT',
         'LVT',

data/lib/bcdice/game_system/BeginningIdol_Korean.rb

@@ -53,13 +53,13 @@ module BCDice
       INFO_MESSAGE_TEXT
 
       register_prefix(
-        '[1-7]*PD\d+(?:[\+\-]\d+)?',
+        '[1-7]*PD',
         'HW',
         'BWT',
         'LWT',
         'TWT',
         'CWT',
-        'LO\d{0,2}',
+        'LO',
         'SU',
         'WI',
         'NA',
@@ -85,7 +85,7 @@ module BCDice
         'NUR',
         'GUR',
         'BUR',
-        'BT\d*',
+        'BT',
         'SGT',
         'RS',
         'SH',
@@ -105,7 +105,7 @@ module BCDice
         'SCH',
         'WCH',
         'NCH',
-        'IT\d*',
+        'IT',
         'ACT',
         'ACB',
         'ACE',
@@ -119,7 +119,7 @@ module BCDice
         'RU',
         '\d{2}C',
         'BU',
-        '\d+S?A[1-6]*(?:[\+\-]\d+)?',
+        '\d+S?A',
         'SIP',
         'BVT',
         'LVT',

data/lib/bcdice/game_system/BladeOfArcana.rb

@@ -33,7 +33,7 @@ module BCDice
       INFO_MESSAGE_TEXT
 
       register_prefix(
-        '\d+A\d*[CF]?\d*[CF]?\d*',
+        '\d+A',
         'CT3[\+\-]?',
         'CTR[\+\-]?',
         'DJV\-?',

data/lib/bcdice/game_system/BlindMythos.rb

@@ -22,7 +22,7 @@ module BCDice
         　BMSは振り足しを自動では行いません。
          例）BM>=1　BM@3>=1　BMS2>=1
 
-        ・判定振り足し：ReRollx,x,x...@y>=1
+        ・判定振り足し：ReRollx,x,x...@y>=z
           　x:振るダイスの個数
         　　y:目標難易度（省略可。デフォルト4）
         　　z:必要成功度
@@ -40,15 +40,15 @@ module BCDice
       def eval_game_system_specific_command(command)
         debug("eval_game_system_specific_command Begin")
 
-        text = judgeRoll(command)
-        return text unless text.nil?
+        result = judgeRoll(command)
+        return result unless result.nil?
 
         isStop = true
         text, = reRoll(command, isStop)
         return text unless text.nil?
 
-        text = getRulingPlanetDiceCommandResult(command)
-        return text unless text.nil?
+        result = getRulingPlanetDiceCommandResult(command)
+        return result unless result.nil?
 
         text = getDurtyTableCommandReuslt(command)
         return text unless text.nil?
@@ -72,9 +72,10 @@ module BCDice
           getRollResult([diceCount], judgeNumberText, judgeNumber, targetNumber, isReRoll, isStop)
 
         message += text
-        message += getTotalResultMessageText(bitList, successList, countOneList, targetNumber, isStop, canReRoll)
+        result = getTotalResult(bitList, successList, countOneList, targetNumber, isStop, canReRoll)
+        result.text = message + result.text
 
-        return message
+        return result
       end
 
       def reRoll(command, isStop)
@@ -181,7 +182,7 @@ module BCDice
         return message, bitList, successList, countOneList, canReRoll
       end
 
-      def getTotalResultMessageText(bitList, successList, countOneList, targetNumber, isStop, canReRoll)
+      def getTotalResult(bitList, successList, countOneList, targetNumber, isStop, canReRoll)
         success = successList.inject { |sum, i| sum + i }
         countOne = countOneList.inject { |sum, i| sum + i }
 
@@ -196,27 +197,35 @@ module BCDice
 
           if success >= targetNumber
             result += " ＞ 現状で成功。コマンド実行で追加リロールも可能"
+            return Result.success(result)
           else
             result += " ＞ 現状のままでは失敗"
-            result += "。汚染ポイント+#{countOne}" if countOne >= 1
+            if countOne >= 1
+              result += "。汚染ポイント+#{countOne}"
+              return Result.fumble(result)
+            else
+              return Result.failure(result)
+            end
           end
-
-          return result
         end
 
         if success >= targetNumber
           result += " ＞ 成功"
-
           if bitList.size >= 1
             result += "、禁書ビット発生[#{bitList.join(',')}]"
+            return Result.critical(result)
+          else
+            return Result.success(result)
           end
-
         else
           result += " ＞ 失敗"
-          result += "。汚染ポイント+#{countOne}" if countOne >= 1
+          if countOne >= 1
+            result += "。汚染ポイント+#{countOne}"
+            return Result.fumble(result)
+          else
+            return Result.failure(result)
+          end
         end
-
-        return result
       end
 
       def getSameDieList(diceList)
@@ -252,44 +261,36 @@ module BCDice
       end
 
       def getRulingPlanetDiceCommandResult(command)
-        return nil unless command =~ /^RP(\d+)/i
+        m = /^RP(\d+)$/i.match(command)
+        return nil unless m
 
-        targetNumbers = Regexp.last_match(1).split(//).map(&:to_i)
+        targetNumbers = m[1].each_char.map(&:to_i)
         diceList = getRulingPlanetDice
 
-        matchResult = "失敗"
-        targetNumbers.each do |i|
-          if diceList.include?(i)
-            matchResult = "発動"
-            break
-          end
-        end
+        condition = diceList.any? { |dice| targetNumbers.include?(dice) }
 
-        text = "守護星表チェック(#{targetNumbers.join(',')}) ＞ #{diceList.count}D10[#{diceList.join(',')}] ＞ #{matchResult}"
+        result = condition ? "発動" : "失敗"
+        text = "守護星表チェック(#{targetNumbers.join(',')}) ＞ #{diceList.count}D10[#{diceList.join(',')}] ＞ #{result}"
 
-        return text
+        Result.new.tap do |r|
+          r.text = text
+          r.condition = condition
+        end
       end
 
       def getRulingPlanetDice
-        dice1 = @randomizer.roll_once(10)
-        dice2 = dice1
+        dice1, dice2 = @randomizer.roll_barabara(2, 10)
 
         while dice1 == dice2
           dice2 = @randomizer.roll_once(10)
         end
 
-        dice1 = changeRulingPlanetDice(dice1)
-        dice2 = changeRulingPlanetDice(dice2)
+        dice1 = 0 if dice1 == 10
+        dice2 = 0 if dice2 == 10
 
         return dice1, dice2
       end
 
-      def changeRulingPlanetDice(dice)
-        return 0 if dice == 10
-
-        return dice
-      end
-
       def getDurtyTableCommandReuslt(command)
         return nil unless /^DT$/i =~ command
 
@@ -456,7 +457,7 @@ module BCDice
         ),
       }.freeze
 
-      register_prefix('BM', 'ReRoll\d+', 'RP\d+', 'DT', TABLES.keys)
+      register_prefix('BM', 'ReRoll', 'RP', 'DT', TABLES.keys)
     end
   end
 end

data/lib/bcdice/game_system/BloodCrusade.rb

@@ -44,18 +44,17 @@ module BCDice
         @round_type = RoundType::CEIL # 端数切り上げに設定
       end
 
-      def check_2D6(total, dice_total, _dice_list, cmp_op, target)
-        return '' if target == '?'
-        return '' unless cmp_op == :>=
+      def result_2d6(total, dice_total, _dice_list, cmp_op, target)
+        return nil if target == '?' || cmp_op != :>=
 
         if dice_total <= 2
-          " ＞ ファンブル(【モラル】-3。追跡フェイズなら吸血シーンを追加。戦闘フェイズなら吸血鬼は追加行動を一回得る)"
+          Result.fumble("ファンブル(【モラル】-3。追跡フェイズなら吸血シーンを追加。戦闘フェイズなら吸血鬼は追加行動を一回得る)")
         elsif dice_total >= 12
-          " ＞ スペシャル(【モラル】+3。追跡フェイズならあなたに関係を持つPCの【モラル】+2。攻撃判定ならダメージ+1D6）"
+          Result.critical("スペシャル(【モラル】+3。追跡フェイズならあなたに関係を持つPCの【モラル】+2。攻撃判定ならダメージ+1D6）")
         elsif total >= target
-          " ＞ 成功"
+          Result.success("成功")
         else
-          " ＞ 失敗"
+          Result.failure("失敗")
         end
       end
 

data/lib/bcdice/game_system/BloodMoon.rb

@@ -9,7 +9,7 @@ module BCDice
       ID = 'BloodMoon'
 
       # ゲームシステム名
-      NAME = 'ブラッド・ムーン'
+      NAME = 'ブラッドムーン'
 
       # ゲームシステム名の読みがな
       SORT_KEY = 'ふらつとむうん'
@@ -43,18 +43,19 @@ module BCDice
       end
 
       # ゲーム別成功度判定(2D6)
-      def check_2D6(total, dice_total, _dice_list, cmp_op, target)
-        return '' if target == '?'
-        return '' unless cmp_op == :>=
+      def result_2d6(total, dice_total, _dice_list, cmp_op, target)
+        return nil unless cmp_op == :>=
 
         if dice_total <= 2
-          return " ＞ ファンブル(【余裕】が 0 に)"
+          Result.fumble("ファンブル(【余裕】が 0 に)")
         elsif dice_total >= 12
-          return " ＞ スペシャル(【余裕】+3）"
+          Result.critical("スペシャル(【余裕】+3）")
+        elsif target == '?'
+          Result.nothing
         elsif total >= target
-          return " ＞ 成功"
+          Result.success("成功")
         else
-          return " ＞ 失敗"
+          Result.failure("失敗")
         end
       end
 

data/lib/bcdice/game_system/CardRanker.rb

@@ -37,18 +37,19 @@ module BCDice
       end
 
       # ゲーム別成功度判定(2D6)
-      def check_2D6(total, dice_total, _dice_list, cmp_op, target)
-        return '' if target == '?'
-        return '' unless cmp_op == :>=
+      def result_2d6(total, dice_total, _dice_list, cmp_op, target)
+        return nil unless cmp_op == :>=
 
         if dice_total <= 2
-          return " ＞ ファンブル"
+          Result.fumble("ファンブル")
         elsif dice_total >= 12
-          return " ＞ スペシャル ＞ " + RTT.roll_command(@randomizer, "RM")
+          Result.critical("スペシャル ＞ " + RTT.roll_command(@randomizer, "RM"))
+        elsif target == "?"
+          Result.nothing
         elsif total >= target
-          return " ＞ 成功"
+          Result.success("成功")
         else
-          return " ＞ 失敗"
+          Result.failure("失敗")
         end
       end
 

data/lib/bcdice/game_system/ChaosFlare.rb

@@ -39,33 +39,39 @@ module BCDice
           - FT7
       INFO_MESSAGE_TEXT
 
-      register_prefix('\d*CF', 'FT\d*')
+      register_prefix('\d*CF', 'FT')
 
       # ゲーム別成功度判定(2D6)。以前の処理をそのまま残しています。
-      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 nil unless cmp_op == :>=
 
-        output = ''
+        sequence = []
+        result = Result.new
 
         if dice_total <= 2
           total -= 20
-          output = " ＞ ファンブル(-20)"
+          sequence.push("ファンブル(-20)")
+          result.fumble = true
         end
 
-        unless cmp_op == :>=
-          return output
-        end
+        if target != '?'
+          if total >= target
+            sequence.push("成功")
+            result.success = true
+          else
+            sequence.push("失敗")
+            result.failure = true
+          end
 
-        if total >= target
-          output += " ＞ 成功"
-          if total > target
-            output += " ＞ 差分値#{total - target}"
+          if total - target != 0
+            sequence.push("差分値#{total - target}")
           end
-        else
-          output += " ＞ 失敗 ＞ 差分値#{total - target}"
         end
 
-        return output
+        return Result.nothing if sequence.empty?
+
+        result.text = sequence.join(" ＞ ")
+        return result
       end
 
       def eval_game_system_specific_command(command)