bcdice 3.1.0 → 3.3.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/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/dice_table/sai_fic_skill_table.rb

@@ -77,7 +77,7 @@ module BCDice
       end
 
       def prefixes
-        ([/RTT[1-6]?/i, "RCT", @rtt, @rct] + @rttn).compact
+        (["RTT[1-6]?", "RCT", @rtt, @rct] + @rttn).compact
       end
 
       private

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"
@@ -112,6 +113,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"
@@ -147,6 +149,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,8 +170,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"

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/Amadeus.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+require "bcdice/arithmetic_evaluator"
+require "bcdice/format"
+require "bcdice/normalize"
+
 module BCDice
   module GameSystem
     class Amadeus < Base
@@ -46,111 +50,124 @@ module BCDice
       end
 
       def eval_game_system_specific_command(command)
-        text = amadeusDice(command)
-        return text unless text.nil?
-
-        return roll_tables(command, self.class::TABLES)
+        roll_amadeus(command) ||
+          roll_tables(command, self.class::TABLES)
       end
 
-      def amadeusDice(command)
-        return nil unless /^(R([A-DS])([+\-\d]*))(@(\d))?((>(=)?)([+\-\d]*))?(@(\d))?$/i =~ command
-
-        commandText = Regexp.last_match(1)
-        skillRank = Regexp.last_match(2)
-        modifyText = Regexp.last_match(3)
-        signOfInequality = (Regexp.last_match(7).nil? ? ">=" : Regexp.last_match(7))
-        targetText = (Regexp.last_match(9).nil? ? "4" : Regexp.last_match(9))
-        if nil | Regexp.last_match(5)
-          specialNum = Regexp.last_match(5).to_i
-        elsif nil | Regexp.last_match(11)
-          specialNum = Regexp.last_match(11).to_i
-        else
-          specialNum = 6
+      private
+
+      def roll_amadeus(command)
+        m = /^R([A-DS])([+\-\d]*)(@(\d))?((>=?)([+\-\d]*))?(@(\d))?$/i.match(command)
+        unless m
+          return nil
         end
 
-        diceCount = CHECK_DICE_COUNT[skillRank]
-        modify = ArithmeticEvaluator.eval(modifyText)
-        target = ArithmeticEvaluator.eval(targetText)
-
-        diceList = @randomizer.roll_barabara(diceCount, 6)
-        diceText = diceList.join(",")
-        specialText = (specialNum == 6 ? "" : "@#{specialNum}")
-
-        message = "(#{commandText}#{specialText}#{signOfInequality}#{targetText}) ＞ [#{diceText}]#{modifyText} ＞ "
-        diceList = [diceList.min] if skillRank == "D"
-        is_loop = false
-        diceList.each do |dice|
-          if  is_loop
-            message += " / "
-          elsif diceList.length > 1
-            is_loop = true
+        rank = m[1]
+        modifier = ArithmeticEvaluator.eval(m[2])
+        cmp_op = m[6] ? Normalize.comparison_operator(m[6]) : :>=
+        target = m[7] ? ArithmeticEvaluator.eval(m[7]) : 4
+        special = (m[4] || m[9] || 6).to_i
+
+        dice_count = CHECK_DICE_COUNT[rank]
+
+        dice_list = @randomizer.roll_barabara(dice_count, 6)
+        dice_text = dice_list.join(",")
+        special_text = (special == 6 ? "" : "@#{special}")
+
+        dice_list = [dice_list.min] if rank == "D"
+        available_inga = dice_list.size > 1
+        inga_table = translate("Amadeus.inga_table")
+
+        success = false
+        critical = false
+        fumble = false
+
+        results =
+          dice_list.map do |dice|
+            total = dice + modifier
+            result =
+              if dice == 1
+                fumble = true
+                translate("Amadeus.fumble")
+              elsif dice >= special
+                critical = true
+                success = true
+                translate("Amadeus.special")
+              elsif total.send(cmp_op, target)
+                success = true
+                translate("success")
+              else
+                translate("failure")
+              end
+
+            if available_inga
+              inga = inga_table[dice - 1]
+              "#{total}_#{result}[#{dice}#{inga}]"
+            else
+              "#{total}_#{result}[#{dice}]"
+            end
           end
