bcdice 3.0.0.pre.rc.2 → 3.1.3

data/lib/bcdice/game_system/SevenFortressMobius.rb

@@ -23,7 +23,7 @@ module BCDice
         　例）12SFM-5@7#2　　1SFM　　50SFM+5@7,10#2,5　50SFM-5+10@7,10#2,5+15+25
       INFO_MESSAGE_TEXT
 
-      register_prefix('([-+]?\d+)?SFM.*', '2R6.*')
+      register_prefix('([-+]?\d+)?SFM', '2R6')
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/SharedFantasia.rb

@@ -21,7 +21,7 @@ module BCDice
         例) SF+4>=9 : 2D6して4を足した値が9以上なら成功
       MESSAGETEXT
 
-      register_prefix('SF.*', 'ST.*')
+      register_prefix('SF', 'ST')
 
       def change_text(string)
         string.gsub(/SF/i, "2D6").gsub(/ST/i, "2D6")

data/lib/bcdice/game_system/ShinkuuGakuen.rb

@@ -34,8 +34,8 @@ module BCDice
       MESSAGETEXT
 
       register_prefix(
-        'CRL.*', 'CSW.*', 'CLS.*', 'CSS.*', 'CSP.*', 'CAX.*', 'CCL.*', 'CMA.*', 'CBX.*', 'CPR.*', 'CST.*',
-        'RL.*', 'SW.*', 'LS.*', 'SS.*', 'SP.*', 'AX.*', 'CL.*', 'BW.*', 'MA.*', 'BX.*', 'PR.*', 'ST.*'
+        'CRL', 'CSW', 'CLS', 'CSS', 'CSP', 'CAX', 'CCL', 'CMA', 'CBX', 'CPR', 'CST',
+        'RL', 'SW', 'LS', 'SS', 'SP', 'AX', 'CL', 'BW', 'MA', 'BX', 'PR', 'ST'
       )
 
       def eval_game_system_specific_command(command)

data/lib/bcdice/game_system/ShinobiGami.rb

@@ -109,10 +109,10 @@ module BCDice
         total = dice_total + cmd.modify_number
 
         result =
-          if dice_total >= cmd.critical
-            Result.critical(SPECIAL)
-          elsif dice_total <= cmd.fumble
+          if dice_total <= cmd.fumble
             Result.fumble("ファンブル")
+          elsif dice_total >= cmd.critical
+            Result.critical(SPECIAL)
           elsif cmd.cmp_op.nil?
             Result.new
           elsif total >= cmd.target_number

data/lib/bcdice/game_system/Skynauts.rb

@@ -25,14 +25,14 @@ module BCDice
         ◆砲撃判定+ダメージチェック　(BOMn/Dx/y@m)　n:目標値（省略時:7）
         　x:ダメージ左側の値、y:ダメージ右側の値
         　m:《弾道学》（省略可）上:8、下:2、左:4、右:6
-        　例） BOM/D/4　BOM9/D19@4
+        　例） BOM/D/4　BOM9/D19/2@4
         ◆《回避運動》　(AVOn@mXX)　n:目標値（省略時:7）
         　m:回避方向。上:8、下:2、左:4、右:6、XX：ダメージチェック結果
         　例）
         　AVO9@8[縦1,横4],[縦2,横6],[縦3,横8]　AVO@2[縦6,横4],[縦2,横6]
       MESSAGETEXT
 
-      register_prefix('D.*', '2[Dd]6<=.*', 'SN.*', 'NV.*', 'AVO.*', 'BOM.*')
+      register_prefix('D', '2D6<=', 'SN', 'NV', 'AVO', 'BOM')
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/SteamPunkers.rb

@@ -481,7 +481,7 @@ module BCDice
         )
       }.freeze
 
-      register_prefix('SP.*', TABLES.keys)
+      register_prefix('SP', TABLES.keys)
     end
   end
 end

data/lib/bcdice/game_system/SterileLife.rb

@@ -37,8 +37,7 @@ module BCDice
         　・超未来の宇宙船内　INT
       MESSAGETEXT
 
