bcdice 3.3.0 → 3.6.0

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,16 +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.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
 
@@ -64,105 +65,111 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    15,    14,    16,     5,    18,    19,    51,    52,    21,    22,
-    11,    53,    12,    17,    13,    15,    14,    16,     4,    18,
-    19,     4,     8,     3,    28,    11,    28,    12,    17,    13,
-    24,    25,    24,    25,    27,    28,    27,    28,    49,    50,
-     9,    24,    25,    24,    25,    27,    28,    27,    28,    49,
-    50,    35,    24,    25,    24,    25,    27,    28,    27,    28,
-    49,    50,    42,    24,    25,    24,    25,    27,    28,    27,
-    28,    49,    50,    47,    24,    25,    24,    25,    27,    28,
-    27,    28,    49,    50,    48,    24,    25,    24,    25,    27,
-    28,    27,    28,    49,    50,   nil,    24,    25,    24,    25,
-    27,    28,    27,    28,    49,    50,   nil,    24,    25,    24,
-    25,    27,    30,    27,   nil,   nil,   nil,   nil,    31,    32 ]
+    15,    14,    16,     5,    17,    18,    20,    21,    57,    58,
+    23,    24,    11,    59,    12,    19,    13,    15,    14,    16,
+     4,    17,    18,    20,    21,     4,    30,     3,    30,    11,
+     8,    12,    19,    13,    26,    27,    26,    27,    29,    30,
+    29,    30,    55,    56,    55,    56,    30,    26,    27,    26,
+    27,    29,    30,    29,    26,    27,     9,    30,    29,    30,
+    26,    27,    55,    56,    29,    26,    27,    26,    27,    29,
+    30,    29,    30,    55,    56,    55,    56,    30,    26,    27,
+    26,    27,    29,    30,    29,    26,    27,    37,    30,    29,
+    30,    26,    27,    55,    56,    29,    26,    27,    26,    27,
+    29,    30,    29,    30,    55,    56,    38,    39,    32,    26,
+    27,    26,    27,    29,    46,    29,    33,    34,    51,    52,
+    53,    54 ]
 
 racc_action_check = [
-     6,     6,     6,     1,     6,     6,    45,    45,    10,    10,
-     6,    45,     6,     6,     6,    20,    20,    20,     3,    20,
-    20,     0,     4,     0,    11,    20,    12,    20,    20,    20,
-    11,    11,    12,    12,    11,    14,    12,    15,    37,    37,
-     5,    14,    14,    15,    15,    14,    17,    15,    18,    39,
-    39,    16,    17,    17,    18,    18,    17,    19,    18,    21,
-    40,    40,    23,    19,    19,    21,    21,    19,    22,    21,
-    24,    41,    41,    31,    22,    22,    24,    24,    22,    25,
-    24,    27,    46,    46,    32,    25,    25,    27,    27,    25,
-    49,    27,    50,    56,    56,   nil,    49,    49,    50,    50,
-    49,    51,    50,    52,    57,    57,   nil,    51,    51,    52,
-    52,    51,    13,    52,   nil,   nil,   nil,   nil,    13,    13 ]
+     6,     6,     6,     1,     6,     6,     6,     6,    49,    49,
+    10,    10,     6,    49,     6,     6,     6,    22,    22,    22,
+     3,    22,    22,    22,    22,     0,    11,     0,    12,    22,
+     4,    22,    22,    22,    11,    11,    12,    12,    11,    14,
+    12,    15,    41,    41,    43,    43,    19,    14,    14,    15,
+    15,    14,    20,    15,    19,    19,     5,    21,    19,    23,
+    20,    20,    44,    44,    20,    21,    21,    23,    23,    21,
+    24,    23,    26,    45,    45,    50,    50,    27,    24,    24,
+    26,    26,    24,    29,    26,    27,    27,    16,    55,    27,
+    56,    29,    29,    62,    62,    29,    55,    55,    56,    56,
+    55,    57,    56,    58,    63,    63,    17,    18,    13,    57,
+    57,    58,    58,    57,    25,    58,    13,    13,    33,    34,
+    38,    39 ]
 
 racc_action_pointer = [
-    18,     3,   nil,    15,    20,    40,    -4,   nil,   nil,   nil,
-     0,    22,    24,   110,    33,    35,    44,    44,    46,    55,
-    11,    57,    66,    47,    68,    77,   nil,    79,   nil,   nil,
-   nil,    71,    82,   nil,   nil,   nil,   nil,    28,   nil,    39,
-    50,    61,   nil,   nil,   nil,    -2,    72,   nil,   nil,    88,
-    90,    99,   101,   nil,   nil,   nil,    83,    94 ]
+    22,     3,   nil,    17,    28,    56,    -4,   nil,   nil,   nil,
+     0,    24,    26,   106,    37,    39,    80,    99,   100,    44,
+    50,    55,    13,    57,    68,    97,    70,    75,   nil,    81,
+   nil,   nil,   nil,   116,   117,   nil,   nil,   nil,   118,   119,
+   nil,    30,   nil,    32,    50,    61,   nil,   nil,   nil,    -2,
+    63,   nil,   nil,   nil,   nil,    86,    88,    99,   101,   nil,
+   nil,   nil,    81,    92 ]
 
 racc_action_default = [
-   -31,   -31,    -4,   -31,   -31,   -31,    -1,    -4,    -3,    58,
-    -5,   -31,   -31,   -31,   -11,   -31,   -31,   -31,   -31,   -31,
-    -2,   -31,   -31,   -31,   -31,   -31,   -28,   -31,   -30,    -7,
-    -8,   -31,   -31,   -12,   -13,   -14,   -15,   -16,   -25,   -17,
-   -18,   -19,    -6,   -26,   -27,   -31,   -22,    -9,   -10,   -31,
-   -31,   -31,   -31,   -29,   -23,   -24,   -20,   -21 ]
+   -33,   -33,    -4,   -33,   -33,   -33,    -1,    -4,    -3,    64,
+    -5,   -33,   -33,   -33,   -11,   -33,   -33,   -33,   -33,   -33,
+   -33,   -33,    -2,   -33,   -33,   -33,   -33,   -33,   -30,   -33,
+   -32,    -7,    -8,   -33,   -33,   -12,   -13,   -14,   -33,   -33,
+   -17,   -18,   -27,   -19,   -20,   -21,    -6,   -28,   -29,   -33,
+   -24,    -9,   -10,   -15,   -16,   -33,   -33,   -33,   -33,   -31,
+   -25,   -26,   -22,   -23 ]
 
 racc_goto_table = [
-    23,    29,     2,    33,    34,     7,    36,    37,    39,     1,
-    40,    41,     6,    43,    44,    45,    46,    20,   nil,   nil,
+    25,    31,     6,    35,    36,     1,    49,    22,    40,    41,
+    43,     2,    44,    45,     7,    47,    48,   nil,    50,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    54,    55,
-    56,    57 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    60,    61,    62,    63 ]
 
 racc_goto_check = [
-     5,     5,     2,     5,     5,     2,     5,     6,     6,     1,
-     6,     6,     3,     5,     5,     7,     6,     3,   nil,   nil,
+     5,     5,     3,     5,     5,     1,     7,     3,     5,     6,
+     6,     2,     6,     6,     2,     5,     5,   nil,     6,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     5,     5,
-     6,     6 ]
+   nil,   nil,   nil,   nil,     5,     5,     6,     6 ]
 
 racc_goto_pointer = [
-   nil,     9,     2,    10,   nil,   -11,   -11,   -12,   nil ]
+   nil,     5,    11,     0,   nil,   -11,   -11,   -23,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,    10,    38,   nil,   nil,    26 ]
+   nil,   nil,   nil,   nil,    10,    42,   nil,   nil,    28 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  2, 20, :_reduce_1,
-  3, 20, :_reduce_2,
-  2, 21, :_reduce_3,
-  0, 22, :_reduce_4,
-  2, 22, :_reduce_5,
-  4, 22, :_reduce_6,
-  3, 22, :_reduce_7,
-  3, 22, :_reduce_8,
-  4, 22, :_reduce_9,
-  4, 22, :_reduce_10,
-  2, 22, :_reduce_11,
-  3, 22, :_reduce_12,
-  3, 22, :_reduce_13,
-  3, 22, :_reduce_14,
-  3, 22, :_reduce_15,
-  2, 23, :_reduce_16,
-  2, 23, :_reduce_17,
-  3, 23, :_reduce_18,
-  3, 23, :_reduce_19,
-  3, 26, :_reduce_20,
-  3, 26, :_reduce_21,
+  2, 22, :_reduce_1,
+  3, 22, :_reduce_2,
+  2, 23, :_reduce_3,
+  0, 24, :_reduce_4,
+  2, 24, :_reduce_5,
+  4, 24, :_reduce_6,
+  3, 24, :_reduce_7,
+  3, 24, :_reduce_8,
+  4, 24, :_reduce_9,
+  4, 24, :_reduce_10,
+  2, 24, :_reduce_11,
+  3, 24, :_reduce_12,
+  3, 24, :_reduce_13,
+  3, 24, :_reduce_14,
+  4, 24, :_reduce_15,
+  4, 24, :_reduce_16,
+  3, 24, :_reduce_17,
+  2, 25, :_reduce_18,
+  2, 25, :_reduce_19,
+  3, 25, :_reduce_20,
+  3, 25, :_reduce_21,
+  3, 28, :_reduce_22,
+  3, 28, :_reduce_23,
+  1, 28, :_reduce_none,
+  3, 27, :_reduce_25,
+  3, 27, :_reduce_26,
+  1, 27, :_reduce_none,
+  2, 26, :_reduce_28,
+  2, 26, :_reduce_29,
   1, 26, :_reduce_none,
