bcdice 3.0.0.pre.alpha.2 → 3.1.1

data/lib/bcdice/game_system/sword_world/transcendent_test.rb

@@ -0,0 +1,104 @@
+module BCDice
+  module GameSystem
+    class SwordWorld2_0 < SwordWorld
+      # 超越判定のノード
+      class TranscendentTest
+        # @param [Integer] critical_value クリティカル値
+        # @param [Integer] modifier 修正値
+        # @param [String, nil] cmp_op 比較演算子（> または >=）
+        # @param [Integer, nil] target 目標値
+        def initialize(critical_value, modifier, cmp_op, target)
+          @critical_value = critical_value
+          @modifier = modifier
+          @cmp_op = cmp_op
+          @target = target
+
+          @modifier_str = Format.modifier(@modifier)
+          @expression = node_expression()
+        end
+
+        # 超越判定を行う
+        # @param randomizer [Randomizer]
+        # @return [String]
+        def execute(randomizer)
+          if @critical_value < 3
+            return "(#{@expression}) ＞ クリティカル値が小さすぎます。3以上を指定してください。"
+          end
+
+          first_value_group = randomizer.roll_barabara(2, 6)
+          value_groups = [first_value_group]
+
+          fumble = first_value_group == [1, 1]
+          critical = first_value_group == [6, 6]
+
+          if !fumble && !critical
+            while sum_of_dice(value_groups.last) >= @critical_value
+              value_groups.push(randomizer.roll_barabara(2, 6))
+            end
+          end
+
+          sum = sum_of_dice(value_groups)
+          total_sum = sum + @modifier
+
+          parts = [
+            "(#{@expression})",
+            "#{dice_str(value_groups, sum)}#{@modifier_str}",
+            total_sum,
+            @target && result_str(total_sum, value_groups.length, fumble, critical)
+          ].compact
+
+          return parts.join(" ＞ ")
+        end
+
+        private
+
+        # 数式表記を返す
+        # @return [String]
+        def node_expression
+          lhs = "2D6@#{@critical_value}#{@modifier_str}"
+
+          return @target ? "#{lhs}#{@cmp_op}#{@target}" : lhs
+        end
+
+        # 出目の合計を返す
+        # @param [(Integer, Integer), Array<(Integer, Integer)>] value_groups
+        #   出目のグループまたはその配列
+        # @return [Integer]
+        def sum_of_dice(value_groups)
+          value_groups.flatten.sum
+        end
+
+        # ダイス部分の文字列を返す
+        # @param [Array<(Integer, Integer)>] value_groups 出目のグループの配列
+        # @param [Integer] sum 出目の合計
+        # @return [String]
+        def dice_str(value_groups, sum)
+          value_groups_str =
+            value_groups
+            .map { |values| "[#{values.join(',')}]" }
+            .join
+
+          return "#{sum}#{value_groups_str}"
+        end
+
+        # 判定結果の文字列を返す
+        # @param [Integer] total_sum 合計値
+        # @param [Integer] n_value_groups 出目のグループの数
+        # @param [Boolean] fumble ファンブルかどうか
+        # @param [Boolean] critical クリティカルかどうか
+        # @return [String]
+        def result_str(total_sum, n_value_groups, fumble, critical)
+          return "自動的失敗" if fumble
+          return "自動的成功" if critical
+
+          if total_sum.send(@cmp_op, @target)
+            # 振り足しが行われ、合計値が41以上ならば「超成功」
+            n_value_groups >= 2 && total_sum >= 41 ? "超成功" : "成功"
+          else
+            "失敗"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bcdice/loader.rb

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module BCDice
   class << self
     # IDを指定してゲームシステムのクラスを取得する
+    # ゲームシステム一覧がロードされていなければロードする
     #
     # @param id [String] ID
     # @return [Class, nil]
@@ -8,18 +11,22 @@ module BCDice
       all_game_systems.find { |game_system| game_system::ID == id }
     end
 
