Skip to content

Commit

Permalink
Merge pull request #67 from bcdice/update_bcdice_to_3.14.0
Browse files Browse the repository at this point in the history
⬆️ Update BCDice to 3.14.0
  • Loading branch information
esnya authored Jul 6, 2024
2 parents 2f41b77 + f5e0097 commit 6e147d9
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 6 deletions.
2 changes: 1 addition & 1 deletion BCDice
Submodule BCDice updated 79 files
+45 −0 CHANGELOG.md
+3 −0 i18n/Arianrhod/ko_kr.yml
+11 −0 i18n/Cthulhu/en_us.yml
+389 −0 i18n/CyberpunkRed/ja_jp.yml
+4 −0 i18n/FinalFantasyXIV/en_us.yml
+4 −0 i18n/FinalFantasyXIV/ja_jp.yml
+158 −1 i18n/FutariSousa/ja_jp.yml
+653 −0 i18n/KizunaBullet/ja_jp.yml
+246 −14 i18n/MonotoneMuseum/ja_jp.yml
+114 −0 i18n/SkynautsBouken/ja_jp.yml
+126 −0 i18n/TensaiGunshiNiNaro/ja_jp.yml
+62 −0 i18n/UnsungDuet/ja_jp.yml
+62 −0 i18n/UnsungDuet/ko_kr.yml
+5 −0 i18n/en_us.yml
+24 −0 lib/bcdice/dice_table/range_table.rb
+16 −0 lib/bcdice/game_system.rb
+248 −0 lib/bcdice/game_system/Agnostos.rb
+99 −59 lib/bcdice/game_system/AniMalus.rb
+30 −0 lib/bcdice/game_system/Arianrhod_Korean.rb
+244 −0 lib/bcdice/game_system/BlackJacket.rb
+5 −4 lib/bcdice/game_system/ConvictorDrive.rb
+59 −0 lib/bcdice/game_system/Cthulhu_English.rb
+14 −4 lib/bcdice/game_system/CyberpunkRed.rb
+841 −0 lib/bcdice/game_system/DivineCharger.rb
+115 −0 lib/bcdice/game_system/FinalFantasyXIV.rb
+39 −0 lib/bcdice/game_system/FinalFantasyXIV_English.rb
+39 −10 lib/bcdice/game_system/FullFace.rb
+88 −8 lib/bcdice/game_system/FutariSousa.rb
+1 −1 lib/bcdice/game_system/Insane_Korean.rb
+79 −0 lib/bcdice/game_system/InvisibleLiar.rb
+240 −0 lib/bcdice/game_system/KizunaBullet.rb
+51 −8 lib/bcdice/game_system/KyokoShinshoku.rb
+14 −1 lib/bcdice/game_system/MonotoneMuseum.rb
+2 −2 lib/bcdice/game_system/NRR.rb
+203 −0 lib/bcdice/game_system/ShuumatsuBargainWars.rb
+45 −130 lib/bcdice/game_system/SkynautsBouken.rb
+1 −1 lib/bcdice/game_system/SwordWorld.rb
+228 −0 lib/bcdice/game_system/TensaiGunshiNiNaro.rb
+406 −0 lib/bcdice/game_system/TheOneRing2nd.rb
+185 −0 lib/bcdice/game_system/TheUnofficialHollowKnightRPG.rb
+139 −0 lib/bcdice/game_system/TrailOfCthulhu.rb
+17 −75 lib/bcdice/game_system/UnsungDuet.rb
+41 −0 lib/bcdice/game_system/UnsungDuet_Korean.rb
+55 −2 lib/bcdice/game_system/Utakaze.rb
+124 −3 lib/bcdice/game_system/Warhammer4.rb
+62 −0 lib/bcdice/game_system/Yotabana.rb
+111 −473 lib/bcdice/game_system/cyberpunk_red/tables.rb
+171 −0 lib/bcdice/game_system/kizuna_bullet/tables.rb
+1 −1 lib/bcdice/version.rb
+371 −0 test/data/Agnostos.toml
+189 −6 test/data/AniMalus.toml
+302 −0 test/data/Arianrhod_Korean.toml
+808 −0 test/data/BlackJacket.toml
+12 −1 test/data/ConvictorDrive.toml
+969 −0 test/data/Cthulhu_English.toml
+57 −0 test/data/CyberpunkRed.toml
+599 −0 test/data/DivineCharger.toml
+199 −0 test/data/FinalFantasyXIV.toml
+199 −0 test/data/FinalFantasyXIV_English.toml
+86 −10 test/data/FullFace.toml
+186 −4 test/data/FutariSousa.toml
+8 −3 test/data/FutariSousa_Korean.toml
+328 −0 test/data/InvisibleLiar.toml
+540 −0 test/data/KizunaBullet.toml
+301 −0 test/data/KyokoShinshoku.toml
+91 −19 test/data/MonotoneMuseum.toml
+32 −1 test/data/NRR.toml
+110 −0 test/data/ShuumatsuBargainWars.toml
+18 −0 test/data/SwordWorld2_0.toml
+18 −0 test/data/SwordWorld2_5.toml
+619 −0 test/data/TensaiGunshiNiNaro.toml
+1,715 −0 test/data/TheOneRing2nd.toml
+226 −0 test/data/TheUnofficialHollowKnightRPG.toml
+84 −0 test/data/TrailOfCthulhu.toml
+234 −0 test/data/UnsungDuet_Korean.toml
+135 −0 test/data/Utakaze.toml
+89 −0 test/data/Warhammer4.toml
+15 −0 test/data/Yotabana.toml
+27 −0 test/test_range_table.rb
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
PATH
remote: BCDice
specs:
bcdice (3.13.0)
bcdice (3.14.0)
i18n (~> 1.8.5)
racc (~> 1.7.3)

