bcdice 3.2.0 → 3.3.0

data/lib/bcdice/game_system/Utakaze.rb

@@ -18,87 +18,92 @@ module BCDice
           n個のサイコロで行為判定ロール。ゾロ目の最大個数を成功レベルとして表示。nを省略すると2UK扱い。
           例）3UK ：サイコロ3個で行為判定
           例）UK  ：サイコロ2個で行為判定
-          不等号用いた成否判定は現時点では実装してません。
+        ・難易度付き行為判定ロール（nUK>=t）
+          tに難易度を指定した行為判定ロール。
+          成功レベルと難易度tを比べて成否を判定します。
+          例）6UK>=3 ：サイコロ6個で行為判定して、成功レベル3が出れば成功。
         ・クリティカルコール付き行為判定ロール（nUK@c or nUKc）
-        　cに「龍のダイス目」を指定した行為判定ロール。
-          ゾロ目ではなく、cと同じ値の出目数x2が成功レベルとなります。
+          cに「龍のダイス目」を指定した行為判定ロール。
+          ゾロ目ではなく、cと同じ値の出目数x2が成功レベルとなります。難易度の指定も可能です。
           例）3UK@5 ：龍のダイス「月」でクリティカルコール宣言したサイコロ3個の行為判定
       MESSAGETEXT
 
       register_prefix('\d*UK')
 
-      def initialize(command)
-        super(command)
-        @arrayDragonDiceName = ['', '風', '雨', '雲', '影', '月', '歌']
-        @enabled_upcase_input = false
-      end
-
       def eval_game_system_specific_command(command)
         debug('eval_game_system_specific_command command', command)
 
-        result = ''
+        check_roll(command)
+      end
 
-        case command
-        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
-          result = checkRoll(base, crit, diff)
-        end
+      private
 
-        return nil if result.empty?
+      DRAGON_DICE_NAME = {
+        1 => "風",
+        2 => "雨",
+        3 => "雲",
+        4 => "影",
+        5 => "月",
+        6 => "歌"
+      }.freeze
 
-        return "#{command} ＞ #{result}"
-      end
+      def check_roll(command)
+        m = /^(\d+)?UK(@?(\d))?(>=(\d+))?$/i.match(command)
+        return nil unless m
 
-      def checkRoll(base, crit, diff = 0)
-        result = ""
+        base = (m[1] || 2).to_i
+        crit = m[3].to_i
+        diff = m[5].to_i
 
         base = getValue(base)
         crit = getValue(crit)
 
-        return result if base < 1
+        return nil if base < 1
 
         crit = 6 if crit > 6
 
-        result += "(#{base}d6)"
+        dice_list = @randomizer.roll_barabara(base, 6).sort
+        result = get_roll_result(dice_list, crit, diff)
 
-        diceList = @randomizer.roll_barabara(base, 6).sort
-
-        result += " ＞ [#{diceList.join(',')}] ＞ "
-        result += getRollResultString(diceList, crit, diff)
+        sequence = [
+          command,
+          "(#{base}D6)",
+          "[#{dice_list.join(',')}]",
+          result.text
+        ]
+        result.text = sequence.join(" ＞ ")
 
         return result
       end
 
-      def getRollResultString(diceList, crit, diff)
-        success, maxnum, setCount = getSuccessInfo(diceList, crit, diff)
+      def get_roll_result(diceList, crit, diff)
+        success, maxnum, setCount = getSuccessInfo(diceList, crit)
 
-        result = ""
+        sequence = []
 
         if isDragonDice(crit)
-          result += "龍のダイス「#{@arrayDragonDiceName[crit]}」(#{crit})を使用 ＞ "
+          sequence.push("龍のダイス「#{DRAGON_DICE_NAME[crit]}」(#{crit})を使用")
         end
 
-        if  success
-          result += "成功レベル:#{maxnum} (#{setCount}セット)"
-          if diff != 0
-            diffSuccess = (maxnum >= diff)
-            if diffSuccess
-              result += " ＞ 成功"
-            else
-              result += " ＞ 失敗"
-            end
-          end
-
+        if success
+          sequence.push("成功レベル:#{maxnum} (#{setCount}セット)")
         else
-          result += "失敗"
+          sequence.push("失敗")
+          return Result.failure(sequence.join(" ＞ "))
         end
 
-        return result
+        if diff == 0
+          return Result.success(sequence.join(" ＞ ")) # 難易度なしでも成功として扱う
+        elsif maxnum >= diff
+          sequence.push("成功")
+          return Result.success(sequence.join(" ＞ "))
+        else
+          sequence.push("失敗")
+          return Result.failure(sequence.join(" ＞ "))
+        end
       end
 
-      def getSuccessInfo(diceList, crit, _diff)
+      def getSuccessInfo(diceList, crit)
         debug("checkSuccess diceList, crit", diceList, crit)
 
         diceCountHash = getDiceCountHash(diceList, crit)
@@ -109,7 +114,7 @@ module BCDice
         countThreshold = (isDragonDice(crit) ? 1 : 2)
 
         diceCountHash.each do |dice, count|
-          maxnum = count if  count > maxnum
+          maxnum = count if count > maxnum
           successDiceList << dice if count >= countThreshold
         end
 