-    # 現在ロードされているゲームシステムのクラス一覧を返す
+    # ゲームシステムのクラス一覧を返す
+    # ゲームシステム一覧がロードされていなければロードする
     #
     # @return [Array<Class>]
     def all_game_systems()
+      require "bcdice/game_system"
       BCDice::GameSystem.constants.map { |class_name| BCDice::GameSystem.const_get(class_name) }
     end
 
-    # クラス名を指定して対象のソースコードを動的にロードし、そのクラスを取得する
+    # IDを指定して対象のソースコードを動的にロードし、そのクラスを取得する
     #
-    # @param class_name [String] クラス名
+    # @param id [String] ID
     # @return [Class, nil]
-    def dynamic_load(class_name)
+    def dynamic_load(id)
+      class_name = id.tr(":.", "_")
+
       # 対象ディレクトリの外にあるファイルをロードされないように制約を設ける
       unless /\A[A-Z]\w*\z/.match?(class_name)
         return nil

data/lib/bcdice/normalize.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BCDice
   module Normalize
     module_function
@@ -18,7 +20,7 @@ module BCDice
         :<
       when />/
         :>
-      when /\=/
+      when /=/
         :==
       end
     end

data/lib/bcdice/preprocessor.rb

@@ -29,7 +29,7 @@ module BCDice
 
       @text = @game_system.change_text(@text)
 
-      replace_implicit_d6()
+      replace_implicit_d()
 
       return @text
     end
@@ -45,18 +45,22 @@ module BCDice
     def replace_parentheses
       loop do
         prev = @text
-        @text = @text.gsub(%r{\([\d/\+\*\-]+\)}) do |expr|
-          ae = ArithmeticEvaluator.new(expr, round_type: @game_system.round_type)
-          val = ae.eval
-          ae.error? ? expr : val
+        @text = @text.gsub(%r{\([\d/+*\-CURF]+\)}) do |expr|
+          Arithmetic.eval(expr, @game_system.round_type) || expr
         end
         break if prev == @text
       end
     end
 
-    # nDをnD6に置き換える
-    def replace_implicit_d6
-      @text = @text.gsub(/(\d+)D([^\w]|$)/i) { "#{Regexp.last_match(1)}D6#{Regexp.last_match(2)}" }
+    # nDをゲームシステムに応じて置き換える
+    def replace_implicit_d
+      @text = @text.gsub(/(\d+)D([^\w]|$)/i) do
+        times = Regexp.last_match(1)
+        sides = @game_system.sides_implicit_d
+        trailer = Regexp.last_match(2)
+
+        "#{times}D#{sides}#{trailer}"
+      end
     end
   end
 end

data/lib/bcdice/randomizer.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 module BCDice
   # 乱数生成器
   class Randomizer
     UPPER_LIMIT_DICE_TIMES = 200
     UPPER_LIMIT_DICE_SIDES = 1000
 
+    UPPER_LIMIT_RANDS = 10000
+
     def initialize
       @rand_results = []
       @detailed_rand_results = []
@@ -30,6 +34,10 @@ module BCDice
     # @param sides [Integer] ダイスの面数
     # @return [Array<Integer>] ダイスの出目一覧
     def roll_barabara(times, sides)
+      if @rand_results.size + times > UPPER_LIMIT_RANDS
+        raise TooManyRandsError
+      end
+
       if times <= 0 || times > UPPER_LIMIT_DICE_TIMES
         return []
       end
@@ -113,6 +121,10 @@ module BCDice
     # @param sides [Integer]
     # @return [Integer] 1以上sides以下の整数
     def rand_inner(sides)
+      if @rand_results.size >= UPPER_LIMIT_RANDS
+        raise TooManyRandsError
+      end
+
       dice = random(sides)
 
       @rand_results << [dice, sides]
@@ -134,4 +146,6 @@ module BCDice
       @detailed_rand_results.push(detail)
     end
   end
+
+  class TooManyRandsError < StandardError; end
 end

data/lib/bcdice/repl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bcdice"
 require "readline"
 
@@ -99,7 +101,7 @@ module BCDice
       if block
         instance_exec(*args, &block)
       else
