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

data/lib/bcdice/game_system/Amadeus.rb

@@ -53,7 +53,7 @@ module BCDice
       end
 
       def amadeusDice(command)
-        return nil unless /^(R([A-DS])([\+\-\d]*))(@(\d))?((>(=)?)([\+\-\d]*))?(@(\d))?$/i =~ command
+        return nil unless /^(R([A-DS])([+\-\d]*))(@(\d))?((>(=)?)([+\-\d]*))?(@(\d))?$/i =~ command
 
         commandText = Regexp.last_match(1)
         skillRank = Regexp.last_match(2)

data/lib/bcdice/game_system/AnimaAnimus.rb

@@ -31,13 +31,9 @@ module BCDice
         　情報収集表　IGT/喪失表　LT
       MESSAGETEXT
 
-      def initialize(command)
-        super(command)
-      end
-
       def eval_game_system_specific_command(command)
         case command
-        when /(\d+)AN<=(\d+([\+\-]\d+)*)/i
+        when /(\d+)AN<=(\d+([+\-]\d+)*)/i
           return check_action(Regexp.last_match)
         else
           return roll_tables(command, TABLES)

data/lib/bcdice/game_system/BadLife.rb

@@ -65,7 +65,7 @@ module BCDice
       end
 
       def judgeDice(command)
-        unless (m = /(\d+)?(BAD|BL|GL)([-+\d]*)((C|F)([-+\d]*)?)?((C|F)([-+\d]*))?(\@([-+\d]*))?(\!(\D*))?/i.match(command))
+        unless (m = /(\d+)?(BAD|BL|GL)([-+\d]*)((C|F)([-+\d]*)?)?((C|F)([-+\d]*))?(@([-+\d]*))?(!(\D*))?/i.match(command))
           return nil
         end
 

data/lib/bcdice/game_system/BeastBindTrinity.rb

@@ -6,15 +6,6 @@ require 'bcdice/normalize'
 require 'bcdice/dice_table/table'
 require 'bcdice/dice_table/d66_grid_table'
 
-# ビーストバインド トリニティのダイスボット
-#
-# = 前ver(1.43.07)からの変更・修正
-# * nBBで判定を行う際、「ダイスを１個しか振らない場合」の達成値計算が正しくなかった誤りを修正。
-# * @x(クリティカル値指定)、を加減式で入力できるように仕様変更。クリティカル値は、加減式での入力なら%w(人間性からのクリティカル値計算)と併用可能に。
-# * #y(ファンブル値指定)を加減式で入力できるように仕様変更。また、「ファンブルしても達成値が0にならない」モード#Ayを追加。
-# * &v(出目v未満のダイスを出目vとして扱う)のモードを追加。2018年12月現在、ゲーマーズ・フィールド誌先行収録データでのみ使用するモードです。
-# * 「暴露表」および「正体判明チャート」をダイスボットに組み込み。
-# * どどんとふ以外のボーンズ＆カーズを用いたオンラインセッション用ツールにあわせ、ヘルプメッセージ部分からイニシアティブ表についての言及を削除。
 module BCDice
   module GameSystem
     class BeastBindTrinity < Base
@@ -106,7 +97,7 @@ module BCDice
         private
 
         def parse()
