bcdice 3.13.0 → 3.15.0

data/lib/bcdice/game_system/kizuna_bullet/tables.rb

@@ -0,0 +1,171 @@
+# frozen_string_literal: true
+
+module BCDice
+  module GameSystem
+    class KizunaBullet < Base
+      class RollTwiceRandomizerTable
+        def initialize(locale:, a_table:, b_table:)
+          @locale = locale
+          @a_table = a_table
+          @b_table = b_table
+        end
+
+        def roll(randomizer)
+          results = []
+
+          result_a = @a_table.roll(randomizer).to_s
+          results.push(result_a)
+
+          result_b = @b_table.roll(randomizer).to_s
+          results.push(result_b)
+
+          return results.join("\n")
+        end
+      end
+
+      class Roll4TimesRandomizerTable
+        def initialize(locale:, a_table:, b_table:, c_table:, d_table:)
+          @locale = locale
+          @a_table = a_table
+          @b_table = b_table
+          @c_table = c_table
+          @d_table = d_table
+        end
+
+        def roll(randomizer)
+          results = []
+
+          result_a = @a_table.roll(randomizer).to_s
+          results.push(result_a)
+
+          result_b = @b_table.roll(randomizer).to_s
+          results.push(result_b)
+
+          result_c = @c_table.roll(randomizer).to_s
+          results.push(result_c)
+
+          result_d = @d_table.roll(randomizer).to_s
+          results.push(result_d)
+
+          return results.join("\n")
+        end
+      end
+
+      class << self
+        private
+
+        def translate_tables(locale)
+          ordinary_days_place_table = DiceTable::Table.from_i18n("KizunaBullet.table.OP", locale)
+          ordinary_days_content_table = DiceTable::Table.from_i18n("KizunaBullet.table.OC", locale)
+          ordinary_days_work_place_table = DiceTable::Table.from_i18n("KizunaBullet.table.OWP", locale)
+          ordinary_days_work_content_table = DiceTable::Table.from_i18n("KizunaBullet.table.OWC", locale)
+          ordinary_days_holiday_place_table = DiceTable::Table.from_i18n("KizunaBullet.table.OHP", locale)
+          ordinary_days_holiday_content_table = DiceTable::Table.from_i18n("KizunaBullet.table.OHC", locale)
+          ordinary_days_trip_place_table = DiceTable::Table.from_i18n("KizunaBullet.table.OTP", locale)
+          ordinary_days_trip_content_table = DiceTable::Table.from_i18n("KizunaBullet.table.OTC", locale)
+          encounter_place_table = DiceTable::Table.from_i18n("KizunaBullet.table.EP", locale)
+          encounter_order_table = DiceTable::Table.from_i18n("KizunaBullet.table.EO", locale)
+          encounter_first_table = DiceTable::Table.from_i18n("KizunaBullet.table.EF", locale)
+          encounter_acquaintance_table = DiceTable::Table.from_i18n("KizunaBullet.table.EA", locale)
+          encounter_end_table = DiceTable::Table.from_i18n("KizunaBullet.table.EE", locale)
+          communication_place_table = DiceTable::Table.from_i18n("KizunaBullet.table.CP", locale)
+          communication_content_table = DiceTable::Table.from_i18n("KizunaBullet.table.CC", locale)
+          investigation_basic_table = DiceTable::D66Table.from_i18n("KizunaBullet.table.IB", locale)
+          investigation_dynamic_table = DiceTable::D66Table.from_i18n("KizunaBullet.table.ID", locale)
+          return {
+            "OP" => ordinary_days_place_table,
+            "OC" => ordinary_days_content_table,
+            "OPC" => RollTwiceRandomizerTable.new(
+              locale: locale,
+              a_table: ordinary_days_place_table,
+              b_table: ordinary_days_content_table
+            ).freeze,
+            "OWP" => ordinary_days_work_place_table,
+            "OWC" => ordinary_days_work_content_table,
+            "OWPC" => RollTwiceRandomizerTable.new(
+              locale: locale,
+              a_table: ordinary_days_work_place_table,
+              b_table: ordinary_days_work_content_table
+            ).freeze,
+            "OHP" => ordinary_days_holiday_place_table,
+            "OHC" => ordinary_days_holiday_content_table,
+            "OHPC" => RollTwiceRandomizerTable.new(
+              locale: locale,
+              a_table: ordinary_days_holiday_place_table,
+              b_table: ordinary_days_holiday_content_table
+            ).freeze,
+            "OTP" => ordinary_days_trip_place_table,
+            "OTC" => ordinary_days_trip_content_table,
+            "OTPC" => RollTwiceRandomizerTable.new(
+              locale: locale,
+              a_table: ordinary_days_trip_place_table,
+              b_table: ordinary_days_trip_content_table
+            ).freeze,
+            "TT" => DiceTable::D66Table.from_i18n("KizunaBullet.table.TT", locale),
+            "TTI" => DiceTable::D66Table.from_i18n("KizunaBullet.table.TTI", locale),
+            "TTC" => DiceTable::D66Table.from_i18n("KizunaBullet.table.TTC", locale),
+            "TTH" => DiceTable::D66Table.from_i18n("KizunaBullet.table.TTH", locale),
+            "EP" => encounter_place_table,
+            "EO" => encounter_order_table,
+            "EF" => encounter_first_table,
+            "EA" => encounter_acquaintance_table,
+            "EE" => encounter_end_table,
+            "EFA" => Roll4TimesRandomizerTable.new(
+              locale: locale,
+              a_table: encounter_place_table,
+              b_table: encounter_order_table,
+              c_table: encounter_first_table,
+              d_table: encounter_end_table
+            ).freeze,
+            "EAA" => Roll4TimesRandomizerTable.new(
+              locale: locale,
+              a_table: encounter_place_table,
+              b_table: encounter_order_table,
+              c_table: encounter_acquaintance_table,
+              d_table: encounter_end_table
+            ).freeze,
+            "CP" => communication_place_table,
+            "CC" => communication_content_table,
+            "CPC" => RollTwiceRandomizerTable.new(
+              locale: locale,
+              a_table: communication_place_table,
+              b_table: communication_content_table
+            ).freeze,
+            "IB" => investigation_basic_table,
+            "ID" => investigation_dynamic_table,
+            "IBD" => RollTwiceRandomizerTable.new(
+              locale: locale,
+              a_table: investigation_basic_table,
+              b_table: investigation_dynamic_table
+            ).freeze,
+            "HA" => DiceTable::Table.from_i18n("KizunaBullet.table.HA", locale),
+            "NI1" => DiceTable::Table.from_i18n("KizunaBullet.table.NI1", locale),
+            "NI2" => DiceTable::Table.from_i18n("KizunaBullet.table.NI2", locale),
+            "NI3" => DiceTable::Table.from_i18n("KizunaBullet.table.NI3", locale),
+            "NI4" => DiceTable::Table.from_i18n("KizunaBullet.table.NI4", locale),
+            "NI5" => DiceTable::Table.from_i18n("KizunaBullet.table.NI5", locale),
+            "NI6" => DiceTable::Table.from_i18n("KizunaBullet.table.NI6", locale),
+            "NT1" => DiceTable::Table.from_i18n("KizunaBullet.table.NT1", locale),
+            "NT2" => DiceTable::Table.from_i18n("KizunaBullet.table.NT2", locale),
+            "NT3" => DiceTable::Table.from_i18n("KizunaBullet.table.NT3", locale),
+            "NT4" => DiceTable::Table.from_i18n("KizunaBullet.table.NT4", locale),
+            "NT5" => DiceTable::Table.from_i18n("KizunaBullet.table.NT5", locale),
+            "NT6" => DiceTable::Table.from_i18n("KizunaBullet.table.NT6", locale),
+            "HH1" => DiceTable::Table.from_i18n("KizunaBullet.table.HH1", locale),
+            "HH2" => DiceTable::Table.from_i18n("KizunaBullet.table.HH2", locale),
+            "HH3" => DiceTable::Table.from_i18n("KizunaBullet.table.HH3", locale),
+            "HH4" => DiceTable::Table.from_i18n("KizunaBullet.table.HH4", locale),
+            "HH5" => DiceTable::Table.from_i18n("KizunaBullet.table.HH5", locale),
+            "HH6" => DiceTable::Table.from_i18n("KizunaBullet.table.HH6", locale),
+            "HC1" => DiceTable::Table.from_i18n("KizunaBullet.table.HC1", locale),
+            "HC2" => DiceTable::Table.from_i18n("KizunaBullet.table.HC2", locale),
+            "HC3" => DiceTable::Table.from_i18n("KizunaBullet.table.HC3", locale),
+            "HC4" => DiceTable::Table.from_i18n("KizunaBullet.table.HC4", locale),
+            "HC5" => DiceTable::Table.from_i18n("KizunaBullet.table.HC5", locale),
+            "HC6" => DiceTable::Table.from_i18n("KizunaBullet.table.HC6", locale),
+          }.freeze
+        end
+      end
+    end
+  end
+end

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

