bcdice 3.5.0 → 3.6.0

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module BCDice
+  module GameSystem
+    class SwordWorld < Base
+      class RatingOptions
+        # @return [Integer, nil]
+        attr_accessor :critical
+
+        # @return [Integer, nil]
+        attr_accessor :kept_modify
+
+        # @return [Integer, nil]
+        attr_accessor :first_to
+
+        # @return [Integer, nil]
+        attr_accessor :first_modify
+
+        # @return [Integer, nil]
+        attr_accessor :rateup
+
+        # @return [Boolean, nil]
+        attr_accessor :greatest_fortune
+
+        # @return [Integer, nil]
+        attr_accessor :semi_fixed_val
+
+        # @return [Integer, nil]
+        attr_accessor :tmp_fixed_val
+
+        # @return [Integer, nil]
+        attr_accessor :modifier
+
+        # @return [Integer, nil]
+        attr_accessor :modifier_after_half
+
+        def settable_first_roll_adjust_option?
+          return first_modify.nil? && first_to.nil?
+        end
+
+        def settable_non_2d_roll_option?
+          return greatest_fortune.nil? && semi_fixed_val.nil? && tmp_fixed_val.nil?
+        end
+      end
+    end
+  end
+end

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

@@ -7,46 +7,48 @@ module BCDice
         # @return [Integer]
         attr_accessor :rate
 
-        # @return [Integer, nil]
-        attr_writer :critical
+        # @return [Integer]
+        attr_accessor :critical
 
-        # @return [Integer, nil]
-        attr_writer :kept_modify
+        # @return [Integer]
+        attr_accessor :kept_modify
 
-        # @return [Integer, nil]
-        attr_writer :first_to
+        # @return [Integer]
+        attr_accessor :first_to
 
-        # @return [Integer, nil]
-        attr_writer :first_modify
+        # @return [Integer]
+        attr_accessor :first_modify
 
-        # @return [Integer, nil]
-        attr_writer :rateup
+        # @return [Integer]
+        attr_accessor :rateup
 
         # @return [Boolean]
         attr_accessor :greatest_fortune
 
-        # @return [Integer, nil]
-        attr_writer :semi_fixed_val
+        # @return [Integer]
+        attr_accessor :semi_fixed_val
 
-        # @return [Integer, nil]
-        attr_writer :tmp_fixed_val
+        # @return [Integer]
+        attr_accessor :tmp_fixed_val
 
         # @return [Integer]
         attr_accessor :modifier
 
         # @return [Integer, nil]
-        attr_writer :modifier_after_half
-
-        def initialize
-          @critical = nil
-          @min_critical = nil
-          @kept_modify = nil
-          @first_to = nil
-          @first_modify = nil
+        attr_accessor :modifier_after_half
+
+        def initialize(rate, modifier)
+          @rate = rate
+          @modifier = modifier
+          @critical = 13
+          @kept_modify = 0
+          @first_to = 0
+          @first_modify = 0
           @greatest_fortune = false
-          @rateup = nil
-          @semi_fixed_val = nil
-          @tmp_fixed_val = nil
+          @rateup = 0
+          @semi_fixed_val = 0
+          @tmp_fixed_val = 0
+          @modifier_after_half = nil
         end
 
         # @return [Boolean]
@@ -54,63 +56,18 @@ module BCDice
           return !@modifier_after_half.nil?
         end
 
-        # @return [Integer]
-        def critical
-          return @critical || (half ? 13 : 10)
-        end
-
         # @return [Integer]
         def min_critical
-          min_critical = 3
-          unless @semi_fixed_val.nil?
-            if @kept_modify.nil?
-              min_critical = @semi_fixed_val + 2 if min_critical < @semi_fixed_val + 2
-            else
-              min_critical = @semi_fixed_val + @kept_modify + 2 if min_critical < @semi_fixed_val + @kept_modify + 2
-            end
-            min_critical = 3 if @semi_fixed_val == 1
+          if @semi_fixed_val <= 1
+            return 3
+          else
+            return (@semi_fixed_val + @kept_modify + 2).clamp(3, 13)
           end
