bcdice 3.12.0 → 3.13.0

data/lib/bcdice/game_system/Postman.rb

@@ -57,11 +57,11 @@ module BCDice
             diceCount = 2 if diceCount < 2
 
             modify = (Regexp.last_match(2) || 0).to_i
-            modifyAddString = (Regexp.last_match(3) || '')
+            modifyAddString = Regexp.last_match(3) || ''
 
-            type = (Regexp.last_match(6) || '')
+            type = Regexp.last_match(6) || ''
             target = (Regexp.last_match(7) || 0).to_i
-            targetAddString = (Regexp.last_match(8) || '')
+            targetAddString = Regexp.last_match(8) || ''
 
             modify_list = modifyAddString.scan(/[+-]\d+/)
             modify_list.each { |i| modify += i.to_i }

data/lib/bcdice/game_system/RecordOfSteam.rb

@@ -118,7 +118,7 @@ module BCDice
       end
 
       def getRoundCountText(roundCount)
-        if  roundCount <= 0
+        if roundCount <= 0
           return ""
         end
 

data/lib/bcdice/game_system/RuneQuestRoleplayingInGlorantha.rb

@@ -7,7 +7,7 @@ module BCDice
       ID = 'RuneQuestRoleplayingInGlorantha'
 
       # ゲームシステム名
-      NAME = 'RuneQuest：Roleplaying in Glorantha'
+      NAME = 'ルーンクエスト：ロールプレイング・イン・グローランサ'
 
       # ゲームシステム名の読みがな
       SORT_KEY = 'るうんくえすと4'

data/lib/bcdice/game_system/Ryutama.rb

@@ -108,8 +108,8 @@ module BCDice
       end
 
       def isValidDice(dice1, dice2)
-        return (isValidDiceOne(dice1) &&
-                 isValidDiceOne(dice2))
+        return isValidDiceOne(dice1) &&
+               isValidDiceOne(dice2)
       end
 
       def isValidDiceOne(dice)
@@ -144,7 +144,7 @@ module BCDice
           return ''
         end
 
-        if  total >= difficulty
+        if total >= difficulty
           return "成功"
         end
 
@@ -152,7 +152,7 @@ module BCDice
       end
 
       def isFamble(value1, value2)
-        return ((value1 == 1) && (value2 == 1))
+        return (value1 == 1) && (value2 == 1)
       end
 
       def isCritical(value1, value2, dice1, dice2)

data/lib/bcdice/game_system/Siren.rb

@@ -0,0 +1,97 @@
+# frozen_string_literal: true
+
+require 'bcdice/command/parser'
+
+module BCDice
+  module GameSystem
+    class Siren < Base
+      # ゲームシステムの識別子
+      ID = "Siren"
+
+      # ゲームシステム名
+      NAME = "終末アイドル育成TRPG セイレーン"
+
+      # ゲームシステム名の読みがな
+      SORT_KEY = "せいれえん"
+
+      HELP_MESSAGE = <<~TEXT
+        ・判定: SL+a<=b±c
+          a=達成値への修正(0の場合は省略)
+          b=能力値
+          c=判定への修正(0の場合は省略、複数可)
+        例)判定修正-10の装備を装着しながら【技術：60】〈兵器：2〉で判定する場合。
+        SL+2<=60+40-10
+
+        ・育成: TR$a<=b
+          a=育成した回数
+          b=ヘルス
+        例）ヘルスの現在値が60で2回目の【身体】の育成を行う場合。
+        TR$2<=60
+      TEXT
+
+      def eval_game_system_specific_command(command)
+        case command
+        when /^SL/ then check_action(command)
+        when /^TR/ then check_training(command)
+        else return nil
+        end
+      end
+
+      def check_action(command)
+        parser = Command::Parser.new('SL', round_type: @round_type).restrict_cmp_op_to(:<=)
+        parsed = parser.parse(command)
+        return nil if parsed.nil?
+
+        target = parsed.target_number
+
+        dice = @randomizer.roll_once(100)
+
+        if dice > target
+          return Result.failure("(1D100<=#{target}) ＞ #{dice} ＞ 失敗")
+        end
+
+        dig10 = dice / 10
+        dig1 = dice % 10
+        if dig10 == 0
+          dig10 = 10
+        end
+        if dig1 == 0
+          dig1 = 10
+        end
+        achievement_value = dig10 + dig1 + parsed.modify_number
+        return Result.success("(1D100<=#{target}) ＞ #{dice} ＞ 成功(達成値：#{achievement_value})")
+      end
+
+      def check_training(command)
+        parser = Command::Parser.new('TR', round_type: @round_type).restrict_cmp_op_to(:<=).enable_dollar.disable_modifier
+        parsed = parser.parse(command)
+        return nil if parsed.nil?
+
+        count = parsed.dollar
+        return nil if count.nil?
+
+        target = parsed.target_number
+
+        dice = @randomizer.roll_once(100)
+
+        dig10 = dice / 10
+        dig1 = dice % 10
+        if dig10 == 0
+          dig10 = 10
+        end
+        if dig1 == 0
+          dig1 = 10
+        end
+        achievement_value = dig10 + dig1
+
+        if dice > target
+          return Result.failure("(1D100<=#{target}) ＞ #{dice} ＞ 失敗(能力値減少：10 / ヘルス減少：#{achievement_value})")
+        end
+
+        return Result.success("(1D100<=#{target}) ＞ #{dice} ＞ 成功(能力値上昇：#{count * 5 + achievement_value} / ヘルス減少：#{achievement_value})")
+      end
+
+      register_prefix('SL', 'TR')
+    end
+  end
+end