@@ -18,6 +18,7 @@ module BCDice
           "@" => :AT,
           "#" => :SHARP,
           "$" => :DOLLAR,
+          "~" => :TILDE,
         }.freeze
 
         def initialize(source)

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

@@ -16,6 +16,9 @@ module BCDice
         # @return [Integer, nil]
         attr_accessor :first_modify
 
+        # @return [Integer, nil]
+        attr_accessor :first_modify_ssp
+
         # @return [Integer, nil]
         attr_accessor :rateup
 
@@ -38,7 +41,7 @@ module BCDice
         attr_accessor :modifier_after_one_and_a_half
 
         def settable_first_roll_adjust_option?
-          return first_modify.nil? && first_to.nil?
+          return first_modify.nil? && first_to.nil? && first_modify_ssp.nil?
         end
 
         def settable_non_2d_roll_option?

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

@@ -19,6 +19,9 @@ module BCDice
         # @return [Integer]
         attr_accessor :first_modify
 
+        # @return [Integer]
+        attr_accessor :first_modify_ssp
+
         # @return [Integer]
         attr_accessor :rateup
 
@@ -47,6 +50,7 @@ module BCDice
           @kept_modify = 0
           @first_to = 0
           @first_modify = 0
+          @first_modify_ssp = 0
           @greatest_fortune = false
           @rateup = 0
           @semi_fixed_val = 0