-          achieve = dice + modify
-          result = check_success(achieve, dice, signOfInequality, target, specialNum)
-          if is_loop
-            inga_table = translate("Amadeus.inga_table")
-            inga = inga_table[dice - 1]
-            message += "#{achieve}_#{result}[#{dice}#{inga}]"
+
+        sequence = [
+          "(R#{rank}#{Format.modifier(modifier)}#{special_text}#{cmp_op}#{target})",
+          "[#{dice_text}]#{Format.modifier(modifier)}",
+          results.join(" / ")
+        ]
+
+        Result.new.tap do |r|
+          r.text = sequence.join(" ＞ ")
+          if success
+            r.success = true
+            r.critical = critical
           else
-            message += "#{achieve}_#{result}[#{dice}]"
+            r.failure = true
+            r.fumble = fumble
           end
         end
-
-        return message
-      end
-
-      def check_success(total_n, dice_n, signOfInequality, diff, special_n)
-        return translate("Amadeus.fumble") if dice_n == 1
-        return translate("Amadeus.special") if dice_n >= special_n
-
-        cmp_op = Normalize.comparison_operator(signOfInequality)
-        target_num = diff.to_i
-
-        if total_n.send(cmp_op, target_num)
-          translate("success")
-        else
-          translate("failure")
-        end
       end
 
       CHECK_DICE_COUNT = {"S" => 4, "A" => 3, "B" => 2, "C" => 1, "D" => 2}.freeze
 
