bcdice 3.1.2 → 3.4.0

data/lib/bcdice/game_system/LogHorizon.rb

@@ -128,27 +128,30 @@ module BCDice
         dice_total = dice_list.sum()
         total = dice_total + parsed.modify_number
 
+        result = result_text(dice_count, dice_list, total, parsed)
+
         sequence = [
           "(#{parsed})",
           "#{dice_total}[#{dice_list.join(',')}]#{Format.modifier(parsed.modify_number)}",
           total,
-          result_text(dice_count, dice_list, total, parsed),
+          result.text,
         ].compact
 
-        return sequence.join(" ＞ ")
+        result.text = sequence.join(" ＞ ")
+        result
       end
 
       def result_text(dice_count, dice_list, total, parsed)
         if dice_list.count(6) >= 2
-          translate("LogHorizon.LH.critical")
+          Result.critical(translate("LogHorizon.LH.critical"))
         elsif dice_list.count(1) >= dice_count
-          translate("LogHorizon.LH.fumble")
+          Result.fumble(translate("LogHorizon.LH.fumble"))
         elsif parsed.cmp_op.nil?
-          nil
+          Result.new
         elsif total >= parsed.target_number
-          translate('success')
+          Result.success(translate("success"))
         else
-          translate('failure')
+          Result.failure(translate("failure"))
         end
       end
 
@@ -244,7 +247,7 @@ module BCDice
 
       # 財宝表ロール
       def roll_treasure(command)
-        m = /^TRS(\d+)*([+\-\d]+)?$/.match(command)
+        m = /^TRS(\d+)?([+\-\d]+)?$/.match(command)
         return nil unless m
 
         character_rank = m[1].to_i
@@ -261,7 +264,7 @@ module BCDice
 
       ### 財宝表 ###
       def roll_treasure_table(command)
-        m = /^([CMIHG]TRS)(\d+)*([+\-\d]+)?(\$)?$/.match(command)
+        m = /^([CMIHG]TRS)(\d+)?([+\-\d]+)?(\$)?$/.match(command)
         return nil unless m
 
         type = m[1]
@@ -286,7 +289,7 @@ module BCDice
 
       # 拡張ルール財宝表
       def roll_treasure_table_b2(command)
-        m = /^([CMIO]TRSE)(\d+)*([+\-\d]+)?(\$)?$/.match(command)
+        m = /^([CMIO]TRSE)(\d+)?([+\-\d]+)?(\$)?$/.match(command)
         return nil unless m
 
         type = m[1]

data/lib/bcdice/game_system/MagicaLogia_SimplifiedChinese.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+require "bcdice/game_system/MagicaLogia"
+
+module BCDice
+  module GameSystem
+    class MagicaLogia_SimplifiedChinese < MagicaLogia
+      # ゲームシステムの識別子
+      ID = "MagicaLogia:SimplifiedChinese"
+
+      # ゲームシステム名
+      NAME = "魔导书大战"
+
+      # ゲームシステム名の読みがな
+      SORT_KEY = "国際化:Simplified Chinese:魔导书大战"
+
+      # ダイスボットの使い方
+      HELP_MESSAGE = <<~INFO_MESSAGE_TEXT
+        ・判定
+        可以判定大成功／大失败／成功／失败
+        ・各种表
+        经历表　BGT/初期锚点表　DAT/命运属性表　FAT
+        愿望表　WIT/战利品表　PT
+        时间流逝表　TPT/大判时间流逝表　TPTB
+        事件表　AT
+        大失败表　FT／变调表　WT
+        命运转变表表　FCT
+        　典型性灾厄 TCT／物理性灾厄 PCT／精神性灾厄 MCT／狂气性灾厄 ICT
+        　社会性灾厄 SCT／超自然灾厄 XCT／不可思议的灾厄 WCT／喜剧性灾厄 CCT
+        　魔法使的灾厄 MGCT
+        场景表　ST／大判场景表　STB
+        　极限环境 XEST／内心世界 IWST／魔法都市 MCST
+        　死后世界 WDST／迷宫世界 LWST
+        　魔法书架 MBST／魔法学院 MAST／克雷德塔 TCST
+        　平行世界 PWST／终末世界 PAST／异世界酒吧 GBST
+        　星影 SLST／旧图书馆 OLST
+        世界法则追加表 WLAT/徘徊怪物表 WMT
+        随机领域表　RCT
+        随机特技表　RTT
+        　星领域随机特技表  RTS, RTT1
+        　兽领域随机特技表  RTB, RTT2
+        　力领域随机特技表  RTF, RTT3
+        　歌领域随机特技表  RTP, RTT4
+        　梦领域随机特技表  RTD, RTT5
+        　暗领域随机特技表  RTN, RTT6
+        空白秘密表　BST
+        　宿敌表　MIT/谋略表　MOT/因缘表　MAT
+        　奇人表　MUT/力场表　MFT/同盟表　MLT
+        落花表　FFT
+        那之后表 FLT
+        ・可以使用D66
+      INFO_MESSAGE_TEXT
+
+      register_prefix_from_super_class()
+
+      def initialize(command)
+        super(command)
+
+        @locale = :zh_hans
+      end
+
+      SKILL_TABLE = translate_skill_table(:zh_hans)
+      TABLES = translate_tables(:zh_hans, SKILL_TABLE)
+    end
+  end
+end