@@ -85,6 +89,7 @@ module BCDice
 
           output += "c[#{critical}]" if critical < 13
           output += "m[#{Format.modifier(first_modify)}]" if first_modify != 0
+          output += "m[~#{Format.modifier(first_modify_ssp)}]" if first_modify_ssp != 0
           output += "m[#{first_to}]" if first_to != 0
           output += "r[#{rateup}]" if rateup != 0
           output += "gf" if @greatest_fortune

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

@@ -49,6 +49,7 @@ def parsed(rate, modifier, option)
     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.first_modify_ssp = option.first_modify_ssp || 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
@@ -66,122 +67,123 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    18,    16,    17,    19,     6,    20,    21,    23,    24,    64,
-    65,    27,    28,    13,    66,    14,    22,    15,    18,    16,
-    17,    19,     5,    20,    21,    23,    24,     5,     9,     3,
-     4,    13,    10,    14,    22,    15,    18,    16,    17,    19,
-    11,    20,    21,    23,    24,    34,     5,    34,    40,    13,
-    42,    14,    22,    15,    30,    31,    30,    31,    33,    34,
-    33,    34,    62,    63,    62,    63,    34,    43,    30,    31,
-    30,    31,    33,    34,    33,    30,    31,    44,    34,    33,
-    34,    52,    30,    31,    57,    34,    33,    30,    31,    30,
-    31,    33,    34,    33,    30,    31,    58,    34,    33,    34,
-    60,    30,    31,    61,    34,    33,    30,    31,    30,    31,
-    33,    34,    33,    30,    31,   nil,    34,    33,    34,   nil,
-    30,    31,   nil,    34,    33,    30,    31,    30,    31,    33,
-    36,    33,    30,    31,    62,    63,    33,    62,    63,    37,
-    38,    62,    63,    62,    63,    62,    63 ]
+    36,    66,    67,    27,    28,     5,    68,     3,     4,    37,
+    38,    18,    16,    17,    19,     6,    20,    21,    23,    24,
+    39,    64,    65,     5,    13,     9,    14,    22,    15,    18,
+    16,    17,    19,    10,    20,    21,    23,    24,    64,    65,
+    64,    65,    13,    11,    14,    22,    15,    18,    16,    17,
+    19,     5,    20,    21,    23,    24,    34,    41,    34,    43,
+    13,    44,    14,    22,    15,    30,    31,    30,    31,    33,
+    34,    33,    34,    64,    65,    64,    65,    34,    45,    30,
+    31,    30,    31,    33,    34,    33,    30,    31,    53,    34,
+    33,    34,    58,    30,    31,    59,    34,    33,    30,    31,
+    30,    31,    33,    34,    33,    30,    31,    60,    34,    33,
+    34,    62,    30,    31,    63,    34,    33,    30,    31,    30,
+    31,    33,    34,    33,    30,    31,    69,    34,    33,    34,
+   nil,    30,    31,   nil,    34,    33,    30,    31,    30,    31,
+    33,   nil,    33,    30,    31,    64,    65,    33,    64,    65 ]
 
 racc_action_check = [
-     7,     7,     7,     7,     1,     7,     7,     7,     7,    55,
-    55,    12,    12,     7,    55,     7,     7,     7,    25,    25,
-    25,    25,     3,    25,    25,    25,    25,     0,     4,     0,
-     0,    25,     5,    25,    25,    25,    49,    49,    49,    49,
-     6,    49,    49,    49,    49,    13,     9,    14,    17,    49,
-    19,    49,    49,    49,    13,    13,    14,    14,    13,    16,
-    14,    18,    46,    46,    48,    48,    22,    20,    16,    16,
-    18,    18,    16,    23,    18,    22,    22,    21,    24,    22,
-    27,    29,    23,    23,    37,    28,    23,    24,    24,    27,
-    27,    24,    30,    27,    28,    28,    38,    31,    28,    33,
-    43,    30,    30,    44,    40,    30,    31,    31,    33,    33,
-    31,    62,    33,    40,    40,   nil,    63,    40,    64,   nil,
-    62,    62,   nil,    65,    62,    63,    63,    64,    64,    63,
-    15,    64,    65,    65,    50,    50,    65,    51,    51,    15,
-    15,    56,    56,    69,    69,    70,    70 ]
+    15,    56,    56,    12,    12,     0,    56,     0,     0,    15,
+    15,     7,     7,     7,     7,     1,     7,     7,     7,     7,
+    15,    47,    47,     3,     7,     4,     7,     7,     7,    25,
+    25,    25,    25,     5,    25,    25,    25,    25,    49,    49,
+    51,    51,    25,     6,    25,    25,    25,    50,    50,    50,
+    50,     9,    50,    50,    50,    50,    13,    17,    14,    19,
+    50,    20,    50,    50,    50,    13,    13,    14,    14,    13,
+    16,    14,    18,    52,    52,    57,    57,    22,    21,    16,
+    16,    18,    18,    16,    23,    18,    22,    22,    29,    24,
+    22,    27,    37,    23,    23,    38,    28,    23,    24,    24,
+    27,    27,    24,    30,    27,    28,    28,    39,    31,    28,
+    33,    44,    30,    30,    45,    41,    30,    31,    31,    33,
+    33,    31,    64,    33,    41,    41,    60,    65,    41,    66,
+   nil,    64,    64,   nil,    67,    64,    65,    65,    66,    66,
+    65,   nil,    66,    67,    67,    72,    72,    67,    73,    73 ]
 
 racc_action_pointer = [
-    24,     4,   nil,    19,    23,    30,    40,    -4,   nil,    43,
-   nil,   nil,     0,    43,    45,   128,    57,    43,    59,    42,
-    59,    69,    64,    71,    76,    14,   nil,    78,    83,    63,
-    90,    95,   nil,    97,   nil,   nil,   nil,    82,    94,   nil,
-   102,   nil,   nil,    98,   101,   nil,    49,   nil,    51,    32,
-   121,   124,   nil,   nil,   nil,    -2,   128,   nil,   nil,   nil,
-   nil,   nil,   109,   114,   116,   121,   nil,   nil,   nil,   130,
-   132 ]
+     2,    15,   nil,    20,    20,    31,    43,     7,   nil,    48,
+   nil,   nil,    -8,    54,    56,    -2,    68,    52,    70,    51,
+    53,    70,    75,    82,    87,    25,   nil,    89,    94,    70,
+   101,   106,   nil,   108,   nil,   nil,   nil,    90,    93,    96,
+   nil,   113,   nil,   nil,   109,   112,   nil,     8,   nil,    25,
+    43,    27,    60,   nil,   nil,   nil,   -10,    62,   nil,   nil,
+   124,   nil,   nil,   nil,   120,   125,   127,   132,   nil,   nil,
+   nil,   nil,   132,   135 ]
 
 racc_action_default = [
-   -36,   -36,    -5,   -36,   -36,   -36,   -36,    -1,    -5,   -36,
-    -4,    71,    -6,   -36,   -36,   -36,   -12,   -36,   -36,   -36,
-   -36,   -36,   -36,   -36,   -36,    -2,    -5,   -36,   -36,   -36,
-   -36,   -36,   -33,   -36,   -35,    -8,    -9,   -36,   -36,   -13,
-   -14,   -16,   -17,   -36,   -36,   -20,   -21,   -30,   -22,    -3,
-   -23,   -24,    -7,   -31,   -32,   -36,   -27,   -10,   -11,   -15,
-   -18,   -19,   -36,   -36,   -36,   -36,   -34,   -28,   -29,   -25,
-   -26 ]
+   -37,   -37,    -5,   -37,   -37,   -37,   -37,    -1,    -5,   -37,
+    -4,    74,    -6,   -37,   -37,   -37,   -13,   -37,   -37,   -37,
+   -37,   -37,   -37,   -37,   -37,    -2,    -5,   -37,   -37,   -37,
+   -37,   -37,   -34,   -37,   -36,    -8,    -9,   -37,   -37,   -37,
+   -14,   -15,   -17,   -18,   -37,   -37,   -21,   -22,   -31,   -23,
+    -3,   -24,   -25,    -7,   -32,   -33,   -37,   -28,   -10,   -11,
+   -37,   -16,   -19,   -20,   -37,   -37,   -37,   -37,   -35,   -12,
+   -29,   -30,   -26,   -27 ]
 
 racc_goto_table = [
-    29,    35,     7,    39,     1,    41,    46,    48,    25,    45,
-    50,    51,     2,    55,   nil,     8,    56,    53,    54,   nil,
-   nil,    26,   nil,   nil,   nil,   nil,    49,    59,   nil,   nil,
+    29,    35,     7,    40,     1,    42,    47,    49,    25,    46,
+    51,    52,     2,    56,   nil,     8,    57,    54,    55,   nil,
+   nil,    26,   nil,   nil,   nil,   nil,    50,   nil,    61,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,    69,    70,    67,
-    68 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    72,
+    73,    70,    71 ]
 
 racc_goto_check = [
      5,     5,     3,     5,     1,     5,     6,     6,     3,     5,
      6,     6,     2,     7,   nil,     2,     6,     5,     5,   nil,
-   nil,     2,   nil,   nil,   nil,   nil,     3,     5,   nil,   nil,
+   nil,     2,   nil,   nil,   nil,   nil,     3,   nil,     5,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,     6,     6,     5,
-     5 ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     6,
+     6,     5,     5 ]
 
 racc_goto_pointer = [
    nil,     4,    12,     0,   nil,   -13,   -17,   -20,   nil ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,    12,    47,   nil,   nil,    32 ]