-      register_prefix('(\d+)*DA.*\[(\d+),(\d+)(,(\d+))?\]', 'VPFT', 'VNFT', 'VNRT', 'AAFT', 'AST', 'RNST', 'RET', 'TRST', 'TRAT', 'TRMT', 'TROT', 'TET', 'ENT', 'CUT', 'NAT', 'INT') # '(\d+)*DA.*\[.*\]'
-
+      register_prefix('\d*DA.*\[(\d+),(\d+)(,(\d+))?\]', 'VPFT', 'VNFT', 'VNRT', 'AAFT', 'AST', 'RNST', 'RET', 'TRST', 'TRAT', 'TRMT', 'TROT', 'TET', 'ENT', 'CUT', 'NAT', 'INT')
       def eval_game_system_specific_command(command) # ダイスロールコマンド
         # 通常判定部分をgetJudgeResultコマンドに切り分け
         output = getJudgeResult(command)
@@ -104,7 +103,7 @@ module BCDice
 
       def getJudgeResult(command)
         case command
-        when /(\d+)*DA([\d+*\-]*\d)?\[(\d+),(\d+)(,(\d+))?\]/i
+        when /(\d+)?DA([\d+*\-]*\d)?\[(\d+),(\d+)(,(\d+))?\]/i
           number = (Regexp.last_match(1) || 1).to_i
           correction = (Regexp.last_match(2) || 0).to_i
           single = (Regexp.last_match(3) || 4).to_i

data/lib/bcdice/game_system/StrangerOfSwordCity.rb

@@ -10,7 +10,7 @@ module BCDice
       NAME = '剣の街の異邦人TRPG'
 
       # ゲームシステム名の読みがな
-      SORT_KEY = 'けんのまちのいほうしんTRPG'
+      SORT_KEY = 'つるきのまちのいほうしんTRPG'
 
       # ダイスボットの使い方
       HELP_MESSAGE = <<~INFO_MESSAGE_TEXT
@@ -21,7 +21,7 @@ module BCDice
         ・D66ダイスあり
       INFO_MESSAGE_TEXT
 
-      register_prefix('\d+SR.*')
+      register_prefix('\d+SR')
 
       def initialize(command)
         super(command)

data/lib/bcdice/game_system/SwordWorld.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "bcdice/game_system/sword_world/rating_parser"
+
 module BCDice
   module GameSystem
     class SwordWorld < Base
@@ -15,35 +17,13 @@ module BCDice
       # ダイスボットの使い方
       HELP_MESSAGE = "・SW　レーティング表　(Kx[c]+m$f) (x:キー, c:クリティカル値, m:ボーナス, f:出目修正)\n"
 
-      register_prefix('H?K\d+.*')
+      register_prefix('H?K\d+')
 
       def initialize(command)
         super(command)
         @rating_table = 0
       end
 
-      # change_textで使うレーティング表コマンドの正規表現
-      #
-      # SW 2.5のダイスボットでも必要なため、共通化のために定数として定義する
-      RATING_TABLE_RE_FOR_CHANGE_TEXT = /\AS?H?K\d+/i.freeze
-
-      # コマンド実行前にメッセージを置換する
-      # @param [String] string 受信したメッセージ
-      # @return [String]
-      def replace_text(string)
-        return string unless RATING_TABLE_RE_FOR_CHANGE_TEXT.match?(string)
-
-        string
-          .gsub(/\[(\d+)\]/) { "c[#{Regexp.last_match(1)}]" }
-          .gsub(/@(\d+)/) { "c[#{Regexp.last_match(1)}]" }
-          .gsub(/\$([-+]?\d+)/) { "m[#{Regexp.last_match(1)}]" }
-          .gsub(/r([-+]?\d+)/i) { "r[#{Regexp.last_match(1)}]" }
-      end
-
-      def getRatingCommandStrings
-        "cmCM"
-      end
-
       def result_2d6(total, dice_total, _dice_list, cmp_op, target)
         if dice_total >= 12
           Result.critical("自動的成功")
@@ -64,60 +44,32 @@ module BCDice
 
       private
 
+      def rating_parser
+        return RatingParser.new
+      end
+
       ####################        SWレーティング表       ########################
       def rating(string) # レーティング表
-        string = replace_text(string)
         debug("rating string", string)
+        command = rating_parser.parse(string)
 
