bcdice 3.3.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,37 +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]
+        attr_accessor :semi_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
-          @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
+          @rateup = 0
+          @semi_fixed_val = 0
+          @tmp_fixed_val = 0
+          @modifier_after_half = nil
         end
 
         # @return [Boolean]
@@ -46,35 +57,17 @@ module BCDice
         end
 
         # @return [Integer]
-        def critical
-          crit = @critical || (half ? 13 : 10)
-          crit = 3 if crit < 3
-          return crit
-        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 kept_modify
-          return @kept_modify || 0
+        def min_critical
+          if @semi_fixed_val <= 1
+            return 3
+          else
+            return (@semi_fixed_val + @kept_modify + 2).clamp(3, 13)
+          end
         end
 
-        # @return [Integer]
-        def modifier_after_half
-          return @modifier_after_half || 0
+        # @return [Boolean]
+        def infinite_roll?
+          return critical < min_critical
         end
 
         # @return [String]
@@ -86,6 +79,8 @@ module BCDice
           output += "m[#{first_to}]" if first_to != 0
           output += "r[#{rateup}]" if rateup != 0
           output += "gf" if @greatest_fortune
+          output += "sf[#{semi_fixed_val}]" if semi_fixed_val != 0
+          output += "tf[#{tmp_fixed_val}]" if tmp_fixed_val != 0
           output += "a[#{Format.modifier(kept_modify)}]" if kept_modify != 0
 
           if @modifier != 0