From 22aaf5f0ec7efd957645b05e14cd54e6414ed55d Mon Sep 17 00:00:00 2001
From: Hideyo Mikisato <h.mikisato@gmail.com>
Date: Fri, 1 Sep 2023 22:43:46 +0900
Subject: [PATCH] =?UTF-8?q?[SwordWorld2.0/2.5]=20=E8=B6=85=E8=B6=8A?=
 =?UTF-8?q?=E5=88=A4=E5=AE=9A=E3=81=AE=E9=9A=9B=E3=81=AB=E8=87=AA=E5=8B=95?=
 =?UTF-8?q?=E7=9A=84=E6=88=90=E5=8A=9F=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88?=
 =?UTF-8?q?=E3=81=A7=E3=82=82=E3=80=81=E9=81=94=E6=88=90=E5=80=A4=E7=AE=97?=
 =?UTF-8?q?=E5=87=BA=E3=81=AE=E3=81=9F=E3=82=81=E3=81=AB=E6=8C=AF=E3=82=8A?=
 =?UTF-8?q?=E8=B6=B3=E3=81=97=E3=82=92=E8=A1=8C=E3=81=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/bcdice/game_system/sword_world/transcendent_test.rb | 2 +-
 test/data/SwordWorld2_0.toml                            | 8 ++++++--
 test/data/SwordWorld2_0_SimplifiedChinese.toml          | 8 ++++++--
 test/data/SwordWorld2_5.toml                            | 8 ++++++--
 test/data/SwordWorld2_5_SimplifiedChinese.toml          | 8 ++++++--
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/lib/bcdice/game_system/sword_world/transcendent_test.rb b/lib/bcdice/game_system/sword_world/transcendent_test.rb
index 2595903cf..30a263b04 100644
--- a/lib/bcdice/game_system/sword_world/transcendent_test.rb
+++ b/lib/bcdice/game_system/sword_world/transcendent_test.rb
@@ -39,7 +39,7 @@ def execute(randomizer)
           fumble = first_value_group == [1, 1]
           critical = first_value_group == [6, 6]
 
-          if !fumble && !critical
+          unless fumble
             while sum_of_dice(value_groups.last) >= @critical_value
               value_groups.push(randomizer.roll_barabara(2, 6))
             end
diff --git a/test/data/SwordWorld2_0.toml b/test/data/SwordWorld2_0.toml
index fdb9f5124..95de01244 100644
--- a/test/data/SwordWorld2_0.toml
+++ b/test/data/SwordWorld2_0.toml
@@ -526,12 +526,14 @@ rands = [
 [[ test ]]
 game_system = "SwordWorld2.0"
 input = "2D6@10+31>=30"
-output = "(2D6@10+31>=30) ＞ 12[6,6]+31 ＞ 43 ＞ 自動的成功"
+output = "(2D6@10+31>=30) ＞ 20[6,6][2,6]+31 ＞ 51 ＞ 自動的成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
@@ -587,12 +589,14 @@ rands = []
 [[ test ]]
 game_system = "SwordWorld2.0"
 input = "2d6@10+11>30"
-output = "(2D6@10+11>30) ＞ 12[6,6]+11 ＞ 23 ＞ 自動的成功"
+output = "(2D6@10+11>30) ＞ 20[6,6][2,6]+11 ＞ 31 ＞ 自動的成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
diff --git a/test/data/SwordWorld2_0_SimplifiedChinese.toml b/test/data/SwordWorld2_0_SimplifiedChinese.toml
index 9fb658145..5ca3b93ff 100644
--- a/test/data/SwordWorld2_0_SimplifiedChinese.toml
+++ b/test/data/SwordWorld2_0_SimplifiedChinese.toml
@@ -526,12 +526,14 @@ rands = [
 [[ test ]]
 game_system = "SwordWorld2.0:SimplifiedChinese"
 input = "2D6@10+31>=30"
-output = "(2D6@10+31>=30) ＞ 12[6,6]+31 ＞ 43 ＞ 自动成功"
+output = "(2D6@10+31>=30) ＞ 20[6,6][2,6]+31 ＞ 51 ＞ 自动成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
@@ -587,12 +589,14 @@ rands = []
 [[ test ]]
 game_system = "SwordWorld2.0:SimplifiedChinese"
 input = "2d6@10+11>30"
-output = "(2D6@10+11>30) ＞ 12[6,6]+11 ＞ 23 ＞ 自动成功"
+output = "(2D6@10+11>30) ＞ 20[6,6][2,6]+11 ＞ 31 ＞ 自动成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
diff --git a/test/data/SwordWorld2_5.toml b/test/data/SwordWorld2_5.toml
index 9707018d0..952c9593e 100644
--- a/test/data/SwordWorld2_5.toml
+++ b/test/data/SwordWorld2_5.toml
@@ -622,12 +622,14 @@ rands = [
 [[ test ]]
 game_system = "SwordWorld2.5"
 input = "2D6@10+31>=30"
-output = "(2D6@10+31>=30) ＞ 12[6,6]+31 ＞ 43 ＞ 自動的成功"
+output = "(2D6@10+31>=30) ＞ 20[6,6][2,6]+31 ＞ 51 ＞ 自動的成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
@@ -683,12 +685,14 @@ rands = []
 [[ test ]]
 game_system = "SwordWorld2.5"
 input = "2d6@10+11>30"
-output = "(2D6@10+11>30) ＞ 12[6,6]+11 ＞ 23 ＞ 自動的成功"
+output = "(2D6@10+11>30) ＞ 20[6,6][2,6]+11 ＞ 31 ＞ 自動的成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
diff --git a/test/data/SwordWorld2_5_SimplifiedChinese.toml b/test/data/SwordWorld2_5_SimplifiedChinese.toml
index 586396a25..0a8df1eaf 100644
--- a/test/data/SwordWorld2_5_SimplifiedChinese.toml
+++ b/test/data/SwordWorld2_5_SimplifiedChinese.toml
@@ -622,12 +622,14 @@ rands = [
 [[ test ]]
 game_system = "SwordWorld2.5:SimplifiedChinese"
 input = "2D6@10+31>=30"
-output = "(2D6@10+31>=30) ＞ 12[6,6]+31 ＞ 43 ＞ 自动成功"
+output = "(2D6@10+31>=30) ＞ 20[6,6][2,6]+31 ＞ 51 ＞ 自动成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]
@@ -683,12 +685,14 @@ rands = []
 [[ test ]]
 game_system = "SwordWorld2.5:SimplifiedChinese"
 input = "2d6@10+11>30"
-output = "(2D6@10+11>30) ＞ 12[6,6]+11 ＞ 23 ＞ 自动成功"
+output = "(2D6@10+11>30) ＞ 20[6,6][2,6]+11 ＞ 31 ＞ 自动成功"
 success = true
 critical = true
 rands = [
   { sides = 6, value = 6 },
   { sides = 6, value = 6 },
+  { sides = 6, value = 2 },
+  { sides = 6, value = 6 },
 ]
 
 [[ test ]]