data/lib/bcdice/game_system/MeikyuDays.rb

@@ -44,18 +44,19 @@ module BCDice
         return string
       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 unless cmp_op == :>=
 
         if dice_total <= 2
-          " ＞ 絶対失敗"
+          Result.fumble("絶対失敗")
         elsif dice_total >= 12
-          " ＞ 絶対成功"
+          Result.critical("絶対成功")
+        elsif target == "?"
+          Result.nothing
         elsif total >= target
-          " ＞ 成功"
+          Result.success("成功")
         else
-          " ＞ 失敗"
+          Result.failure("失敗")
         end
       end
 
@@ -104,7 +105,8 @@ module BCDice
 
         if signOfInequality != "" # 成功度判定処理
           cmp_op = Normalize.comparison_operator(signOfInequality)
-          output += check_2D6(total_n, dice_now, dice_num, cmp_op, diff)
+          result = result_2d6(total_n, dice_now, dice_num, cmp_op, diff)
+          output += " ＞ #{result.text}" if result
         end
 
         return output

data/lib/bcdice/game_system/MeikyuKingdom.rb

@@ -51,12 +51,12 @@ module BCDice
         'TT', 'NT', 'ET', 'MPT',
         'T1T', 'T2T', 'T3T', 'T4T', 'T5T',
         'NAME',
-        'DFT', 'IDT\d*',
+        'DFT', 'IDT',
         'WIT', 'LIT', 'RIT', 'SIT', 'RWIT', 'RUIT',
         'IFT',
         '\d+RET',
-        'PNT\d*', 'MLT\d*',
-        'KNT\d+', 'WORD\d+'
+        'PNT', 'MLT',
+        'KNT', 'WORD'
       )
 
       def initialize(command)
@@ -77,38 +77,38 @@ module BCDice
         return string
       end
 
-      def check_nD6(total, dice_total, dice_list, cmp_op, target)
-        return '' if target == '?'
+      def result_nd6(total, dice_total, dice_list, cmp_op, target)
+        return Result.nothing if target == "?"
+        return nil unless cmp_op == :>=
 
-        result = get2D6Result(total, dice_total, cmp_op, target)
-        result += getKiryokuResult(total, dice_list, target)
+        result = result_nd6_only(total, dice_total, cmp_op, target)
+        result.text += kiryoku_result(total, dice_list, target)
 
         return result
       end
 
-      alias check_2D6 check_nD6
+      def result_nd6_only(total, dice_total, cmp_op, target)
+        return nil unless cmp_op == :>=
 