-          min_critical = 13 if min_critical > 13
-          return min_critical
-        end
-
-        # @return [Integer]
-        def first_modify
-          return @first_modify || 0
-        end
-
-        # @return [Integer]
-        def first_to
-          return @first_to || 0
-        end
-
-        # @return [Integer]
-        def rateup
-          return @rateup || 0
-        end
-
-        # @return [Integer]
-        def semi_fixed_val
-          sf = @semi_fixed_val || 0
-          sf = 6 if sf > 6
-          return sf
-        end
-
-        # @return [Integer]
-        def tmp_fixed_val
-          tf = @tmp_fixed_val || 0
-          tf = 6 if tf > 6
-          return tf
-        end
-
-        # @return [Integer]
-        def kept_modify
-          return @kept_modify || 0
         end
 
-        # @return [Integer]
-        def modifier_after_half
-          return @modifier_after_half || 0
+        # @return [Boolean]
+        def infinite_roll?
+          return critical < min_critical
         end
 
         # @return [String]
@@ -131,11 +88,6 @@ module BCDice
           end
           return output
         end
-
-        # @return [Boolean]
-        def infinite_roll?
-          return critical < min_critical
-        end
       end
     end
   end

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

@@ -11,6 +11,7 @@ require "bcdice/arithmetic/node"
 require "bcdice/enum"
 require "bcdice/game_system/sword_world/rating_lexer"
 require "bcdice/game_system/sword_world/rating_parsed"
+require "bcdice/game_system/sword_world/rating_options"
 
 module BCDice
   module GameSystem
@@ -44,18 +45,16 @@ end
 private
 
 def parsed(rate, modifier, option)
-  RatingParsed.new.tap do |p|
-    p.rate = rate
-    p.critical = option[:critical]&.eval(@round_type)
-    p.kept_modify = option[:kept_modify]&.eval(@round_type)
-    p.first_to = option[:first_to]
-    p.first_modify = option[:first_modify]
-    p.rateup = option[:rateup]&.eval(@round_type)
-    p.greatest_fortune = option.fetch(:greatest_fortune, false)
-    p.semi_fixed_val = option[:semi_fixed_val]
-    p.tmp_fixed_val = option[:tmp_fixed_val]
-    p.modifier = modifier.eval(@round_type)
-    p.modifier_after_half = option[:modifier_after_half]&.eval(@round_type)
+  RatingParsed.new(rate, modifier).tap do |p|
+    p.kept_modify = option.kept_modify&.eval(@round_type) || 0
+    p.first_to = option.first_to || 0
+    p.first_modify = option.first_modify || 0
+    p.rateup = option.rateup&.eval(@round_type) || 0
+    p.greatest_fortune = option.greatest_fortune if !option.greatest_fortune.nil?
+    p.semi_fixed_val = option.semi_fixed_val&.clamp(1, 6) || 0
+    p.tmp_fixed_val = option.tmp_fixed_val&.clamp(1, 6) || 0
+    p.modifier_after_half = option.modifier_after_half&.eval(@round_type)
+    p.critical = option.critical&.eval(@round_type)&.clamp(0, 13) || (p.half ? 13 : 10)
   end
 end
 
@@ -255,17 +254,17 @@ Racc_debug_parser = false
 
 def _reduce_1(val, _values, result)
           rate, option = val
-          modifier = option[:modifier] || Arithmetic::Node::Number.new(0)
-          result = parsed(rate, modifier, option)
+          modifier = option.modifier || Arithmetic::Node::Number.new(0)
+          result = parsed(rate, modifier.eval(@round_type), option)
 
     result
 end
 
 def _reduce_2(val, _values, result)
           _, rate, option = val
-          option[:modifier_after_half] ||= Arithmetic::Node::Number.new(0)
-          modifier = option[:modifier] || Arithmetic::Node::Number.new(0)
-          result = parsed(rate, modifier, option)
+          option.modifier_after_half ||= Arithmetic::Node::Number.new(0)
+          modifier = option.modifier || Arithmetic::Node::Number.new(0)
+          result = parsed(rate, modifier.eval(@round_type), option)
 
     result
 end
