bcdice 3.0.0.pre.alpha.2 → 3.0.0.pre.rc.1

data/lib/bcdice/game_system/StellarKnights.rb

@@ -126,15 +126,13 @@ module BCDice
 
         # 正規表現の都合で先頭に ',' が残っているので取っておく
         text = text[1..-1]
-        rules = text.split(',').map do |rule|
+        text.split(',').map do |rule|
           v = rule.split('>').map(&:to_i)
           {
             from: v[0],
             to: v[1],
           }
         end
-
-        rules
       end
 
       def roll_all_situation_b2_tables

data/lib/bcdice/game_system/SterileLife.rb

@@ -104,7 +104,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

@@ -46,7 +46,7 @@ module BCDice
         debug("checkRoll begin command", command)
 
         result = ''
-        return result unless command =~ /^(\d+)SR([\+\-]?\d+)?(>=(\d+))?$/i
+        return result unless command =~ /^(\d+)SR([+\-]?\d+)?(>=(\d+))?$/i
 
         diceCount = Regexp.last_match(1).to_i
         modify = Regexp.last_match(2).to_i

data/lib/bcdice/game_system/StratoShout.rb

@@ -17,15 +17,14 @@ module BCDice
 
         VOT, GUT, BAT, KEYT, DRT: (ボーカル、ギター、ベース、キーボード、ドラム)トラブル表
         EMO: 感情表
-        AT[1-6]: 特技表(空: ランダム 1: 主義 2: 身体 3: モチーフ 4: エモーション 5: 行動 6: 逆境)
+        ATn, RTTn: 特技表(n＝分野。空:ランダム 1:主義 2:身体 3:モチーフ 4:エモーション 5:行動 6:逆境)
+        RCT: 分野ランダム表
         SCENE, MACHI, GAKKO, BAND: (汎用、街角、学校、バンド)シーン表 接近シーンで使用
         TENKAI: シーン展開表 奔走シーン 練習シーンで使用
 
-        []内は省略可　D66入れ替えあり
+        D66入れ替えあり
       INFO_MESSAGE_TEXT
 
-      register_prefix('AT[1-6]?')
-
       def initialize(command)
         super(command)
 
@@ -52,37 +51,7 @@ module BCDice
       end
 
       def eval_game_system_specific_command(command)
-        if (m = /^AT([1-6]?)$/.match(command))
-          value = m[1].to_i
-          return getSkillList(value)
-        end
-
-        roll_tables(command, self.class::TABLES)
-      end
-
-      def getSkillList(field = 0)
-        title = translate("StratoShout.AT.name")
-        table = translate("StratoShout.AT.table")
-
-        number1 = 0
-        if field == 0
-          table, number1 = get_table_by_1d6(table)
-        else
-          table = table[field - 1]
-        end
-
-        fieldName, table = table
-        skill, number2 = get_table_by_2d6(table)
-
-        text = title
-        if field == 0
-          text += " ＞ [#{number1},#{number2}]"
-        else
-          skill_class = translate("StratoShout.AT.skill_class", name: fieldName)
-          text += "#{skill_class} ＞ [#{number2}]"
-        end
-
-        return "#{text} ＞ 《#{skill}／#{fieldName}#{number2}》"
+        roll_tables(command, self.class::TABLES) || self.class::RTT.roll_command(@randomizer, command)
       end
 
       class << self
@@ -103,11 +72,16 @@ module BCDice
             "TENKAI" => DiceTable::D66Table.from_i18n("StratoShout.table.TENKAI", locale),
           }
         end
+
+        def translate_rtt(locale)
+          DiceTable::SaiFicSkillTable.from_i18n("StratoShout.RTT", locale, rtt: 'AT', rttn: ['AT1', 'AT2', 'AT3', 'AT4', 'AT5', 'AT6'])
+        end
       end
 
       TABLES = translate_tables(:ja_jp)
+      RTT = translate_rtt(:ja_jp)
 
