bcdice 3.0.0.pre.alpha.1 → 3.1.0

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.1".freeze
+  VERSION = "3.1.0"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: bcdice
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha.1
+  version: 3.1.0
 platform: ruby
 authors:
 - SAKATA Sinji
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
-dependencies: []
+date: 2021-03-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.5
 description: BCDice is a rolling dice engine for TRPG
 email:
 - ysakasin@gmail.com
@@ -17,49 +31,87 @@ 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
+- i18n/Cthulhu/ko_kr.yml
+- i18n/Cthulhu/zh_hant.yml
+- i18n/DetatokoSaga/ja_jp.yml
+- i18n/DetatokoSaga/ko_kr.yml
+- i18n/DoubleCross/ja_jp.yml
+- i18n/DoubleCross/ko_kr.yml
+- i18n/Dracurouge/ja_jp.yml
+- i18n/Dracurouge/ko_kr.yml
+- i18n/Fiasco/ja_jp.yml
+- i18n/Fiasco/ko_kr.yml
+- i18n/FutariSousa/ja_jp.yml
+- i18n/FutariSousa/ko_kr.yml
+- i18n/Insane/ja_jp.yml
+- i18n/Insane/ko_kr.yml
+- i18n/Kamigakari/ja_jp.yml
+- i18n/Kamigakari/ko_kr.yml
+- i18n/KillDeathBusiness/ja_jp.yml
+- i18n/KillDeathBusiness/ko_kr.yml
+- 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
+- i18n/Nechronica/ko_kr.yml
+- i18n/StratoShout/ja_jp.yml
+- i18n/StratoShout/ko_kr.yml
+- i18n/ja_jp.yml
+- 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/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/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/choice.rb
 - lib/bcdice/common_command/d66_dice.rb
+- lib/bcdice/common_command/lexer.rb
+- lib/bcdice/common_command/repeat.rb
 - 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/upper_dice.rb
+- lib/bcdice/common_command/upper_dice/node.rb
+- lib/bcdice/common_command/upper_dice/parser.rb
 - 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
 - lib/bcdice/dice_table/roll_result.rb
 - lib/bcdice/dice_table/sai_fic_skill_table.rb
+- lib/bcdice/dice_table/sai_fic_skill_table/category.rb
+- lib/bcdice/dice_table/sai_fic_skill_table/skill.rb
 - lib/bcdice/dice_table/table.rb
 - lib/bcdice/enum.rb
 - lib/bcdice/format.rb
@@ -67,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
@@ -93,6 +147,7 @@ files:
 - lib/bcdice/game_system/Chill3.rb
 - lib/bcdice/game_system/CodeLayerd.rb
 - lib/bcdice/game_system/ColossalHunter.rb
+- lib/bcdice/game_system/Comes.rb
 - lib/bcdice/game_system/CrashWorld.rb
 - lib/bcdice/game_system/Cthulhu.rb
 - lib/bcdice/game_system/Cthulhu7th.rb
@@ -106,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
@@ -122,6 +178,7 @@ files:
 - lib/bcdice/game_system/Elric.rb
 - lib/bcdice/game_system/Elysion.rb
 - lib/bcdice/game_system/EmbryoMachine.rb
+- lib/bcdice/game_system/Emoklore.rb
 - lib/bcdice/game_system/EndBreaker.rb
 - lib/bcdice/game_system/EtrianOdysseySRS.rb
 - lib/bcdice/game_system/Fiasco.rb
@@ -130,6 +187,7 @@ files:
 - lib/bcdice/game_system/FullMetalPanic.rb
 - lib/bcdice/game_system/FutariSousa.rb
 - lib/bcdice/game_system/FutariSousa_Korean.rb
+- lib/bcdice/game_system/GURPS.rb
 - lib/bcdice/game_system/Garako.rb
 - lib/bcdice/game_system/GardenOrder.rb
 - lib/bcdice/game_system/GehennaAn.rb