@@ -276,16 +275,16 @@ def _reduce_3(val, _values, result)
 end
 
 def _reduce_4(val, _values, result)
-            result = {}
+            result = RatingOptions.new
 
     result
 end
 
 def _reduce_5(val, _values, result)
             option, term = val
-            raise ParseError unless option[:modifier].nil?
+            raise ParseError unless option.modifier.nil?
 
-            option[:modifier] = term
+            option.modifier = term
             result = option
 
     result
@@ -293,9 +292,9 @@ end
 
 def _reduce_6(val, _values, result)
             option, _, term, _ = val
-            raise ParseError unless option[:critical].nil?
+            raise ParseError unless option.critical.nil?
 
-            option[:critical] = term
+            option.critical = term
             result = option
 
     result
@@ -303,9 +302,9 @@ end
 
 def _reduce_7(val, _values, result)
             option, _, term = val
-            raise ParseError unless option[:critical].nil?
+            raise ParseError unless option.critical.nil?
 
-            option[:critical] = term
+            option.critical = term
             result = option
 
     result
@@ -313,9 +312,9 @@ end
 
 def _reduce_8(val, _values, result)
             option, _, term = val
-            raise ParseError unless option[:first_to].nil? && option[:first_modify].nil?
+            raise ParseError unless option.settable_first_roll_adjust_option?
 
-            option[:first_to] = term.to_i
+            option.first_to = term.to_i
             result = option
 
     result
@@ -323,9 +322,9 @@ end
 
 def _reduce_9(val, _values, result)
             option, _, _, term = val
-            raise ParseError unless option[:first_to].nil? && option[:first_modify].nil?
+            raise ParseError unless option.settable_first_roll_adjust_option?
 
-            option[:first_modify] = term.to_i
+            option.first_modify = term.to_i
             result = option
 
     result
@@ -333,9 +332,9 @@ end
 
 def _reduce_10(val, _values, result)
             option, _, _, term = val
-            raise ParseError unless option[:first_to].nil? && option[:first_modify].nil?
+            raise ParseError unless option.settable_first_roll_adjust_option?
 
-            option[:first_modify] = -(term.to_i)
+            option.first_modify = -(term.to_i)
             result = option
 
     result
@@ -343,9 +342,9 @@ end
 
 def _reduce_11(val, _values, result)
             option, _ = val
-            raise ParseError unless option[:modifier_after_half].nil?
+            raise ParseError unless option.modifier_after_half.nil?
 
-            option[:modifier_after_half] = Arithmetic::Node::Number.new(0)
+            option.modifier_after_half = Arithmetic::Node::Number.new(0)
             result = option
 
     result
@@ -353,9 +352,9 @@ end
 
 def _reduce_12(val, _values, result)
             option, _, term = val
-            raise ParseError unless option[:modifier_after_half].nil?
+            raise ParseError unless option.modifier_after_half.nil?
 
-            option[:modifier_after_half] = term
+            option.modifier_after_half = term
             result = option
 
     result
@@ -363,9 +362,9 @@ end
 
 def _reduce_13(val, _values, result)
             option, _, term = val
-            raise ParseError unless [:v2_5, :v2_0].include?(@version) && option[:rateup].nil?
+            raise ParseError unless [:v2_5, :v2_0].include?(@version) && option.rateup.nil?
 
-            option[:rateup] = term
+            option.rateup = term
             result = option
 
     result
@@ -373,12 +372,9 @@ end
 
 def _reduce_14(val, _values, result)
             option, _, _ = val
-            raise ParseError unless [:v2_5, :v2_0].include?(@version)
-            raise ParseError unless option[:greatest_fortune].nil?
-            raise ParseError unless option[:semi_fixed_val].nil?
-            raise ParseError unless option[:tmp_fixed_val].nil?
+            raise ParseError unless [:v2_5, :v2_0].include?(@version) && option.settable_non_2d_roll_option?
 
-            option[:greatest_fortune] = true
+            option.greatest_fortune = true
             result = option
 
     result
@@ -386,12 +382,9 @@ end
 
 def _reduce_15(val, _values, result)
             option, _, _, term = val
