bcdice 3.1.2 → 3.4.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/barabara_dice/node.rb

@@ -43,8 +43,8 @@ module BCDice
             Result.new.tap do |r|
               r.secret = @secret
               r.text = sequence.join(" ＞ ")
-              r.rands = randomizer.rand_results
-              r.detailed_rands = randomizer.detailed_rand_results
+              r.last_dice_list_list = dice_list_list
+              r.last_dice_list = dice_list
               r.success_num = success_num
             end
           end

data/lib/bcdice/common_command/barabara_dice/result.rb

@@ -7,6 +7,10 @@ module BCDice
     module BarabaraDice
       # バラバラロールの結果を表すクラス
       class Result < ::BCDice::Result
+        # @return [Array<Array<Integer>>] 出目のグループの配列
+        attr_accessor :last_dice_list_list
+        # @return [Array<Integer>] すべての出目が格納される配列
+        attr_accessor :last_dice_list
         # @return [Integer] 成功数
         attr_accessor :success_num
 
@@ -14,6 +18,8 @@ module BCDice
         def initialize(text = nil)
           super(text)
 
+          @last_dice_list_list = []
+          @last_dice_list = []
           @success_num = 0
         end
       end

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/common_command/choice.rb

@@ -29,6 +29,17 @@ module BCDice
     #   choice A,B X,Y -> "A,B" と "X,Y" から選ぶ
     #   choice(A[], B[], C[]) -> "A[]", "B[]", "C[]" から選ぶ
     #   choice[A(), B(), C()] -> "A()", "B()", "C()" から選ぶ
+    #
+    # "choise"の後に数を指定することで、列挙した要素から重複なしで複数個を選ぶ
+    #   choice2[A,B,C] -> "A", "B", "C" から重複なしで2個選ぶ
+    #
+    # 指定したい要素が「AからD」のように連続する項目の場合に「A-D」と省略して記述できる
+    # 略記の展開はアルファベット1文字もしくは数字の範囲に限り、略記1つを指定したときのみ展開される
+    #   choice[A-D] -> choice[A,B,C,D] と等価
+    #   choice[b-g] -> choice[b,c,d,e,f,g] と等価
+    #   choice[3-7] -> choice[3,4,5,6,7] と等価
+    #   choice[A-D,Z] -> 展開されない。 "A-D", "Z" から選ぶ
+    #   choice[D-A] -> 展開されない。
     class Choice
       PREFIX_PATTERN = /choice/.freeze
 
@@ -44,6 +55,12 @@ module BCDice
         space: /\s+/,
       }.freeze
 
+      DELIMITER_CHAR = {
+        bracket: ", ",
+        paren: ", ",
+        space: " ",
+      }.freeze
+
       TERMINATION = {
         bracket: /\]/,
         paren: /\)/,
@@ -77,6 +94,11 @@ module BCDice
             return nil
           end
 
