bcdice 3.1.2 → 3.4.0

data/lib/bcdice/game_system/Chill.rb

@@ -22,24 +22,24 @@ module BCDice
         　例）SR7　　　sr13　　　SR(7+4)　　　Ssr10
       INFO_MESSAGE_TEXT
 
-      register_prefix('SR\d+')
+      register_prefix('SR')
 
-      def check_1D100(total, _dice_total, cmp_op, target)
-        return '' if target == '?'
-        return '' if cmp_op != :<=
+      def result_1d100(total, _dice_total, cmp_op, target)
+        return nil if target == '?'
+        return nil if cmp_op != :<=
 
         if total >= 100
-          " ＞ ファンブル"
+          Result.fumble("ファンブル")
         elsif total > target
-          " ＞ 失敗"
+          Result.failure("失敗")
         elsif total >= (target * 0.9)
-          " ＞ Ｌ成功"
+          Result.success("Ｌ成功")
         elsif total >= (target / 2)
-          " ＞ Ｍ成功"
+          Result.success("Ｍ成功")
         elsif total >= (target / 10)
-          " ＞ Ｈ成功"
+          Result.success("Ｈ成功")
         else
-          " ＞ Ｃ成功"
+          Result.critical("Ｃ成功")
         end
       end
 

data/lib/bcdice/game_system/Chill3.rb

@@ -19,9 +19,9 @@ module BCDice
         　　　Chill3 : (1D100<=50) ＞ 55 ＞ Botch
       INFO_MESSAGE_TEXT
 
-      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 if target == '?'
+        return nil unless cmp_op == :<=
 
         # ゾロ目ならC-ResultかBotch
         tens = (dice_total / 10) % 10
@@ -30,21 +30,21 @@ module BCDice
         if tens == ones
           if (total > target) || (dice_total == 100) # 00は必ず失敗
             if target > 100 # 目標値が100を超えている場合は、00を振ってもBotchにならない
-              return " ＞ 失敗"
+              return Result.failure("失敗")
             else
-              return " ＞ Botch"
+              return Result.fumble("Botch")
             end
           else
-            return " ＞ Ｃ成功"
+            return Result.critical("Ｃ成功")
           end
         elsif (total <= target) || (dice_total == 1) # 01は必ず成功
           if total <= (target / 2)
-            return " ＞ Ｈ成功"
+            return Result.success("Ｈ成功")
           else
-            return " ＞ Ｌ成功"
+            return Result.success("Ｌ成功")
           end
         else
-          return " ＞ 失敗"
+          return Result.failure("失敗")
         end
       end
     end

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

data/lib/bcdice/game_system/CrashWorld.rb

@@ -19,7 +19,7 @@ module BCDice
         例・CW8
       INFO_MESSAGE_TEXT
 
-      register_prefix('CW\d+')
+      register_prefix('CW')
 
       def eval_game_system_specific_command(command)
         result = nil

data/lib/bcdice/game_system/Cthulhu.rb

@@ -48,7 +48,7 @@ module BCDice
 
       INFO_MESSAGE_TEXT
 
-      register_prefix('CC(B)?\(\d+\)', 'CC(B)?', 'RES(B)?', 'CBR(B)?\(\d+,\d+\)')
+      register_prefix('CCB?', 'RESB?', 'CBRB?')
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/Cthulhu7th.rb

@@ -17,13 +17,19 @@ module BCDice
 
       # ダイスボットの使い方
       HELP_MESSAGE = <<~INFO_MESSAGE_TEXT
-        ※コマンドは入力内容の前方一致で検出しています。
         ・判定　CC(x)<=（目標値）
-        　x：ボーナス・ペナルティダイス (2～－2)。省略可。
+        　x：ボーナス・ペナルティダイス。省略可。
         　目標値が無くても1D100は表示される。
         　ファンブル／失敗／　レギュラー成功／ハード成功／
         　イクストリーム成功／クリティカル を自動判定。
-        例）CC<=30　CC(2)<=50 CC(+2)<=50 CC(-1)<=75 CC-1<=50 CC1<=65 CC+1<=65 CC
+        　例）CC<=30　CC(2)<=50 CC(+2)<=50 CC(-1)<=75 CC-1<=50 CC1<=65 CC+1<=65 CC
+
+        ・技能ロールの難易度指定　CC(x)<=(目標値)(難易度)
+        　目標値の後に難易度を指定することで
+        　成功／失敗／クリティカル／ファンブル を自動判定する。
+        　難易度の指定：
+        　　r:レギュラー　h:ハード　e:イクストリーム　c:クリティカル
+        　例）CC<=70r CC1<=60h CC-2<=50e CC2<=99c
 
         ・組み合わせ判定　(CBR(x,y))
         　目標値 x と y で％ロールを行い、成否を判定。