-          m = /^(\d+)(?:R6|BB6?)((?:[\+\-]\d+)+)?(?:%(\-?\d+))?(?:@([\+\-\d]+))?(?:#(A)?([\+\-\d]+))?(?:\$([1-6]+))?(?:&([1-6]))?(?:([>=]+)(\d+))?$/.match(@command)
+          m = /^(\d+)(?:R6|BB6?)((?:[+\-]\d+)+)?(?:%(-?\d+))?(?:@([+\-\d]+))?(?:#(A)?([+\-\d]+))?(?:\$([1-6]+))?(?:&([1-6]))?(?:([>=]+)(\d+))?$/.match(@command)
           unless m
             @parse_error = true
             return

data/lib/bcdice/game_system/BeginningIdol.rb

@@ -170,7 +170,7 @@ module BCDice
 
       def eval_game_system_specific_command(command)
         case command.upcase
-        when /^([1-7]*)PD(\d+)([\+\-]\d+)?$/
+        when /^([1-7]*)PD(\d+)([+\-]\d+)?$/
           counts = Regexp.last_match(2).to_i
           return nil if counts <= 0
 
@@ -1951,7 +1951,7 @@ module BCDice
           ]
           return textFrom1D6Table(title, table)
 
-        when /^(\d+)(S?)A([1-6]*)([\+\-]\d+)?$/
+        when /^(\d+)(S?)A([1-6]*)([+\-]\d+)?$/
           title = '攻撃'
           counts = Regexp.last_match(1).to_i
           return nil if counts <= 0
@@ -2261,7 +2261,7 @@ module BCDice
         return text, skill unless text =~ /チャンスが(\d{1,2})以下ならオフ。/
 
         target = Regexp.last_match(1).to_i
-        matchedText = $&
+        matchedText = Regexp.last_match(0)
 
         if target >= chance.to_i
           text = "オフ"
@@ -2433,7 +2433,7 @@ module BCDice
         end
 
         substitution = text.clone
-        substitution = substitution.gsub($&, '')
+        substitution = substitution.gsub(Regexp.last_match(0), '')
         substitution += "\n" unless substitution.empty? || /\n$/ =~ substitution
 
         return substitution + badStatus(counts)

data/lib/bcdice/game_system/BeginningIdol_Korean.rb

@@ -165,7 +165,7 @@ module BCDice
 
       def eval_game_system_specific_command(command)
         case command.upcase
-        when /^([1-7]*)PD(\d+)([\+\-]\d+)?$/
+        when /^([1-7]*)PD(\d+)([+\-]\d+)?$/
           counts = Regexp.last_match(2).to_i
           return nil if counts <= 0
 
@@ -1802,7 +1802,7 @@ module BCDice
           ]
           return textFrom1D6Table(title, table)
 
-        when /^(\d+)(S?)A([1-6]*)([\+\-]\d+)?$/
+        when /^(\d+)(S?)A([1-6]*)([+\-]\d+)?$/
           title = '攻撃'
           counts = Regexp.last_match(1).to_i
           return nil if counts <= 0
@@ -2112,7 +2112,7 @@ module BCDice
         return text, skill unless text =~ /チャンスが(\d{1,2})以下なら오프。/
 
         target = Regexp.last_match(1).to_i
-        matchedText = $&
+        matchedText = Regexp.last_match(0)
 
         if target >= chance.to_i
           text = "오프"
@@ -2284,7 +2284,7 @@ module BCDice
         end
 
         substitution = text.clone
-        substitution = substitution.gsub($&, '')
+        substitution = substitution.gsub(Regexp.last_match(0), '')
         substitution += "\n" unless substitution.empty? || /\n$/ =~ substitution
 
         return substitution + badStatus(counts)

data/lib/bcdice/game_system/BladeOfArcana.rb

@@ -66,7 +66,7 @@ module BCDice
           end
           return rollAct(counts, judgment, critical, fumble)
 
-        when /^CT3([\+\-]?)$/
+        when /^CT3([+\-]?)$/
           sign = Regexp.last_match(1)
           title = '因縁表(The 3rd)　『BoA3』P292'
           table = [
@@ -95,7 +95,7 @@ module BCDice
           ]
           return tableText(title, table, sign)
 
-        when /^CTR([\+\-]?)$/
+        when /^CTR([+\-]?)$/
           sign = Regexp.last_match(1)
           title = '因縁表(リインカーネイション)　『BAR』P51、299'
           table = [
@@ -124,7 +124,7 @@ module BCDice
           ]
           return tableText(title, table, sign)
 
-        when /^DJV(\-?)$/
+        when /^DJV(-?)$/
           sign = Regexp.last_match(1)
           title = '前世邂逅表（デジャブ）　『BAR』P235'
           table = [
@@ -153,7 +153,7 @@ module BCDice
           ]
           return tableText(title, table, sign)
 
