bcdice 3.2.0 → 3.3.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/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
 

data/lib/bcdice/game_system/CodeLayerd.rb

@@ -30,7 +30,7 @@ module BCDice
           デフォルトダイス：10面
       MESSAGETEXT
 
-      register_prefix('[+-]?\d*CL([+-]\d+)?[@\d]*')
+      register_prefix('[+-]?\d*CL')
 
       def initialize(command)
         super(command)
@@ -41,61 +41,61 @@ module BCDice
       def eval_game_system_specific_command(command)
         debug('eval_game_system_specific_command command', command)
 
-        result = ''
-
-        case command
-        when /([+-]?\d+)?CL([+-]\d+)?(@(\d))?(\[(\d+)\])?([+-]\d+)?(>=(\d+))?/i
-          m = Regexp.last_match
-          base = (m[1] || 1).to_i
-          modifier1 = m[2].to_i
-          target = (m[4] || 6).to_i
-          critical_target = (m[6] || 1).to_i
-          modifier2 = m[7].to_i
-          diff = m[9].to_i
-          result = check_roll(base, target, critical_target, diff, modifier1 + modifier2)
-        end
-
-        return nil if result.empty?
+        m = /([+-]?\d+)?CL([+-]\d+)?(@(\d))?(\[(\d+)\])?([+-]\d+)?(>=(\d+))?/i.match(command)
+        return nil unless m
 
-        return "#{command} ＞ #{result}"
+        base = (m[1] || 1).to_i
+        modifier1 = m[2].to_i
+        target = (m[4] || 6).to_i
+        critical_target = (m[6] || 1).to_i
+        modifier2 = m[7].to_i
+        diff = m[9].to_i if m[9]
+        check_roll(command, base, target, critical_target, diff, modifier1 + modifier2)
       end
 
-      def check_roll(base, target, critical_target, diff, modifier)
+      def check_roll(command, base, target, critical_target, diff, modifier)
         if base <= 0 # クリティカルしない1D
           critical_target = 0
           base = 1
         end
+        result = Result.new
 
         target = 10 if target > 10
         dice_list = @randomizer.roll_barabara(base, 10).sort
         success_count = dice_list.count { |x| x <= target }
         critical_count = dice_list.count { |x| x <= critical_target }
+        result.critical = critical_count > 0
         success_total = success_count + critical_count + modifier
 
         mod_text = Format.modifier(modifier)
 
         # (10d10+5)
-        result = "(#{base}d10#{mod_text}) ＞ [#{dice_list.join(',')}]#{mod_text} ＞ "
-        result += "判定値[#{target}] " unless target == 6
-        result += "クリティカル値[#{critical_target}] " unless critical_target == 1
-        result += "達成値[#{success_count}]"
-
-        return "#{result} ＞ ファンブル！" if success_count <= 0
-
-        result += "+クリティカル[#{critical_count}]" if critical_count > 0
-        result += mod_text
-        result += "=[#{success_total}]" if critical_count > 0 || modifier != 0
-
-        success_text =
-          if diff == 0
-            success_total.to_s
-          elsif success_total >= diff
-            "成功"
-          else
-            "失敗"
-          end
-
-        return "#{result} ＞ #{success_text}"
+        text = "#{command} ＞ (#{base}d10#{mod_text}) ＞ [#{dice_list.join(',')}]#{mod_text} ＞ "
+        text += "判定値[#{target}] " unless target == 6
+        text += "クリティカル値[#{critical_target}] " unless critical_target == 1
+        text += "達成値[#{success_count}]"
+
+        if success_count <= 0
+          result.fumble = true
+          result.failure = true
+          result.text = "#{text} ＞ ファンブル！"
+          return result
+        end
+
+        text += "+クリティカル[#{critical_count}]" if result.critical?
+        text += mod_text
+        text += "=[#{success_total}]" if result.critical? || modifier != 0
+
+        if diff.nil?
+          result.text = "#{text} ＞ #{success_total}"
+        elsif success_total >= diff
+          result.text = "#{text} ＞ 成功"
+          result.success = true
+        else
+          result.text = "#{text} ＞ 失敗"
+          result.failure = true
+        end
+        return result
       end
     end
   end

data/lib/bcdice/game_system/ColossalHunter.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "bcdice/format"
+
 module BCDice
   module GameSystem
     class ColossalHunter < Base