data/lib/bcdice/game_system/Yggdrasill.rb

@@ -88,7 +88,7 @@ module BCDice
 
         add_dice_randomizer = CommonCommand::AddDice::Randomizer.new(@randomizer, self)
         total = node.lhs.eval(self, add_dice_randomizer)
-        rand_values = @randomizer.rand_results.map(&:first)
+        rand_values = add_dice_randomizer.rand_results.map(&:value)
 
         n1 = count_fumble(rand_values, lucky_state)
         n_max = count_critical(rand_values, lucky_state)

data/lib/bcdice/game_system/ZettaiReido.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'bcdice/base'
+
 module BCDice
   module GameSystem
     class ZettaiReido < Base
@@ -38,20 +40,23 @@ module BCDice
         mod, modText = getModInfo(modText)
         diff, diffText = getDiffInfo(diffValue)
 
-        output = ""
-        output += "(#{baseAvility}-2DR#{modText}#{diffText})"
-        output += " ＞ #{baseAvility}-#{diceTotal}[#{diceText}]#{modText}"
-
+        baseCommandText = "(#{baseAvility}-2DR#{modText}#{diffText})"
+        diceCommandText = "#{baseAvility}-#{diceTotal}[#{diceText}]#{modText}"
         total = baseAvility - diceTotal + mod
-        output += " ＞ #{total}"
 
-        successText = getSuccessText(diceTotal, total, diff)
-        output += successText
+        result = getResult(diceTotal, total, diff)
 
-        darkPointText = getDarkPointResult(total, diff, darkPoint)
-        output += darkPointText
+        darkPointText = "#{darkPoint}DP" if darkPoint > 0
 
-        return output
+        result.text = [
+          baseCommandText,
+          diceCommandText,
+          total.to_i,
+          result.text,
+          darkPointText,
+        ].compact.join(" ＞ ")
+
+        return result
       end
 
       def roll2DarkDice()
@@ -107,23 +112,13 @@ module BCDice
         return diffValue, diffText
       end
 
-      def getDarkPointResult(_total, _diff, darkPoint)
-        text = ''
-
-        if darkPoint > 0
-          text = " ＞ #{darkPoint}DP"
-        end
-
-        return text
-      end
-
-      def getSuccessText(diceTotal, total, diff)
+      def getResult(diceTotal, total, diff)
         if diceTotal == 0
-          return " ＞ クリティカル"
+          return Result.critical("クリティカル")
         end
 
         if diceTotal == 10
-          return " ＞ ファンブル"
+          return Result.fumble("ファンブル")
         end
 
         if diff.nil?
@@ -132,10 +127,10 @@ module BCDice
 
         successLevel = (total - diff)
         if successLevel >= 0
-          return " ＞ #{successLevel} 成功"
+          return Result.success("#{successLevel} 成功")
         end
 
-        return ' ＞ 失敗'
+        return Result.failure("失敗")
       end
     end
   end

data/lib/bcdice/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BCDice
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcdice
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - SAKATA Sinji
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -59,15 +59,18 @@ files:
 - i18n/LogHorizon/ko_kr.yml
 - i18n/MagicaLogia/ja_jp.yml
 - i18n/MagicaLogia/ko_kr.yml
+- i18n/MagicaLogia/zh_hans.yml
 - i18n/MonotoneMuseum/ja_jp.yml
 - i18n/MonotoneMuseum/ko_kr.yml
 - i18n/Nechronica/ja_jp.yml
 - i18n/Nechronica/ko_kr.yml
 - i18n/StellarKnights/ja_jp.yml
+- i18n/StellarKnights/ko_kr.yml
 - i18n/StratoShout/ja_jp.yml
 - i18n/StratoShout/ko_kr.yml
 - i18n/ja_jp.yml
 - i18n/ko_kr.yml
+- i18n/zh_hans.yml
 - i18n/zh_hant.yml
 - lib/bcdice.rb
 - lib/bcdice/arithmetic.rb
@@ -232,6 +235,7 @@ files:
 - lib/bcdice/game_system/LostRoyal.rb
 - lib/bcdice/game_system/MagicaLogia.rb
 - lib/bcdice/game_system/MagicaLogia_Korean.rb
+- lib/bcdice/game_system/MagicaLogia_SimplifiedChinese.rb
 - lib/bcdice/game_system/MeikyuDays.rb
 - lib/bcdice/game_system/MeikyuKingdom.rb
 - lib/bcdice/game_system/MeikyuKingdomBasic.rb
@@ -289,8 +293,10 @@ files:
 - lib/bcdice/game_system/ShoujoTenrankai.rb
 - lib/bcdice/game_system/Skynauts.rb
 - lib/bcdice/game_system/SkynautsBouken.rb
+- lib/bcdice/game_system/StarryDolls.rb
 - lib/bcdice/game_system/SteamPunkers.rb
 - lib/bcdice/game_system/StellarKnights.rb
+- lib/bcdice/game_system/StellarKnights_Korean.rb
 - lib/bcdice/game_system/SterileLife.rb
 - lib/bcdice/game_system/StrangerOfSwordCity.rb
 - lib/bcdice/game_system/StratoShout.rb