-        when /^AKST([\+\-]?)$/
+        when /^AKST([+\-]?)$/
           sign = Regexp.last_match(1)
           title = '悪徳シーン表　『GoV』P16、164'
           table = [

data/lib/bcdice/game_system/BlindMythos.rb

@@ -100,8 +100,8 @@ module BCDice
         debug("commandText", commandText)
 
         message = ""
-        if rerollCounts.size > 1
-          message += "(#{commandText})" if isStop
+        if rerollCounts.size > 1 && isStop
+          message += "(#{commandText})"
         end
         message += "\n"
         isReRoll = true
@@ -167,13 +167,16 @@ module BCDice
 
         canReRoll = !rerollCommand.empty?
 
-        if canReRoll
-          unless isStop
-            text, successListTmp, countOneListTmp, = reRoll(rerollCommand, isStop)
-            message += text
-            successList += successListTmp
-            countOneList += countOneListTmp
-          end
+        # frozen_string_literal: true
+        # ゲームシステムの識別子
+        # ゲームシステム名
+        # ゲームシステム名の読みがな
+        # ダイスボットの使い方
+        if canReRoll && !isStop
+          text, successListTmp, countOneListTmp, = reRoll(rerollCommand, isStop)
+          message += text
+          successList += successListTmp
+          countOneList += countOneListTmp
         end
 
         return message, bitList, successList, countOneList, canReRoll

data/lib/bcdice/game_system/BloodCrusade.rb

@@ -60,8 +60,18 @@ module BCDice
       end
 
       def eval_game_system_specific_command(command)
-        roll_tables(command, TABLES)
+        roll_tables(command, TABLES) || RTT.roll_command(randomizer, command)
       end
+      RTT = DiceTable::SaiFicSkillTable.new(
+        [["社会", ["怯える", "脅す", "考えない", "自信", "黙る", "伝える", "だます", "地位", "笑う", "話す", "怒る"]],
+         ["頭部", ["聴く", "感覚器", "見る", "反応", "考える", "脳", "閃く", "予感", "叫ぶ", "口", "噛む"]],
+         ["腕部", ["締める", "殴る", "斬る", "利き腕", "撃つ", "操作", "刺す", "逆腕", "振る", "掴む", "投げる"]],
+         ["胴部", ["塞ぐ", "呼吸器", "止める", "受ける", "測る", "心臓", "逸らす", "かわす", "耐える", "消化器", "落ちる"]],
+         ["脚部", ["走る", "迫る", "蹴る", "利き脚", "跳ぶ", "仕掛ける", "踏む", "逆脚", "這う", "伏せる", "歩く"]],
+         ["環境", ["休む", "日常", "隠れる", "待つ", "現れる", "人脈", "捕らえる", "開ける", "逃げる", "退路", "休まない"]],],
+        rtt: 'AST',
+        rtt_format: "ランダム全特技表(%<category_dice>d) ＞ %<category_name>s(%<row_dice>d) ＞ %<skill_name>s"
+      )
 
       TABLES_WITH_BLOOD_MOON = {
         "ST" => DiceTable::Table.new(
@@ -110,42 +120,6 @@ module BCDice
             "《心臓》"
           ]
         ),
-        "AST" => DiceTable::ChainTable.new(
-          "ランダム全特技表",
-          "1D6",
-          [
-            DiceTable::Table.new(
-              "社会",
-              "2D6",
-              ["怯える", "脅す", "考えない", "自信", "黙る", "伝える", "だます", "地位", "笑う", "話す", "怒る"]
-            ),
-            DiceTable::Table.new(
-              "頭部",
-              "2D6",
-              ["聴く", "感覚器", "見る", "反応", "考える", "脳", "閃く", "予感", "叫ぶ", "口", "噛む"]
-            ),
-            DiceTable::Table.new(
-              "腕部",
-              "2D6",
-              ["締める", "殴る", "斬る", "利き腕", "撃つ", "操作", "刺す", "逆腕", "振る", "掴む", "投げる"]
-            ),
-            DiceTable::Table.new(
-              "胴部",
-              "2D6",
-              ["塞ぐ", "呼吸器", "止める", "受ける", "測る", "心臓", "逸らす", "かわす", "耐える", "消化器", "落ちる"]
-            ),
-            DiceTable::Table.new(
-              "脚部",
-              "2D6",
-              ["走る", "迫る", "蹴る", "利き脚", "跳ぶ", "仕掛ける", "踏む", "逆脚", "這う", "伏せる", "歩く"]
-            ),
-            DiceTable::Table.new(
-              "環境",
-              "2D6",
-              ["休む", "日常", "隠れる", "待つ", "現れる", "人脈", "捕らえる", "開ける", "逃げる", "退路", "休まない"]
-            )
-          ]
-        ),
         "MIT" => DiceTable::Table.new(
           "軽度狂気表",
           "1D6",
@@ -416,7 +390,7 @@ module BCDice
         ),
       }.merge(TABLES_WITH_BLOOD_MOON).freeze
 
-      register_prefix(TABLES.keys)
+      register_prefix(RTT.prefixes, TABLES.keys)
     end
   end
 end

data/lib/bcdice/game_system/BloodMoon.rb

@@ -59,7 +59,7 @@ module BCDice
       end
 
       def eval_game_system_specific_command(command)