+   nil,   nil,   nil,   nil,    12,    48,   nil,   nil,    32 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  2, 23, :_reduce_1,
-  3, 23, :_reduce_2,
-  4, 23, :_reduce_3,
-  2, 24, :_reduce_4,
-  0, 25, :_reduce_5,
-  2, 25, :_reduce_6,
-  4, 25, :_reduce_7,
-  3, 25, :_reduce_8,
-  3, 25, :_reduce_9,
-  4, 25, :_reduce_10,
-  4, 25, :_reduce_11,
-  2, 25, :_reduce_12,
-  3, 25, :_reduce_13,
-  3, 25, :_reduce_14,
-  4, 25, :_reduce_15,
-  3, 25, :_reduce_16,
-  3, 25, :_reduce_17,
-  4, 25, :_reduce_18,
-  4, 25, :_reduce_19,
-  3, 25, :_reduce_20,
-  2, 26, :_reduce_21,
-  2, 26, :_reduce_22,
-  3, 26, :_reduce_23,
-  3, 26, :_reduce_24,
-  3, 29, :_reduce_25,
-  3, 29, :_reduce_26,
+  2, 24, :_reduce_1,
+  3, 24, :_reduce_2,
+  4, 24, :_reduce_3,
+  2, 25, :_reduce_4,
+  0, 26, :_reduce_5,
+  2, 26, :_reduce_6,
+  4, 26, :_reduce_7,
+  3, 26, :_reduce_8,
+  3, 26, :_reduce_9,
+  4, 26, :_reduce_10,
+  4, 26, :_reduce_11,
+  5, 26, :_reduce_12,
+  2, 26, :_reduce_13,
+  3, 26, :_reduce_14,
+  3, 26, :_reduce_15,
+  4, 26, :_reduce_16,
+  3, 26, :_reduce_17,
+  3, 26, :_reduce_18,
+  4, 26, :_reduce_19,
+  4, 26, :_reduce_20,
+  3, 26, :_reduce_21,
+  2, 27, :_reduce_22,
+  2, 27, :_reduce_23,
+  3, 27, :_reduce_24,
+  3, 27, :_reduce_25,
+  3, 30, :_reduce_26,
+  3, 30, :_reduce_27,
+  1, 30, :_reduce_none,
+  3, 29, :_reduce_29,
+  3, 29, :_reduce_30,
   1, 29, :_reduce_none,