-      register_prefix(TABLES.keys)
+      register_prefix(TABLES.keys, RTT.prefixes)
     end
   end
 end

data/lib/bcdice/game_system/StratoShout_Korean.rb

@@ -18,7 +18,7 @@ module BCDice
       HELP_MESSAGE = <<~INFO_MESSAGE_TEXT
         VOT, GUT, BAT, KEYT, DRT: (보컬, 기타, 베이스, 키보드, 드럼)트러블표
         EMO: 감정표
-        AT[1-6]: 특기표(공백: 랜덤 1: 주의 2: 신체 3: 모티브 4: 이모션 5: 행동 6: 역경)
+        RTT[1-6], AT[1-6]: 특기표(공백: 랜덤 1: 주의 2: 신체 3: 모티브 4: 이모션 5: 행동 6: 역경)
         SCENE, MACHI, GAKKO, BAND: (범용, 거리, 학교, 밴드)장면표. 접근 장면에 사용
         TENKAI: 장면 전개표. 분주 장면, 연습 장면에 사용
         []내는 생략가능　D66는 변동있음
@@ -33,6 +33,7 @@ module BCDice
       end
 
       TABLES = translate_tables(:ko_kr).freeze
+      RTT = translate_rtt(:ko_kr)
     end
   end
 end

data/lib/bcdice/game_system/SwordWorld.rb

@@ -71,7 +71,7 @@ module BCDice
 
         commands = getRatingCommandStrings
 