-      def get2D6Result(total_n, dice_n, signOfInequality, diff)
-        return '' unless signOfInequality == :>=
-
-        if dice_n <= 2
-          " ＞ 絶対失敗"
-        elsif dice_n >= 12
-          " ＞ 絶対成功"
+        if dice_total <= 2
+          Result.fumble("絶対失敗")
+        elsif dice_total >= 12
+          Result.critical("絶対成功")
+        elsif total >= target
+          Result.success("成功")
         else
-          get2D6ResultOnlySuccess(total_n, diff)
+          Result.failure("失敗")
         end
       end
 
-      def get2D6ResultOnlySuccess(total_n, diff)
-        if total_n >= diff
-          " ＞ 成功"
-        else
-          " ＞ 失敗"
-        end
+      def result_2d6_text(total, dice_total, cmp_op, target)
+        text = result_nd6_only(total, dice_total, cmp_op, target)&.text
+        return "" if text.nil?
+
+        return " ＞ #{text}"
       end
 
-      def getKiryokuResult(total_n, dice_list, diff)
+      def kiryoku_result(total_n, dice_list, diff)
         num_6 = dice_list.count(6)
 
         if num_6 == 0
@@ -131,7 +131,7 @@ module BCDice
         none6Dice_n = maxDice1 + maxDice2
         debug("none6Dice_n", none6Dice_n)
         debug("diff", diff)
-        none6DiceReuslt = get2D6ResultOnlySuccess(none6Total_n, diff)
+        none6DiceReuslt = (none6Total_n >= diff ? " ＞ 成功" : " ＞ 失敗")
 
         return " (もしくは) #{none6Total_n}#{none6DiceReuslt} ＆ 《気力》1点獲得"
       end
@@ -180,8 +180,8 @@ module BCDice
 
         if signOfInequality != "" # 成功度判定処理
           cmp_op = Normalize.comparison_operator(signOfInequality)
-          output += get2D6Result(total_n, dice_now, cmp_op, diff)
-          output += getKiryokuResult(total_n, dice_list, diff)
+          output += result_2d6_text(total_n, dice_now, cmp_op, diff)
+          output += kiryoku_result(total_n, dice_list, diff)
         end
 
         return output

data/lib/bcdice/game_system/MeikyuKingdomBasic.rb

@@ -65,14 +65,15 @@ module BCDice
         'BDT', 'TBO', 'CBO', 'SBO', 'VBO',
         'ET', 'FET', 'HET', 'SDT', 'IEQ', 'FRT',
         'T1T', 'T2T', 'T3T', 'T4T', 'T5T',
-        'MPT', 'KNT\d+', 'WORD\d+', 'NAME', 'NNAME', 'NM',
+        'MPT', 'KNT', 'WORD', 'NAME', 'NNAME', 'NM',
         'RT', 'CIR', 'RUIR', 'RWIR',
         'WIT', 'LIT', 'RIT', 'SIT', 'NRWT', 'NRUT', 'ARWT', 'ARUT',
         'KET', 'TET', 'NST', 'RET', 'FAT', 'HRT', 'BLT',
         'BUS', 'SHS', 'ASS', 'SUS', 'SCS', 'LAS', 'NES', 'COS', 'ENS', 'TOS',
         'ABUS', 'ASHS', 'AASS', 'ASUS', 'ASCS', 'ALAS', 'ANES', 'ACOS', 'AENS', 'ATOS',
         'SE', 'ARN', 'WEN', 'NEN', 'CEN', 'SEN', 'OEN',
-        'DFT\d+'
+        'DFT',
+        'PNT', 'MLT'
       )
 
       def initialize(command)
@@ -82,7 +83,7 @@ module BCDice
         @d66_sort_type = D66SortType::ASC
       end
 
-      def getKiryokuResult(_total_n, dice_list, _diff)
+      def kiryoku_result(_total_n, dice_list, _diff)
         num_6 = dice_list.count(6)
 
         if num_6 == 0

data/lib/bcdice/game_system/MetalHead.rb