-  3, 28, :_reduce_28,
-  3, 28, :_reduce_29,
+  2, 28, :_reduce_32,
+  2, 28, :_reduce_33,
   1, 28, :_reduce_none,
-  2, 27, :_reduce_31,
-  2, 27, :_reduce_32,
-  1, 27, :_reduce_none,
-  3, 30, :_reduce_34,
-  1, 30, :_reduce_35 ]
+  3, 31, :_reduce_35,
+  1, 31, :_reduce_36 ]
 
-racc_reduce_n = 36
+racc_reduce_n = 37
 
-racc_shift_n = 71
+racc_shift_n = 74
 
 racc_token_table = {
   false => 0,
@@ -205,9 +207,10 @@ racc_token_table = {
   :BRACKETR => 18,
   :AT => 19,
   :SHARP => 20,
-  :DOLLAR => 21 }
+  :DOLLAR => 21,
+  :TILDE => 22 }
 
-racc_nt_base = 22
+racc_nt_base = 23
 
 racc_use_result_var = true
 
@@ -251,6 +254,7 @@ Racc_token_to_s_table = [
   "AT",
   "SHARP",
   "DOLLAR",
+  "TILDE",
   "$start",
   "expr",
   "rate",
@@ -368,6 +372,16 @@ def _reduce_11(val, _values, result)
 end
 
 def _reduce_12(val, _values, result)
+            option, _, _, _, term = val
+            raise ParseError unless @version == :v2_5 && option.settable_first_roll_adjust_option?
+
+            option.first_modify_ssp = term.to_i
+            result = option
+
+    result
+end
+
+def _reduce_13(val, _values, result)
             option, _ = val
             raise ParseError unless option.modifier_after_half.nil?
 
@@ -377,7 +391,7 @@ def _reduce_12(val, _values, result)
     result
 end
 
-def _reduce_13(val, _values, result)
+def _reduce_14(val, _values, result)
             option, _, term = val
             raise ParseError unless option.modifier_after_half.nil?
 
@@ -387,7 +401,7 @@ def _reduce_13(val, _values, result)
     result
 end
 
-def _reduce_14(val, _values, result)
+def _reduce_15(val, _values, result)
             option, _, _ = val
             raise ParseError if option.modifier_after_one_and_a_half
 
@@ -397,7 +411,7 @@ def _reduce_14(val, _values, result)
     result
 end
 
-def _reduce_15(val, _values, result)
+def _reduce_16(val, _values, result)
             option, _, _, term = val
             raise ParseError if option.modifier_after_one_and_a_half
 
@@ -407,7 +421,7 @@ def _reduce_15(val, _values, result)
     result
 end
 
-def _reduce_16(val, _values, result)
+def _reduce_17(val, _values, result)
             option, _, term = val
             raise ParseError unless [:v2_5, :v2_0].include?(@version) && option.rateup.nil?
 
@@ -417,7 +431,7 @@ def _reduce_16(val, _values, result)
     result
 end
 
-def _reduce_17(val, _values, result)
+def _reduce_18(val, _values, result)
             option, _, _ = val
             raise ParseError unless [:v2_5, :v2_0].include?(@version) && option.settable_non_2d_roll_option?
 
@@ -427,7 +441,7 @@ def _reduce_17(val, _values, result)
     result
 end
 
-def _reduce_18(val, _values, result)
+def _reduce_19(val, _values, result)
             option, _, _, term = val
             raise ParseError unless [:v2_5, :v2_0].include?(@version) && option.settable_non_2d_roll_option?
 
@@ -437,7 +451,7 @@ def _reduce_18(val, _values, result)
     result
 end
 
-def _reduce_19(val, _values, result)
+def _reduce_20(val, _values, result)
             option, _, _, term = val
             raise ParseError unless [:v2_5, :v2_0].include?(@version) && option.settable_non_2d_roll_option?
 
@@ -447,7 +461,7 @@ def _reduce_19(val, _values, result)
     result
 end
 
-def _reduce_20(val, _values, result)
+def _reduce_21(val, _values, result)
             option, _, term = val
             raise ParseError unless @version == :v2_5 && option.kept_modify.nil?
 
@@ -457,69 +471,69 @@ def _reduce_20(val, _values, result)
     result
 end
 
-def _reduce_21(val, _values, result)
+def _reduce_22(val, _values, result)
  result = val[1]
     result
 end
 
-def _reduce_22(val, _values, result)
+def _reduce_23(val, _values, result)
  result = Arithmetic::Node::Negative.new(val[1])
     result
 end
 
-def _reduce_23(val, _values, result)
+def _reduce_24(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :+, val[2])
     result
 end
 
-def _reduce_24(val, _values, result)
+def _reduce_25(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :-, val[2])
     result
 end
 
-def _reduce_25(val, _values, result)
+def _reduce_26(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :+, val[2])
     result
 end
 
-def _reduce_26(val, _values, result)
+def _reduce_27(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :-, val[2])
     result
 end
 
-# reduce 27 omitted
+# reduce 28 omitted
 
-def _reduce_28(val, _values, result)
+def _reduce_29(val, _values, result)
  result = Arithmetic::Node::BinaryOp.new(val[0], :*, val[2])
     result
 end
 
-def _reduce_29(val, _values, result)
+def _reduce_30(val, _values, result)
          result = Arithmetic::Node::DivideWithGameSystemDefault.new(val[0], val[2])
 
     result
 end
 
-# reduce 30 omitted
+# reduce 31 omitted
 
-def _reduce_31(val, _values, result)
+def _reduce_32(val, _values, result)
  result = val[1]
     result
 end
 
-def _reduce_32(val, _values, result)
+def _reduce_33(val, _values, result)
  result = Arithmetic::Node::Negative.new(val[1])
     result
 end
 
-# reduce 33 omitted
+# reduce 34 omitted
 
-def _reduce_34(val, _values, result)
+def _reduce_35(val, _values, result)
  result = val[1]
     result
 end
 
-def _reduce_35(val, _values, result)
+def _reduce_36(val, _values, result)
  result = Arithmetic::Node::Number.new(val[0])
     result
 end