-  3, 25, :_reduce_23,
-  3, 25, :_reduce_24,
-  1, 25, :_reduce_none,
-  2, 24, :_reduce_26,
-  2, 24, :_reduce_27,
-  1, 24, :_reduce_none,
-  3, 27, :_reduce_29,
-  1, 27, :_reduce_30 ]
+  3, 29, :_reduce_31,
+  1, 29, :_reduce_32 ]
 
-racc_reduce_n = 31
+racc_reduce_n = 33
 
-racc_shift_n = 58
+racc_shift_n = 64
 
 racc_token_table = {
   false => 0,
@@ -173,19 +180,21 @@ racc_token_table = {
   :H => 5,
   :G => 6,
   :F => 7,
-  :PLUS => 8,
-  :MINUS => 9,
-  :ASTERISK => 10,
-  :SLASH => 11,
-  :PARENL => 12,
-  :PARENR => 13,
-  :BRACKETL => 14,
-  :BRACKETR => 15,
-  :AT => 16,
-  :SHARP => 17,
-  :DOLLAR => 18 }
-
-racc_nt_base = 19
+  :S => 8,
+  :T => 9,
+  :PLUS => 10,
+  :MINUS => 11,
+  :ASTERISK => 12,
+  :SLASH => 13,
+  :PARENL => 14,
+  :PARENR => 15,
+  :BRACKETL => 16,
+  :BRACKETR => 17,
+  :AT => 18,
+  :SHARP => 19,
+  :DOLLAR => 20 }
+
+racc_nt_base = 21
 
 racc_use_result_var = true
 