-        return roll_tables(command, TABLES)
+        return roll_tables(command, TABLES) || BloodCrusade::RTT.roll_command(randomizer, command)
       end
 
       TABLES = {
@@ -206,7 +206,7 @@ module BCDice
         ),
       }.merge(BloodCrusade::TABLES_WITH_BLOOD_MOON).freeze
 
-      register_prefix(TABLES.keys)
+      register_prefix(BloodCrusade::RTT.prefixes, TABLES.keys)
     end
   end
 end

data/lib/bcdice/game_system/CardRanker.rb

@@ -14,7 +14,8 @@ module BCDice
 
       # ダイスボットの使い方
       HELP_MESSAGE = <<~INFO_MESSAGE_TEXT
-        ランダムでモンスターカードを選ぶ (RM)
+        ランダムでモンスターカードを選ぶ (RM) (RTTn n：色番号、省略可能)
+        ランダム分野表 RCT
         特定のモンスターカードを選ぶ (CMxy　x：色、y：番号）
         　白：W、青：U、緑：V、金：G、赤：R、黒：B
         　例）CMW1→白の2：白竜　CMG12→金の12：土精霊
@@ -43,7 +44,7 @@ module BCDice
         if dice_total <= 2
           return " ＞ ファンブル"
         elsif dice_total >= 12
-          return " ＞ スペシャル ＞ " + getRandumMonster()
+          return " ＞ スペシャル ＞ " + RTT.roll_command(@randomizer, "RM")
         elsif total >= target
           return " ＞ 成功"
         else
@@ -52,72 +53,31 @@ module BCDice
       end
 
       def eval_game_system_specific_command(command)
-        command = command.upcase
-
-        case command
-        when /^RM$/i
-          return getRandumMonster
-        when /^CM(\w)(\d+)$/i
-          color = Regexp.last_match(1).upcase
-          index = Regexp.last_match(2).to_i
-          return getMonster(color, index)
-        else
-          return roll_tables(command, TABLES)
-        end
-      end
-
-      def getRandumMonster
-        type = "ランダムモンスター選択"
-        colorTable = getColorTable
-        color, colorIndex = get_table_by_1d6(colorTable)
-
-        monsters = getMonsterTables(colorIndex - 1)
-        monsterName, monsterIndex = get_table_by_2d6(monsters)
-
-        output = "#{type}(#{colorIndex},#{monsterIndex}) ＞ #{color}の#{monsterIndex}：#{monsterName}"
-        return output
+        roll_tables(command, TABLES) || get_monster(command) || RTT.roll_command(randomizer, command)
       end
 
-      def getColorTable
-        ['白', '青', '緑', '金', '赤', '黒']
-      end
-
-      def getMonsterTables(colorIndex)
-        tables = [
-          ['白竜', '僧侶', '格闘家', '斧使い', '剣士', '槍士', '歩兵', '弓兵', '砲兵', '天使', '軍神'],
-          ['水竜', '魚', '魚人', 'イカ', '蟹', '探偵', '海賊', '魔術師', '使い魔', '雲', '水精霊'],
-          ['緑竜', 'ワーム', '鳥人', '鳥', '獣', '獣人', 'エルフ', '妖精', '昆虫', '植物', '森精霊'],
-          ['金竜', '宝石', '岩石', '鋼', '錬金術師', '魔法生物', 'ドワーフ', '機械', '運命', '女神', '土精霊'],
-          ['火竜', '竜人', '恐竜', '戦車', '蛮族', '小鬼', '大鬼', '巨人', '雷', '炎', '火精霊'],
-          ['黒竜', '闇騎士', '怪物', '忍者', '妖怪', '蝙蝠', '吸血鬼', '不死者', '幽霊', '悪魔', '邪神'],
-        ]
-
-        return tables[colorIndex]
-      end
-
-      def getMonster(color, monsterIndex)
-        return nil if monsterIndex < 2
-
-        type = "モンスター選択"
-
-        colorWords = ['W', 'U', 'V', 'G', 'R', 'B']
-        colorIndex = colorWords.index(color)
-        debug("colorIndex")
-
-        return nil if colorIndex.nil?
+      COLOR_TABLE = ['W', 'U', 'V', 'G', 'R', 'B'].freeze
 
-        colorTable = getColorTable
-        color = colorTable[colorIndex]
+      RTT = DiceTable::SaiFicSkillTable.new([
+        ['白', ['白竜', '僧侶', '格闘家', '斧使い', '剣士', '槍士', '歩兵', '弓兵', '砲兵', '天使', '軍神']],
+        ['青', ['水竜', '魚', '魚人', 'イカ', '蟹', '探偵', '海賊', '魔術師', '使い魔', '雲', '水精霊']],
+        ['緑', ['緑竜', 'ワーム', '鳥人', '鳥', '獣', '獣人', 'エルフ', '妖精', '昆虫', '植物', '森精霊']],
+        ['金', ['金竜', '宝石', '岩石', '鋼', '錬金術師', '魔法生物', 'ドワーフ', '機械', '運命', '女神', '土精霊']],
+        ['赤', ['火竜', '竜人', '恐竜', '戦車', '蛮族', '小鬼', '大鬼', '巨人', '雷', '炎', '火精霊']],
+        ['黒', ['黒竜', '闇騎士', '怪物', '忍者', '妖怪', '蝙蝠', '吸血鬼', '不死者', '幽霊', '悪魔', '邪神']],
+      ], rtt: "RM", rtt_format: "ランダムモンスター選択(%<category_dice>d,%<row_dice>d) ＞ %<text>s", s_format: "%<category_name>sの%<row_dice>d：%<skill_name>s")
 
-        monsters = getMonsterTables(colorIndex)
-        debug("monsters", monsters)
-        debug("monsterIndex", monsterIndex)
-        monsterName = monsters[monsterIndex - 2]
+      def get_monster(command)
+        m = command.match(/^CM(\w)(\d+)$/i)
+        return nil unless m
 
-        return nil if monsterName.nil?
+        cat = COLOR_TABLE.index(m[1])
+        row_dice = m[2].to_i
+        return nil unless cat
+        return nil unless row_dice.between?(2, 12)
 
-        output = "#{type} ＞ #{color}の#{monsterIndex}：#{monsterName}"
-        return output
+        skill = RTT.categories[cat].skills[row_dice - 2]
+        return "モンスター選択 ＞ #{skill}"
       end
 
       TABLES = {
@@ -242,7 +202,7 @@ module BCDice
           ]
         ),
       }.freeze