+          takes = scanner.scan(/\d+/)&.to_i || 1
+          if takes == 0
+            return nil
+          end
+
           type =
             case scanner.scan(/\(|\[|\s+/)
             when "["
@@ -105,47 +127,96 @@ module BCDice
           items.push(last_item.delete_suffix(SUFFIX[type]))
 
           items = items.map(&:strip).reject(&:empty?)
-          if items.empty?
+          if items.size == 1
+            items = parse_multi_item_shorthand(items.first)
+          end
+
+          if items.empty? || items.size < takes
             return nil
           end
 
           new(
             secret: secret,
             block_delimiter: type,
+            takes: takes,
             items: items
           )
         end
+
+        def parse_multi_item_shorthand(str)
+          parse_multi_nums_shorthand(str) || parse_multi_chars_shorthand(str) || []
+        end
+
+        def parse_multi_nums_shorthand(str)
+          m = /^(\d+)-(\d+)$/.match(str)
+          unless m
+            return nil
+          end
+
+          first = m[1].to_i
+          last = m[2].to_i
+          if first > last
+            return nil
+          end
+
+          return first.upto(last).to_a
+        end
+
+        def parse_multi_chars_shorthand(str)
+          m = /^([a-z])-([a-z])$/.match(str) || /^([A-Z])-([A-Z])$/.match(str)
+          unless m
+            return nil
+          end
+
+          first = m[1]
+          last = m[2]
+          if first > last
+            return nil
+          end
+
+          return first.upto(last).to_a
+        end
       end
 
       # @param secret [Boolean]
       # @param block_delimiter [BlockDelimiter::BRACKET, BlockDelimiter::PAREN, BlockDelimiter::SPACE]
+      # @param takes [Integer] 何個チョイスするか
       # @param items [Array<String>]
-      def initialize(secret:, block_delimiter:, items:)
+      def initialize(secret:, block_delimiter:, takes:, items:)
         @secret = secret
         @block_delimiter = block_delimiter
+        @takes = takes
         @items = items
       end
 
       # @param randomizer [Randomizer]
       # @return [Result]
       def roll(randomizer)
-        index = randomizer.roll_index(@items.size)
-        chosen = @items[index]
+        items = @items.dup
+        chosens = []
+        @takes.times do
+          index = randomizer.roll_index(items.size)
+          chosens << items.delete_at(index)
+        end
 
         Result.new.tap do |r|
+          chosen = chosens.join(DELIMITER_CHAR[@block_delimiter])
+
           r.secret = @secret
           r.text = "(#{expr()}) ＞ #{chosen}"
         end
       end
 
       def expr
+        takes = @takes == 1 ? nil : @takes
+
         case @block_delimiter
         when BlockDelimiter::SPACE
-          "choice #{@items.join(' ')}"
+          "choice#{takes} #{@items.join(' ')}"
         when BlockDelimiter::BRACKET
-          "choice[#{@items.join(',')}]"
+          "choice#{takes}[#{@items.join(',')}]"
         when BlockDelimiter::PAREN
-          "choice(#{@items.join(',')})"
+          "choice#{takes}(#{@items.join(',')})"
         end
       end
     end

data/lib/bcdice/dice_table.rb

@@ -3,6 +3,9 @@
 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_left_range_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_left_range_table.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require "bcdice/dice_table/d66_table"
+
+module BCDice
+  module DiceTable
+    # 左側（十の位）のみ Range を用いる D66 表
+    class D66LeftRangeTable < D66Table
+      # @param name [String] 表の名前
+      # @param sort_type [Symbol] 出目入れ替えの方式 BCDice::D66SortType
+      # @param items [Array<(Range, Array<String>)>] 表の項目の配列
+      def initialize(name, sort_type, items)
+        expanded_items = {}
+        items.each do |item|
+          range, right_items = item
+
+          range.each do |left_value|
+            right_items.each_with_index do |right_item, right_value|
+              key = left_value * 10 + (right_value + 1)
+              expanded_items[key] = right_item
+            end
+          end
+        end
+
+        super(name, sort_type, expanded_items)
+      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"
@@ -40,6 +41,7 @@ require "bcdice/game_system/Cthulhu7th_Korean"
 require "bcdice/game_system/CthulhuTech"
 require "bcdice/game_system/Cthulhu_ChineseTraditional"
 require "bcdice/game_system/Cthulhu_Korean"
+require "bcdice/game_system/Cthulhu_SimplifiedChinese"
 require "bcdice/game_system/DarkBlaze"
 require "bcdice/game_system/DarkDaysDrive"
 require "bcdice/game_system/DarkSouls"
@@ -94,6 +96,7 @@ require "bcdice/game_system/InfiniteBabeL"
 require "bcdice/game_system/InfiniteFantasia"
 require "bcdice/game_system/Insane"
 require "bcdice/game_system/Insane_Korean"
+require "bcdice/game_system/Irisbane"
 require "bcdice/game_system/IthaWenUa"
 require "bcdice/game_system/JamesBond"
 require "bcdice/game_system/JekyllAndHyde"
@@ -112,6 +115,7 @@ require "bcdice/game_system/LostRecord"
 require "bcdice/game_system/LostRoyal"
 require "bcdice/game_system/MagicaLogia"
 require "bcdice/game_system/MagicaLogia_Korean"
+require "bcdice/game_system/MagicaLogia_SimplifiedChinese"
 require "bcdice/game_system/MeikyuDays"
 require "bcdice/game_system/MeikyuKingdom"
 require "bcdice/game_system/MeikyuKingdomBasic"
@@ -141,12 +145,14 @@ require "bcdice/game_system/ParasiteBlood"
 require "bcdice/game_system/Pathfinder"
 require "bcdice/game_system/Peekaboo"
 require "bcdice/game_system/Pendragon"
+require "bcdice/game_system/PersonaO"
 require "bcdice/game_system/PhantasmAdventure"
 require "bcdice/game_system/Postman"
 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,8 +173,11 @@ 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/StarryDolls"
 require "bcdice/game_system/SteamPunkers"
 require "bcdice/game_system/StellarKnights"
+require "bcdice/game_system/StellarKnights_Korean"
 require "bcdice/game_system/SterileLife"
 require "bcdice/game_system/StrangerOfSwordCity"
 require "bcdice/game_system/StratoShout"
@@ -184,6 +193,7 @@ require "bcdice/game_system/TokyoNova"
 require "bcdice/game_system/Torg"
 require "bcdice/game_system/Torg1_5"
 require "bcdice/game_system/TorgEternity"
+require "bcdice/game_system/ToshiakiHolyGrailWar"
 require "bcdice/game_system/TrinitySeven"
 require "bcdice/game_system/TunnelsAndTrolls"
 require "bcdice/game_system/TwilightGunsmoke"

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