bcdice 3.0.0.pre.alpha.1 → 3.0.0.pre.alpha.2

data/lib/bcdice/game_system/AnimaAnimus.rb

@@ -90,7 +90,7 @@ module BCDice
       }.freeze
 
       # ダイスボットで使用するコマンドを配列で列挙する
-      register_prefix(['\d+AN<=\d([\+\-]\d+)*'] + TABLES.keys)
+      register_prefix('\d+AN<=\d([\+\-]\d+)*', TABLES.keys)
     end
   end
 end

data/lib/bcdice/game_system/Arianrhod.rb

@@ -22,7 +22,6 @@ module BCDice
         super(command)
 
         @sort_add_dice = true
-        @enabled_d66 = true
         @d66_sort_type = D66SortType::NO_SORT
       end
 

data/lib/bcdice/game_system/ArsMagica.rb

@@ -26,7 +26,7 @@ module BCDice
         　　最初の0が判断基準で、その右側5つがボッチダイスです。1*2,8*2,0*1なので1botchという訳です。
       INFO_MESSAGE_TEXT
 
-      register_prefix(['ArS.*', '1R10.*'])
+      register_prefix('ArS.*', '1R10.*')
 
       def eval_game_system_specific_command(string)
         unless parse_ars(string) || parse_1r10(string)

data/lib/bcdice/game_system/Avandner.rb

@@ -34,7 +34,7 @@ module BCDice
         ・8av4*7+10 → 8d10で目標値4、攻撃力7、クリティカルトリガー10の命中判定。
       MESSAGETEXT
 
-      register_prefix(['\d+AV\d+((x|\*)\d+(\+\d+)?)?(c\d+)?'])
+      register_prefix('\d+AV\d+((x|\*)\d+(\+\d+)?)?(c\d+)?')
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/BBN.rb

@@ -2,7 +2,7 @@ module BCDice
   module GameSystem
     class BBN < Base
       # ダイスボットで使用するコマンドを配列で列挙する
-      register_prefix(['\d+BN.*'])
+      register_prefix('\d+BN.*')
 
       ID = 'BBN'.freeze
 

data/lib/bcdice/game_system/BadLife.rb

@@ -41,7 +41,7 @@ module BCDice
         ・スキル表：SKL
       MESSAGETEXT
 
-      register_prefix(['\d?(BAD|BL|GL).*', '[TDGKSB]RN', 'SKL'])
+      register_prefix('\d?(BAD|BL|GL).*', '[TDGKSB]RN', 'SKL')
 
       def eval_game_system_specific_command(command)
         command = command.upcase

data/lib/bcdice/game_system/BarnaKronika.rb

@@ -26,7 +26,7 @@ module BCDice
         　セット数が1以上の時はセット数も表示し、攻撃判定の場合は命中部位も表示します。
       INFO_MESSAGE_TEXT
 
-      register_prefix(['\d+BK.*', '\d+BA.*', '\d+BKC\d+.*', '\d+BAC\d+.*', '\d+R6.*'])
+      register_prefix('\d+BK.*', '\d+BA.*', '\d+BKC\d+.*', '\d+BAC\d+.*', '\d+R6.*')
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/BeastBindTrinity.rb

@@ -63,7 +63,6 @@ module BCDice
       def initialize(command)
         super(command)
 
-        @enabled_d66 = true
         @d66_sort_type = D66SortType::ASC
       end
 
@@ -342,7 +341,7 @@ module BCDice
         ),
       }.freeze
 
-      register_prefix(['\d+BB.*', '\d+R6.*'] + TABLES.keys)
+      register_prefix('\d+BB.*', '\d+R6.*', TABLES.keys)
     end
   end
 end

data/lib/bcdice/game_system/BeginningIdol.rb

@@ -54,7 +54,7 @@ module BCDice
         []内は省略可　D66入れ替えあり
       INFO_MESSAGE_TEXT
 
-      register_prefix([
+      register_prefix(
         '[1-7]*PD\d+(?:[\+\-]\d+)?',
         'HW',
         'BWT',
@@ -142,13 +142,12 @@ module BCDice
         'LIT',
         'TIT',
         'CIT'
-      ])
+      )
 
       def initialize(command)
         super(command)
 
         @sort_add_dice = true
-        @enabled_d66 = true
         @d66_sort_type = D66SortType::ASC
       end
 

data/lib/bcdice/game_system/BeginningIdol_Korean.rb

@@ -52,7 +52,7 @@ module BCDice
         []内は省略可　D66 다이스가 존재
       INFO_MESSAGE_TEXT
 