-        eval_game_system(command)
+        eval_game_system(input)
       end
     end
 

data/lib/bcdice/result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BCDice
   class Result
     class << self
@@ -38,6 +40,8 @@ module BCDice
 
     def initialize(text = nil)
       @text = text
+      @rands = nil
+      @detailed_rands = nil
       @secret = false
       @success = false
       @failure = false

data/lib/bcdice/translate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BCDice
   # i18n用のモジュール
   module Translate

data/lib/bcdice/user_defined_dice_table.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BCDice
   # テキストで定義したダイス表を実行するクラス
   #
@@ -14,25 +16,32 @@ module BCDice
   #   TEXT
   #   table = BCDice::UserDefinedDiceTable.new(text)
   #   table.valid?() #=> true
-  #   table.roll()   #=> "飲み物表(6) ＞ 選ばれし者の知的飲料"
+  #   table.roll().text #=> "飲み物表(6) ＞ 選ばれし者の知的飲料"
+  #   BCDice::UserDefinedDiceTable.eval(text) #=> #<BCDice::Result>
   #
   class UserDefinedDiceTable
+    class << self
+      # @param text [String]
+      # @return [Result nil]
+      def roll(text)
+        new(text).roll()
+      end
+    end
+
     # @param text [String] ダイス表のテキストデータ
     def initialize(text)
       @text = text
-      @randomizer = Randomizer.new
       @rows = nil
     end
 
-    # @return [Randomizer]
-    attr_accessor :randomizer
-
     # ダイス表をロールする
-    # @return [String, nil]
-    def roll
+    # @param randomizer [Randomizer]
+    # @return [Result, nil]
+    def roll(randomizer: Randomizer.new)
       parse()
-      index = roll_index()
-      unless index
+
+      index = roll_index(randomizer)
+      unless valid? && index
         return nil
       end
 
@@ -43,7 +52,11 @@ module BCDice
       end
 
       chosen = row.delete_prefix(key).gsub('\n', "\n").strip
-      return "#{@name}(#{index}) ＞ #{chosen}"
+      Result.new.tap do |r|
+        r.text = "#{@name}(#{index}) ＞ #{chosen}"
+        r.rands = randomizer.rand_results
+        r.detailed_rands = randomizer.detailed_rand_results
+      end
     end
 
     # 有効なダイス表かをチェックする。テキスト形式のミスだけではなく、抜けている出目や範囲外の出目がないか確認する。
@@ -75,20 +88,20 @@ module BCDice
     private
 
     # @return [Integer, nil]
-    def roll_index
+    def roll_index(randomizer)
       if (m = /^(\d+)D(\d+)$/.match(@type))
         times = m[1].to_i
         sides = m[2].to_i
-        return @randomizer.roll_sum(times, sides)
+        return randomizer.roll_sum(times, sides)
       end
 
       case @type
       when "D66", "D66N"
-        @randomizer.roll_d66(D66SortType::NO_SORT)
+        randomizer.roll_d66(D66SortType::NO_SORT)
       when "D66A", "D66S"
-        @randomizer.roll_d66(D66SortType::ASC)
+        randomizer.roll_d66(D66SortType::ASC)
       when "D66D"
-        @randomizer.roll_d66(D66SortType::DESC)
+        randomizer.roll_d66(D66SortType::DESC)
       end
     end
 

data/lib/bcdice/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module BCDice
-  VERSION = "3.0.0-alpha.2".freeze
+  VERSION = "3.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcdice
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha.2
+  version: 3.1.1
 platform: ruby
 authors:
 - SAKATA Sinji
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-20 00:00:00.000000000 Z
+date: 2021-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -31,25 +31,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".github/.codecov.yaml"
-- ".github/workflows/coverage.yaml"
-- ".github/workflows/lint.yaml"
-- ".github/workflows/test.yml"
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- ROADMAP.md
-- Rakefile
-- bcdice.gemspec
-- bin/repl.rb
-- docs/README.txt
-- docs/dicebot_sort_key.md
-- docs/how_to_make_dicebot.md
 - i18n/Amadeus/ja_jp.yml
 - i18n/Amadeus/ko_kr.yml
 - i18n/Cthulhu/ja_jp.yml
