Merge pull request #505 from rassi0429/master

エモクロア文字列”成功数を追加
bcdice · Oct 16, 2021 · 0ab5b50 · 0ab5b50
2 parents dea3c9c + 29abfa8
commit 0ab5b50
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/lib/bcdice/game_system/Emoklore.rb b/lib/bcdice/game_system/Emoklore.rb
@@ -67,7 +67,7 @@ def dice_roll(num_dice, success_threshold)
         success_value = 2 * critical + success - fumble
         result = compare_result(success_value)
 
-        result.text = "#{values} ＞ #{success_value} ＞ #{result.text}"
+        result.text = "#{values} ＞ #{success_value} ＞ 成功数#{success_value} #{result.text}"
         return result
       end
 

diff --git a/test/data/Emoklore.toml b/test/data/Emoklore.toml
@@ -10,7 +10,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "1DM<=5"
-output = "(1DM<=5) ＞ [6] ＞ 0 ＞ 失敗!"
+output = "(1DM<=5) ＞ [6] ＞ 0 ＞ 成功数0 失敗!"
 failure = true
 rands = [
   { sides = 10, value = 6 },
@@ -19,7 +19,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "1DM<=5"
-output = "(1DM<=5) ＞ [5] ＞ 1 ＞ 成功!"
+output = "(1DM<=5) ＞ [5] ＞ 1 ＞ 成功数1 成功!"
 success = true
 rands = [
   { sides = 10, value = 5 },
@@ -28,7 +28,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "1DM<=5"
-output = "(1DM<=5) ＞ [1] ＞ 2 ＞ ダブル!"
+output = "(1DM<=5) ＞ [1] ＞ 2 ＞ 成功数2 ダブル!"
 success = true
 critical = true
 rands = [
@@ -38,7 +38,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "DM<=5"
-output = "(1DM<=5) ＞ [1] ＞ 2 ＞ ダブル!"
+output = "(1DM<=5) ＞ [1] ＞ 2 ＞ 成功数2 ダブル!"
 success = true
 critical = true
 rands = [
@@ -48,7 +48,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "2DM<=5"
-output = "(2DM<=5) ＞ [1, 6] ＞ 2 ＞ ダブル!"
+output = "(2DM<=5) ＞ [1, 6] ＞ 2 ＞ 成功数2 ダブル!"
 success = true
 critical = true
 rands = [
@@ -59,7 +59,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "2DM<=5"
-output = "(2DM<=5) ＞ [1, 1] ＞ 4 ＞ ミラクル!"
+output = "(2DM<=5) ＞ [1, 1] ＞ 4 ＞ 成功数4 ミラクル!"
 success = true
 critical = true
 rands = [
@@ -70,7 +70,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "10DM<=3"
-output = "(10DM<=3) ＞ [4, 7, 10, 3, 6, 9, 2, 5, 8, 1] ＞ 3 ＞ トリプル!"
+output = "(10DM<=3) ＞ [4, 7, 10, 3, 6, 9, 2, 5, 8, 1] ＞ 3 ＞ 成功数3 トリプル!"
 success = true
 critical = true
 rands = [
@@ -89,7 +89,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "10DM<=3"
-output = "(10DM<=3) ＞ [10, 10, 10, 1, 1, 1, 1, 1, 1, 1] ＞ 11 ＞ カタストロフ!"
+output = "(10DM<=3) ＞ [10, 10, 10, 1, 1, 1, 1, 1, 1, 1] ＞ 11 ＞ 成功数11 カタストロフ!"
 success = true
 critical = true
 rands = [
@@ -108,7 +108,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "10DM<=3"
-output = "(10DM<=3) ＞ [10, 10, 5, 1, 1, 1, 1, 1, 1, 1] ＞ 12 ＞ カタストロフ!"
+output = "(10DM<=3) ＞ [10, 10, 5, 1, 1, 1, 1, 1, 1, 1] ＞ 12 ＞ 成功数12 カタストロフ!"
 success = true
 critical = true
 rands = [
@@ -127,7 +127,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "10DM<=3"
-output = "(10DM<=3) ＞ [10, 10, 10, 10, 1, 1, 1, 1, 1, 1] ＞ 8 ＞ ミラクル!"
+output = "(10DM<=3) ＞ [10, 10, 10, 10, 1, 1, 1, 1, 1, 1] ＞ 8 ＞ 成功数8 ミラクル!"
 success = true
 critical = true
 rands = [
@@ -146,7 +146,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "10DM<=3"
-output = "(10DM<=3) ＞ [10, 10, 10, 10, 1, 4, 5, 6, 7, 8] ＞ -2 ＞ ファンブル!"
+output = "(10DM<=3) ＞ [10, 10, 10, 10, 1, 4, 5, 6, 7, 8] ＞ -2 ＞ 成功数-2 ファンブル!"
 failure = true
 fumble = true
 rands = [
@@ -165,7 +165,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "2DA3"
-output = "(2DA3) ＞ (2DM<=5) ＞ [8, 5] ＞ 1 ＞ 成功!"
+output = "(2DA3) ＞ (2DM<=5) ＞ [8, 5] ＞ 1 ＞ 成功数1 成功!"
 success = true
 rands = [
   { sides = 10, value = 8 },
@@ -175,7 +175,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "2DA3+1"
-output = "(2DA3+1) ＞ (3DM<=5) ＞ [8, 5, 6] ＞ 1 ＞ 成功!"
+output = "(2DA3+1) ＞ (3DM<=5) ＞ [8, 5, 6] ＞ 1 ＞ 成功数1 成功!"
 success = true
 rands = [
   { sides = 10, value = 8 },
@@ -186,7 +186,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "DA3+1"
-output = "(DA3+1) ＞ (2DM<=3) ＞ [8, 6] ＞ 0 ＞ 失敗!"
+output = "(DA3+1) ＞ (2DM<=3) ＞ [8, 6] ＞ 0 ＞ 成功数0 失敗!"
 failure = true
 rands = [
   { sides = 10, value = 8 },
@@ -196,7 +196,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "1DA3"
-output = "(1DA3) ＞ (1DM<=4) ＞ [2] ＞ 1 ＞ 成功!"
+output = "(1DA3) ＞ (1DM<=4) ＞ [2] ＞ 1 ＞ 成功数1 成功!"
 success = true
 rands = [
   { sides = 10, value = 2 },
@@ -205,7 +205,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "1DA3"
-output = "(1DA3) ＞ (1DM<=4) ＞ [1] ＞ 2 ＞ ダブル!"
+output = "(1DA3) ＞ (1DM<=4) ＞ [1] ＞ 2 ＞ 成功数2 ダブル!"
 success = true
 critical = true
 rands = [
@@ -215,7 +215,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "bDA3"
-output = "(BDA3) ＞ (1DM<=3) ＞ [1] ＞ 2 ＞ ダブル!"
+output = "(BDA3) ＞ (1DM<=3) ＞ [1] ＞ 2 ＞ 成功数2 ダブル!"
 success = true
 critical = true
 rands = [
@@ -225,7 +225,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "bDA3+5"
-output = "(BDA3+5) ＞ (6DM<=3) ＞ [1, 2, 3, 4, 7, 8] ＞ 4 ＞ ミラクル!"
+output = "(BDA3+5) ＞ (6DM<=3) ＞ [1, 2, 3, 4, 7, 8] ＞ 4 ＞ 成功数4 ミラクル!"
 success = true
 critical = true
 rands = [
@@ -240,7 +240,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "3DA3+5"
-output = "(3DA3+5) ＞ (8DM<=6) ＞ [1, 2, 3, 4, 7, 8, 9, 10] ＞ 4 ＞ ミラクル!"
+output = "(3DA3+5) ＞ (8DM<=6) ＞ [1, 2, 3, 4, 7, 8, 9, 10] ＞ 4 ＞ 成功数4 ミラクル!"
 success = true
 critical = true
 rands = [
@@ -257,7 +257,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "3DA3+9"
-output = "(3DA3+9) ＞ (12DM<=6) ＞ [10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10] ＞ -12 ＞ ファンブル!"
+output = "(3DA3+9) ＞ (12DM<=6) ＞ [10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10] ＞ -12 ＞ 成功数-12 ファンブル!"
 failure = true
 fumble = true
 rands = [
@@ -278,7 +278,7 @@ rands = [
 [[ test ]]
 game_system = "Emoklore"
 input = "3DA3+4 (技能：調査)"
-output = "(3DA3+4) ＞ (7DM<=6) ＞ [10, 10, 10, 10, 10, 10, 10] ＞ -7 ＞ ファンブル!"
+output = "(3DA3+4) ＞ (7DM<=6) ＞ [10, 10, 10, 10, 10, 10, 10] ＞ -7 ＞ 成功数-7 ファンブル!"
 failure = true
 fumble = true
 rands = [