-      register_prefix([
+      register_prefix(
         '[1-7]*PD\d+(?:[\+\-]\d+)?',
         'HW',
         'BWT',
@@ -137,13 +137,12 @@ module BCDice
         'LIT',
         'TIT',
         'CIT'
-      ])
+      )
 
       def initialize(command)
         super(command)
 
         @sort_add_dice = true
-        @enabled_d66 = true
         @d66_sort_type = D66SortType::ASC
       end
 

data/lib/bcdice/game_system/BladeOfArcana.rb

@@ -32,13 +32,13 @@ module BCDice
         　　例）CTR+→因縁表（R版）を出目2～21でロールする。
       INFO_MESSAGE_TEXT
 
-      register_prefix([
+      register_prefix(
         '\d+A\d*[CF]?\d*[CF]?\d*',
         'CT3[\+\-]?',
         'CTR[\+\-]?',
         'DJV\-?',
         'AKST[\+\-]?'
-      ])
+      )
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/BlindMythos.rb

@@ -454,7 +454,7 @@ module BCDice
         ),
       }.freeze
 
-      register_prefix(['BM.*', 'ReRoll\d+.*', 'RP\d+', 'DT'] + TABLES.keys)
+      register_prefix('BM.*', 'ReRoll\d+.*', 'RP\d+', 'DT', TABLES.keys)
     end
   end
 end

data/lib/bcdice/game_system/BloodCrusade.rb

@@ -40,7 +40,6 @@ module BCDice
         super(command)
 
         @sort_add_dice = true
-        @enabled_d66 = true
         @d66_sort_type = D66SortType::ASC
         @round_type = RoundType::CEIL # 端数切り上げに設定
       end

data/lib/bcdice/game_system/BloodMoon.rb

@@ -38,7 +38,6 @@ module BCDice
         super(command)
 
         @sort_add_dice = true
-        @enabled_d66 = true
         @d66_sort_type = D66SortType::ASC
         @round_type = RoundType::CEIL # 端数切り上げに設定
       end

data/lib/bcdice/game_system/CardRanker.rb

@@ -32,7 +32,6 @@ module BCDice
         super(command)
 
         @sort_add_dice = true
-        @enabled_d66 = true
         @d66_sort_type = D66SortType::ASC
       end
 
@@ -243,7 +242,7 @@ module BCDice
           ]
         ),
       }.freeze
-      register_prefix(['RM', 'CM.*'] + TABLES.keys)
+      register_prefix('RM', 'CM.*', TABLES.keys)
     end
   end
 end

data/lib/bcdice/game_system/ChaosFlare.rb

@@ -41,7 +41,7 @@ module BCDice
           - FT7
       INFO_MESSAGE_TEXT
 
-      register_prefix(['\d*CF.*', 'FT\d*'])
+      register_prefix('\d*CF.*', 'FT\d*')
 
       # ゲーム別成功度判定(2D6)。以前の処理をそのまま残しています。
       def check_2D6(total, dice_total, _dice_list, cmp_op, target)

data/lib/bcdice/game_system/Chill.rb

@@ -22,7 +22,7 @@ module BCDice
         　例）SR7　　　sr13　　　SR(7+4)　　　Ssr10
       INFO_MESSAGE_TEXT
 
-      register_prefix(['SR\d+.*'])
+      register_prefix('SR\d+.*')
 
       def check_1D100(total, _dice_total, cmp_op, target)
         return '' if target == '?'

data/lib/bcdice/game_system/CodeLayerd.rb

@@ -28,7 +28,7 @@ module BCDice
           0CL : 1CL[0]と同じ判定
       MESSAGETEXT
 
-      register_prefix(['[+-]?\d*CL([+-]\d+)?[@\d]*.*'])
+      register_prefix('[+-]?\d*CL([+-]\d+)?[@\d]*.*')
 
       def eval_game_system_specific_command(command)
         debug('eval_game_system_specific_command command', command)

data/lib/bcdice/game_system/ColossalHunter.rb

@@ -32,7 +32,6 @@ module BCDice
 
       def initialize(command)
         super(command)
-        @enabled_d66 = true
         @d66_sort_type = D66SortType::NO_SORT
       end
 
@@ -563,7 +562,7 @@ module BCDice
 
         }.freeze
 
-      register_prefix(["CH.*", "B6T", "CNP"] + TABLES.keys)
+      register_prefix("CH.*", "B6T", "CNP", TABLES.keys)
     end
   end
 end