-            raise ParseError unless [:v2_5, :v2_0].include?(@version)
-            raise ParseError unless option[:greatest_fortune].nil?
-            raise ParseError unless option[:semi_fixed_val].nil?
-            raise ParseError unless option[:tmp_fixed_val].nil?
+            raise ParseError unless [:v2_5, :v2_0].include?(@version) && option.settable_non_2d_roll_option?
 
-            option[:semi_fixed_val] = term.to_i
+            option.semi_fixed_val = term.to_i
             result = option
 
     result
@@ -399,12 +392,9 @@ end
 
 def _reduce_16(val, _values, result)
             option, _, _, term = val
-            raise ParseError unless [:v2_5, :v2_0].include?(@version)
-            raise ParseError unless option[:greatest_fortune].nil?
-            raise ParseError unless option[:semi_fixed_val].nil?
-            raise ParseError unless option[:tmp_fixed_val].nil?
+            raise ParseError unless [:v2_5, :v2_0].include?(@version) && option.settable_non_2d_roll_option?
 
-            option[:tmp_fixed_val] = term.to_i
+            option.tmp_fixed_val = term.to_i
             result = option
 
     result
@@ -412,9 +402,9 @@ end
 
 def _reduce_17(val, _values, result)
             option, _, term = val
-            raise ParseError unless @version == :v2_5 && option[:kept_modify].nil?
+            raise ParseError unless @version == :v2_5 && option.kept_modify.nil?
 
-            option[:kept_modify] = term
+            option.kept_modify = term
             result = option
 
     result

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

@@ -1,27 +1,23 @@
 require "bcdice/result"
+require "bcdice/translate"
 
 module BCDice
   module GameSystem
     class SwordWorld2_0 < SwordWorld
       # 超越判定のノード
       class TranscendentTest
-        RESULT_STR = {
-          success: "成功",
-          failure: "失敗",
-          super_success: "超成功",
-          critical: "自動的成功",
-          fumble: "自動的失敗",
-        }.freeze
+        include Translate
 
         # @param [Integer] critical_value クリティカル値
         # @param [Integer] modifier 修正値
         # @param [String, nil] cmp_op 比較演算子（> または >=）
         # @param [Integer, nil] target 目標値
-        def initialize(critical_value, modifier, cmp_op, target)
+        def initialize(critical_value, modifier, cmp_op, target, locale)
           @critical_value = critical_value
           @modifier = modifier
           @cmp_op = cmp_op
           @target = target
+          @locale = locale
 
           @modifier_str = Format.modifier(@modifier)
           @expression = node_expression()
@@ -32,7 +28,7 @@ module BCDice
         # @return [String]
         def execute(randomizer)
           if @critical_value < 3
-            return "(#{@expression}) ＞ クリティカル値が小さすぎます。3以上を指定してください。"
+            return translate("SwordWorld2_0.transcendent_critical_too_small", expression: @expression)
           end
 
           first_value_group = randomizer.roll_barabara(2, 6)
@@ -51,11 +47,19 @@ module BCDice
           total_sum = sum + @modifier
 
           result = result_status(total_sum, value_groups.length, fumble, critical)
+          result_str = {
+            success: translate("success"),
+            failure: translate("failure"),
+            super_success: translate("SwordWorld2_0.super_success"),
+            critical: translate("SwordWorld.critical"),
+            fumble: translate("SwordWorld.fumble"),
+          }.freeze[result]
+
           parts = [
             "(#{@expression})",
             "#{dice_str(value_groups, sum)}#{@modifier_str}",
             total_sum,
-            RESULT_STR[result],
+            result_str,
           ].compact
 
           return Result.new.tap do |r|

data/lib/bcdice/game_system.rb

@@ -17,6 +17,7 @@ require "bcdice/game_system/Arianrhod"
 require "bcdice/game_system/ArsMagica"
 require "bcdice/game_system/AssaultEngine"
 require "bcdice/game_system/Avandner"
+require "bcdice/game_system/Ayabito"
 require "bcdice/game_system/Bakenokawa"
 require "bcdice/game_system/BBN"
 require "bcdice/game_system/BadLife"