-      register_prefix('RM', 'CM.*', TABLES.keys)
+      register_prefix(RTT.prefixes, 'CM.*', TABLES.keys)
     end
   end
 end

data/lib/bcdice/game_system/ChaosFlare.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'bcdice/command_parser'
-
 module BCDice
   module GameSystem
     class ChaosFlare < Base
@@ -108,7 +106,9 @@ module BCDice
       # @param command [String]
       # @return [String, nil]
       def cf_roll(command)
-        parser = CommandParser.new(/\d*CF/)
+        parser = Command::Parser.new(/\d*CF/, round_type: round_type)
+                                .enable_critical
+                                .enable_fumble
 
         @cmd = parser.parse(command)
         unless @cmd

data/lib/bcdice/game_system/CodeLayerd.rb

@@ -36,7 +36,7 @@ module BCDice
         result = ''
 
         case command
-        when /([+-]?\d+)?CL([+-]\d+)?(\@(\d))?(\[(\d+)\])?([+-]\d+)?(>=(\d+))?/i
+        when /([+-]?\d+)?CL([+-]\d+)?(@(\d))?(\[(\d+)\])?([+-]\d+)?(>=(\d+))?/i
           m = Regexp.last_match
           base = (m[1] || 1).to_i
           modifier1 = m[2].to_i

data/lib/bcdice/game_system/ColossalHunter.rb

@@ -45,7 +45,7 @@ module BCDice
       def getCheckRollDiceCommandResult(command)
         debug("getCheckRollDiceCommandResult command", command)
 
-        return nil unless command =~ /(\d+)?CH([\+\-\d]*)(>=([\+\-\d]*))?$/i
+        return nil unless command =~ /(\d+)?CH([+\-\d]*)(>=([+\-\d]*))?$/i
 
         diceCount = (Regexp.last_match(1) || 3).to_i
         modifyText = (Regexp.last_match(2) || '')
@@ -134,7 +134,7 @@ module BCDice
       def getYear(yearText)
         text = yearText.gsub(/(\d+)D(6+)/) { getD6xResult(Regexp.last_match(1).to_i, Regexp.last_match(2).length) }
 
-        unless text.match?(%r{^[\+\-\*/\d]+$})
+        unless text.match?(%r{^[+\-*/\d]+$})
           return nil
         end