@@ -74,6 +58,7 @@ files:
 - i18n/LogHorizon/ja_jp.yml
 - i18n/LogHorizon/ko_kr.yml
 - i18n/MagicaLogia/ja_jp.yml
+- i18n/MagicaLogia/ko_kr.yml
 - i18n/MonotoneMuseum/ja_jp.yml
 - i18n/MonotoneMuseum/ko_kr.yml
 - i18n/Nechronica/ja_jp.yml
@@ -84,24 +69,26 @@ files:
 - i18n/ko_kr.yml
 - i18n/zh_hant.yml
 - lib/bcdice.rb
+- lib/bcdice/arithmetic.rb
 - lib/bcdice/arithmetic/node.rb
+- lib/bcdice/arithmetic/parser.rb
 - lib/bcdice/arithmetic_evaluator.rb
 - lib/bcdice/base.rb
-- lib/bcdice/command_parser.rb
+- lib/bcdice/command/lexer.rb
+- lib/bcdice/command/parsed.rb
+- lib/bcdice/command/parser.rb
 - lib/bcdice/common_command.rb
 - lib/bcdice/common_command/add_dice.rb
 - lib/bcdice/common_command/add_dice/node.rb
 - lib/bcdice/common_command/add_dice/parser.rb
-- lib/bcdice/common_command/add_dice/parser.y
 - lib/bcdice/common_command/add_dice/randomizer.rb
 - lib/bcdice/common_command/barabara_dice.rb
 - lib/bcdice/common_command/barabara_dice/node.rb
 - lib/bcdice/common_command/barabara_dice/parser.rb
-- lib/bcdice/common_command/barabara_dice/parser.y
+- lib/bcdice/common_command/barabara_dice/result.rb
 - lib/bcdice/common_command/calc.rb
 - lib/bcdice/common_command/calc/node.rb
 - lib/bcdice/common_command/calc/parser.rb
-- lib/bcdice/common_command/calc/parser.y
 - lib/bcdice/common_command/choice.rb
 - lib/bcdice/common_command/d66_dice.rb
 - lib/bcdice/common_command/lexer.rb
@@ -109,16 +96,15 @@ files:
 - lib/bcdice/common_command/reroll_dice.rb
 - lib/bcdice/common_command/reroll_dice/node.rb
 - lib/bcdice/common_command/reroll_dice/parser.rb
-- lib/bcdice/common_command/reroll_dice/parser.y
 - lib/bcdice/common_command/upper_dice.rb
 - lib/bcdice/common_command/upper_dice/node.rb
 - lib/bcdice/common_command/upper_dice/parser.rb
-- lib/bcdice/common_command/upper_dice/parser.y
 - lib/bcdice/common_command/version.rb
 - lib/bcdice/deprecated/checker.rb
 - lib/bcdice/dice_table.rb
 - lib/bcdice/dice_table/chain_table.rb
 - lib/bcdice/dice_table/d66_grid_table.rb
+- lib/bcdice/dice_table/d66_parity_table.rb
 - lib/bcdice/dice_table/d66_range_table.rb
 - lib/bcdice/dice_table/d66_table.rb
 - lib/bcdice/dice_table/range_table.rb
@@ -133,11 +119,13 @@ files:
 - lib/bcdice/game_system/AFF2e.rb
 - lib/bcdice/game_system/AceKillerGene.rb
 - lib/bcdice/game_system/Airgetlamh.rb
+- lib/bcdice/game_system/AlchemiaStruggle.rb
 - lib/bcdice/game_system/Alsetto.rb
 - lib/bcdice/game_system/Alshard.rb
 - lib/bcdice/game_system/AlterRaise.rb
 - lib/bcdice/game_system/Amadeus.rb
 - lib/bcdice/game_system/Amadeus_Korean.rb