@@ -48,7 +54,7 @@ module BCDice
         　　強力でない呪文の場合　FCL／強力な呪文の場合　FCM
       INFO_MESSAGE_TEXT
 
-      register_prefix('CC', 'CBR\(\d+,\d+\)', 'FAR', 'BMR', 'BMS', 'FCL', 'FCM', 'PH', 'MA')
+      register_prefix('CC', 'CBR', 'FAR', 'BMR', 'BMS', 'FCL', 'FCM', 'PH', 'MA')
 
       def eval_game_system_specific_command(command)
         case command
@@ -77,6 +83,7 @@ module BCDice
         LEVEL = [
           :fumble,
           :failure,
+          :success,
           :regular_success,
           :hard_success,
           :extreme_success,
@@ -88,23 +95,38 @@ module BCDice
           extreme_success: "イクストリーム成功",
           hard_success: "ハード成功",
           regular_success: "レギュラー成功",
+          success: "成功",
           fumble: "ファンブル",
           failure: "失敗",
         }.freeze
 
+        def self.with_difficulty_level(total, difficulty)
+          fumble = difficulty < 50 ? 96 : 100
+
+          if total == 1
+            ResultLevel.new(:critical)
+          elsif total >= fumble
+            ResultLevel.new(:fumble)
+          elsif total <= difficulty
+            ResultLevel.new(:success)
+          else
+            ResultLevel.new(:failure)
+          end
+        end
+
         def self.from_values(total, difficulty, fumbleable = false)
           fumble = difficulty < 50 || fumbleable ? 96 : 100
 
           if total == 1
             ResultLevel.new(:critical)
+          elsif total >= fumble
+            ResultLevel.new(:fumble)
           elsif total <= (difficulty / 5)
             ResultLevel.new(:extreme_success)
           elsif total <= (difficulty / 2)
             ResultLevel.new(:hard_success)
           elsif total <= difficulty
             ResultLevel.new(:regular_success)
-          elsif total >= fumble
-            ResultLevel.new(:fumble)
           else
             ResultLevel.new(:failure)
           end
@@ -117,7 +139,7 @@ module BCDice
         end
 
         def success?
-          @level_index >= LEVEL.index(:regular_success)
+          @level_index >= LEVEL.index(:success)
         end
 
         def failure?
@@ -160,15 +182,26 @@ module BCDice
       end
 
       def skill_roll(command)
-        m = /^CC([-+]?\d+)?(?:<=(\d+))?$/.match(command)
+        m = /^CC([-+]?\d+)?(?:<=(\d+)([RHEC])?)?$/.match(command)
         unless m
           return nil
         end
 
         bonus_dice = m[1].to_i
-        difficulty = m[2].to_i
+        difficulty = m[2]&.to_i
+        difficulty_level = m[3]
+
+        if difficulty == 0
+          difficulty = nil
+        elsif difficulty_level == "H"
+          difficulty /= 2
+        elsif difficulty_level == "E"
+          difficulty /= 5
+        elsif difficulty_level == "C"
+          difficulty = 0
+        end
 
-        if bonus_dice == 0 && difficulty == 0
+        if bonus_dice == 0 && difficulty.nil?
           dice = @randomizer.roll_once(100)
           return "1D100 ＞ #{dice}"
         end
@@ -179,8 +212,13 @@ module BCDice
 
         total, total_list = roll_with_bonus(bonus_dice)
 
-        expr = difficulty.zero? ? "1D100" : "1D100<=#{difficulty}"
-        result = ResultLevel.from_values(total, difficulty) unless difficulty.zero?
+        expr = difficulty.nil? ? "1D100" : "1D100<=#{difficulty}"
+        result =
+          if difficulty_level
+            ResultLevel.with_difficulty_level(total, difficulty)
+          elsif difficulty
+            ResultLevel.from_values(total, difficulty)
+          end
 
         sequence = [
           "(#{expr}) ボーナス・ペナルティダイス[#{bonus_dice}]",