data/lib/bcdice/game_system/Comes.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module BCDice
+  module GameSystem
+    class Comes < Base
+      # ゲームシステムの識別子
+      ID = 'Comes'
+
+      # ゲームシステム名
+      NAME = 'カムズ'
+
+      # ゲームシステム名の読みがな
+      SORT_KEY = 'かむす'
+
+      # ダイスボットの使い方
+      HELP_MESSAGE = <<~INFO_MESSAGE_TEXT
+        ・各種表
+        　判定ペナルティ表 PT
+      INFO_MESSAGE_TEXT
+
+      def initialize(command)
+        super(command)
+
+        @sort_add_dice = true
+        @d66_sort_type = D66SortType::ASC
+      end
+
+      def eval_game_system_specific_command(command)
+        return roll_tables(command, self.class::TABLES)
+      end
+
+      TABLES = {
+        'PT' => DiceTable::Table.new(
+          '判定ペナルティ表',
+          '1D6',
+          [
+            '恐ろしい目に合う。『恐怖』を与える。',
+            '今見ているものを理解できない。『混乱』を与える。',
+            '我を忘れて見とれてしまう。『魅了』を与える。',
+            '思わぬ遠回りをしてしまう。『疲労』を与える。',
+            '大きな失態を演じてしまう。『負傷』を与える。',
+            '別の困難が立ちはだかる。新たに判定を行わせる。',
+          ]
+        )
+      }.freeze
+
+      register_prefix(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\d+')
 
       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('CC(B)?\(\d+\)', 'CC(B)?.*', 'RES(B)?.*', 'CBR(B)?\(\d+,\d+\)')
 
       def initialize(command)
         super(command)
@@ -94,90 +94,95 @@ module BCDice
         return nil
       end
 
+      private
+
       def getCheckResult(command)
-        broken_num = 0
-        diff = 0
+        m = %r{CCB?(\d+)?(?:<=([+-/*\d]+))?}i.match(command)
+        broken_num = m[1].to_i
+        diff = ArithmeticEvaluator.eval(m[2])
 
-        if (m = %r{CCB?(\d+)?<=([+-/*\d]+)}i.match(command))
-          broken_num = m[1].to_i
-          diff = ArithmeticEvaluator.eval(m[2])
+        if diff <= 0
+          total = @randomizer.roll_once(100)
+          return Result.new("(1D100) ＞ #{total}")
         end
 
-        output = ""
-
-        if diff > 0
-          output = "(1D100<=#{diff})"
-
-          if broken_num > 0
-            output += " 故障ナンバー[#{broken_num}]"
-          end
+        expr = "(1D100<=#{diff})"
+        if broken_num > 0
+          expr += " #{translate('Cthulhu.broken_number')}[#{broken_num}]"
+        end
 
-          total_n = @randomizer.roll_once(100)
+        total = @randomizer.roll_once(100)
+        compare_result = compare(total, diff, broken_num)
 
-          output += " ＞ #{total_n}"
-          output += " ＞ #{getCheckResultText(total_n, diff, broken_num)}"
-        else
-          total_n = @randomizer.roll_once(100)
-          output = "(1D100) ＞ #{total_n}"
+        compare_result.to_result.tap do |r|
+          r.text = "#{expr} ＞ #{total} ＞ #{compare_result.text}"
         end
-
-        return output
       end
 
-      def getCheckResultText(total_n, diff, broken_num = 0)
-        result = ""
-        diff_special = 0
-        fumble = false
+      class CompareResult
+        include Translate
+        attr_accessor :success, :failure, :critical, :fumble, :special, :broken
+
+        def initialize(locale)
+          @locale = locale
+
+          @success = false
+          @failure = false
+          @critical = false
+          @fumble = false
+          @special = false
+          @broke = false
+        end
 
-        if @special_percentage > 0
-          # specialの値設定が無い場合はクリティカル/ファンブル判定もしない
-          diff_special = (diff * @special_percentage / 100).floor
-          if diff_special < 1
-            diff_special = 1
+        def text
+          if critical && special
+            translate("Cthulhu.critical_special")
+          elsif critical
+            translate("Cthulhu.critical")
+          elsif special
+            translate("Cthulhu.special")
+          elsif success
+            translate("success")
+          elsif broken && fumble
+            "#{translate('Cthulhu.fumble')}/#{translate('Cthulhu.broken')}"
+          elsif broken
+            translate("Cthulhu.broken")
+          elsif fumble
+            translate("Cthulhu.fumble")
+          elsif failure
+            translate("failure")
           end
         end
 
-        if (total_n <= diff) && (total_n < 100)
-          @is_success = true
-          result = "成功"
-
-          if diff_special > 0
-            if total_n <= @critical_percentage
-              @is_critical = true
-              if total_n <= diff_special
-                result = "決定的成功/スペシャル"
-              else
-                result = "決定的成功"
-              end
-            else
-              if total_n <= diff_special
-                result = "スペシャル"
-              end
-            end
+        def to_result
+          Result.new.tap do |r|
+            r.success = success
+            r.failure = failure
+            r.critical = critical
+            r.fumble = fumble
           end
+        end
+      end
+
+      def compare(total, target, broken_number = 0)
+        result = CompareResult.new(@locale)
+        target_special = (target * @special_percentage / 100).clamp(1, 100)
+
+        if (total <= target) && (total < 100)
+          result.success = true
+          result.special = total <= target_special
+          result.critical = total <= @critical_percentage
         else
-          @is_failure = true
-          result = "失敗"
-
-          if diff_special > 0
-            if (total_n >= (101 - @fumble_percentage)) && (diff < 100)
-              @is_fumble = true
-              result = "致命的失敗"
-              fumble = true
-            end
-          end
+          result.failure = true
+          result.fumble = total >= (101 - @fumble_percentage)
         end
 
-        if broken_num > 0
-          if total_n >= broken_num
-            @is_success = false
-            @is_failure = true
-            if fumble
-              result += "/故障"
-            else
-              result = "故障"
-            end
-          end
+        if broken_number > 0 && total >= broken_number
+          result.broken = true
+          result.failure = true
+          result.success = false
+          result.special = false
+          result.critical = false
         end
 
         return result
@@ -186,33 +191,33 @@ module BCDice
       def getRegistResult(command)
         m = /RES(B)?([-\d]+)/i.match(command)
         unless m
-          return "1"
+          return nil
         end
 
         value = m[2].to_i
         target = value * 5 + 50
 
         if target < 5
-          @is_failure = true
-          return "(1d100<=#{target}) ＞ 自動失敗"
+          return Result.failure("(1d100<=#{target}) ＞ #{translate('Cthulhu.automatic_failure')}")
         end
 
         if target > 95
-          @is_success = true
-          return "(1d100<=#{target}) ＞ 自動成功"
+          return Result.success("(1d100<=#{target}) ＞ #{translate('Cthulhu.automatic_success')}")
         end
 
         # 通常判定
         total_n = @randomizer.roll_once(100)
-        result = getCheckResultText(total_n, target)
+        compare_result = compare(total_n, target)
 
-        return "(1d100<=#{target}) ＞ #{total_n} ＞ #{result}"
+        compare_result.to_result.tap do |r|
+          r.text = "(1d100<=#{target}) ＞ #{total_n} ＞ #{compare_result.text}"
+        end
       end
 
       def getCombineRoll(command)
         m = /CBR(B)?\((\d+),(\d+)\)/i.match(command)
         unless m
-          return "1"
+          return nil
         end
 
         diff_1 = m[2].to_i
@@ -220,32 +225,24 @@ module BCDice
 
         total = @randomizer.roll_once(100)
 
-        result_1 = getCheckResultText(total, diff_1)
-        result_2 = getCheckResultText(total, diff_2)
-
-        successList = ["決定的成功/スペシャル", "決定的成功", "スペシャル", "成功"]
-
-        succesCount = 0
-        succesCount += 1 if successList.include?(result_1)
-        succesCount += 1 if successList.include?(result_2)
-        debug("succesCount", succesCount)
-
-        @is_failure = false
-        @is_success = false
+        result_1 = compare(total, diff_1)
+        result_2 = compare(total, diff_2)
 
         rank =
-          if succesCount >= 2
-            @is_success = true
-            "成功"
-          elsif succesCount == 1
-            @is_success = true
-            "部分的成功"
+          if result_1.success && result_2.success
+            translate("success")
+          elsif result_1.success || result_2.success
+            translate("Cthulhu.partial_success")
           else
-            @is_failure = true
-            "失敗"
+            translate("failure")
           end
 
-        return "(1d100<=#{diff_1},#{diff_2}) ＞ #{total}[#{result_1},#{result_2}] ＞ #{rank}"
+        Result.new.tap do |r|
+          r.text = "(1d100<=#{diff_1},#{diff_2}) ＞ #{total}[#{result_1.text},#{result_2.text}] ＞ #{rank}"
+          r.critical = result_1.critical || result_2.critical
+          r.fumble = result_1.fumble || result_2.fumble
+          r.condition = result_1.success || result_2.success
+        end
       end
     end
   end