bcdice 3.1.3 → 3.2.0

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)

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/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,10 +95,25 @@ 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 <= difficulty
+            ResultLevel.new(:success)
+          elsif total >= fumble
+            ResultLevel.new(:fumble)
+          else
+            ResultLevel.new(:failure)
+          end
+        end
+
         def self.from_values(total, difficulty, fumbleable = false)
           fumble = difficulty < 50 || fumbleable ? 96 : 100
 
@@ -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}]",

data/lib/bcdice/game_system/Cthulhu7th_ChineseTraditional.rb

@@ -35,7 +35,7 @@ module BCDice
         ・實時型　Short／總結型　Longer
       INFO_MESSAGE_TEXT
 
-      register_prefix('CC\(\d+\)', 'CC', 'CBR\(\d+,\d+\)', 'FAR\(\d+\)', 'FAR')
+      register_prefix('CC', 'CBR', 'FAR')
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/Cthulhu7th_Korean.rb

@@ -32,7 +32,7 @@ module BCDice
         예）FAR(25,70,98)　FAR(50,80,98,-1)
       INFO_MESSAGE_TEXT
 
-      register_prefix('CC\(\d+\)', 'CC', 'CBR\(\d+,\d+\)', 'FAR\(\d+\)', 'FAR')
+      register_prefix('CC', 'CBR', 'FAR')
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/DarkBlaze.rb

@@ -43,17 +43,6 @@ module BCDice
         return string
       end
 
-      # ゲーム別成功度判定(nD6)
-      def check_nD6(total, _dice_total, _dice_list, cmp_op, target)
-        if cmp_op != :>= || target == "?"
-          ''
-        elsif total >= target
-          " ＞ 成功"
-        else
-          " ＞ 失敗"
-        end
-      end
-
       def check_roll(string)
         string = replace_text(string)
         return nil unless (m = /(^|\s)S?(3[rR]6([+\-\d]+)?(\[(\d+),(\d+)\])(([>=]+)(\d+))?)(\s|$)/i.match(string))

data/lib/bcdice/game_system/DarkDaysDrive.rb

@@ -51,18 +51,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
-          " ＞ ファンブル(判定失敗。失敗表(FT)を追加で１回振る)"
+          Result.fumble("ファンブル(判定失敗。失敗表(FT)を追加で１回振る)")
         elsif dice_total >= 12
-          " ＞ スペシャル(判定成功。大成功表(GJT)を１回使用可能)"
+          Result.critical("スペシャル(判定成功。大成功表(GJT)を１回使用可能)")
+        elsif target == "?"
+          Result.nothing
         elsif total >= target
-          " ＞ 成功"
+          Result.success("成功")
         else
-          " ＞ 失敗"
+          Result.failure("失敗")
         end
       end
 

data/lib/bcdice/game_system/DeadlineHeroes.rb

@@ -33,8 +33,8 @@ module BCDice
       INFO_MESSAGE_TEXT
 
       register_prefix(
-        'DLH\\d+([\\+\\-]\\d+)*',
-        'DC(L|S|C)\d+',
+        'DLH',
+        'DC[LSC]',
         'RNC[JO]',
         'HNC'
       )

data/lib/bcdice/game_system/DemonParasite.rb

@@ -28,7 +28,7 @@ module BCDice
         ・D66ダイスあり
       INFO_MESSAGE_TEXT
 
-      register_prefix('[NAMUC]?URGE\d+')
+      register_prefix('[NAMUC]?URGE')
 
       def initialize(command)
         super(command)
@@ -38,21 +38,13 @@ module BCDice
       end
 
       # ゲーム別成功度判定(nD6)
-      def check_nD6(total, _dice_total, dice_list, cmp_op, target)
+      def result_nd6(_total, _dice_total, dice_list, _cmp_op, target)
         if dice_list.count(1) >= 2 # １の目が２個以上ならファンブル
-          return " ＞ 致命的失敗"
+          Result.fumble("致命的失敗")
         elsif dice_list.count(6) >= 2 # ６の目が２個以上あったらクリティカル
-          return " ＞ 効果的成功"
+          Result.critical("効果的成功")
         elsif target == "?"
-          return ''
-        end
-
-        if [:>=, :>].include?(cmp_op)
-          if total.send(cmp_op, target)
-            " ＞ 成功"
-          else
-            " ＞ 失敗"
-          end
+          Result.nothing
         end
       end