@@ -35,7 +35,7 @@ module BCDice
           例）CRCM98 対物で数値98の戦闘結果を参照する。
       MESSAGETEXT
 
-      register_prefix('AR', 'SR', 'HR<=.+', 'CC', 'ACT', 'ACL', 'ACS', 'CRC[A-Z]\d+')
+      register_prefix('AR', 'SR', 'HR<=', 'CC', 'ACT', 'ACL', 'ACS', 'CRC[A-Z]')
 
       def eval_game_system_specific_command(command)
         result = roll_tables(command, TABLES)
@@ -62,17 +62,13 @@ module BCDice
         return string
       end
 
-      def check_2D6(total, dice_total, _dice_list, cmp_op, target)
-        return '' if cmp_op != :>= || target == "?"
+      def result_2d6(_total, dice_total, _dice_list, cmp_op, _target)
+        return nil if cmp_op != :>=
 
         if dice_total >= 12
-          " ＞ 絶対成功"
+          Result.critical("絶対成功")
         elsif dice_total <= 2
-          " ＞ 絶対失敗"
-        elsif total >= target
-          " ＞ 成功"
-        else
-          " ＞ 失敗"
+          Result.fumble("絶対失敗")
         end
       end
 
@@ -85,11 +81,14 @@ module BCDice
         return text
       end
 
-      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 unless cmp_op == :<=
 
-        return getResult(total, dice_total, target)
+        if dice_total <= 5
+          Result.critical("絶対成功")
+        elsif dice_total >= 96
+          Result.fumble("絶対失敗")
+        end
       end
 
       def getHitResult(total_n, _dice_n, diff)
@@ -106,15 +105,6 @@ module BCDice
         return ' ＞ 成功'
       end
 
-      def getResult(total_n, dice_n, diff)
-        return ' ＞ 絶対成功' if  dice_n <= 5
-        return ' ＞ 絶対失敗' if  dice_n >= 96
-
-        return ' ＞ 成功' if total_n <= diff
-
-        return ' ＞ 失敗'
-      end
-
       # 戦闘結果チャートを振る
       # @param [String] suv 耐久レベル
       # @param [String] num 数値

data/lib/bcdice/game_system/MetalHeadExtream.rb

@@ -51,11 +51,11 @@ module BCDice
       MESSAGETEXT
 
       register_prefix(
-        '[AS]R\d+',
-        '(HU|BK|WA|SC|BG|IN|PT|HT|TA|AC|HE|TR|VT|BO|CS|TH|AM|GD|HC|BI|BT|AI)HIT\d*',
-        'SUV[A-Z]\d+', '[HTALMEBPD]DMG[LMHO]',
-        'CRT\d*', '[GSME]AC\d*', '[ASL]MA\d*(\+\d+)?',
-        'SEC', 'NAC', 'LDC', '[W]ENC\d*'
+        '[AS]R',
+        '(HU|BK|WA|SC|BG|IN|PT|HT|TA|AC|HE|TR|VT|BO|CS|TH|AM|GD|HC|BI|BT|AI)HIT',
+        'SUV[A-Z]', '[HTALMEBPD]DMG[LMHO]',
+        'CRT', '[GSME]AC', '[ASL]MA',
+        'SEC', 'NAC', 'LDC', '[W]ENC'
       )
 
       def eval_game_system_specific_command(command)

data/lib/bcdice/game_system/MonotoneMuseum.rb

@@ -77,23 +77,25 @@ module BCDice
 
         result =
           if dice_value <= fumble
-            translate("MonotoneMuseum.automatic_failure")
+            Result.fumble(translate("MonotoneMuseum.automatic_failure"))
           elsif dice_value >= critical
-            translate("MonotoneMuseum.automatic_success")
+            Result.critical(translate("MonotoneMuseum.automatic_success"))
           elsif total >= target
-            translate("success")
+            Result.success(translate("success"))
           else