-      def self.translate_tables(locale)
-        {
-          "ECT" => DiceTable::Table.from_i18n("Amadeus.table.ECT", locale),
-          "BST" => DiceTable::Table.from_i18n("Amadeus.table.BST", locale),
-          "RT" => DiceTable::Table.from_i18n("Amadeus.table.RT", locale),
-          "PRT" => DiceTable::Table.from_i18n("Amadeus.table.PRT", locale),
-          "FT" => DiceTable::Table.from_i18n("Amadeus.table.FT", locale),
-          "BT" => DiceTable::D66Table.from_i18n("Amadeus.table.BT", locale),
-          "FWT" => DiceTable::Table.from_i18n("Amadeus.table.FWT", locale),
-          "BRT" => DiceTable::Table.from_i18n("Amadeus.table.BRT", locale),
-          "RIT" => DiceTable::Table.from_i18n("Amadeus.table.RIT", locale),
-          "WT" => DiceTable::Table.from_i18n("Amadeus.table.WT", locale),
-          "NMT" => DiceTable::Table.from_i18n("Amadeus.table.NMT", locale),
-          "TGT" => DiceTable::Table.from_i18n("Amadeus.table.TGT", locale),
-          "CST" => DiceTable::Table.from_i18n("Amadeus.table.CST", locale),
-          "GCVT" => DiceTable::Table.from_i18n("Amadeus.table.GCVT", locale),
-          "YCVT" => DiceTable::Table.from_i18n("Amadeus.table.YCVT", locale),
-          "ECVT" => DiceTable::Table.from_i18n("Amadeus.table.ECVT", locale),
-          "CCVT" => DiceTable::Table.from_i18n("Amadeus.table.CCVT", locale),
-          "NCVT" => DiceTable::Table.from_i18n("Amadeus.table.NCVT", locale),
-          "DGVT" => DiceTable::Table.from_i18n("Amadeus.table.DGVT", locale),
-          "DAVT" => DiceTable::Table.from_i18n("Amadeus.table.DAVT", locale),
-          "PRCT" => DiceTable::Table.from_i18n("Amadeus.table.PRCT", locale),
-          "TCCT" => DiceTable::Table.from_i18n("Amadeus.table.TCCT", locale),
-          "INCT" => DiceTable::Table.from_i18n("Amadeus.table.INCT", locale),
-          "PSCT" => DiceTable::Table.from_i18n("Amadeus.table.PSCT", locale),
-          "LVCT" => DiceTable::Table.from_i18n("Amadeus.table.LVCT", locale),
-          "DACT" => DiceTable::Table.from_i18n("Amadeus.table.DACT", locale),
-          "RGT" => DiceTable::Table.from_i18n("Amadeus.table.RGT", locale),
-          "FBT" => DiceTable::Table.from_i18n("Amadeus.table.FBT", locale),
-          "CHVT" => DiceTable::Table.from_i18n("Amadeus.table.CHVT", locale),
-          "LCVT" => DiceTable::Table.from_i18n("Amadeus.table.LCVT", locale),
-          "KCVT" => DiceTable::Table.from_i18n("Amadeus.table.KCVT", locale),
-          "SAT" => DiceTable::D66Table.from_i18n("Amadeus.table.SAT", locale),
-          "SMT" => DiceTable::D66Table.from_i18n("Amadeus.table.SMT", locale),
-        }
+      class << self
+        private
+
+        def translate_tables(locale)
+          {
+            "ECT" => DiceTable::Table.from_i18n("Amadeus.table.ECT", locale),
+            "BST" => DiceTable::Table.from_i18n("Amadeus.table.BST", locale),
+            "RT" => DiceTable::Table.from_i18n("Amadeus.table.RT", locale),
+            "PRT" => DiceTable::Table.from_i18n("Amadeus.table.PRT", locale),
+            "FT" => DiceTable::Table.from_i18n("Amadeus.table.FT", locale),
+            "BT" => DiceTable::D66Table.from_i18n("Amadeus.table.BT", locale),
+            "FWT" => DiceTable::Table.from_i18n("Amadeus.table.FWT", locale),
+            "BRT" => DiceTable::Table.from_i18n("Amadeus.table.BRT", locale),
+            "RIT" => DiceTable::Table.from_i18n("Amadeus.table.RIT", locale),
+            "WT" => DiceTable::Table.from_i18n("Amadeus.table.WT", locale),
+            "NMT" => DiceTable::Table.from_i18n("Amadeus.table.NMT", locale),
+            "TGT" => DiceTable::Table.from_i18n("Amadeus.table.TGT", locale),
+            "CST" => DiceTable::Table.from_i18n("Amadeus.table.CST", locale),
+            "GCVT" => DiceTable::Table.from_i18n("Amadeus.table.GCVT", locale),
+            "YCVT" => DiceTable::Table.from_i18n("Amadeus.table.YCVT", locale),
+            "ECVT" => DiceTable::Table.from_i18n("Amadeus.table.ECVT", locale),
+            "CCVT" => DiceTable::Table.from_i18n("Amadeus.table.CCVT", locale),
+            "NCVT" => DiceTable::Table.from_i18n("Amadeus.table.NCVT", locale),
+            "DGVT" => DiceTable::Table.from_i18n("Amadeus.table.DGVT", locale),
+            "DAVT" => DiceTable::Table.from_i18n("Amadeus.table.DAVT", locale),
+            "PRCT" => DiceTable::Table.from_i18n("Amadeus.table.PRCT", locale),
+            "TCCT" => DiceTable::Table.from_i18n("Amadeus.table.TCCT", locale),
+            "INCT" => DiceTable::Table.from_i18n("Amadeus.table.INCT", locale),
+            "PSCT" => DiceTable::Table.from_i18n("Amadeus.table.PSCT", locale),
+            "LVCT" => DiceTable::Table.from_i18n("Amadeus.table.LVCT", locale),
+            "DACT" => DiceTable::Table.from_i18n("Amadeus.table.DACT", locale),
+            "RGT" => DiceTable::Table.from_i18n("Amadeus.table.RGT", locale),
+            "FBT" => DiceTable::Table.from_i18n("Amadeus.table.FBT", locale),
+            "CHVT" => DiceTable::Table.from_i18n("Amadeus.table.CHVT", locale),
+            "LCVT" => DiceTable::Table.from_i18n("Amadeus.table.LCVT", locale),
+            "KCVT" => DiceTable::Table.from_i18n("Amadeus.table.KCVT", locale),
+            "SAT" => DiceTable::D66Table.from_i18n("Amadeus.table.SAT", locale),
+            "SMT" => DiceTable::D66Table.from_i18n("Amadeus.table.SMT", locale),
+          }
+        end
       end
 
       TABLES = translate_tables(:ja_jp)