@@ -14,10 +16,12 @@ module BCDice
 
       # ダイスボットの使い方
       HELP_MESSAGE = <<~MESSAGETEXT
-        ・判定（CH±x>=y)
-        　3D6の判定。クリティカル、ファンブルの自動判定を行います。
-        　x：修正値。省略可能。y：目標値。省略可能。
-        　例） CH　CH+1　CH+2>=10
+        ・判定（nCH±x>=y)
+        　nD6の判定。クリティカル、ファンブルの自動判定を行います。
+        　n：ダイス数。省略可能。省略した場合3。
+        　x：修正値。省略可能。
+        　y：目標値。省略可能。
+        　例） CH　CH+1　CH+2>=10　4CH+1
         ・BIG-6表(B6T)
         ・覚醒表(AWT)
         ・現状表(CST)
@@ -45,65 +49,48 @@ module BCDice
       def getCheckRollDiceCommandResult(command)
         debug("getCheckRollDiceCommandResult command", command)
 
-        return nil unless command =~ /(\d+)?CH([+\-\d]*)(>=([+\-\d]*))?$/i
+        parser = Command::Parser.new(/\d*CH/, round_type: round_type)
+                                .restrict_cmp_op_to(nil, :>=)
 
-        diceCount = (Regexp.last_match(1) || 3).to_i
-        modifyText = (Regexp.last_match(2) || '')
-        difficultyText = Regexp.last_match(4)
+        parsed = parser.parse(command)
+        unless parsed
+          return nil
+        end
 
-        # 修正値の計算
-        modify = getValue(modifyText, 0)
+        parsed.command = "3CH" unless parsed.command.start_with?(/\d/)
 
-        # 目標値の計算
-        difficulty = getValue(difficultyText, nil)
+        dice_count = parsed.command.to_i
+        modify = parsed.modify_number
 
         # ダイスロール
-        dice_list = @randomizer.roll_barabara(diceCount, 6)
+        dice_list = @randomizer.roll_barabara(dice_count, 6)
         dice = dice_list.sum()
         dice_str = dice_list.join(",")
 
         total = dice + modify
 
-        # 出力用ダイスコマンドを生成
-        command =  "#{diceCount}CH#{modifyText}"
-        command += ">=#{difficulty}" unless difficulty.nil?
-
         # 出力文の生成
-        result = "(#{command}) ＞ #{dice}[#{dice_str}]#{modifyText} ＞ #{total}"
+        text = "(#{parsed}) ＞ #{dice}[#{dice_str}]#{Format.modifier(modify)} ＞ #{total}"
 
-        # クリティカル・ファンブルチェック
-        if isFamble(dice)
-          result += " ＞ ファンブル"
-        elsif isCritical(total)
-          result += " ＞ クリティカル"
-        else
-          result += getJudgeResultString(difficulty, total)
-        end
+        result = get_judge_result(dice, total, parsed)
 
+        result.text = text + result.text
         return result
       end
 
       # 成否判定
-      def getJudgeResultString(difficulty, total)
-        return '' if difficulty.nil?
-
-        return " ＞ 成功" if total >= difficulty
-
-        return " ＞ 失敗"
-      end
-
-      def getValue(text, defaultValue)
-        return defaultValue if text.nil? || text.empty?
-
-        ArithmeticEvaluator.eval(text)
-      end
-
-      def isCritical(total)
-        (total >= 16)
-      end
-
-      def isFamble(total)
-        (total <= 5)
+      def get_judge_result(dice, total, parsed)
+        if dice <= 5
+          Result.fumble(" ＞ ファンブル")
+        elsif total >= 16
+          Result.critical(" ＞ クリティカル")
+        elsif parsed.cmp_op.nil?
+          Result.new("")
+        elsif total >= parsed.target_number
+          Result.success(" ＞ 成功")
+        else
+          Result.failure(" ＞ 失敗")
+        end
       end
 
       def getSourceSceneDiceCommandResult(command)
@@ -562,7 +549,7 @@ module BCDice
 
         }.freeze
 
-      register_prefix("CH.*", "B6T", "CNP", TABLES.keys)
+      register_prefix('\d*CH', "B6T", "CNP", TABLES.keys)
     end
   end
 end