-            translate("failure")
+            Result.failure(translate("failure"))
           end
 
         sequence = [
           "(#{command})",
           "#{dice_value}[#{dice_str}]#{Format.modifier(modify_number)}",
           total.to_s,
-          result,
+          result.text,
         ]
 
-        return sequence.join(" ＞ ")
+        result.text = sequence.join(" ＞ ")
+
+        result
       end
 
       # モノトーンミュージアム用のテーブル

data/lib/bcdice/game_system/Nechronica.rb

@@ -17,10 +17,10 @@ module BCDice
       # ダイスボットの使い方
       HELP_MESSAGE = <<~INFO_MESSAGE_TEXT
         ・判定　(nNC+m)
-        　ダイス数n、修正値mで判定ロールを行います。
+        　ダイス数n、修正値mで判定ロールを行います(省略=1)
         　ダイス数が2以上の時のパーツ破損数も表示します。
         ・攻撃判定　(nNA+m)
-        　ダイス数n、修正値mで攻撃判定ロールを行います。
+        　ダイス数n、修正値mで攻撃判定ロールを行います(省略=1)
         　命中部位とダイス数が2以上の時のパーツ破損数も表示します。
 
         表
@@ -37,119 +37,92 @@ module BCDice
         @default_target_number = 6 # 目標値が空欄の時の目標値
       end
 
-      private
-
-      def replace_text(string)
-        string = string.gsub(/(\d+)NC(10)?([+\-][+\-\d]+)/i) { "#{Regexp.last_match(1)}R10#{Regexp.last_match(3)}[0]" }
-        string = string.gsub(/(\d+)NC(10)?/i) { "#{Regexp.last_match(1)}R10[0]" }
-        string = string.gsub(/(\d+)NA(10)?([+\-][+\-\d]+)/i) { "#{Regexp.last_match(1)}R10#{Regexp.last_match(3)}[1]" }
-        string = string.gsub(/(\d+)NA(10)?/i) { "#{Regexp.last_match(1)}R10[1]" }
-
-        return string
+      def eval_game_system_specific_command(command)
+        roll_tables(command, self.class::TABLES) || nechronica_check(command)
       end
 
-      public
+      def result_nd10(total, _dice_total, value_list, cmp_op, target)
+        # 後方互換を維持するため、1d10>=nを目標値nの1NCとして処理
+        if value_list.count != 1 || cmp_op != :>= || target.nil? || target == "?"
+          return nil
+        end
 
-      def eval_game_system_specific_command(command)
-        return roll_tables(command, self.class::TABLES) || nechronica_check(command)
+        result_nechronica([total], target)
       end
 
       private
 
-      def check_nD10(total, _dice_total, dice_list, cmp_op, target) # ゲーム別成功度判定(nD10)
-        return '' if target == '?'
-        return '' unless cmp_op == :>=
-
-        result =
-          if total >= 11
-            translate("Nechronica.critical")
-          elsif total >= target
-            translate("success")
-          elsif dice_list.count { |i| i <= 1 } == 0
-            translate("failure")
-          elsif dice_list.size > 1
-            fumble = translate("Nechronica.fumble")
-            break_all_parts = translate("Nechronica.break_all_parts")
-            "#{fumble} ＞ #{break_all_parts}"
+      def result_nechronica(value_list, target)
+        if value_list.max >= target
+          if value_list.max >= 11
+            Result.critical(translate("Nechronica.critical"))
           else
-            translate("Nechronica.fumble")
+            Result.success(translate("success"))
           end
-
-        return " ＞ #{result}"
+        elsif value_list.count { |i| i <= 1 } == 0
+          Result.failure(translate("failure"))
+        elsif value_list.size > 1
+          break_all_parts = translate("Nechronica.break_all_parts")
+          fumble = translate("Nechronica.fumble")
+          Result.fumble("#{fumble} ＞ #{break_all_parts}")
+        else
+          Result.fumble(translate("Nechronica.fumble"))
+        end
       end
 
