bcdice 3.1.3 → 3.2.0

data/lib/bcdice/common_command/add_dice.rb

@@ -7,7 +7,7 @@ require "bcdice/common_command/add_dice/randomizer"
 module BCDice
   module CommonCommand
     module AddDice
-      PREFIX_PATTERN = /[+\-\dD(]+/.freeze
+      PREFIX_PATTERN = /[+\-(]*\d+/.freeze
 
       class << self
         def eval(command, game_system, randomizer)

data/lib/bcdice/common_command/calc.rb

@@ -5,7 +5,7 @@ require "bcdice/common_command/calc/parser"
 module BCDice
   module CommonCommand
     module Calc
-      PREFIX_PATTERN = /C/.freeze
+      PREFIX_PATTERN = /C[+\-(]*\d+/.freeze
 
       class << self
         def eval(command, game_system, _randomizer)

data/lib/bcdice/dice_table.rb

@@ -3,6 +3,8 @@
 require "bcdice/dice_table/roll_result"
 require "bcdice/dice_table/chain_table"
 require "bcdice/dice_table/d66_grid_table"
+require "bcdice/dice_table/d66_half_grid_table"
+require "bcdice/dice_table/d66_one_third_table"
 require "bcdice/dice_table/d66_parity_table"
 require "bcdice/dice_table/d66_range_table"
 require "bcdice/dice_table/d66_table"

data/lib/bcdice/dice_table/d66_half_grid_table.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require "bcdice/dice_table/d66_grid_table"
+
+module BCDice
+  module DiceTable
+    # D66を振って6x6マスの表を参照する
+    class D66HalfGridTable < D66GridTable
+      # @param key [String]
+      # @param locale [Symbol]
+      # @return [D66HalfGridTable]
+      def self.from_i18n(key, locale)
+        table = I18n.t(key, locale: locale, raise: true)
+        new(table[:name], table[:items_1_2_3], table[:items_4_5_6])
+      end
+
+      # @param [String] name 表の名前
+      # @param [Array<String>] items_1_2_3
+      # @param [Array<String>] items_4_5_6
+      def initialize(name, items_1_2_3, items_4_5_6)
+        @name = name
+        @items = [
+          items_1_2_3,
+          items_1_2_3,
+          items_1_2_3,
+          items_4_5_6,
+          items_4_5_6,
+          items_4_5_6,
+        ].freeze
+      end
+    end
+  end
+end

data/lib/bcdice/dice_table/d66_one_third_table.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "bcdice/dice_table/d66_grid_table"
+
+module BCDice
+  module DiceTable
+    # D66を振って6x6マスの表を参照する
+    class D66OneThirdTable < D66GridTable
+      # @param key [String]
+      # @param locale [Symbol]
+      # @return [D66OneThirdTable]
+      def self.from_i18n(key, locale)
+        table = I18n.t(key, locale: locale, raise: true)
+        new(table[:name], table[:items_1_2], table[:items_3_4], table[:items_5_6])
+      end
+
+      # @param [String] name 表の名前
+      # @param [Array<String>] items_1_2
+      # @param [Array<String>] items_3_4
+      # @param [Array<String>] items_5_6
+      def initialize(name, items_1_2, items_3_4, items_5_6)
+        @name = name
+        @items = [
+          items_1_2,
+          items_1_2,
+          items_3_4,
+          items_3_4,
+          items_5_6,
+          items_5_6,
+        ].freeze
+      end
+    end
+  end
+end

data/lib/bcdice/game_system.rb

@@ -2,6 +2,7 @@
 
 require "bcdice/game_system/AFF2e"
 require "bcdice/game_system/AceKillerGene"
+require "bcdice/game_system/Ainecadette"
 require "bcdice/game_system/Airgetlamh"
 require "bcdice/game_system/AlchemiaStruggle"
 require "bcdice/game_system/Alsetto"
@@ -147,6 +148,7 @@ require "bcdice/game_system/PulpCthulhu"
 require "bcdice/game_system/Raisondetre"
 require "bcdice/game_system/RecordOfLodossWar"
 require "bcdice/game_system/RecordOfSteam"
+require "bcdice/game_system/Revulture"
 require "bcdice/game_system/RokumonSekai2"
 require "bcdice/game_system/RoleMaster"
 require "bcdice/game_system/RuinBreakers"
@@ -167,6 +169,7 @@ require "bcdice/game_system/ShinkuuGakuen"
 require "bcdice/game_system/ShinobiGami"
 require "bcdice/game_system/ShoujoTenrankai"
 require "bcdice/game_system/Skynauts"
+require "bcdice/game_system/SkynautsBouken"
 require "bcdice/game_system/SteamPunkers"
 require "bcdice/game_system/StellarKnights"
 require "bcdice/game_system/SterileLife"

data/lib/bcdice/game_system/AceKillerGene.rb

@@ -28,7 +28,7 @@ module BCDice
       INFO_MESSAGE_TEXT
 
       register_prefix(
-        '(AK|AKG)(\-?\d+)(\/\d+)?(@\d+)?',
+        '(AK|AKG)',
         'DC(SL|BL|IM|BR|RF|EL).+'
       )
 

data/lib/bcdice/game_system/Ainecadette.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module BCDice
+  module GameSystem
+    class Ainecadette < Base
+      # ゲームシステムの識別子
+      ID = "Ainecadette"
+
+      # ゲームシステム名
+      NAME = "エネカデット"
+
+      # ゲームシステム名の読みがな
+      SORT_KEY = "えねかてつと"
+
+      # ダイスボットの使い方
+      HELP_MESSAGE = <<~MESSAGETEXT
+        ■ 判定
+        - 先輩 (AI) 10面ダイスを2つ振って判定します。『有利』なら【3AI】、『不利』なら【1AI】を使います。
+        - 後輩 (CA) 6面ダイスを2つ振って判定します。『有利』なら【3CA】、『不利』なら【1CA】を使います。
+      MESSAGETEXT
+
+      register_prefix('(\d+)?AI', '(\d+)?CA')
+
+      def eval_game_system_specific_command(command)
+        roll_action(command)
+      end
+
+      private
+
+      # 成功の目標値
+      SUCCESS_THRESHOLD = 4
+
+      # スペシャルとなる出目
+      SPECIAL_DICE = 6
+
+      def roll_action(command)
+        m = /^(\d+)?(AI|CA)$/.match(command)
+        return nil unless m
+
+        is_senpai = m[2] == "AI"
+
+        times = m[1]&.to_i || 2
+        sides = is_senpai ? 10 : 6
+        return nil if times <= 0
+
+        dice_list = @randomizer.roll_barabara(times, sides)
+        max = dice_list.max
+
+        result =
+          if max <= 1
+            Result.fumble("ファンブル（もやもやカウンターを2個獲得）")
+          elsif dice_list.include?(6)
+            me = is_senpai ? "先輩" : "後輩"
+            target = is_senpai ? "後輩" : "先輩"
+            Result.critical("スペシャル（絆カウンターを1個獲得し、#{target}は#{me}への感情を1つ獲得）")
+          elsif max >= SUCCESS_THRESHOLD
+            Result.success("成功")
+          else
+            Result.failure("失敗")
+          end
+
+        result.text = "(#{command}) ＞ [#{dice_list.join(',')}] ＞ #{result.text}"
+
+        return result
+      end
+    end
+  end
+end

data/lib/bcdice/game_system/Airgetlamh.rb

@@ -42,7 +42,7 @@ module BCDice
       MESSAGETEXT
 
       register_prefix(
-        '(\d+)?A(A|L)(\d+)?((x|\*)(\d+)(\+(\d+))?)?(C(\d+))?'
+        '\d*A[AL]'
       )
 
       def initialize(command)

data/lib/bcdice/game_system/Alsetto.rb

@@ -37,7 +37,7 @@ module BCDice
         ・8ALC4x5 → 8d6で目標値4、攻撃力5、トライアンフ無しの命中判定。
       MESSAGETEXT
 
-      register_prefix('\d+AL(C|G)?(\d+)?(x|\*)\d+', '\d+ALC?(\d+)?')
+      register_prefix('\d+AL[CG]?')
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/AlterRaise.rb

@@ -35,8 +35,8 @@ module BCDice
       MESSAGETEXT
 
       register_prefix(
-        'EMA(\d+)?', 'PER(\d+)?', 'LOC(\d+)?', 'QUI(\d+)?', 'DEL(\d+)?',
-        'TRA(\d+)?', 'SCE(\d+)?', 'STA(\d+)?', 'EMO(\d+)?'
+        'EMA', 'PER', 'LOC', 'QUI', 'DEL',
+        'TRA', 'SCE', 'STA', 'EMO'
       )
 
       def eval_game_system_specific_command(command)

data/lib/bcdice/game_system/AngelGear.rb

@@ -117,7 +117,7 @@ module BCDice
         )
       }.freeze
 
-      register_prefix('(\d+)AG(\d+)?(([\+\-]\d+)*)', TABLES.keys)
+      register_prefix('\d+AG', TABLES.keys)
     end
   end
 end

data/lib/bcdice/game_system/AnimaAnimus.rb

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

data/lib/bcdice/game_system/Arianrhod.rb

@@ -25,25 +25,23 @@ module BCDice
         @d66_sort_type = D66SortType::NO_SORT
       end
 
-      def check_nD6(total, _dice_total, dice_list, cmp_op, target)
+      def result_nd6(total, _dice_total, dice_list, cmp_op, target)
         n_max = dice_list.count(6)
 
         if dice_list.count(1) == dice_list.size
           # 全部１の目ならファンブル
-          " ＞ ファンブル"
+          Result.fumble("ファンブル")
         elsif n_max >= 2
           # ２個以上６の目があったらクリティカル
-          " ＞ クリティカル(+#{n_max}D6)" if n_max >= 2
+          Result.critical("クリティカル(+#{n_max}D6)")
         elsif cmp_op != :>= || target == '?'
-          ''
+          nil
         elsif total >= target
-          " ＞ 成功"
+          Result.success("成功")
         else
-          " ＞ 失敗"
+          Result.failure("失敗")
         end
       end
-
-      alias check_2D6 check_nD6
     end
   end
 end

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')
 
       def initialize(command)
         super(command)

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+BAC', '\d+R6')
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/BattleTech.rb

@@ -34,7 +34,7 @@ module BCDice
         ・CDx：メック戦士意識維持表。ダメージ値xで判定　例）CD3
       MESSAGETEXT
 
-      register_prefix('\d*SRM\d+.+', '\d*LRM\d+.+', '\d*BT.+', 'PPC', 'CT', 'DW', 'CD\d+')
+      register_prefix('\d*SRM', '\d*LRM', '\d*BT', 'PPC', 'CT', 'DW', 'CD')
 
       # 致命的命中が発生しない上限値
       NO_CRITICAL_HIT_LIMIT = 7

data/lib/bcdice/game_system/BeginningIdol.rb

@@ -55,13 +55,13 @@ module BCDice
       INFO_MESSAGE_TEXT
 
       register_prefix(
-        '[1-7]*PD\d+(?:[\+\-]\d+)?',
+        '[1-7]*PD',
         'HW',
         'BWT',
         'LWT',
         'TWT',
         'CWT',
-        'LO\d{0,2}',
+        'LO',
         'SU',
         'WI',
         'NA',
@@ -88,7 +88,7 @@ module BCDice
         'NUR',
         'GUR',
         'BUR',
-        'BT\d*',
+        'BT',
         'SGT',
         'RS',
         'SH',
@@ -110,7 +110,7 @@ module BCDice
         'NCH',
         'GCH',
         'PCH',
-        'IT\d*',
+        'IT',
         'ACT',
         'ACB',
         'ACE',
@@ -124,7 +124,7 @@ module BCDice
         'RU',
         '\d{2}C',
         'BU',
-        '\d+S?A[1-6]*(?:[\+\-]\d+)?',
+        '\d+S?A',
         'SIP',
         'BVT',
         'LVT',

data/lib/bcdice/game_system/BeginningIdol_Korean.rb

@@ -53,13 +53,13 @@ module BCDice
       INFO_MESSAGE_TEXT
 
       register_prefix(
-        '[1-7]*PD\d+(?:[\+\-]\d+)?',
+        '[1-7]*PD',
         'HW',
         'BWT',
         'LWT',
         'TWT',
         'CWT',
-        'LO\d{0,2}',
+        'LO',
         'SU',
         'WI',
         'NA',
@@ -85,7 +85,7 @@ module BCDice
         'NUR',
         'GUR',
         'BUR',
-        'BT\d*',
+        'BT',
         'SGT',
         'RS',
         'SH',
@@ -105,7 +105,7 @@ module BCDice
         'SCH',
         'WCH',
         'NCH',
-        'IT\d*',
+        'IT',
         'ACT',
         'ACB',
         'ACE',
@@ -119,7 +119,7 @@ module BCDice
         'RU',
         '\d{2}C',
         'BU',
-        '\d+S?A[1-6]*(?:[\+\-]\d+)?',
+        '\d+S?A',
         'SIP',
         'BVT',
         'LVT',

data/lib/bcdice/game_system/BladeOfArcana.rb

@@ -33,7 +33,7 @@ module BCDice
       INFO_MESSAGE_TEXT
 
       register_prefix(
-        '\d+A\d*[CF]?\d*[CF]?\d*',
+        '\d+A',
         'CT3[\+\-]?',
         'CTR[\+\-]?',
         'DJV\-?',

data/lib/bcdice/game_system/BlindMythos.rb

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

data/lib/bcdice/game_system/BloodCrusade.rb

@@ -44,18 +44,17 @@ module BCDice
         @round_type = RoundType::CEIL # 端数切り上げに設定
       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 if target == '?' || cmp_op != :>=
 
         if dice_total <= 2
-          " ＞ ファンブル(【モラル】-3。追跡フェイズなら吸血シーンを追加。戦闘フェイズなら吸血鬼は追加行動を一回得る)"
+          Result.fumble("ファンブル(【モラル】-3。追跡フェイズなら吸血シーンを追加。戦闘フェイズなら吸血鬼は追加行動を一回得る)")
         elsif dice_total >= 12
-          " ＞ スペシャル(【モラル】+3。追跡フェイズならあなたに関係を持つPCの【モラル】+2。攻撃判定ならダメージ+1D6）"
+          Result.critical("スペシャル(【モラル】+3。追跡フェイズならあなたに関係を持つPCの【モラル】+2。攻撃判定ならダメージ+1D6）")
         elsif total >= target
-          " ＞ 成功"
+          Result.success("成功")
         else
-          " ＞ 失敗"
+          Result.failure("失敗")
         end
       end