bcdice 3.11.0 → 3.13.0

data/lib/bcdice/game_system/VampireTheMasquerade5th.rb

@@ -22,14 +22,14 @@ module BCDice
             2VMF6+3
             2VMI9H3
 
-          難易度指定：成功数のカウント、判定成功と失敗、Critical処理、Critical Winのチェックを行う
+          難易度指定：成功数のカウント、判定成功と失敗、Critical処理、Critical Win、Total Failureのチェックを行う
                      （Hungerダイスがある場合）Messy CriticalとBestial Failureチェックを行う
           例) (難易度)VMF(通常ダイス)+(Hungerダイス)
               (難易度)VMF(通常ダイス)
               (難易度)VMI(通常ダイス)H(Hungerダイス)
               (難易度)VMI(通常ダイス)
 
-          難易度省略：成功数のカウント、判定失敗、Critical処理、（Hungerダイスがある場合）Bestial Failureチェックを行う
+          難易度省略：成功数のカウント、判定失敗、Critical処理、Total Failure、（Hungerダイスがある場合）Bestial Failureチェックを行う
                       判定成功、Messy Criticalのチェックを行わない
                       Critical Win、（Hungerダイスがある場合）Bestial Failure、Messy Criticalのヒントを出力
           例) VMF(通常ダイス)+(Hungerダイス)
@@ -58,20 +58,23 @@ module BCDice
       register_prefix('\d*(VMF|(VMI\d*(H\d?)?))')
 
       def eval_game_system_specific_command(command)
-        m = /\A(\d+)?(((VMF)(\d)(\+(\d+))?)|((VMI)(\d)(H(\d+))?))$/.match(command)
+        m = /\A(\d+)?(((VMF)(\d+)(\+(\d+))?)|((VMI)(\d+)(H(\d+))?))$/.match(command)
         unless m
           return ''
         end
 
         dice_pool, hunger_dice_pool = get_dice_pools(m)
         if dice_pool < 0
-          return "ダイスプールより多いHungerダイスは指定できません。"
+          return "ダイスプール0のときにHungerダイスは指定できません。"
+        end
+        if hunger_dice_pool > 5
+          return "Hungerダイス指定は5ダイスが最大です。"
         end
 
         dice_text, success_dice, ten_dice, = make_dice_roll(dice_pool)
         result_text = "(#{dice_pool}D10"
 
-        if hunger_dice_pool
+        if hunger_dice_pool >= 0
           hunger_dice_text, hunger_success_dice, hunger_ten_dice, hunger_botch_dice = make_dice_roll(hunger_dice_pool)
 
           ten_dice += hunger_ten_dice
@@ -97,11 +100,17 @@ module BCDice
         hunger_dice_included_command = m[COMMAND_HUNGER_DICE_INCLUDED_INDEX]
         if hunger_dice_included_command && hunger_dice_included_command == "VMI"
           # Hunger Diceを内数処理するの場合
-          hunger_dice_pool = m[HUNGER_DICE_INCLUDED_INDEX]&.to_i
-          dice_pool = m[DICE_POOL_HUNGER_DICE_INCLUDED_INDEX].to_i - (hunger_dice_pool || 0)
+          hunger_dice_pool = m[HUNGER_DICE_INCLUDED_INDEX].nil? ? -1 : m[HUNGER_DICE_INCLUDED_INDEX].to_i
+          dice_pool_value = m[DICE_POOL_HUNGER_DICE_INCLUDED_INDEX].to_i
+          dice_pool = dice_pool_value - (hunger_dice_pool < 0 ? 0 : hunger_dice_pool)
+          if dice_pool_value > 0 && hunger_dice_pool >= dice_pool_value
+            # 1 以上のダイスプール、かつ、Hungerダイスがダイスプール以上のとき、ダイスプールが全てHungerダイスになる。
+            dice_pool = 0
+            hunger_dice_pool = dice_pool_value
+          end
         else
           # Hunger DiceがPLによる内数指定の場合
-          hunger_dice_pool = m[HUNGER_DICE_NO_INCLUDED_INDEX]&.to_i
+          hunger_dice_pool = m[HUNGER_DICE_NO_INCLUDED_INDEX].nil? ? -1 : m[HUNGER_DICE_NO_INCLUDED_INDEX].to_i
           dice_pool = m[DICE_POOL_HUNGER_DICE_NO_INCLUDED_INDEX].to_i
         end
         return dice_pool, hunger_dice_pool
@@ -128,6 +137,9 @@ module BCDice
             if hunger_botch_dice > 0
               return Result.fumble("#{result_text}：判定失敗! [Bestial Failure]")
             end
+            if success_dice == 0
+              return Result.fumble("#{result_text}：判定失敗! [Total Failure]")
+            end
 
             return Result.failure("#{result_text}：判定失敗!")
           end
@@ -137,7 +149,7 @@ module BCDice
               return Result.fumble("#{result_text}：判定失敗! [Bestial Failure]")
             end
 