@@ -214,6 +223,8 @@ Racc_token_to_s_table = [
   "H",
   "G",
   "F",
+  "S",
+  "T",
   "PLUS",
   "MINUS",
   "ASTERISK",
@@ -243,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
@@ -264,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
@@ -281,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
@@ -291,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
@@ -301,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
@@ -311,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
@@ -321,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
@@ -331,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
@@ -341,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
@@ -351,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
@@ -361,41 +372,51 @@ end
 
 def _reduce_14(val, _values, result)
             option, _, _ = val
-            raise ParseError unless [:v2_5, :v2_0].include?(@version) && option[:greatest_fortune].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
 end
 
 def _reduce_15(val, _values, result)
-            option, _, term = val
-            raise ParseError unless @version == :v2_5 && option[:kept_modify].nil?
+            option, _, _, term = val
+            raise ParseError unless [:v2_5, :v2_0].include?(@version) && option.settable_non_2d_roll_option?
 
-            option[:kept_modify] = term
+            option.semi_fixed_val = term.to_i
             result = option
 
     result
 end
 
 def _reduce_16(val, _values, result)
- result = val[1]
+            option, _, _, term = val
+            raise ParseError unless [:v2_5, :v2_0].include?(@version) && option.settable_non_2d_roll_option?
+
+            option.tmp_fixed_val = term.to_i
+            result = option
+
     result
 end
 
 def _reduce_17(val, _values, result)
- result = Arithmetic::Node::Negative.new(val[1])
+            option, _, term = val
+            raise ParseError unless @version == :v2_5 && option.kept_modify.nil?
+
+            option.kept_modify = term
+            result = option
+
     result
 end
 
 def _reduce_18(val, _values, result)
- result = Arithmetic::Node::BinaryOp.new(val[0], :+, val[2])
+ result = val[1]
     result
 end
 
 def _reduce_19(val, _values, result)
- result = Arithmetic::Node::BinaryOp.new(val[0], :-, val[2])
+ result = Arithmetic::Node::Negative.new(val[1])
     result
 end
 
@@ -409,39 +430,49 @@ def _reduce_21(val, _values, result)
     result
 end
 
-# reduce 22 omitted
+def _reduce_22(val, _values, result)
+ result = Arithmetic::Node::BinaryOp.new(val[0], :+, val[2])
+    result
+end
 
 def _reduce_23(val, _values, result)
+ result = Arithmetic::Node::BinaryOp.new(val[0], :-, val[2])
+    result
+end
+
+# reduce 24 omitted
+
+def _reduce_25(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :*, val[2])
     result
 end
 
-def _reduce_24(val, _values, result)
+def _reduce_26(val, _values, result)
          result = Arithmetic::Node::DivideWithGameSystemDefault.new(val[0], val[2])
 
     result
 end
 
-# reduce 25 omitted
+# reduce 27 omitted
 
-def _reduce_26(val, _values, result)
+def _reduce_28(val, _values, result)
  result = val[1]
     result
 end
 
-def _reduce_27(val, _values, result)
+def _reduce_29(val, _values, result)
  result = Arithmetic::Node::Negative.new(val[1])
     result
 end
 
-# reduce 28 omitted
+# reduce 30 omitted
 
-def _reduce_29(val, _values, result)
+def _reduce_31(val, _values, result)
  result = val[1]
     result
 end
 
-def _reduce_30(val, _values, result)
+def _reduce_32(val, _values, result)
  result = Arithmetic::Node::Number.new(val[0])
     result
 end

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|