@@ -141,7 +199,6 @@ files:
 - lib/bcdice/game_system/Gundog.rb
 - lib/bcdice/game_system/GundogRevised.rb
 - lib/bcdice/game_system/GundogZero.rb
-- lib/bcdice/game_system/Gurps.rb
 - lib/bcdice/game_system/GurpsFW.rb
 - lib/bcdice/game_system/HarnMaster.rb
 - lib/bcdice/game_system/HatsuneMiku.rb
@@ -149,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
@@ -167,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
@@ -175,6 +236,7 @@ files:
 - lib/bcdice/game_system/MetallicGuardian.rb
 - lib/bcdice/game_system/MonotoneMuseum.rb
 - lib/bcdice/game_system/MonotoneMuseum_Korean.rb
+- lib/bcdice/game_system/NSSQ.rb
 - lib/bcdice/game_system/Nechronica.rb
 - lib/bcdice/game_system/Nechronica_Korean.rb
 - lib/bcdice/game_system/NeverCloud.rb
@@ -203,6 +265,7 @@ files:
 - lib/bcdice/game_system/RecordOfSteam.rb
 - lib/bcdice/game_system/RokumonSekai2.rb
 - lib/bcdice/game_system/RoleMaster.rb
+- lib/bcdice/game_system/RuinBreakers.rb
 - lib/bcdice/game_system/RuneQuest.rb
 - lib/bcdice/game_system/RyuTuber.rb
 - lib/bcdice/game_system/Ryutama.rb
@@ -240,17 +303,24 @@ files:
 - lib/bcdice/game_system/TrinitySeven.rb
 - lib/bcdice/game_system/TunnelsAndTrolls.rb
 - lib/bcdice/game_system/TwilightGunsmoke.rb
+- lib/bcdice/game_system/UnsungDuet.rb
 - lib/bcdice/game_system/Utakaze.rb
 - lib/bcdice/game_system/VampireTheMasquerade5th.rb
 - lib/bcdice/game_system/Villaciel.rb
 - lib/bcdice/game_system/WARPS.rb
 - lib/bcdice/game_system/WaresBlade.rb
 - lib/bcdice/game_system/Warhammer.rb
+- lib/bcdice/game_system/Warhammer4.rb
 - lib/bcdice/game_system/WitchQuest.rb
 - 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
 - lib/bcdice/game_system/meikyu_kingdom/kingdom_name_table.rb
 - lib/bcdice/game_system/meikyu_kingdom/landscape_table.rb
@@ -266,16 +336,23 @@ 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
 - lib/bcdice/randomizer.rb
 - lib/bcdice/repl.rb
+- lib/bcdice/result.rb
+- lib/bcdice/translate.rb
 - lib/bcdice/user_defined_dice_table.rb
 - 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
@@ -292,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

data/.editorconfig

@@ -1,21 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-
-[*.rb]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-
-[Rakefile]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true
-
-[*.yml]
-indent_style = space
-indent_size = 2
-trim_trailing_whitespace = true

data/.github/.codecov.yaml

@@ -1,10 +0,0 @@
-coverage:
-  status:
-    project:
-      default:
-        target: 75
-        threshold: 5%
-    patch:
-      default:
-        target: 75
-        threshold: 5%

data/.github/workflows/coverage.yaml

@@ -1,21 +0,0 @@
-name: Coverage
-on: [push, pull_request]
-jobs:
-  coverage:
-    strategy:
-      fail-fast: false
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-        bundler-cache: true
-    - run: bundle install
-    - uses: paambaati/codeclimate-action@v2.6.0
-      env:
-        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      with:
-        coverageCommand: bundle exec rake test
-        coverageLocations: |
-          ${{github.workspace}}/coverage/.resultset.json:simplecov

data/.github/workflows/lint.yaml

@@ -1,13 +0,0 @@
-name: Lint
-on: [push, pull_request]
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-        bundler-cache: true
-    - run: bundle install
-    - run: bundle exec rake rubocop