-            return Result.failure("#{result_text}：判定失敗!")
+            return Result.fumble("#{result_text}：判定失敗! [Total Failure]")
           else
             if hunger_botch_dice > 0
               result_text = "#{result_text}\n　判定失敗なら [Bestial Failure]"

data/lib/bcdice/game_system/WerewolfTheApocalypse5th.rb

@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+
+module BCDice
+  module GameSystem
+    class WerewolfTheApocalypse5th < Base
+      # ゲームシステムの識別子
+      ID = 'WerewolfTheApocalypse5th'
+
+      # ゲームシステム名
+      NAME = 'Werewolf: The Apocalypse 5th Edition'
+
+      # ゲームシステム名の読みがな
+      SORT_KEY = 'わあうふるしあほかりふす5'
+
+      # ダイスボットの使い方
+      HELP_MESSAGE = <<~MESSAGETEXT
+        ・判定コマンド(nWAFx+x または nWAIxRx)
+          WAFコマンドはRageダイスとダイスプールを個別に指定する。
+          WAIコマンドはRageダイスをダイスプールの内数として指定する。
+
+            例：難易度2、9ダイスプールでRageダイス3個の場合、それぞれ以下のようなコマンドとなる。
+            2WAF6+3
+            2WAI9R3
+
+          難易度指定：成功数のカウント、判定成功と失敗、（Rageダイスがある場合）Brutal outcome、Critical処理、Total Failure、Critical Winのチェックを行う
+          例) (難易度)WAF(通常ダイス)+(Rageダイス)
+              (難易度)WAF(通常ダイス)
+              (難易度)WAI(通常ダイス)R(Rageダイス)
+              (難易度)WAI(通常ダイス)
+
+          難易度省略：成功数のカウント、判定失敗、（Rageダイスがある場合）Brutal outcome、Critical処理、Total Failureのチェックを行う
+                      判定成功チェックを行わない
+                      Critical Winのヒントを出力
+          例) WAF(通常ダイス)+(Rageダイス)
+              WAF(通常ダイス)
+              WAI(通常ダイス)R(Rageダイス)
+              WAI(通常ダイス)
+
+          難易度0指定：Critical処理と成功数のカウントを行い、全てのチェックを行わない
+          例) 0WAF(通常ダイス)+(Rageダイス)
+              0WAF(通常ダイス)
+              0WAI(通常ダイス)+(Rageダイス)
+              0WAI(通常ダイス)
+
+      MESSAGETEXT
+
+      DIFFICULTY_INDEX                          = 1
+      DICE_POOL_RAGE_DICE_NO_INCLUDED_INDEX     = 5
+      RAGE_DICE_NO_INCLUDED_INDEX               = 7
+      COMMAND_RAGE_DICE_INCLUDED_INDEX          = 9
+      DICE_POOL_RAGE_DICE_INCLUDED_INDEX        = 10
+      RAGE_DICE_INCLUDED_INDEX                  = 12
+
+      # 難易度に指定可能な特殊値
+      NOT_CHECK_SUCCESS = -1 # 判定成功にかかわるチェックを行わない(判定失敗に関わるチェックは行う)
+
+      register_prefix('\d*(WAF|(WAI\d*(R\d?)?))')
+
+      def eval_game_system_specific_command(command)
+        m = /\A(\d+)?(((WAF)(\d+)(\+(\d+))?)|((WAI)(\d+)(R(\d+))?))$/.match(command)
+        unless m
+          return ''
+        end
+
+        dice_pool, rage_dice_pool = get_dice_pools(m)
+        if dice_pool < 0
+          return "ダイスプール0のときにRageダイスは指定できません。"
+        end
+        if rage_dice_pool > 5
+          return "5を超えるRageダイス指定はできません。"
+        end
+
+        dice_text, success_dice, ten_dice, = make_dice_roll(dice_pool)
+        result_text = "(#{dice_pool}D10"
+
+        if rage_dice_pool >= 0
+          rage_dice_text, rage_success_dice, rage_ten_dice, brutal_result_dice = make_dice_roll(rage_dice_pool)
+
+          brutal_outcome = brutal_result_dice / 2
+          ten_dice += rage_ten_dice
+          success_dice += rage_success_dice
+
+          result_text = "#{result_text}+#{rage_dice_pool}D10) ＞ [#{dice_text}]+[#{rage_dice_text}] "
+        else
+          rage_ten_dice = 0
+          brutal_outcome = 0
+          result_text = "#{result_text}) ＞ [#{dice_text}] "
+        end
+
+        success_dice += get_critical_success(ten_dice)
+
+        difficulty = m[DIFFICULTY_INDEX] ? m[DIFFICULTY_INDEX].to_i : NOT_CHECK_SUCCESS
+
+        return get_roll_result(result_text, success_dice, ten_dice, rage_ten_dice, brutal_outcome, difficulty)
+      end
+
+      private
+
+      def get_dice_pools(m)
+        rage_dice_included_command = m[COMMAND_RAGE_DICE_INCLUDED_INDEX]
+        if rage_dice_included_command && rage_dice_included_command == "WAI"
+          # Rage Diceを内数処理するの場合
+          rage_dice_pool = m[RAGE_DICE_INCLUDED_INDEX].nil? ? -1 : m[RAGE_DICE_INCLUDED_INDEX].to_i
+          dice_pool_value = m[DICE_POOL_RAGE_DICE_INCLUDED_INDEX].to_i
+          dice_pool = dice_pool_value - (rage_dice_pool < 0 ? 0 : rage_dice_pool)
+          if dice_pool_value > 0 && rage_dice_pool >= dice_pool_value
+            # 1 以上のダイスプール、かつ、Rageダイスがダイスプール以上のとき、ダイスプールが全てRageダイスになる。
+            dice_pool = 0
+            rage_dice_pool = dice_pool_value
+          end
+        else
+          # Rage DiceがPLによる内数指定の場合
+          rage_dice_pool = m[RAGE_DICE_NO_INCLUDED_INDEX].nil? ? -1 : m[RAGE_DICE_NO_INCLUDED_INDEX].to_i
+          dice_pool = m[DICE_POOL_RAGE_DICE_NO_INCLUDED_INDEX].to_i
+        end
+        return dice_pool, rage_dice_pool
+      end
+
+      def get_roll_result(result_text, success_dice, ten_dice, _rage_ten_dice, brutal_outcome, difficulty)
+        is_critical = ten_dice >= 2
+
+        if brutal_outcome > 0 && difficulty != 0
+          success_dice += 4
+          result_text = "#{result_text} [Brutal outcome] 自動失敗、または 成功数=#{success_dice}"
+        else
+          result_text = "#{result_text} 成功数=#{success_dice}"
+        end
+
+        if difficulty > 0
+          result_text = "#{result_text} 難易度=#{difficulty}"
+          if success_dice >= difficulty
+            result_text = "#{result_text} 差分=#{success_dice - difficulty}"
+
+            if is_critical
+              result_data = Result.critical("#{result_text}：判定成功! [Critical Win]")
+              return brutal_outcome > 0 ? result_data.text : result_data
+            end
+            result_data = Result.success("#{result_text}：判定成功!")
+            return brutal_outcome > 0 ? result_data.text : result_data
+          else
+            if success_dice == 0
+              return Result.fumble("#{result_text}：判定失敗! [Total Failure]")
+            else
+              return Result.failure("#{result_text}：判定失敗!")
+            end
+          end
+        elsif difficulty < 0
+          if success_dice == 0
+            return Result.fumble("#{result_text}：判定失敗! [Total Failure]")
+          else
+            if is_critical
+              result_text = "#{result_text}\n　判定成功なら [Critical Win]"
+            end
+            return result_text.to_s
+          end
+        end
+
+        # 難易度0指定(=全ての判定チェックを行わない)
+        return result_text.to_s
+      end
+
+      def get_critical_success(ten_dice)
+        # 10の目が2個毎に追加2成功
+        return ((ten_dice / 2) * 2)
+      end
+
+      def make_dice_roll(dice_pool)
+        dice_list = @randomizer.roll_barabara(dice_pool, 10)
+
+        dice_text = dice_list.join(',')
+        success_dice = dice_list.count { |x| x >= 6 }
+        ten_dice = dice_list.count(10)
+        brutal_result_dice = dice_list.count(1) + dice_list.count(2)
+
+        return dice_text, success_dice, ten_dice, brutal_result_dice
+      end
+    end
+  end
+end