-        commands = getRatingCommandStrings
-
-        m = /^S?(H?K[\d+\-]+([#{commands}]\[([\d+\-]+)\])*([\d+\-]*)([CMR]\[([\d+\-]+)\]|GF|H)*)/i.match(string)
-        unless m
+        unless command
           debug("not matched")
           return '1'
         end
 
-        string = m[1]
-        half = string.include?("H")
-
-        rateUp, string = getRateUpFromString(string)
-        crit, string = getCriticalFromString(string, half)
-        firstDiceChanteTo, firstDiceChangeModify, string = getDiceChangesFromString(string)
-
-        key, addValue = getKeyAndAddValueFromString(string)
-
-        return '1' unless key =~ /(\d+)/
-
-        key = Regexp.last_match(1).to_i
-
         # 2.0対応
         rate_sw2_0 = getSW2_0_RatingTable
 
         keyMax = rate_sw2_0.length - 1
         debug("keyMax", keyMax)
-        if key > keyMax
+        if command.rate > keyMax
           return "キーナンバーは#{keyMax}までです"
         end
 
         newRates = getNewRates(rate_sw2_0)
 
-        output = "KeyNo.#{key}"
-
-        output += "c[#{crit}]" if crit < 13
-        output += "m[#{firstDiceChangeModify}]" if firstDiceChangeModify != 0
-        output += "m[#{firstDiceChanteTo}]" if  firstDiceChanteTo != 0
-        output += "r[#{rateUp}]" if rateUp != 0
-
-        output, values = getAdditionalString(string, output)
-
-        debug('output', output)
-
-        if addValue != 0
-          output += "+#{addValue}" if addValue > 0
-          output += addValue.to_s if addValue < 0
-        end
-
-        output += " ＞ "
+        output = "#{command} ＞ "
 
         diceResultTotals = []
         diceResults = []
@@ -126,17 +78,19 @@ module BCDice
         diceOnlyTotal = 0
         totalValue = 0
         round = 0
+        first_to = command.first_to
+        first_modify = command.first_modify
 
         loop do
-          dice_raw, diceText = rollDice(values)
+          dice_raw, diceText = rollDice(command)
           dice = dice_raw
 
-          if  firstDiceChanteTo != 0
-            dice = dice_raw = firstDiceChanteTo
-            firstDiceChanteTo = 0
-          elsif  firstDiceChangeModify != 0
-            dice += firstDiceChangeModify.to_i
-            firstDiceChangeModify = 0
+          if first_to != 0
+            dice = dice_raw = first_to
+            first_to = 0
+          elsif first_modify != 0
+            dice += first_modify
+            first_modify = 0
           end
 
           # 出目がピンゾロの時にはそこで終了
@@ -149,12 +103,12 @@ module BCDice
             break
           end
 
-          dice += getAdditionalDiceValue(dice, values)
+          dice += command.kept_modify if (command.kept_modify != 0) && (dice != 2)
 
           dice = 2 if dice < 2
           dice = 12 if dice > 12
 
-          currentKey = [key + round * rateUp, keyMax].min
+          currentKey = [command.rate + round * command.rateup, keyMax].min
           debug("currentKey", currentKey)
           rateValue = newRates[dice][currentKey]
           debug("rateValue", rateValue)
@@ -168,79 +122,15 @@ module BCDice
 
           round += 1
 
-          break unless dice >= crit
+          break unless dice >= command.critical
         end
 
-        output += getResultText(totalValue, addValue, diceResults, diceResultTotals,
-                                rateResults, diceOnlyTotal, round, half)
+        output += getResultText(totalValue, command, diceResults, diceResultTotals,
+                                rateResults, diceOnlyTotal, round)
 
         return output
       end
 
-      def getAdditionalString(_string, output)
-        values = {}
-        return output, values
-      end
-
-      def getAdditionalDiceValue(_dice, _values)
-        0
-      end
-
-      def getCriticalFromString(string, half)
-        crit = half ? 13 : 10
-
-        regexp = /c\[(\d+)\]/i
-
-        if regexp =~ string
-          crit = Regexp.last_match(1).to_i
-          crit = 3 if crit < 3 # エラートラップ(クリティカル値が3未満なら3とする)
-          string = string.gsub(regexp, '')
-        end
-
-        return crit, string
-      end
-
-      def getDiceChangesFromString(string)
-        firstDiceChanteTo = 0
-        firstDiceChangeModify = 0
-
-        regexp = /m\[([\d+\-]+)\]/i
-
-        if  regexp =~ string
-          firstDiceChangeModify = Regexp.last_match(1)
-
-          unless /[+\-]/ =~ firstDiceChangeModify
-            firstDiceChanteTo = firstDiceChangeModify.to_i
-            firstDiceChangeModify = 0
-          end
-
-          string = string.gsub(regexp, '')
-        end
-
-        return firstDiceChanteTo, firstDiceChangeModify, string
-      end
-
-      def getRateUpFromString(string)
-        rateUp = 0
-        return rateUp, string
-      end
-
-      def getKeyAndAddValueFromString(string)
-        key = nil
-        addValue = 0
-
-        if /K(\d+)([\d+\-]*)/i =~ string # ボーナスの抽出
-          key = Regexp.last_match(1)
-          if Regexp.last_match(2)
-            addValue = ArithmeticEvaluator.eval(Regexp.last_match(2))
-          end
-        else
-          key = string
-        end
-
-        return key, addValue
-      end
-
       def getSW2_0_RatingTable
         rate_sw2_0 = [
           # 0
@@ -397,7 +287,7 @@ module BCDice
         return newRates
       end
 
-      def rollDice(_values)
+      def rollDice(_command)
         dice_list = @randomizer.roll_barabara(2, 6)
         total = dice_list.sum()
         dice_str = dice_list.join(",")
@@ -405,15 +295,14 @@ module BCDice
       end
 
       # @param rating_total [Integer]
-      # @param modifier [Integer]
+      # @param command [SwordWorld::RatingParsed]
       # @param diceResults [Array<String>]
       # @param diceResultTotals [Array<String>]
       # @param rateResults  [Array<String>]
       # @param dice_total [Integer]
       # @param round [Integer]
-      # @param half [Boolean]
-      def getResultText(rating_total, modifier, diceResults, diceResultTotals,
-                        rateResults, dice_total, round, half)
+      def getResultText(rating_total, command, diceResults, diceResultTotals,
+                        rateResults, dice_total, round)
         sequence = []
 
         sequence.push("2D:[#{diceResults.join(' ')}]=#{diceResultTotals.join(',')}")
@@ -425,14 +314,21 @@ module BCDice
         end
 
         # rate回数が1回で、修正値がない時には途中式と最終結果が一致するので、途中式を省略する
-        if rateResults.size > 1 || modifier != 0
-          text = rateResults.join(',') + Format.modifier(modifier)
-          if half
+        if rateResults.size > 1 || command.modifier != 0
+          text = rateResults.join(',') + Format.modifier(command.modifier)
+          if command.half
             text = "(#{text})/2"
+            if command.modifier_after_half != 0
+              text += Format.modifier(command.modifier_after_half)
+            end
+          end
+          sequence.push(text)
+        elsif command.half
+          text = "#{rateResults.first}/2"
+          if command.modifier_after_half != 0
+            text += Format.modifier(command.modifier_after_half)
           end
           sequence.push(text)
-        elsif half
-          sequence.push("#{rateResults.first}/2")
         end
 
         if round > 1
@@ -440,9 +336,12 @@ module BCDice
           sequence.push(round_text)
         end
 
-        total = rating_total + modifier
-        if half
+        total = rating_total + command.modifier
+        if command.half
           total = (total / 2.0).ceil
+          if command.modifier_after_half != 0
+            total += command.modifier_after_half
+          end
         end
 
         total_text = total.to_s
@@ -450,41 +349,6 @@ module BCDice
 
         return sequence.join(" ＞ ")
       end
-
-      def setRatingTable(tnick)
-        mode_str = ""
-        pre_mode = @rating_table
-
-        if /(\d+)/ =~ tnick
-          @rating_table = Regexp.last_match(1).to_i
-          if @rating_table > 1
-            mode_str = "2.0-mode"
-            @rating_table = 2
-          elsif @rating_table > 0
-            mode_str = "new-mode"
-            @rating_table = 1
-          else
-            mode_str = "old-mode"
-            @rating_table = 0
-          end
-        else
-          case tnick
-          when /old/i
-            @rating_table = 0
-            mode_str = "old-mode"
-          when /new/i
-            @rating_table = 1
-            mode_str = "new-mode"
-          when /2\.0/i
-            @rating_table = 2
-            mode_str = "2.0-mode"
-          end
-        end
-
-        return '1' if @rating_table == pre_mode
-
-        return "RatingTableを#{mode_str}に変更しました"
-      end
     end
   end
 end