-      def nechronica_check(string)
-        string = replace_text(string)
-        debug("nechronica_check string", string)
+      # Rコマンドの後方互換を維持する
+      def r_backward_compatibility(command)
+        m = command.match(/^(\d)?R10([+\-\d]+)?(\[(\d+)\])?$/)
+        return command unless m
 
-        unless /(^|\s)S?((\d+)[rR]10([+\-\d]+)?(\[(\d+)\])?)(\s|$)/i =~ string
-          return nil
+        if m[4] == "1"
+          "#{m[1]}NA#{m[2]}"
+        else
+          "#{m[1]}NC#{m[2]}"
         end
+      end
 
-        string = Regexp.last_match(2)
-
-        dice_n = 1
-        dice_n = Regexp.last_match(3).to_i if Regexp.last_match(3)
-
-        battleMode = Regexp.last_match(6).to_i
-
-        modText = Regexp.last_match(4)
-        mod = ArithmeticEvaluator.eval(modText)
-
-        # 0=判定モード, 1=戦闘モード
-        isBattleMode = (battleMode == 1)
-        debug("nechronica_check string", string)
-        debug("isBattleMode", isBattleMode)
-
-        diff = 6
-
-        dice = @randomizer.roll_barabara(dice_n, 10).sort
-        n_max = dice.max
-
-        total_n = n_max + mod
+      def nechronica_check(command)
+        command = r_backward_compatibility(command)
+        # 歴史的経緯で10を受理する
+        cmd = Command::Parser.new(/N[CA](10)?/, round_type: round_type)
+                             .enable_prefix_number.parse(command)
+        return nil unless cmd
 
-        output = "(#{string}) ＞ [#{dice.join(',')}]"
-        if mod < 0
-          output += mod.to_s
-        elsif mod > 0
-          output += "+#{mod}"
-        end
+        dice_count = [1, cmd.prefix_number.to_i].max
+        modify_number = cmd.modify_number || 0
 
-        dice.map! { |i| i + mod }
+        dice = @randomizer.roll_barabara(dice_count, 10).sort
+        dice_mod = dice.map { |i| i + modify_number }
+        total = dice_mod.max
 
-        dice_str = dice.join(",")
-        output += "  ＞ #{total_n}[#{dice_str}]"
+        na = get_hit_location(total) if cmd.command.start_with?("NA")
 
-        output += check_nD10(total_n, dice_n, dice, :>=, diff)
+        result = result_nechronica(dice_mod, 6)
 
-        if isBattleMode
-          hit_loc = getHitLocation(total_n)
-          if hit_loc != '1'
-            output += " ＞ #{hit_loc}"
-          end
-        end
+        sequence = [
+          "(#{cmd})",
+          "[#{dice.join(',')}]#{Format.modifier(modify_number)}",
+          "#{total}[#{dice_mod.join(',')}]",
+          result.text,
+          na,
+        ].compact
 
-        return output
+        result.text = sequence.join(" ＞ ")
+        return result
       end
 
-      def getHitLocation(dice)
-        output = '1'
-
-        debug("getHitLocation dice", dice)
-        return output if dice <= 5
+      def get_hit_location(value)
+        return nil if value <= 5
 
         table = translate("Nechronica.hit_location.table")
-        index = dice - 6
+        text = table[(value - 6).clamp(0, 5)]
 
-        addDamage = ""
-        if dice > 10
-          index = 5
-          addDamage = translate("Nechronica.hit_location.additional_damage", damage: dice - 10)
+        if value > 10
+          text + translate("Nechronica.hit_location.additional_damage", damage: value - 10)
+        else
+          text
         end
-
-        output = table[index] + addDamage
-
-        return output
       end
 
       class << self
@@ -166,7 +139,7 @@ module BCDice
 
       TABLES = translate_tables(:ja_jp)
 
-      register_prefix('\d+NC.*', '\d+NA.*', '\d+R10.*', TABLES.keys)
+      register_prefix('\d?NC', '\d?NA', '\dR10', TABLES.keys)
     end
   end
 end