-        m = /^S?(H?K[\d\+\-]+([#{commands}]\[([\d\+\-]+)\])*([\d\+\-]*)([CMR]\[([\d\+\-]+)\]|GF|H)*)/i.match(string)
+        m = /^S?(H?K[\d+\-]+([#{commands}]\[([\d+\-]+)\])*([\d+\-]*)([CMR]\[([\d+\-]+)\]|GF|H)*)/i.match(string)
         unless m
           debug("not matched")
           return '1'
@@ -86,7 +86,7 @@ module BCDice
 
         key, addValue = getKeyAndAddValueFromString(string)
 
-        return '1' unless key =~ /([\d]+)/
+        return '1' unless key =~ /(\d+)/
 
         key = Regexp.last_match(1).to_i
 
@@ -204,12 +204,12 @@ module BCDice
         firstDiceChanteTo = 0
         firstDiceChangeModify = 0
 
-        regexp = /m\[([\d\+\-]+)\]/i
+        regexp = /m\[([\d+\-]+)\]/i
 
         if  regexp =~ string
           firstDiceChangeModify = Regexp.last_match(1)
 
-          unless /[\+\-]/ =~ firstDiceChangeModify
+          unless /[+\-]/ =~ firstDiceChangeModify
             firstDiceChanteTo = firstDiceChangeModify.to_i
             firstDiceChangeModify = 0
           end
@@ -229,7 +229,7 @@ module BCDice
         key = nil
         addValue = 0
 
-        if /K(\d+)([\d\+\-]*)/i =~ string # ボーナスの抽出
+        if /K(\d+)([\d+\-]*)/i =~ string # ボーナスの抽出
           key = Regexp.last_match(1)
           if Regexp.last_match(2)
             addValue = ArithmeticEvaluator.eval(Regexp.last_match(2))

data/lib/bcdice/game_system/SwordWorld2_5.rb

@@ -108,7 +108,7 @@ module BCDice
 
       def getKeptDiceChangesFromString(string)
         keptDiceChangeModify = 0
-        regexp = /a\[([\+\-]\d+)\]/i
+        regexp = /a\[([+\-]\d+)\]/i
         if regexp =~ string
           keptDiceChangeModify = Regexp.last_match(1)
           string = string.gsub(regexp, '')

data/lib/bcdice/game_system/TherapieSein.rb

@@ -36,13 +36,13 @@ module BCDice
         output =
           case command.upcase
 
-          when /(TS|OP)(\d+)?(([\+\-]\d+)*)(\@(\d+))?$/i
+          when /(TS|OP)(\d+)?(([+\-]\d+)*)(@(\d+))?$/i
             hasCritical = (Regexp.last_match(1) == "OP")
             target = (Regexp.last_match(6) || 0).to_i
             modify = (Regexp.last_match(2) || 0).to_i
             modifyAddString = Regexp.last_match(3)
 
-            modify_list = modifyAddString.scan(/[\+\-]\d+/) # 修正値を分割して配列へ
+            modify_list = modifyAddString.scan(/[+\-]\d+/) # 修正値を分割して配列へ
             modify_list.each { |i| modify += i.to_i }
 
             checkRoll(hasCritical, modify, target)

data/lib/bcdice/game_system/TokumeiTenkousei.rb

@@ -26,10 +26,10 @@ module BCDice
         @sort_add_dice = true
       end
 
-      register_prefix('\d+D6.*')
+      register_prefix('\d+D6')
 
       def eval_game_system_specific_command(command)
-        parser = CommandParser.new(/^\d+D6$/)
+        parser = Command::Parser.new(/\d+D6/, round_type: round_type)
         cmd = parser.parse(command)
         unless cmd
           return nil

data/lib/bcdice/game_system/Torg.rb

@@ -120,7 +120,7 @@ module BCDice
         ttype = ""
         value = 0
 
-        return nil unless /([RITMDB]T)(\d+([\+\-]\d+)*)/i =~ string
+        return nil unless /([RITMDB]T)(\d+([+\-]\d+)*)/i =~ string
 
         type = Regexp.last_match(1)
         num = Regexp.last_match(2)

data/lib/bcdice/game_system/TorgEternity.rb

@@ -42,9 +42,6 @@ module BCDice
         　・ロールボーナス表「BTx+y or BONUSx+y or TOTALx+y」 xは数値, yは技能基本値
       INFO_MESSAGE_TEXT
       register_prefix('TE.*', 'UP.*', 'POS.*', '\d+BD.*', 'TG.*', 'RT.*', 'Result.*', 'DT.*', 'damage.*', 'BT.*', 'bonus.*', 'total.*', '1R20.*')
-      def initialize(command)
-        super(command)
-      end
 
       def eval_game_system_specific_command(command)
         torg_check(command) ||
@@ -176,7 +173,7 @@ module BCDice
       # ダメージボーナスコマンド
       def getBonusDamageDiceCommandResult(command)
         debug("TorgEternity Bonus Damage Roll Command ? ", command)
-        m = /(\d+)(BD)(([\+\-]\d+)*)/i.match(command)
+        m = /(\d+)(BD)(([+\-]\d+)*)/i.match(command)
         unless m
           return nil
         end
@@ -196,7 +193,7 @@ module BCDice
       # 成功レベル表コマンド
       def getSuccessLevelDiceCommandResult(command)
         debug("TorgEternity Success Level Table Command ? ", command)
-        m = /(RT|Result)(\-*\d+([\+\-]\d+)*)/i.match(command)
+        m = /(RT|Result)(-*\d+([+\-]\d+)*)/i.match(command)
         unless m
           return nil
         end
@@ -216,7 +213,7 @@ module BCDice
       # ダメージ結果表コマンド
       def getDamageResultDiceCommandResult(command)
         debug("TorgEternity Damage Result Table Command ? ", command)
-        m = /(DT|Damage)(\-*\d+([\+\-]\d+)*)/i.match(command)
+        m = /(DT|Damage)(-*\d+([+\-]\d+)*)/i.match(command)
         unless m
           return nil
         end
@@ -232,7 +229,7 @@ module BCDice
       # ロールボーナス表コマンド
       def getRollBonusDiceCommandResult(command)
         debug("TorgEternity Roll Bonus Table Command ? ", command)
-        m = /(BT|Bonus)(\d+)(([\+\-]\d+)*)/i.match(command)
+        m = /(BT|Bonus)(\d+)(([+\-]\d+)*)/i.match(command)
         unless m
           return nil
         end

data/lib/bcdice/game_system/TrinitySeven.rb

@@ -44,14 +44,14 @@ module BCDice
           return "#{firstName} , #{secondName}"
         end
 
-        if /^TR([\+\-\d]*)<=([\d]*)([\+\-\d]*)/ =~ command
+        if /^TR([+\-\d]*)<=(\d*)([+\-\d]*)/ =~ command
           critical = Regexp.last_match(1).to_i + 7
           target = Regexp.last_match(2).to_i
           modify = Regexp.last_match(3).to_i
           return rollHit(command, critical, target, modify)
         end
 
-        if /^([\d]*)DM([\d]*)([\+\-\d]*)$/ =~ command
+        if /^(\d*)DM(\d*)([+\-\d]*)$/ =~ command
           diceCount = Regexp.last_match(1).to_i
           critical = Regexp.last_match(2).to_i
           modify = Regexp.last_match(3).to_i

data/lib/bcdice/game_system/TunnelsAndTrolls.rb

@@ -42,9 +42,9 @@ module BCDice
 
       def replace_text(string)
         if /BS/i =~ string
-          string = string.gsub(/(\d+)HBS([^\d\s][\+\-\d]+)/i) { "#{Regexp.last_match(1)}R6#{Regexp.last_match(2)}[H]" }
+          string = string.gsub(/(\d+)HBS([^\d\s][+\-\d]+)/i) { "#{Regexp.last_match(1)}R6#{Regexp.last_match(2)}[H]" }
           string = string.gsub(/(\d+)HBS/i) { "#{Regexp.last_match(1)}R6[H]" }
-          string = string.gsub(/(\d+)BS([^\d\s][\+\-\d]+)/i) { "#{Regexp.last_match(1)}R6#{Regexp.last_match(2)}" }
+          string = string.gsub(/(\d+)BS([^\d\s][+\-\d]+)/i) { "#{Regexp.last_match(1)}R6#{Regexp.last_match(2)}" }
           string = string.gsub(/(\d+)BS/i) { "#{Regexp.last_match(1)}R6" }
         end
 
@@ -61,7 +61,7 @@ module BCDice
 
         output = "1"
 
-        return output unless (m = /(^|\s)S?((\d+)[rR]6([\+\-\d]*)(\[(\w+)\])?)(\s|$)/i.match(string))
+        return output unless (m = /(^|\s)S?((\d+)[rR]6([+\-\d]*)(\[(\w+)\])?)(\s|$)/i.match(string))
 
         debug('tandt_berserk matched')
 
@@ -184,9 +184,9 @@ module BCDice
         command = command
                   .sub(/\d+LV$/i) { |level| level.to_i * 5 + 15 }
 
-        parser = CommandParser.new(/^\d+D6$/)
-                              .allow_cmp_op(nil, :>=)
-                              .enable_question_target()
+        parser = Command::Parser.new(/\d+D6/, round_type: round_type)
+                                .restrict_cmp_op_to(nil, :>=)
+                                .enable_question_target()
         cmd = parser.parse(command)
         unless cmd
           return nil

data/lib/bcdice/game_system/TwilightGunsmoke.rb

@@ -58,7 +58,7 @@ module BCDice
       private
 
       def check_roll(command)
-        m = /^2D6([\+\-\d]*)>=(\d+)(\[(\d+)?(,(\d+))?\])?$/i.match(command)
+        m = /^2D6([+\-\d]*)>=(\d+)(\[(\d+)?(,(\d+))?\])?$/i.match(command)
         unless m
           return nil
         end

data/lib/bcdice/game_system/Utakaze.rb

@@ -39,7 +39,7 @@ module BCDice
         result = ''
 
         case command
-        when /(\d+)?UK(\@?(\d))?(>=(\d+))?/i
+        when /(\d+)?UK(@?(\d))?(>=(\d+))?/i
           base = (Regexp.last_match(1) || 2).to_i
           crit = Regexp.last_match(3).to_i
           diff = Regexp.last_match(5).to_i

data/lib/bcdice/game_system/Warhammer.rb

@@ -255,18 +255,18 @@ module BCDice
         debug("pos_type", pos_type)
         if pos_type != ""
           case pos_type
-          when /\@(2W|W2)/i
+          when /@(2W|W2)/i
             pos_t = 1
-          when /\@(4W|W4)/i
+          when /@(4W|W4)/i
             pos_t = 4
-          when /\@(4H|H4)/i
+          when /@(4H|H4)/i
             pos_t = 3
-          when /\@4/i
+          when /@4/i
             pos_t = 2
-          when /\@W/i
+          when /@W/i
             pos_t = 5
           else
-            unless  /\@(2H|H2|2)/i =~ pos_type
+            unless  /@(2H|H2|2)/i =~ pos_type
               pos_t = -1
             end
           end

data/lib/bcdice/game_system/Warhammer4.rb

@@ -263,19 +263,16 @@ module BCDice
 
       def additional_result(total, target_number)
         tens, ones = split_d100(total)
-        result =
-          if (total > target_number) || (total > 95) # 自動失敗時のファンブル処理も
-            if ones == tens
-              "ファンブル"
-            end
-          elsif ones == tens
-            "クリティカル"
-          else
-            # 一の位と十の位を入れ替えて参照する
-            HIT_PARTS_TABLE.fetch(merge_d100(ones, tens)).content
+        if (total > target_number) || (total > 95) # 自動失敗時のファンブル処理も
+          if ones == tens
+            "ファンブル"
           end
-
-        result
+        elsif ones == tens
+          "クリティカル"
+        else
+          # 一の位と十の位を入れ替えて参照する
+          HIT_PARTS_TABLE.fetch(merge_d100(ones, tens)).content
+        end
       end
 
       def split_d100(dice)

data/lib/bcdice/game_system/ZettaiReido.rb

@@ -23,7 +23,7 @@ module BCDice
       register_prefix('\d+\-2DR.*')
 
       def eval_game_system_specific_command(command)
-        return nil unless command =~ /^(\d+)-2DR([\+\-\d]*)(>=(\d+))?$/i
+        return nil unless command =~ /^(\d+)-2DR([+\-\d]*)(>=(\d+))?$/i
 
         baseAvility = Regexp.last_match(1).to_i
         modText = Regexp.last_match(2)

data/lib/bcdice/normalize.rb

@@ -18,7 +18,7 @@ module BCDice
         :<
       when />/
         :>
-      when /\=/
+      when /=/
         :==
       end
     end

data/lib/bcdice/preprocessor.rb

@@ -29,7 +29,7 @@ module BCDice
 
       @text = @game_system.change_text(@text)
 
-      replace_implicit_d6()
+      replace_implicit_d()
 
       return @text
     end
@@ -45,18 +45,22 @@ module BCDice
     def replace_parentheses
       loop do
         prev = @text
-        @text = @text.gsub(%r{\([\d/\+\*\-]+\)}) do |expr|
-          ae = ArithmeticEvaluator.new(expr, round_type: @game_system.round_type)
-          val = ae.eval
-          ae.error? ? expr : val
+        @text = @text.gsub(%r{\([\d/+*\-CURF]+\)}) do |expr|
+          Arithmetic.eval(expr, @game_system.round_type) || expr
         end
         break if prev == @text
       end
     end
 
-    # nDをnD6に置き換える
-    def replace_implicit_d6
-      @text = @text.gsub(/(\d+)D([^\w]|$)/i) { "#{Regexp.last_match(1)}D6#{Regexp.last_match(2)}" }
+    # nDをゲームシステムに応じて置き換える
+    def replace_implicit_d
+      @text = @text.gsub(/(\d+)D([^\w]|$)/i) do
+        times = Regexp.last_match(1)
+        sides = @game_system.sides_implicit_d
+        trailer = Regexp.last_match(2)
+
+        "#{times}D#{sides}#{trailer}"
+      end
     end
   end
 end