GEM
remote: https://rubygems.org/
specs:
ast (2.4.2)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
docile (1.4.0)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
Expand Down
29 changes: 26 additions & 3 deletions patch.diff
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,17 @@ diff --git a/lib/bcdice/game_system/Amadeus.rb b/lib/bcdice/game_system/Amadeus.
"#{total}_#{result}[#{dice}#{inga}]"
else
"#{total}_#{result}[#{dice}]"
diff --git a/lib/bcdice/game_system/Arianrhod_Korean.rb b/lib/bcdice/game_system/Arianrhod_Korean.rb
--- a/lib/bcdice/game_system/Arianrhod_Korean.rb
+++ b/lib/bcdice/game_system/Arianrhod_Korean.rb
@@ -1,5 +1,7 @@
# frozen_string_literal: true

+require "bcdice/game_system/Arianrhod"
+
module BCDice
module GameSystem
class Arianrhod_Korean < Arianrhod
diff --git a/lib/bcdice/game_system/AssaultEngine.rb b/lib/bcdice/game_system/AssaultEngine.rb
--- a/lib/bcdice/game_system/AssaultEngine.rb
+++ b/lib/bcdice/game_system/AssaultEngine.rb
Expand Down Expand Up @@ -705,7 +716,7 @@ diff --git a/lib/bcdice/game_system/HunterTheReckoning5th.rb b/lib/bcdice/game_s
diff --git a/lib/bcdice/game_system/InfiniteFantasia.rb b/lib/bcdice/game_system/InfiniteFantasia.rb
--- a/lib/bcdice/game_system/InfiniteFantasia.rb
+++ b/lib/bcdice/game_system/InfiniteFantasia.rb
@@ -25,15 +25,15 @@ module BCDice
@@ -28,15 +28,15 @@ module BCDice
end

output =
Expand Down Expand Up @@ -983,6 +994,18 @@ diff --git a/lib/bcdice/game_system/Skynauts.rb b/lib/bcdice/game_system/Skynaut
movePoint = move_point_base + bonus
debug("移動エリア数", movePoint)

diff --git a/lib/bcdice/game_system/TensaiGunshiNiNaro.rb b/lib/bcdice/game_system/TensaiGunshiNiNaro.rb
--- a/lib/bcdice/game_system/TensaiGunshiNiNaro.rb
+++ b/lib/bcdice/game_system/TensaiGunshiNiNaro.rb
@@ -182,7 +182,7 @@ module BCDice
# ダメージ計算
damage = @randomizer.roll_sum(parsed.prefix_number, 6)
# HP減少量計算
- dec = damage / parsed.target_number
+ dec = (damage / parsed.target_number).floor

# HP減少量の最大値は3
dec = 3 if dec > 3
diff --git a/lib/bcdice/game_system/ToshiakiHolyGrailWar.rb b/lib/bcdice/game_system/ToshiakiHolyGrailWar.rb
--- a/lib/bcdice/game_system/ToshiakiHolyGrailWar.rb
+++ b/lib/bcdice/game_system/ToshiakiHolyGrailWar.rb
Expand Down Expand Up @@ -1060,7 +1083,7 @@ diff --git a/lib/bcdice/game_system/Warhammer.rb b/lib/bcdice/game_system/Warham
diff --git a/lib/bcdice/game_system/Warhammer4.rb b/lib/bcdice/game_system/Warhammer4.rb
--- a/lib/bcdice/game_system/Warhammer4.rb
+++ b/lib/bcdice/game_system/Warhammer4.rb
@@ -48,8 +48,8 @@ module BCDice
@@ -62,8 +62,8 @@ module BCDice
return Result.nothing if target == '?'
return nil unless cmp_op == :<=

Expand All @@ -1071,7 +1094,7 @@ diff --git a/lib/bcdice/game_system/Warhammer4.rb b/lib/bcdice/game_system/Warha
sl = d10 - t10

if total <= 5 && sl < 1
@@ -287,7 +287,7 @@ module BCDice
@@ -301,7 +301,7 @@ module BCDice
if dice == 100
return 0, 0
else
Expand Down

0 comments on commit 6e147d9

Please sign in to comment.