data/lib/bcdice/game_system/cthulhu7th/full_auto.rb

@@ -41,7 +41,7 @@ module BCDice
           bullet_count = m[1].to_i
           diff = m[2].to_i
           broken_number = m[3].to_i
-          bonus_dice_count = m[4]&.to_i || 0
+          bonus_dice_count = m[4].to_i
           stop_count = m[5]&.downcase || ""
           bullet_set_count_cap = m[6]&.to_i || diff / 10
 

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

@@ -34,6 +34,9 @@ module BCDice
         # @return [Integer, nil]
         attr_accessor :modifier_after_half
 
+        # @return [Integer, nil]
+        attr_accessor :modifier_after_one_and_a_half
+
         def settable_first_roll_adjust_option?
           return first_modify.nil? && first_to.nil?
         end

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

@@ -37,6 +37,9 @@ module BCDice
         # @return [Integer, nil]
         attr_accessor :modifier_after_half
 
+        # @return [Integer, nil]
+        attr_accessor :modifier_after_one_and_a_half
+
         def initialize(rate, modifier)
           @rate = rate
           @modifier = modifier
@@ -49,6 +52,7 @@ module BCDice
           @semi_fixed_val = 0
           @tmp_fixed_val = 0
           @modifier_after_half = nil
+          @modifier_after_one_and_a_half = nil
         end
 
         # @return [Boolean]
@@ -56,6 +60,11 @@ module BCDice
           return !@modifier_after_half.nil?
         end
 
+        # @return [Boolean]
+        def one_and_a_half
+          return !@modifier_after_one_and_a_half.nil?
+        end
+
         # @return [Integer]
         def min_critical
           if @semi_fixed_val <= 1