data/lib/bcdice/game_system/Skynauts.rb

@@ -50,7 +50,7 @@ module BCDice
       private
 
       def get_judge_result(command)
-        return nil unless (m = (/^2D6<=(\d)$/i.match(command) || /^SN(\d*)$/i.match(command)))
+        return nil unless (m = /^2D6<=(\d)$/i.match(command) || /^SN(\d*)$/i.match(command))
 
         debug("====get_judge_result====")
 

data/lib/bcdice/game_system/Strave.rb

@@ -90,7 +90,7 @@ module BCDice
           result = "(#{diceCount}D10\<\=#{target}) ＞ #{diceText} ＞ Hits：#{successCount}*#{damage} ＞ #{totalDamage}ダメージ"
         else
           result = "(#{diceCount}D10\<\=#{target}) ＞ #{diceText}"
-          if  successCount > 0
+          if successCount > 0
             result += " ＞ 【成功】"
           else
             result += " ＞ 【失敗】"

data/lib/bcdice/game_system/TherapieSein.rb

@@ -73,7 +73,7 @@ module BCDice
 
         return result if target == 0
 
-        if  successValue >= target
+        if successValue >= target
           result += " ＞ 【成功】"
         else
           result += " ＞ 【失敗】"

data/lib/bcdice/game_system/TrinitySeven.rb

@@ -355,7 +355,7 @@ module BCDice
           '武器防具の名前（ソード、メイルなど）',
           '自然現象の名前（カザンハリケーンなど）',
           '機械の名前（洗濯機、テレビなど）',
-          '目についた物の名前（シャーペン、メガネなど）',  # 100
+          '目についた物の名前（シャーペン、メガネなど）', # 100
         ]
       )
     end

data/lib/bcdice/game_system/VampireTheMasquerade5th.rb

@@ -65,16 +65,16 @@ module BCDice
 
         dice_pool, hunger_dice_pool = get_dice_pools(m)
         if dice_pool < 0
-          return "ダイスプールより多いHungerダイスは指定できません。"
+          return "ダイスプール0のときにHungerダイスは指定できません。"
         end
-        if hunger_dice_pool && hunger_dice_pool > 5
+        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
@@ -100,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

data/lib/bcdice/game_system/WerewolfTheApocalypse5th.rb

@@ -64,16 +64,16 @@ module BCDice
 
         dice_pool, rage_dice_pool = get_dice_pools(m)
         if dice_pool < 0
-          return "ダイスプールより多いRageダイス指定はできません。"
+          return "ダイスプール0のときにRageダイスは指定できません。"
         end
-        if rage_dice_pool && rage_dice_pool > 5
+        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
+        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
@@ -100,11 +100,17 @@ module BCDice
         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]&.to_i
