From 71fa5c8e7f050d9c16d7bfc650742b74340ef408 Mon Sep 17 00:00:00 2001
From: SAKATA Sinji <ysakasin@gmail.com>
Date: Thu, 8 Feb 2024 21:18:50 +0900
Subject: [PATCH] :arrow_up: Update BCDice to 3.13.0
---
BCDice | 2 +-
Gemfile | 2 +-
Gemfile.lock | 59 ++++++++++++++++++++++++++--------------------------
patch.diff | 47 +++++++++++++++++++++++++++++------------
4 files changed, 66 insertions(+), 44 deletions(-)
diff --git a/BCDice b/BCDice
index 5f2d9ac..785693a 160000
--- a/BCDice
+++ b/BCDice
@@ -1 +1 @@
-Subproject commit 5f2d9ac383cf46f50016c00765c30800a770bec5
+Subproject commit 785693a24dd2d8cef3022422b118ace5a1bac3e8
diff --git a/Gemfile b/Gemfile
index 9f2f6d4..2d61803 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,3 +1,3 @@
eval_gemfile File.join(__dir__, 'BCDice/Gemfile')
-gem 'opal', ">= 1.7.1"
+gem 'opal', "~> 1.7.4"
diff --git a/Gemfile.lock b/Gemfile.lock
index a65db0c..2ec7940 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,43 +1,47 @@
PATH
remote: BCDice
specs:
- bcdice (3.12.0)
+ bcdice (3.13.0)
i18n (~> 1.8.5)
+ racc (~> 1.7.3)
GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
- concurrent-ruby (1.2.2)
+ concurrent-ruby (1.2.3)
docile (1.4.0)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
- json (2.6.3)
- opal (1.7.1)
+ json (2.7.1)
+ language_server-protocol (3.17.0.3)
+ opal (1.7.4)
ast (>= 2.3.0)
parser (~> 3.0, >= 3.0.3.2)
- parallel (1.22.1)
- parser (3.1.3.0)
+ parallel (1.24.0)
+ parser (3.3.0.5)
ast (~> 2.4.1)
- power_assert (2.0.1)
- racc (1.6.2)
+ racc
+ power_assert (2.0.3)
+ racc (1.7.3)
rainbow (3.1.1)
- rake (13.0.6)
- regexp_parser (2.7.0)
- rexml (3.2.5)
- rubocop (1.39.0)
+ rake (13.1.0)
+ regexp_parser (2.9.0)
+ rexml (3.2.6)
+ rubocop (1.59.0)
json (~> 2.3)
+ language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
- parser (>= 3.1.2.1)
+ parser (>= 3.2.2.4)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml (>= 3.2.5, < 4.0)
- rubocop-ast (>= 1.23.0, < 2.0)
+ rubocop-ast (>= 1.30.0, < 2.0)
ruby-progressbar (~> 1.7)
- unicode-display_width (>= 1.4.0, < 3.0)
- rubocop-ast (1.24.1)
- parser (>= 3.1.1.0)
- ruby-progressbar (1.11.0)
+ unicode-display_width (>= 2.4.0, < 3.0)
+ rubocop-ast (1.30.0)
+ parser (>= 3.2.1.0)
+ ruby-progressbar (1.13.0)
simplecov (0.21.2)
docile (~> 1.1)
simplecov-html (~> 0.11)
@@ -47,13 +51,11 @@ GEM
simplecov (~> 0.19)
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
- test-unit (3.3.9)
+ test-unit (3.6.1)
power_assert
tomlrb (2.0.3)
- unicode-display_width (2.4.2)
- webrick (1.7.0)
- yard (0.9.27)
- webrick (~> 1.7.0)
+ unicode-display_width (2.5.0)
+ yard (0.9.34)
PLATFORMS
ruby
@@ -61,15 +63,14 @@ PLATFORMS
DEPENDENCIES
bcdice!
- opal (>= 1.7.1)
- racc (~> 1.6.2)
- rake (~> 13.0.3)
- rubocop (~> 1.39.0)
+ opal (~> 1.7.4)
+ rake (~> 13.1.0)
+ rubocop (~> 1.59.0)
simplecov (~> 0.21.2)
simplecov-cobertura (~> 2.1.0)
- test-unit (~> 3.3.7)
+ test-unit (~> 3.6.1)
tomlrb (~> 2.0.3)
- yard
+ yard (~> 0.9.34)
BUNDLED WITH
2.1.4
diff --git a/patch.diff b/patch.diff
index c26c0dd..f2c97e5 100644
--- a/patch.diff
+++ b/patch.diff
@@ -307,14 +307,14 @@ diff --git a/lib/bcdice/game_system/Chill3.rb b/lib/bcdice/game_system/Chill3.rb
if tens == ones
@@ -38,7 +38,7 @@ module BCDice
- return Result.critical("Ｃ成功")
+ return Result.critical("Colossal Success")
end
elsif (total <= target) || (dice_total == 1) # 01は必ず成功
- if total <= (target / 2)
+ if total <= (target / 2).to_i
- return Result.success("Ｈ成功")
+ return Result.success("High Success")
else
- return Result.success("Ｌ成功")
+ return Result.success("Low Success")
diff --git a/lib/bcdice/game_system/ColossalHunter.rb b/lib/bcdice/game_system/ColossalHunter.rb
--- a/lib/bcdice/game_system/ColossalHunter.rb
+++ b/lib/bcdice/game_system/ColossalHunter.rb
@@ -820,7 +820,7 @@ diff --git a/lib/bcdice/game_system/NightmareHunterDeep.rb b/lib/bcdice/game_sys
diff --git a/lib/bcdice/game_system/NinjaSlayer.rb b/lib/bcdice/game_system/NinjaSlayer.rb
--- a/lib/bcdice/game_system/NinjaSlayer.rb
+++ b/lib/bcdice/game_system/NinjaSlayer.rb
-@@ -48,18 +48,18 @@ module BCDice
+@@ -50,18 +50,18 @@ module BCDice
end
# 難易度の値の正規表現
@@ -845,7 +845,7 @@ diff --git a/lib/bcdice/game_system/NinjaSlayer.rb b/lib/bcdice/game_system/Ninj
# 回避判定のノード
EV = Struct.new(:num, :difficulty, :targetValue)
-@@ -81,7 +81,7 @@ module BCDice
+@@ -83,7 +83,7 @@ module BCDice
m = NJ_RE.match(str)
return str unless m
@@ -854,7 +854,7 @@ diff --git a/lib/bcdice/game_system/NinjaSlayer.rb b/lib/bcdice/game_system/Ninj
return "#{m[1]}#{b_roll}"
end
-@@ -127,8 +127,8 @@ module BCDice
+@@ -129,8 +129,8 @@ module BCDice
# @return [EV]
def parseEV(m)
num = m[1].to_i
@@ -865,7 +865,7 @@ diff --git a/lib/bcdice/game_system/NinjaSlayer.rb b/lib/bcdice/game_system/Ninj
return EV.new(num, difficulty, targetValue)
end
-@@ -138,7 +138,7 @@ module BCDice
+@@ -140,7 +140,7 @@ module BCDice
# @return [AT]
def parseAT(m)
num = m[1].to_i
@@ -874,7 +874,7 @@ diff --git a/lib/bcdice/game_system/NinjaSlayer.rb b/lib/bcdice/game_system/Ninj
return AT.new(num, difficulty)
end
-@@ -148,7 +148,7 @@ module BCDice
+@@ -150,7 +150,7 @@ module BCDice
# @return [EL]
def parseEL(m)
num = m[1].to_i
@@ -883,7 +883,7 @@ diff --git a/lib/bcdice/game_system/NinjaSlayer.rb b/lib/bcdice/game_system/Ninj
return EL.new(num, difficulty)
end
-@@ -218,7 +218,7 @@ module BCDice
+@@ -220,7 +220,7 @@ module BCDice
def integerValueOfDifficulty(s)
return 4 unless s
@@ -950,6 +950,27 @@ diff --git a/lib/bcdice/game_system/ShinMegamiTenseiKakuseihen.rb b/lib/bcdice/g
tens = value % 10
return [ones, tens]
+diff --git a/lib/bcdice/game_system/Siren.rb b/lib/bcdice/game_system/Siren.rb
+--- a/lib/bcdice/game_system/Siren.rb
++++ b/lib/bcdice/game_system/Siren.rb
+@@ -50,7 +50,7 @@ module BCDice
+ return Result.failure("(1D100<=#{target}) ＞ #{dice} ＞ 失敗")
+ end
+
+- dig10 = dice / 10
++ dig10 = (dice / 10).floor
+ dig1 = dice % 10
+ if dig10 == 0
+ dig10 = 10
+@@ -74,7 +74,7 @@ module BCDice
+
+ dice = @randomizer.roll_once(100)
+
+- dig10 = dice / 10
++ dig10 = (dice / 10).floor
+ dig1 = dice % 10
+ if dig10 == 0
+ dig10 = 10
diff --git a/lib/bcdice/game_system/Skynauts.rb b/lib/bcdice/game_system/Skynauts.rb
--- a/lib/bcdice/game_system/Skynauts.rb
+++ b/lib/bcdice/game_system/Skynauts.rb
@@ -989,7 +1010,7 @@ diff --git a/lib/bcdice/game_system/TunnelsAndTrolls.rb b/lib/bcdice/game_system
diff --git a/lib/bcdice/game_system/VampireTheMasquerade5th.rb b/lib/bcdice/game_system/VampireTheMasquerade5th.rb
--- a/lib/bcdice/game_system/VampireTheMasquerade5th.rb
+++ b/lib/bcdice/game_system/VampireTheMasquerade5th.rb
-@@ -163,7 +163,7 @@ module BCDice
+@@ -169,7 +169,7 @@ module BCDice
def get_critical_success(ten_dice)
# 10の目が2個毎に追加2成功
@@ -1063,7 +1084,7 @@ diff --git a/lib/bcdice/game_system/WerewolfTheApocalypse5th.rb b/lib/bcdice/gam
--- a/lib/bcdice/game_system/WerewolfTheApocalypse5th.rb
+++ b/lib/bcdice/game_system/WerewolfTheApocalypse5th.rb
@@ -76,7 +76,7 @@ module BCDice
- 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
@@ -1071,7 +1092,7 @@ diff --git a/lib/bcdice/game_system/WerewolfTheApocalypse5th.rb b/lib/bcdice/gam
ten_dice += rage_ten_dice
success_dice += rage_success_dice
-@@ -155,7 +155,7 @@ module BCDice
+@@ -161,7 +161,7 @@ module BCDice
def get_critical_success(ten_dice)
# 10の目が2個毎に追加2成功
@@ -1163,7 +1184,7 @@ diff --git a/lib/bcdice/game_system/cthulhu7th/full_auto.rb b/lib/bcdice/game_sy
+++ b/lib/bcdice/game_system/cthulhu7th/full_auto.rb
@@ -43,7 +43,7 @@ module BCDice
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
+ bullet_set_count_cap = m[6]&.to_i || (diff / 10).to_i