@@ -46,6 +47,7 @@ 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/CyberpunkRed"
 require "bcdice/game_system/DarkBlaze"
 require "bcdice/game_system/DarkDaysDrive"
 require "bcdice/game_system/DarkSouls"
@@ -177,7 +179,9 @@ require "bcdice/game_system/SharedFantasia"
 require "bcdice/game_system/ShinMegamiTenseiKakuseihen"
 require "bcdice/game_system/ShinkuuGakuen"
 require "bcdice/game_system/ShinobiGami"
+require "bcdice/game_system/Shiranui"
 require "bcdice/game_system/ShoujoTenrankai"
+require "bcdice/game_system/ShuumatsuKikou"
 require "bcdice/game_system/Skynauts"
 require "bcdice/game_system/SkynautsBouken"
 require "bcdice/game_system/StarryDolls"

data/lib/bcdice/randomizer.rb

@@ -4,7 +4,7 @@ module BCDice
   # 乱数生成器
   class Randomizer
     UPPER_LIMIT_DICE_TIMES = 200
-    UPPER_LIMIT_DICE_SIDES = 1000
+    UPPER_LIMIT_DICE_SIDES = 10000
 
     UPPER_LIMIT_RANDS = 10000
 

data/lib/bcdice/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BCDice
-  VERSION = "3.5.0"
+  VERSION = "3.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcdice
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - SAKATA Sinji
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-02 00:00:00.000000000 Z
+date: 2022-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -71,6 +71,9 @@ files:
 - i18n/StellarKnights/ko_kr.yml
 - i18n/StratoShout/ja_jp.yml
 - i18n/StratoShout/ko_kr.yml
+- i18n/SwordWorld/ja_jp.yml
+- i18n/SwordWorld2_0/ja_jp.yml
+- i18n/SwordWorld2_5/ja_jp.yml
 - i18n/ja_jp.yml
 - i18n/ko_kr.yml
 - i18n/zh_hans.yml
@@ -146,6 +149,7 @@ files:
 - lib/bcdice/game_system/ArsMagica.rb
 - lib/bcdice/game_system/AssaultEngine.rb
 - lib/bcdice/game_system/Avandner.rb
+- lib/bcdice/game_system/Ayabito.rb
 - lib/bcdice/game_system/BBN.rb
 - lib/bcdice/game_system/BadLife.rb
 - lib/bcdice/game_system/Bakenokawa.rb
@@ -175,6 +179,7 @@ files:
 - lib/bcdice/game_system/Cthulhu_ChineseTraditional.rb
 - lib/bcdice/game_system/Cthulhu_Korean.rb
 - lib/bcdice/game_system/Cthulhu_SimplifiedChinese.rb
+- lib/bcdice/game_system/CyberpunkRed.rb
 - lib/bcdice/game_system/DarkBlaze.rb
 - lib/bcdice/game_system/DarkDaysDrive.rb
 - lib/bcdice/game_system/DarkSouls.rb
@@ -306,7 +311,9 @@ files:
 - lib/bcdice/game_system/ShinMegamiTenseiKakuseihen.rb
 - lib/bcdice/game_system/ShinkuuGakuen.rb
 - lib/bcdice/game_system/ShinobiGami.rb
+- lib/bcdice/game_system/Shiranui.rb
 - lib/bcdice/game_system/ShoujoTenrankai.rb
+- lib/bcdice/game_system/ShuumatsuKikou.rb
 - lib/bcdice/game_system/Skynauts.rb
 - lib/bcdice/game_system/SkynautsBouken.rb
 - lib/bcdice/game_system/StarryDolls.rb
@@ -362,6 +369,7 @@ files:
 - lib/bcdice/game_system/beginning_idol/work_table.rb
 - lib/bcdice/game_system/cthulhu7th/full_auto.rb
 - lib/bcdice/game_system/cthulhu7th/rollable.rb
+- lib/bcdice/game_system/cyberpunk_red/tables.rb
 - lib/bcdice/game_system/filled_with/cook_tables.rb
 - lib/bcdice/game_system/filled_with/enemy_data_tables.rb
 - lib/bcdice/game_system/filled_with/event_tables.rb
@@ -384,6 +392,7 @@ files:
 - 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_options.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