From 4c5cd460ca3da62314db217272258954426939ed Mon Sep 17 00:00:00 2001
From: Hideyo Mikisato <h.mikisato@gmail.com>
Date: Tue, 27 Apr 2021 22:45:07 +0900
Subject: [PATCH 1/2] =?UTF-8?q?[DoubleCross]=20=E3=82=AF=E3=83=AA=E3=83=86?=
 =?UTF-8?q?=E3=82=A3=E3=82=AB=E3=83=AB=E6=83=85=E5=A0=B1=E3=82=92=E4=BB=98?=
 =?UTF-8?q?=E4=B8=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/bcdice/game_system/DoubleCross.rb |  2 +
 test/data/DoubleCross.toml            | 69 +++++++++++++++++++++++++++
 test/data/DoubleCross_Korean.toml     | 67 ++++++++++++++++++++++++++
 3 files changed, 138 insertions(+)

diff --git a/lib/bcdice/game_system/DoubleCross.rb b/lib/bcdice/game_system/DoubleCross.rb
index d538e99bf..763ce8cb8 100644
--- a/lib/bcdice/game_system/DoubleCross.rb
+++ b/lib/bcdice/game_system/DoubleCross.rb
@@ -117,6 +117,8 @@ def result(value_groups)
               achieved_value.to_s
             end
 
+          r.critical = !r.fumble? && value_groups.length > 1
+
           parts = [
             "(#{@expression})",
             "#{value_groups.join('+')}#{@modifier_str}",
diff --git a/test/data/DoubleCross.toml b/test/data/DoubleCross.toml
index 60f62c38b..3466cdfdc 100644
--- a/test/data/DoubleCross.toml
+++ b/test/data/DoubleCross.toml
@@ -2,6 +2,7 @@
 game_system = "DoubleCross"
 input = "10dx"
 output = "(10DX10) ＞ 10[1,1,4,5,5,8,9,10,10,10]+6[4,5,6] ＞ 16"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 8 },
@@ -22,6 +23,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx"
 output = "(10DX10) ＞ 10[1,1,3,4,4,7,9,10,10,10]+10[2,5,10]+5[5] ＞ 25"