-          dice_pool = m[DICE_POOL_RAGE_DICE_INCLUDED_INDEX].to_i - (rage_dice_pool || 0)
+          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]&.to_i
+          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

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_parser.rb

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.2
-# from Racc grammar file "".
+# This file is automatically generated by Racc 1.7.3
+# from Racc grammar file "rating_parser.y".
 #
 
 require 'racc/parser.rb'
@@ -226,6 +226,7 @@ Racc_arg = [
   racc_shift_n,
   racc_reduce_n,
   racc_use_result_var ]
+Ractor.make_shareable(Racc_arg) if defined?(Ractor)
 
 Racc_token_to_s_table = [
   "$end",
@@ -259,6 +260,7 @@ Racc_token_to_s_table = [
   "mul",
   "add",
   "term" ]
+Ractor.make_shareable(Racc_token_to_s_table) if defined?(Ractor)
 
 Racc_debug_parser = false
 

data/lib/bcdice/game_system.rb

@@ -12,8 +12,10 @@ require "bcdice/game_system/Amadeus"
 require "bcdice/game_system/Amadeus_Korean"
 require "bcdice/game_system/AngelGear"
 require "bcdice/game_system/AnimaAnimus"
+require "bcdice/game_system/AniMalus"
 require "bcdice/game_system/Aoharubaan"
 require "bcdice/game_system/Arianrhod"
+require "bcdice/game_system/ArknightsFan"
 require "bcdice/game_system/ArsMagica"
 require "bcdice/game_system/AssaultEngine"
 require "bcdice/game_system/Avandner"
@@ -83,6 +85,7 @@ require "bcdice/game_system/Fiasco"
 require "bcdice/game_system/Fiasco_Korean"
 require "bcdice/game_system/FilledWith"
 require "bcdice/game_system/FullMetalPanic"
+require "bcdice/game_system/FullFace"
 require "bcdice/game_system/FutariSousa"
 require "bcdice/game_system/FutariSousa_Korean"
 require "bcdice/game_system/Garako"
@@ -128,6 +131,8 @@ require "bcdice/game_system/KillDeathBusiness"
 require "bcdice/game_system/KillDeathBusiness_Korean"
 require "bcdice/game_system/KurayamiCrying"
 require "bcdice/game_system/Kutulu"
+require "bcdice/game_system/KyokoShinshoku"
+require "bcdice/game_system/Liminal"
 require "bcdice/game_system/LiveraDoll"
 require "bcdice/game_system/LogHorizon"
 require "bcdice/game_system/LogHorizon_Korean"
@@ -155,6 +160,7 @@ require "bcdice/game_system/NinjaSlayer"
 require "bcdice/game_system/NinjaSlayer2"
 require "bcdice/game_system/NjslyrBattle"
 require "bcdice/game_system/NobunagasBlackCastle"
+require "bcdice/game_system/NRR"
 require "bcdice/game_system/NSSQ"
 require "bcdice/game_system/Nuekagami"
 require "bcdice/game_system/OneWayHeroics"
@@ -165,6 +171,7 @@ require "bcdice/game_system/Paradiso"
 require "bcdice/game_system/Paranoia"
 require "bcdice/game_system/ParanoiaRebooted"
 require "bcdice/game_system/ParasiteBlood"
+require "bcdice/game_system/PastFutureParadox"
 require "bcdice/game_system/Pathfinder"
 require "bcdice/game_system/Peekaboo"
 require "bcdice/game_system/Pendragon"
@@ -201,6 +208,7 @@ require "bcdice/game_system/ShinobiGami"
 require "bcdice/game_system/Shiranui"
 require "bcdice/game_system/ShoujoTenrankai"
 require "bcdice/game_system/ShuumatsuKikou"
+require "bcdice/game_system/Siren"
 require "bcdice/game_system/Skynauts"
 require "bcdice/game_system/SkynautsBouken"
 require "bcdice/game_system/StarryDolls"

data/lib/bcdice/loader.rb

@@ -8,7 +8,7 @@ module BCDice
     # @param id [String] ID
     # @return [Class, nil]
     def game_system_class(id)
-      all_game_systems.find { |game_system| game_system::ID == id }
+      all_game_systems.find { |game_system| id == game_system::ID }
     end
 
     # ゲームシステムのクラス一覧を返す

data/lib/bcdice/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bcdice
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.13.0
 platform: ruby
 authors:
 - SAKATA Sinji
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.5
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.7.3
 description: BCDice is a rolling dice engine for TRPG
 email:
 - ysakasin@gmail.com
@@ -149,9 +163,11 @@ files:
 - lib/bcdice/game_system/Amadeus.rb
 - lib/bcdice/game_system/Amadeus_Korean.rb
 - lib/bcdice/game_system/AngelGear.rb
+- lib/bcdice/game_system/AniMalus.rb
 - lib/bcdice/game_system/AnimaAnimus.rb
 - lib/bcdice/game_system/Aoharubaan.rb
 - lib/bcdice/game_system/Arianrhod.rb
+- lib/bcdice/game_system/ArknightsFan.rb
 - lib/bcdice/game_system/ArsMagica.rb
 - lib/bcdice/game_system/AssaultEngine.rb
 - lib/bcdice/game_system/Avandner.rb
@@ -220,6 +236,7 @@ files:
 - lib/bcdice/game_system/Fiasco.rb
 - lib/bcdice/game_system/Fiasco_Korean.rb
 - lib/bcdice/game_system/FilledWith.rb
+- lib/bcdice/game_system/FullFace.rb
 - lib/bcdice/game_system/FullMetalPanic.rb
 - lib/bcdice/game_system/FutariSousa.rb
 - lib/bcdice/game_system/FutariSousa_Korean.rb
@@ -266,6 +283,8 @@ files:
 - lib/bcdice/game_system/KillDeathBusiness_Korean.rb
 - lib/bcdice/game_system/KurayamiCrying.rb
 - lib/bcdice/game_system/Kutulu.rb
+- lib/bcdice/game_system/KyokoShinshoku.rb
+- lib/bcdice/game_system/Liminal.rb
 - lib/bcdice/game_system/LiveraDoll.rb
 - lib/bcdice/game_system/LogHorizon.rb
 - lib/bcdice/game_system/LogHorizon_Korean.rb
@@ -283,6 +302,7 @@ files:
 - lib/bcdice/game_system/MetallicGuardian.rb
 - lib/bcdice/game_system/MonotoneMuseum.rb
 - lib/bcdice/game_system/MonotoneMuseum_Korean.rb
+- lib/bcdice/game_system/NRR.rb
 - lib/bcdice/game_system/NSSQ.rb
 - lib/bcdice/game_system/Nechronica.rb
 - lib/bcdice/game_system/Nechronica_Korean.rb
@@ -303,6 +323,7 @@ files:
 - lib/bcdice/game_system/Paranoia.rb
 - lib/bcdice/game_system/ParanoiaRebooted.rb
 - lib/bcdice/game_system/ParasiteBlood.rb
+- lib/bcdice/game_system/PastFutureParadox.rb
 - lib/bcdice/game_system/Pathfinder.rb
 - lib/bcdice/game_system/Peekaboo.rb
 - lib/bcdice/game_system/Pendragon.rb
@@ -339,6 +360,7 @@ files:
 - lib/bcdice/game_system/Shiranui.rb
 - lib/bcdice/game_system/ShoujoTenrankai.rb
 - lib/bcdice/game_system/ShuumatsuKikou.rb
+- lib/bcdice/game_system/Siren.rb
 - lib/bcdice/game_system/Skynauts.rb
 - lib/bcdice/game_system/SkynautsBouken.rb
 - lib/bcdice/game_system/StarryDolls.rb
@@ -443,7 +465,7 @@ homepage: https://bcdice.org
 licenses:
 - BSD-3-Clause
 metadata:
-  allowed_push_host: https://rubygems.org/
+  allowed_push_host: https://rubygems.org
   homepage_uri: https://bcdice.org
   source_code_uri: https://github.com/bcdice/BCDice
   changelog_uri: https://github.com/bcdice/BCDice/blob/master/CHANGELOG.md
@@ -455,14 +477,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: BCDice is a rolling dice engine for TRPG