+- lib/bcdice/game_system/AngelGear.rb
 - lib/bcdice/game_system/AnimaAnimus.rb
 - lib/bcdice/game_system/Arianrhod.rb
 - lib/bcdice/game_system/ArsMagica.rb
@@ -173,6 +161,7 @@ files:
 - lib/bcdice/game_system/DarkSouls.rb
 - lib/bcdice/game_system/DeadlineHeroes.rb
 - lib/bcdice/game_system/DemonParasite.rb
+- lib/bcdice/game_system/DesperateRun.rb
 - lib/bcdice/game_system/DetatokoSaga.rb
 - lib/bcdice/game_system/DetatokoSaga_Korean.rb
 - lib/bcdice/game_system/DiceBot.rb
@@ -217,11 +206,14 @@ files:
 - lib/bcdice/game_system/HouraiGakuen.rb
 - lib/bcdice/game_system/HuntersMoon.rb
 - lib/bcdice/game_system/Illusio.rb
+- lib/bcdice/game_system/InfiniteBabeL.rb
 - lib/bcdice/game_system/InfiniteFantasia.rb
 - lib/bcdice/game_system/Insane.rb
 - lib/bcdice/game_system/Insane_Korean.rb
 - lib/bcdice/game_system/IthaWenUa.rb
 - lib/bcdice/game_system/JamesBond.rb
+- lib/bcdice/game_system/JekyllAndHyde.rb
+- lib/bcdice/game_system/JuinKansen.rb
 - lib/bcdice/game_system/Kamigakari.rb
 - lib/bcdice/game_system/Kamigakari_Korean.rb
 - lib/bcdice/game_system/KanColle.rb
@@ -235,6 +227,7 @@ files:
 - lib/bcdice/game_system/LostRecord.rb
 - lib/bcdice/game_system/LostRoyal.rb
 - lib/bcdice/game_system/MagicaLogia.rb
+- lib/bcdice/game_system/MagicaLogia_Korean.rb
 - lib/bcdice/game_system/MeikyuDays.rb
 - lib/bcdice/game_system/MeikyuKingdom.rb
 - lib/bcdice/game_system/MeikyuKingdomBasic.rb
@@ -322,7 +315,10 @@ files:
 - lib/bcdice/game_system/WorldOfDarkness.rb
 - lib/bcdice/game_system/YankeeYogSothoth.rb
 - lib/bcdice/game_system/YearZeroEngine.rb
+- lib/bcdice/game_system/Yggdrasill.rb
 - lib/bcdice/game_system/ZettaiReido.rb
+- lib/bcdice/game_system/cthulhu7th/full_auto.rb
+- lib/bcdice/game_system/cthulhu7th/rollable.rb
 - lib/bcdice/game_system/filled_with/cook_tables.rb
 - lib/bcdice/game_system/filled_with/lot_tables.rb
 - lib/bcdice/game_system/meikyu_kingdom/item_table.rb
@@ -340,6 +336,11 @@ files:
 - lib/bcdice/game_system/one_way_heroics/dungeon_table.rb
 - lib/bcdice/game_system/one_way_heroics/random_event_table.rb
 - lib/bcdice/game_system/one_way_heroics/tables.rb
+- lib/bcdice/game_system/satasupe/tables.rb
+- lib/bcdice/game_system/sword_world/rating_lexer.rb
+- lib/bcdice/game_system/sword_world/rating_parsed.rb
+- lib/bcdice/game_system/sword_world/rating_parser.rb
+- lib/bcdice/game_system/sword_world/transcendent_test.rb
 - lib/bcdice/loader.rb
 - lib/bcdice/normalize.rb
 - lib/bcdice/preprocessor.rb
@@ -351,7 +352,7 @@ files:
 - lib/bcdice/version.rb
 homepage: https://bcdice.org
 licenses:
-- MIT
+- BSD-3-Clause
 metadata:
   allowed_push_host: https://rubygems.org/
   homepage_uri: https://bcdice.org
@@ -368,9 +369,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6.2