+critical = true
 rands = [
   { sides = 10, value = 3 },
   { sides = 10, value = 4 },
@@ -43,6 +45,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx"
 output = "(10DX10) ＞ 10[3,4,4,4,5,5,8,9,10,10]+8[1,8] ＞ 18"
+critical = true
 rands = [
   { sides = 10, value = 5 },
   { sides = 10, value = 4 },
@@ -62,6 +65,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx"
 output = "(10DX10) ＞ 10[1,1,4,4,7,7,8,8,10,10]+10[4,10]+2[2] ＞ 22"
+critical = true
 rands = [
   { sides = 10, value = 8 },
   { sides = 10, value = 4 },
@@ -82,6 +86,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx"
 output = "(10DX10) ＞ 10[1,1,1,7,8,8,9,10,10,10]+10[4,4,10]+2[2] ＞ 22"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 1 },
@@ -103,6 +108,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx"
 output = "(10DX10) ＞ 10[2,3,3,4,5,5,5,5,6,10]+3[3] ＞ 13"
+critical = true
 rands = [
   { sides = 10, value = 4 },
   { sides = 10, value = 6 },
@@ -121,6 +127,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx"
 output = "(10DX10) ＞ 10[1,5,5,5,5,6,6,7,8,10]+9[9] ＞ 19"
+critical = true
 rands = [
   { sides = 10, value = 7 },
   { sides = 10, value = 6 },
@@ -139,6 +146,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx"
 output = "(10DX10) ＞ 10[1,1,4,5,7,7,8,8,9,10]+5[5] ＞ 15"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 7 },
@@ -157,6 +165,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx"
 output = "(10DX10) ＞ 10[3,3,4,4,4,6,8,9,10,10]+9[1,9] ＞ 19"
+critical = true
 rands = [
   { sides = 10, value = 4 },
   { sides = 10, value = 3 },
@@ -193,6 +202,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+5 ＞ 21"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -213,6 +223,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[1,1,1,2,3,3,7,7,8,9]+10[7,9]+4[4]+5 ＞ 29"
+critical = true
 rands = [
   { sides = 10, value = 3 },
   { sides = 10, value = 7 },
@@ -233,6 +244,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[1,1,2,2,4,5,6,7,7,8]+10[10]+7[7]+5 ＞ 32"
+critical = true
 rands = [
   { sides = 10, value = 4 },
   { sides = 10, value = 2 },
@@ -252,6 +264,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[2,2,3,4,5,6,7,8,9,9]+10[6,7,9]+10[8]+10[10]+3[3]+5 ＞ 48"
+critical = true
 rands = [
   { sides = 10, value = 4 },
   { sides = 10, value = 5 },
@@ -275,6 +288,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[3,4,4,5,6,6,7,7,10,10]+10[5,10]+2[2]+5 ＞ 27"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 4 },
@@ -295,6 +309,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[2,2,2,2,4,5,7,7,8,9]+10[10,10]+10[8,9]+10[1,10]+5[5]+5 ＞ 50"
+critical = true
 rands = [
   { sides = 10, value = 8 },
   { sides = 10, value = 9 },
@@ -319,6 +334,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[1,1,1,2,4,6,6,8,8,10]+10[4,9,9]+7[4,7]+5 ＞ 32"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 6 },
@@ -341,6 +357,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[1,1,2,4,4,5,5,8,10,10]+10[1,2,8]+10[8]+4[4]+5 ＞ 39"
+critical = true
 rands = [
   { sides = 10, value = 8 },
   { sides = 10, value = 5 },
@@ -363,6 +380,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[1,2,2,2,2,4,5,6,7,8]+2[2]+5 ＞ 17"
+critical = true
 rands = [
   { sides = 10, value = 5 },
   { sides = 10, value = 8 },
@@ -381,6 +399,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[1,3,4,4,4,5,7,8,9,10]+10[4,5,8]+4[4]+5 ＞ 29"
+critical = true
 rands = [
   { sides = 10, value = 9 },
   { sides = 10, value = 5 },
@@ -402,6 +421,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]+4 ＞ 29"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },
@@ -417,6 +437,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[2,2,9,10,10]+10[6,9,9]+6[3,6]+4 ＞ 30"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 2 },
@@ -434,6 +455,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[3,4,5,5,9]+4[4]+4 ＞ 18"
+critical = true
 rands = [
   { sides = 10, value = 5 },
   { sides = 10, value = 3 },
@@ -447,6 +469,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[5,6,6,8,10]+10[3,9]+1[1]+4 ＞ 25"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 6 },
@@ -462,6 +485,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[4,4,6,9,10]+3[3,3]+4 ＞ 17"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 4 },
@@ -488,6 +512,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[1,1,2,6,7]+10[8]+10[7]+1[1]+4 ＞ 35"
+critical = true
 rands = [
   { sides = 10, value = 7 },
   { sides = 10, value = 6 },
@@ -503,6 +528,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[3,6,8,8,10]+10[2,5,9]+6[6]+4 ＞ 30"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 8 },
@@ -519,6 +545,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[2,4,4,5,10]+4[4]+4 ＞ 18"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 4 },
@@ -532,6 +559,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[2,3,3,4,10]+6[6]+4 ＞ 20"
+critical = true
 rands = [
   { sides = 10, value = 3 },
   { sides = 10, value = 10 },
@@ -545,6 +573,7 @@ rands = [
 game_system = "DoubleCross"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[1,2,5,5,5,10,10]+10[2,3,7,7,8,9]+10[1,2,2,3,4,8]+10[3,4,4,7,7]+10[2,5,7,7,8]+10[1,6,7,8,9]+10[1,2,3,8]+10[2,3,5]+10[5,6,8]+10[6,8,10]+10[1,5,9]+10[3,4]+10[1,5]+10[5]+10[9]+10[3]+10[10]+10[5]+10[7]+10[7]+10[6]+10[5]+10[7]+10[3]+1[1] ＞ 241"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 5 },
@@ -618,6 +647,7 @@ rands = [
 game_system = "DoubleCross"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[1,3,3,4,6,8,9]+10[4,5,5,7,7,9]+10[2,2,6,8,9,10]+10[1,2,2,4,6,8]+10[1,3,3,7,8]+10[2,6,7,8]+10[2,2,8,9]+10[3,5,6,7]+10[1,5,5,9]+10[1,1,5]+10[9]+10[6]+10[2]+10[10]+10[6]+10[6]+10[4]+10[2]+10[4]+10[2]+10[3]+10[4]+10[8]+10[4]+10[4]+1[1] ＞ 251"
+critical = true
 rands = [
   { sides = 10, value = 4 },
   { sides = 10, value = 1 },
@@ -690,6 +720,7 @@ rands = [
 game_system = "DoubleCross"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[2,3,3,4,6,7,8]+10[1,1,2,3,3,6,10]+10[1,2,6,10,10]+10[1,7,7,9]+10[3,5,7]+10[1,6,10]+10[6,9]+10[8,8]+10[8,9]+10[1,10]+10[3]+10[7]+10[8]+10[9]+10[2]+10[4]+10[8]+10[3]+10[10]+10[2]+10[8]+10[9]+10[4]+10[7]+10[8]+1[1] ＞ 251"
+critical = true
 rands = [
   { sides = 10, value = 8 },
   { sides = 10, value = 6 },
@@ -750,6 +781,7 @@ rands = [
 game_system = "DoubleCross"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[2,3,5,7,9,9,10]+10[5,6,6,6,8,9,9]+10[2,2,6,7,7,7,10]+10[3,4,4,6,8,8,9]+10[3,6,6,7,7,8,9]+10[2,3,4,6,6,9,9]+10[2,3,3,5,5,5,5]+10[4,4,5,6,7,8,10]+10[1,1,3,3,4,5,6]+10[3,4,4,9,10]+10[2,4,4,7,10]+10[2,3,3,6,8]+10[3,4,7,8,8]+10[1,2,4,7,7]+10[1,2,3,10]+10[4,7,7]+10[2,3,7]+10[2,6,10]+10[1,2,10]+10[2,5]+10[4,8]+10[1,8]+10[3]+10[5]+1[1] ＞ 241"
+critical = true
 rands = [
   { sides = 10, value = 7 },
   { sides = 10, value = 9 },
@@ -870,6 +902,7 @@ rands = [
 game_system = "DoubleCross"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[3,4,5,6,6,9,10]+10[2,2,4,5,8,8,9]+10[1,2,3,8,8,9,10]+10[4,4,5,8,9,10]+10[5,6,6,9,9,10]+10[3,3,5,5,6,8]+10[1,2,7,9,10,10]+10[1,1,2,4,7]+10[4,6,7]+10[4,7,8]+10[5,7,9]+10[3,5,8]+10[1,9,10]+10[2,4]+10[1,9]+10[2]+10[4]+10[4]+10[6]+10[4]+10[9]+10[3]+1[1] ＞ 221"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 4 },
@@ -954,6 +987,7 @@ rands = [
 game_system = "DoubleCross"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[1,1,5,5,6,7,7]+10[1,4,8,9,9]+10[1,2,6,10]+10[2,6,7]+10[2,6,6]+10[2,4,10]+10[3,8,10]+10[7,9,9]+10[1,4,5]+10[6,9]+10[4,6]+10[1,3]+10[10]+10[3]+10[2]+10[9]+10[10]+10[2]+10[8]+10[8]+10[6]+1[1] ＞ 211"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 7 },
@@ -1011,6 +1045,7 @@ rands = [
 game_system = "DoubleCross"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[2,3,7,8,9,9,9]+10[2,3,3,4,4,8,10]+10[1,1,3,5,7,7,9]+10[1,2,4,6,8]+10[5,5,7,10]+10[2,2,5,6]+10[2,4,8,10]+10[1,3,6,10]+10[1,1,7]+1[1] ＞ 91"
+critical = true
 rands = [
   { sides = 10, value = 9 },
   { sides = 10, value = 3 },
@@ -1064,6 +1099,7 @@ rands = [
 game_system = "DoubleCross"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[1,3,4,4,5,5,10]+10[1,2,2,4,6,6]+10[2,6,7,8,9]+10[3,4,7,8,8]+10[1,2,5,8,9]+10[1,1,3,7]+10[4,7]+10[5,7]+10[5,9]+10[5,9]+10[1,5]+10[2]+10[8]+10[8]+10[3]+10[5]+10[6]+10[6]+10[2]+10[4]+10[10]+10[4]+10[4]+10[8]+10[7]+10[2]+10[4]+1[1] ＞ 271"
+critical = true
 rands = [
   { sides = 10, value = 5 },
   { sides = 10, value = 3 },
@@ -1130,6 +1166,7 @@ rands = [
 game_system = "DoubleCross"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[1,1,2,2,6,6,8]+10[1,3,6,7,8]+10[3,5,6,8]+10[5,7,8,10]+10[3,5,5,7]+10[2,6,7,9]+10[1,2,9,10]+10[2,7,8]+10[5,6,6]+10[2,4,4]+10[1,6,10]+10[5,7]+10[4,5]+10[7,9]+10[5,7]+10[5,6]+10[5,7]+10[1,10]+10[10]+10[3]+10[7]+10[3]+10[7]+10[7]+10[5]+10[10]+10[3]+10[2]+10[2]+10[9]+10[9]+10[2]+10[4]+10[6]+10[7]+10[5]+10[4]+10[5]+10[3]+10[2]+10[9]+10[7]+10[6]+10[10]+10[2]+10[2]+10[3]+10[3]+10[6]+10[9]+10[10]+10[6]+10[10]+10[2]+10[6]+10[4]+10[10]+10[5]+10[3]+10[3]+10[3]+10[5]+10[8]+10[3]+10[9]+10[8]+10[2]+10[7]+10[3]+10[9]+10[10]+10[2]+10[9]+10[6]+10[8]+10[7]+10[2]+10[9]+10[6]+10[8]+10[5]+10[6]+10[10]+10[3]+10[7]+10[6]+10[7]+10[10]+10[7]+10[2]+10[4]+10[8]+10[8]+10[3]+10[9]+10[8]+10[8]+10[10]+10[2]+10[5]+10[6]+10[5]+10[6]+10[10]+1[1] ＞ 1041"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 1 },
@@ -1282,6 +1319,7 @@ rands = [
 game_system = "DoubleCross"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[1,2,3,4,5,6,9]+10[6,7,7,7,8,9]+10[1,2,4,5,6,10]+10[2,2,3,3,5]+10[2,3,5,9,10]+10[5,5,5,8,10]+10[1,1,2,6,8]+10[3,3,8]+10[3,5,10]+10[3,9,10]+10[2,3,7]+10[6,6,9]+10[2,2,6]+10[2,4,5]+10[3,3,5]+10[6,7,10]+10[3,5,6]+10[3,4,9]+10[2,5,6]+10[1,5,10]+10[5,6]+10[2,10]+10[2,6]+10[7,9]+10[9,10]+10[1,3]+10[4]+10[9]+10[2]+10[5]+10[2]+10[5]+10[7]+10[4]+10[5]+10[5]+1[1] ＞ 361"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 4 },
@@ -1390,6 +1428,7 @@ rands = [
 game_system = "DoubleCross"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[8,9,9]+10[2,8,10]+10[4,10]+3[3] ＞ 33"
+critical = true
 rands = [
   { sides = 10, value = 9 },
   { sides = 10, value = 9 },
@@ -1406,6 +1445,7 @@ rands = [
 game_system = "DoubleCross"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[2,4,7]+10[10]+4[4] ＞ 24"
+critical = true
 rands = [
   { sides = 10, value = 7 },
   { sides = 10, value = 4 },
@@ -1418,6 +1458,7 @@ rands = [
 game_system = "DoubleCross"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[1,3,5]+2[2] ＞ 12"
+critical = true
 rands = [
   { sides = 10, value = 5 },
   { sides = 10, value = 1 },
@@ -1429,6 +1470,7 @@ rands = [
 game_system = "DoubleCross"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[2,3,6]+10[5]+10[6]+10[9]+1[1] ＞ 41"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 3 },
@@ -1443,6 +1485,7 @@ rands = [
 game_system = "DoubleCross"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[2,4,8]+10[6]+10[8]+10[10]+10[9]+1[1] ＞ 51"
+critical = true
 rands = [
   { sides = 10, value = 8 },
   { sides = 10, value = 4 },
@@ -1458,6 +1501,7 @@ rands = [
 game_system = "DoubleCross"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[3,7,7]+10[2,10]+10[5]+10[5]+10[8]+3[3] ＞ 53"
+critical = true
 rands = [
   { sides = 10, value = 7 },
   { sides = 10, value = 3 },
@@ -1474,6 +1518,7 @@ rands = [
 game_system = "DoubleCross"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[1,8,9]+10[8,9]+10[4,8]+10[6]+4[4] ＞ 44"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 9 },
@@ -1490,6 +1535,7 @@ rands = [
 game_system = "DoubleCross"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[2,9,10]+3[1,3] ＞ 13"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1502,6 +1548,7 @@ rands = [
 game_system = "DoubleCross"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[6,6,9]+10[2,8,8]+4[1,4] ＞ 24"
+critical = true
 rands = [
   { sides = 10, value = 9 },
   { sides = 10, value = 6 },
@@ -1517,6 +1564,7 @@ rands = [
 game_system = "DoubleCross"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[2,8,9]+10[3,6]+10[5]+10[6]+10[7]+10[5]+10[5]+10[6]+10[6]+10[8]+2[2] ＞ 102"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 9 },
@@ -1561,6 +1609,7 @@ game_system = "DoubleCross"
 input = "3DX@5>=12"
 output = "(3DX5>=12) ＞ 10[2,9,10]+3[1,3] ＞ 13 ＞ 成功"
 success = true
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1574,6 +1623,7 @@ game_system = "DoubleCross"
 input = "3DX@5>=13"
 output = "(3DX5>=13) ＞ 10[2,9,10]+3[1,3] ＞ 13 ＞ 成功"
 success = true
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1587,6 +1637,7 @@ game_system = "DoubleCross"
 input = "3DX@5>=14"
 output = "(3DX5>=14) ＞ 10[2,9,10]+3[1,3] ＞ 13 ＞ 失敗"
 failure = true
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1648,6 +1699,7 @@ rands = []
 game_system = "DoubleCross"
 input = "1DX@2"
 output = "(1DX2) ＞ 10[2]+1[1] ＞ 11"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 1 },
@@ -1657,6 +1709,7 @@ rands = [
 game_system = "DoubleCross"
 input = "1DX@9"
 output = "(1DX9) ＞ 10[10]+10[9]+8[8] ＞ 28"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 9 },
@@ -1667,6 +1720,7 @@ rands = [
 game_system = "DoubleCross"
 input = "1DX@10"
 output = "(1DX10) ＞ 10[10]+9[9] ＞ 19"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 9 },
@@ -1676,6 +1730,7 @@ rands = [
 game_system = "DoubleCross"
 input = "1DX"
 output = "(1DX10) ＞ 10[10]+9[9] ＞ 19"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 9 },
@@ -1691,6 +1746,7 @@ rands = []
 game_system = "DoubleCross"
 input = "(1+1+1)DX(8-0)+4+-4 埋め込み対応"
 output = "(3DX8) ＞ 10[2,4,9]+4[4] ＞ 14"
+critical = true
 rands = [
     { sides = 10, value = 4 },
     { sides = 10, value = 9 },
@@ -1702,6 +1758,7 @@ rands = [
 game_system = "DoubleCross"
 input = "(1+1+1)DX@(8-0)+4+-4 埋め込み対応"
 output = "(3DX8) ＞ 10[2,4,9]+4[4] ＞ 14"
+critical = true
 rands = [
     { sides = 10, value = 4 },
     { sides = 10, value = 9 },
@@ -1819,6 +1876,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+5*2@8"
 output = "(10DX8+10) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+10 ＞ 26"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1839,6 +1897,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+(5*2)@8"
 output = "(10DX8+10) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+10 ＞ 26"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1859,6 +1918,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+3+(5*2)@8"
 output = "(10DX8+13) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+13 ＞ 29"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1879,6 +1939,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+(5*2)+4@8"
 output = "(10DX8+14) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+14 ＞ 30"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1899,6 +1960,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+3+(5*2)+4@8"
 output = "(10DX8+17) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+17 ＞ 33"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1919,6 +1981,7 @@ rands = [
 game_system = "DoubleCross"
 input = "10dx+3+(5*2+1)+4@8"
 output = "(10DX8+18) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+18 ＞ 34"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1939,6 +2002,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3*2"
 output = "(5DX7+1) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]+1 ＞ 26"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },
@@ -1954,6 +2018,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3*2+4"
 output = "(5DX7+5) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]+5 ＞ 30"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },
@@ -1969,6 +2034,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3*(2+1)"
 output = "(5DX7-2) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]-2 ＞ 23"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },
@@ -1984,6 +2050,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-3*(2+1)+7"
 output = "(5DX7+5) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]+5 ＞ 30"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },
@@ -1999,6 +2066,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX7+7-2*(2+5-3)"
 output = "(5DX7-1) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]-1 ＞ 24"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },
@@ -2013,6 +2081,7 @@ rands = [
 [[ test ]]
 game_system = "DoubleCross"
 input = "5DX(8-1)-(2-1)"
+critical = true
 output = "(5DX7-1) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]-1 ＞ 24"
 rands = [
   { sides = 10, value = 6 },
diff --git a/test/data/DoubleCross_Korean.toml b/test/data/DoubleCross_Korean.toml
index 18a5283c9..bf1e69356 100644
--- a/test/data/DoubleCross_Korean.toml
+++ b/test/data/DoubleCross_Korean.toml
@@ -2,6 +2,7 @@
 game_system = "DoubleCross:Korean"
 input = "10dx"
 output = "(10DX10) ＞ 10[1,1,4,5,5,8,9,10,10,10]+6[4,5,6] ＞ 16"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 8 },
@@ -22,6 +23,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx"
 output = "(10DX10) ＞ 10[1,1,3,4,4,7,9,10,10,10]+10[2,5,10]+5[5] ＞ 25"
+critical = true
 rands = [
   { sides = 10, value = 3 },
   { sides = 10, value = 4 },
@@ -43,6 +45,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx"
 output = "(10DX10) ＞ 10[3,4,4,4,5,5,8,9,10,10]+8[1,8] ＞ 18"
+critical = true
 rands = [
   { sides = 10, value = 5 },
   { sides = 10, value = 4 },
@@ -62,6 +65,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx"
 output = "(10DX10) ＞ 10[1,1,4,4,7,7,8,8,10,10]+10[4,10]+2[2] ＞ 22"
+critical = true
 rands = [
   { sides = 10, value = 8 },
   { sides = 10, value = 4 },
@@ -82,6 +86,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx"
 output = "(10DX10) ＞ 10[1,1,1,7,8,8,9,10,10,10]+10[4,4,10]+2[2] ＞ 22"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 1 },
@@ -103,6 +108,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx"
 output = "(10DX10) ＞ 10[2,3,3,4,5,5,5,5,6,10]+3[3] ＞ 13"
+critical = true
 rands = [
   { sides = 10, value = 4 },
   { sides = 10, value = 6 },
@@ -121,6 +127,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx"
 output = "(10DX10) ＞ 10[1,5,5,5,5,6,6,7,8,10]+9[9] ＞ 19"
+critical = true
 rands = [
   { sides = 10, value = 7 },
   { sides = 10, value = 6 },
@@ -139,6 +146,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx"
 output = "(10DX10) ＞ 10[1,1,4,5,7,7,8,8,9,10]+5[5] ＞ 15"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 7 },
@@ -157,6 +165,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx"
 output = "(10DX10) ＞ 10[3,3,4,4,4,6,8,9,10,10]+9[1,9] ＞ 19"
+critical = true
 rands = [
   { sides = 10, value = 4 },
   { sides = 10, value = 3 },
@@ -193,6 +202,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+5 ＞ 21"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -213,6 +223,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[1,1,1,2,3,3,7,7,8,9]+10[7,9]+4[4]+5 ＞ 29"
+critical = true
 rands = [
   { sides = 10, value = 3 },
   { sides = 10, value = 7 },
@@ -233,6 +244,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[1,1,2,2,4,5,6,7,7,8]+10[10]+7[7]+5 ＞ 32"
+critical = true
 rands = [
   { sides = 10, value = 4 },
   { sides = 10, value = 2 },
@@ -252,6 +264,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[2,2,3,4,5,6,7,8,9,9]+10[6,7,9]+10[8]+10[10]+3[3]+5 ＞ 48"
+critical = true
 rands = [
   { sides = 10, value = 4 },
   { sides = 10, value = 5 },
@@ -275,6 +288,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[3,4,4,5,6,6,7,7,10,10]+10[5,10]+2[2]+5 ＞ 27"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 4 },
@@ -295,6 +309,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[2,2,2,2,4,5,7,7,8,9]+10[10,10]+10[8,9]+10[1,10]+5[5]+5 ＞ 50"
+critical = true
 rands = [
   { sides = 10, value = 8 },
   { sides = 10, value = 9 },
@@ -319,6 +334,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[1,1,1,2,4,6,6,8,8,10]+10[4,9,9]+7[4,7]+5 ＞ 32"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 6 },
@@ -341,6 +357,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[1,1,2,4,4,5,5,8,10,10]+10[1,2,8]+10[8]+4[4]+5 ＞ 39"
+critical = true
 rands = [
   { sides = 10, value = 8 },
   { sides = 10, value = 5 },
@@ -363,6 +380,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[1,2,2,2,2,4,5,6,7,8]+2[2]+5 ＞ 17"
+critical = true
 rands = [
   { sides = 10, value = 5 },
   { sides = 10, value = 8 },
@@ -381,6 +399,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+5@8"
 output = "(10DX8+5) ＞ 10[1,3,4,4,4,5,7,8,9,10]+10[4,5,8]+4[4]+5 ＞ 29"
+critical = true
 rands = [
   { sides = 10, value = 9 },
   { sides = 10, value = 5 },
@@ -402,6 +421,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]+4 ＞ 29"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },
@@ -417,6 +437,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[2,2,9,10,10]+10[6,9,9]+6[3,6]+4 ＞ 30"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 2 },
@@ -434,6 +455,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[3,4,5,5,9]+4[4]+4 ＞ 18"
+critical = true
 rands = [
   { sides = 10, value = 5 },
   { sides = 10, value = 3 },
@@ -447,6 +469,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[5,6,6,8,10]+10[3,9]+1[1]+4 ＞ 25"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 6 },
@@ -462,6 +485,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[4,4,6,9,10]+3[3,3]+4 ＞ 17"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 4 },
@@ -488,6 +512,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[1,1,2,6,7]+10[8]+10[7]+1[1]+4 ＞ 35"
+critical = true
 rands = [
   { sides = 10, value = 7 },
   { sides = 10, value = 6 },
@@ -503,6 +528,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[3,6,8,8,10]+10[2,5,9]+6[6]+4 ＞ 30"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 8 },
@@ -519,6 +545,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[2,4,4,5,10]+4[4]+4 ＞ 18"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 4 },
@@ -532,6 +559,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3"
 output = "(5DX7+4) ＞ 10[2,3,3,4,10]+6[6]+4 ＞ 20"
+critical = true
 rands = [
   { sides = 10, value = 3 },
   { sides = 10, value = 10 },
@@ -545,6 +573,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[1,2,5,5,5,10,10]+10[2,3,7,7,8,9]+10[1,2,2,3,4,8]+10[3,4,4,7,7]+10[2,5,7,7,8]+10[1,6,7,8,9]+10[1,2,3,8]+10[2,3,5]+10[5,6,8]+10[6,8,10]+10[1,5,9]+10[3,4]+10[1,5]+10[5]+10[9]+10[3]+10[10]+10[5]+10[7]+10[7]+10[6]+10[5]+10[7]+10[3]+1[1] ＞ 241"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 5 },
@@ -618,6 +647,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[1,3,3,4,6,8,9]+10[4,5,5,7,7,9]+10[2,2,6,8,9,10]+10[1,2,2,4,6,8]+10[1,3,3,7,8]+10[2,6,7,8]+10[2,2,8,9]+10[3,5,6,7]+10[1,5,5,9]+10[1,1,5]+10[9]+10[6]+10[2]+10[10]+10[6]+10[6]+10[4]+10[2]+10[4]+10[2]+10[3]+10[4]+10[8]+10[4]+10[4]+1[1] ＞ 251"
+critical = true
 rands = [
   { sides = 10, value = 4 },
   { sides = 10, value = 1 },
@@ -690,6 +720,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[2,3,3,4,6,7,8]+10[1,1,2,3,3,6,10]+10[1,2,6,10,10]+10[1,7,7,9]+10[3,5,7]+10[1,6,10]+10[6,9]+10[8,8]+10[8,9]+10[1,10]+10[3]+10[7]+10[8]+10[9]+10[2]+10[4]+10[8]+10[3]+10[10]+10[2]+10[8]+10[9]+10[4]+10[7]+10[8]+1[1] ＞ 251"
+critical = true
 rands = [
   { sides = 10, value = 8 },
   { sides = 10, value = 6 },
@@ -750,6 +781,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[2,3,5,7,9,9,10]+10[5,6,6,6,8,9,9]+10[2,2,6,7,7,7,10]+10[3,4,4,6,8,8,9]+10[3,6,6,7,7,8,9]+10[2,3,4,6,6,9,9]+10[2,3,3,5,5,5,5]+10[4,4,5,6,7,8,10]+10[1,1,3,3,4,5,6]+10[3,4,4,9,10]+10[2,4,4,7,10]+10[2,3,3,6,8]+10[3,4,7,8,8]+10[1,2,4,7,7]+10[1,2,3,10]+10[4,7,7]+10[2,3,7]+10[2,6,10]+10[1,2,10]+10[2,5]+10[4,8]+10[1,8]+10[3]+10[5]+1[1] ＞ 241"
+critical = true
 rands = [
   { sides = 10, value = 7 },
   { sides = 10, value = 9 },
@@ -870,6 +902,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[3,4,5,6,6,9,10]+10[2,2,4,5,8,8,9]+10[1,2,3,8,8,9,10]+10[4,4,5,8,9,10]+10[5,6,6,9,9,10]+10[3,3,5,5,6,8]+10[1,2,7,9,10,10]+10[1,1,2,4,7]+10[4,6,7]+10[4,7,8]+10[5,7,9]+10[3,5,8]+10[1,9,10]+10[2,4]+10[1,9]+10[2]+10[4]+10[4]+10[6]+10[4]+10[9]+10[3]+1[1] ＞ 221"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 4 },
@@ -954,6 +987,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[1,1,5,5,6,7,7]+10[1,4,8,9,9]+10[1,2,6,10]+10[2,6,7]+10[2,6,6]+10[2,4,10]+10[3,8,10]+10[7,9,9]+10[1,4,5]+10[6,9]+10[4,6]+10[1,3]+10[10]+10[3]+10[2]+10[9]+10[10]+10[2]+10[8]+10[8]+10[6]+1[1] ＞ 211"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 7 },
@@ -1011,6 +1045,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[2,3,7,8,9,9,9]+10[2,3,3,4,4,8,10]+10[1,1,3,5,7,7,9]+10[1,2,4,6,8]+10[5,5,7,10]+10[2,2,5,6]+10[2,4,8,10]+10[1,3,6,10]+10[1,1,7]+1[1] ＞ 91"
+critical = true
 rands = [
   { sides = 10, value = 9 },
   { sides = 10, value = 3 },
@@ -1064,6 +1099,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[1,3,4,4,5,5,10]+10[1,2,2,4,6,6]+10[2,6,7,8,9]+10[3,4,7,8,8]+10[1,2,5,8,9]+10[1,1,3,7]+10[4,7]+10[5,7]+10[5,9]+10[5,9]+10[1,5]+10[2]+10[8]+10[8]+10[3]+10[5]+10[6]+10[6]+10[2]+10[4]+10[10]+10[4]+10[4]+10[8]+10[7]+10[2]+10[4]+1[1] ＞ 271"
+critical = true
 rands = [
   { sides = 10, value = 5 },
   { sides = 10, value = 3 },
@@ -1130,6 +1166,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[1,1,2,2,6,6,8]+10[1,3,6,7,8]+10[3,5,6,8]+10[5,7,8,10]+10[3,5,5,7]+10[2,6,7,9]+10[1,2,9,10]+10[2,7,8]+10[5,6,6]+10[2,4,4]+10[1,6,10]+10[5,7]+10[4,5]+10[7,9]+10[5,7]+10[5,6]+10[5,7]+10[1,10]+10[10]+10[3]+10[7]+10[3]+10[7]+10[7]+10[5]+10[10]+10[3]+10[2]+10[2]+10[9]+10[9]+10[2]+10[4]+10[6]+10[7]+10[5]+10[4]+10[5]+10[3]+10[2]+10[9]+10[7]+10[6]+10[10]+10[2]+10[2]+10[3]+10[3]+10[6]+10[9]+10[10]+10[6]+10[10]+10[2]+10[6]+10[4]+10[10]+10[5]+10[3]+10[3]+10[3]+10[5]+10[8]+10[3]+10[9]+10[8]+10[2]+10[7]+10[3]+10[9]+10[10]+10[2]+10[9]+10[6]+10[8]+10[7]+10[2]+10[9]+10[6]+10[8]+10[5]+10[6]+10[10]+10[3]+10[7]+10[6]+10[7]+10[10]+10[7]+10[2]+10[4]+10[8]+10[8]+10[3]+10[9]+10[8]+10[8]+10[10]+10[2]+10[5]+10[6]+10[5]+10[6]+10[10]+1[1] ＞ 1041"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 1 },
@@ -1282,6 +1319,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "7DX@2"
 output = "(7DX2) ＞ 10[1,2,3,4,5,6,9]+10[6,7,7,7,8,9]+10[1,2,4,5,6,10]+10[2,2,3,3,5]+10[2,3,5,9,10]+10[5,5,5,8,10]+10[1,1,2,6,8]+10[3,3,8]+10[3,5,10]+10[3,9,10]+10[2,3,7]+10[6,6,9]+10[2,2,6]+10[2,4,5]+10[3,3,5]+10[6,7,10]+10[3,5,6]+10[3,4,9]+10[2,5,6]+10[1,5,10]+10[5,6]+10[2,10]+10[2,6]+10[7,9]+10[9,10]+10[1,3]+10[4]+10[9]+10[2]+10[5]+10[2]+10[5]+10[7]+10[4]+10[5]+10[5]+1[1] ＞ 361"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 4 },
@@ -1390,6 +1428,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[8,9,9]+10[2,8,10]+10[4,10]+3[3] ＞ 33"
+critical = true
 rands = [
   { sides = 10, value = 9 },
   { sides = 10, value = 9 },
@@ -1406,6 +1445,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[2,4,7]+10[10]+4[4] ＞ 24"
+critical = true
 rands = [
   { sides = 10, value = 7 },
   { sides = 10, value = 4 },
@@ -1418,6 +1458,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[1,3,5]+2[2] ＞ 12"
+critical = true
 rands = [
   { sides = 10, value = 5 },
   { sides = 10, value = 1 },
@@ -1429,6 +1470,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[2,3,6]+10[5]+10[6]+10[9]+1[1] ＞ 41"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 3 },
@@ -1443,6 +1485,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[2,4,8]+10[6]+10[8]+10[10]+10[9]+1[1] ＞ 51"
+critical = true
 rands = [
   { sides = 10, value = 8 },
   { sides = 10, value = 4 },
@@ -1458,6 +1501,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[3,7,7]+10[2,10]+10[5]+10[5]+10[8]+3[3] ＞ 53"
+critical = true
 rands = [
   { sides = 10, value = 7 },
   { sides = 10, value = 3 },
@@ -1474,6 +1518,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[1,8,9]+10[8,9]+10[4,8]+10[6]+4[4] ＞ 44"
+critical = true
 rands = [
   { sides = 10, value = 1 },
   { sides = 10, value = 9 },
@@ -1490,6 +1535,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[2,9,10]+3[1,3] ＞ 13"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1502,6 +1548,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[6,6,9]+10[2,8,8]+4[1,4] ＞ 24"
+critical = true
 rands = [
   { sides = 10, value = 9 },
   { sides = 10, value = 6 },
@@ -1517,6 +1564,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "3DX@5"
 output = "(3DX5) ＞ 10[2,8,9]+10[3,6]+10[5]+10[6]+10[7]+10[5]+10[5]+10[6]+10[6]+10[8]+2[2] ＞ 102"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 9 },
@@ -1561,6 +1609,7 @@ game_system = "DoubleCross:Korean"
 input = "3DX@5>=12"
 output = "(3DX5>=12) ＞ 10[2,9,10]+3[1,3] ＞ 13 ＞ 성공"
 success = true
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1574,6 +1623,7 @@ game_system = "DoubleCross:Korean"
 input = "3DX@5>=13"
 output = "(3DX5>=13) ＞ 10[2,9,10]+3[1,3] ＞ 13 ＞ 성공"
 success = true
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1587,6 +1637,7 @@ game_system = "DoubleCross:Korean"
 input = "3DX@5>=14"
 output = "(3DX5>=14) ＞ 10[2,9,10]+3[1,3] ＞ 13 ＞ 실패"
 failure = true
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1648,6 +1699,7 @@ rands = []
 game_system = "DoubleCross:Korean"
 input = "1DX@2"
 output = "(1DX2) ＞ 10[2]+1[1] ＞ 11"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 1 },
@@ -1657,6 +1709,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "1DX@9"
 output = "(1DX9) ＞ 10[10]+10[9]+8[8] ＞ 28"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 9 },
@@ -1667,6 +1720,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "1DX@10"
 output = "(1DX10) ＞ 10[10]+9[9] ＞ 19"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 9 },
@@ -1676,6 +1730,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "1DX"
 output = "(1DX10) ＞ 10[10]+9[9] ＞ 19"
+critical = true
 rands = [
   { sides = 10, value = 10 },
   { sides = 10, value = 9 },
@@ -1791,6 +1846,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+5*2@8"
 output = "(10DX8+10) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+10 ＞ 26"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1811,6 +1867,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+(5*2)@8"
 output = "(10DX8+10) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+10 ＞ 26"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1831,6 +1888,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+3+(5*2)@8"
 output = "(10DX8+13) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+13 ＞ 29"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1851,6 +1909,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+(5*2)+4@8"
 output = "(10DX8+14) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+14 ＞ 30"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1871,6 +1930,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+3+(5*2)+4@8"
 output = "(10DX8+17) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+17 ＞ 33"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1891,6 +1951,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "10dx+3+(5*2+1)+4@8"
 output = "(10DX8+18) ＞ 10[2,3,6,6,6,6,7,8,10,10]+6[1,5,6]+18 ＞ 34"
+critical = true
 rands = [
   { sides = 10, value = 2 },
   { sides = 10, value = 10 },
@@ -1911,6 +1972,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3*2"
 output = "(5DX7+1) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]+1 ＞ 26"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },
@@ -1926,6 +1988,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3*2+4"
 output = "(5DX7+5) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]+5 ＞ 30"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },
@@ -1941,6 +2004,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3*(2+1)"
 output = "(5DX7-2) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]-2 ＞ 23"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },
@@ -1956,6 +2020,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-3*(2+1)+7"
 output = "(5DX7+5) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]+5 ＞ 30"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },
@@ -1971,6 +2036,7 @@ rands = [
 game_system = "DoubleCross:Korean"
 input = "5DX7+7-2*(2+5-3)"
 output = "(5DX7-1) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]-1 ＞ 24"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },
@@ -1986,6 +2052,7 @@ rands = [
 game_system = "DoubleCross"
 input = "5DX(8-1)-(2-1)"
 output = "(5DX7-1) ＞ 10[5,6,6,7,8]+10[1,9]+5[5]-1 ＞ 24"
+critical = true
 rands = [
   { sides = 10, value = 6 },
   { sides = 10, value = 6 },

From 7cd978e340f04e6a8299f8b10eecfc06f29924ce Mon Sep 17 00:00:00 2001
From: Hideyo Mikisato <h.mikisato@gmail.com>
Date: Thu, 29 Apr 2021 00:49:54 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E5=8F=8D=E6=98=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/bcdice/game_system/DoubleCross.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bcdice/game_system/DoubleCross.rb b/lib/bcdice/game_system/DoubleCross.rb
index 763ce8cb8..456952cf1 100644
--- a/lib/bcdice/game_system/DoubleCross.rb
+++ b/lib/bcdice/game_system/DoubleCross.rb
@@ -117,7 +117,7 @@ def result(value_groups)
               achieved_value.to_s
             end
 
-          r.critical = !r.fumble? && value_groups.length > 1
+          r.critical = value_groups.length > 1
 
           parts = [
             "(#{@expression})",