From d344cc87255c4ce068871a8159f7eb582227b587 Mon Sep 17 00:00:00 2001 From: SAKATA Sinji Date: Thu, 3 Dec 2020 20:14:56 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=E7=A9=BA=E7=99=BD=E3=81=AE=E5=85=A5?= =?UTF-8?q?=E3=82=8C=E5=BF=98=E3=82=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/bcdice/game_system/HarnMaster.rb | 2 +- test/data/HarnMaster.toml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/bcdice/game_system/HarnMaster.rb b/lib/bcdice/game_system/HarnMaster.rb index 9a48811e2..6a6beeb46 100644 --- a/lib/bcdice/game_system/HarnMaster.rb +++ b/lib/bcdice/game_system/HarnMaster.rb @@ -28,7 +28,7 @@ def check_1D100(total, _dice_total, cmp_op, target) return '' unless cmp_op == :<= result = getCheckResult(total, target) - return "＞ #{result}" + return " ＞ #{result}" end def getCheckResult(total, diff) diff --git a/test/data/HarnMaster.toml b/test/data/HarnMaster.toml index 29cb1250d..c904d41dd 100644 --- a/test/data/HarnMaster.toml +++ b/test/data/HarnMaster.toml @@ -1,7 +1,7 @@ [[ test ]] game_system = "HarnMaster" input = "1D100<=50" -output = "(1D100<=50) ＞ 49＞ 成功" +output = "(1D100<=50) ＞ 49 ＞ 成功" rands = [ { sides = 100, value = 49 }, ] @@ -9,7 +9,7 @@ rands = [ [[ test ]] game_system = "HarnMaster" input = "1D100<=50" -output = "(1D100<=50) ＞ 51＞ 失敗" +output = "(1D100<=50) ＞ 51 ＞ 失敗" rands = [ { sides = 100, value = 51 }, ] @@ -17,7 +17,7 @@ rands = [ [[ test ]] game_system = "HarnMaster" input = "1D100<=50" -output = "(1D100<=50) ＞ 50＞ 決定的成功" +output = "(1D100<=50) ＞ 50 ＞ 決定的成功" rands = [ { sides = 100, value = 50 }, ] @@ -25,7 +25,7 @@ rands = [ [[ test ]] game_system = "HarnMaster" input = "1D100<=50" -output = "(1D100<=50) ＞ 55＞ 致命的失敗" +output = "(1D100<=50) ＞ 55 ＞ 致命的失敗" rands = [ { sides = 100, value = 55 }, ] From 63291ecbf1df28402063fe73012fb111487b4ea6 Mon Sep 17 00:00:00 2001 From: SAKATA Sinji Date: Thu, 3 Dec 2020 20:15:15 +0900 Subject: [PATCH 2/8] =?UTF-8?q?check=5FXXX=E3=81=AE=E4=BB=A3=E6=9B=BF?= =?UTF-8?q?=E3=81=A8=E3=81=97=E3=81=A6=E3=80=81Result=E3=82=92=E8=BF=94?= =?UTF-8?q?=E3=81=99result=5FXXX=E3=82=92=E6=96=B0=E8=A8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/bcdice/base.rb | 64 +++++++++++++++++++--- lib/bcdice/common_command/add_dice/node.rb | 29 ++++++---- lib/bcdice/result.rb | 4 ++ test/data/GranCrest.toml | 10 ++-- 4 files changed, 84 insertions(+), 23 deletions(-) diff --git a/lib/bcdice/base.rb b/lib/bcdice/base.rb index e360e8d9f..37cb634d1 100644 --- a/lib/bcdice/base.rb +++ b/lib/bcdice/base.rb @@ -188,8 +188,48 @@ def change_text(string) # @param rand_results [Array] ダイスの一覧 # @param cmp_op [Symbol] 比較演算子 # @param target [Integer, String] 目標値の整数か'?' - # @return [String] + # @return [Result] def check_result(total, rand_results, cmp_op, target) + ret = check_result_legacy(total, rand_results, cmp_op, target) + return ret if ret + + sides_list = rand_results.map(&:sides) + value_list = rand_results.map(&:value) + dice_total = value_list.sum() + + ret = + case sides_list + when [100] + result_1d100(total, dice_total, cmp_op, target) + when [20] + result_1d20(total, dice_total, cmp_op, target) + when [6, 6] + result_2d6(total, dice_total, value_list, cmp_op, target) + end + + return nil if ret == Result.nothing + return ret if ret + + ret = + case sides_list.uniq + when [10] + result_nd10(total, dice_total, value_list, cmp_op, target) + when [6] + result_nd6(total, dice_total, value_list, cmp_op, target) + end + + return nil if ret == Result.nothing + return ret if ret + + return result_ndx(total, cmp_op, target) + end + + # @param total [Integer] コマンド合計値 + # @param rand_results [Array] ダイスの一覧 + # @param cmp_op [Symbol] 比較演算子 + # @param target [Integer, String] 目標値の整数か'?' + # @return [Result] + def check_result_legacy(total, rand_results, cmp_op, target) sides_list = rand_results.map(&:sides) value_list = rand_results.map(&:value) dice_total = value_list.sum() @@ -204,7 +244,7 @@ def check_result(total, rand_results, cmp_op, target) check_2D6(total, dice_total, value_list, cmp_op, target) end - return ret unless ret.nil? || ret.empty? + return Result.new(ret.delete_prefix(" ＞ ")) unless ret.nil? || ret.empty? ret = case sides_list.uniq @@ -214,9 +254,9 @@ def check_result(total, rand_results, cmp_op, target) check_nD6(total, dice_total, value_list, cmp_op, target) end - return ret unless ret.nil? || ret.empty? + return Result.new(ret.delete_prefix(" ＞ ")) unless ret.nil? || ret.empty? - check_nDx(total, cmp_op, target) + return nil end # シャドウラン用グリッチ判定 @@ -271,8 +311,8 @@ def eval_game_system_specific_command(command); end # # @param (see #check_result) # @return [String] - def check_nDx(total, cmp_op, target) - result = + def result_ndx(total, cmp_op, target) + str = if target.is_a?(String) translate("failure") elsif total.send(cmp_op, target) @@ -281,7 +321,7 @@ def check_nDx(total, cmp_op, target) translate("failure") end - return " ＞ #{result}" + Result.new(str) end # @param (see #check_result) @@ -304,6 +344,16 @@ def check_2D6(total, dice_total, dice_list, cmp_op, target); end # @return [nil] def check_nD6(total, dice_total, dice_list, cmp_op, target); end + def result_1d100(total, dice_total, cmp_op, target); end + + def result_1d20(total, dice_total, cmp_op, target); end + + def result_nd10(total, dice_total, value_list, cmp_op, target); end + + def result_2d6(total, dice_total, value_list, cmp_op, target); end + + def result_nd6(total, dice_total, value_list, cmp_op, target); end + def get_table_by_2d6(table) get_table_by_nD6(table, 2) end diff --git a/lib/bcdice/common_command/add_dice/node.rb b/lib/bcdice/common_command/add_dice/node.rb index 9cefb4dc5..db228f6b9 100644 --- a/lib/bcdice/common_command/add_dice/node.rb +++ b/lib/bcdice/common_command/add_dice/node.rb @@ -53,21 +53,28 @@ def eval(game_system, randomizer) randomizer = Randomizer.new(randomizer, game_system) total = @lhs.eval(randomizer) - output = - if randomizer.rand_results.size <= 1 && @lhs.is_a?(Node::DiceRoll) - "(#{self}) ＞ #{total}" - else - "(#{self}) ＞ #{@lhs.output} ＞ #{total}" + interrim_expr = + unless randomizer.rand_results.size <= 1 && @lhs.is_a?(Node::DiceRoll) + @lhs.output end - if @cmp_op - rhs = @rhs.eval(nil) - output += game_system.check_result(total, randomizer.rand_results, @cmp_op, rhs) - end + result = + if @cmp_op + rhs = @rhs.eval(nil) + game_system.check_result(total, randomizer.rand_results, @cmp_op, rhs) + end + result ||= Result.new + + sequence = [ + "(#{self})", + interrim_expr, + total, + result&.text + ].compact - Result.new.tap do |r| + result.tap do |r| r.secret = @secret - r.text = output + r.text = sequence.join(" ＞ ") end end diff --git a/lib/bcdice/result.rb b/lib/bcdice/result.rb index 8eb8c64f7..7688c6291 100644 --- a/lib/bcdice/result.rb +++ b/lib/bcdice/result.rb @@ -14,6 +14,10 @@ def failure(text) r.failure = true end end + + def nothing + :nothing + end end def initialize(text = nil) diff --git a/test/data/GranCrest.toml b/test/data/GranCrest.toml index 1ce5f315d..a70ca0598 100644 --- a/test/data/GranCrest.toml +++ b/test/data/GranCrest.toml @@ -10,7 +10,7 @@ rands = [ [[ test ]] game_system = "GranCrest" input = "2d6>=10" -output = "(2D6>=10) ＞ 12[6,6] ＞ 12（クリティカル） ＞ 22 ＞ 成功" +output = "(2D6>=10) ＞ 12[6,6] ＞ 12 ＞ （クリティカル） ＞ 22 ＞ 成功" rands = [ { sides = 6, value = 6 }, { sides = 6, value = 6 }, @@ -28,7 +28,7 @@ rands = [ [[ test ]] game_system = "GranCrest" input = "3d6>=19" -output = "(3D6>=19) ＞ 15[3,6,6] ＞ 15（クリティカル） ＞ 25 ＞ 成功" +output = "(3D6>=19) ＞ 15[3,6,6] ＞ 15 ＞ （クリティカル） ＞ 25 ＞ 成功" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 6 }, @@ -38,7 +38,7 @@ rands = [ [[ test ]] game_system = "GranCrest" input = "3d6+5>=24" -output = "(3D6+5>=24) ＞ 18[6,6,6]+5 ＞ 23（クリティカル） ＞ 33 ＞ 成功" +output = "(3D6+5>=24) ＞ 18[6,6,6]+5 ＞ 23 ＞ （クリティカル） ＞ 33 ＞ 成功" rands = [ { sides = 6, value = 6 }, { sides = 6, value = 6 }, @@ -48,7 +48,7 @@ rands = [ [[ test ]] game_system = "GranCrest" input = "3d6>=?" -output = "(3D6>=?) ＞ 14[2,6,6] ＞ 14（クリティカル） ＞ 24" +output = "(3D6>=?) ＞ 14[2,6,6] ＞ 14 ＞ （クリティカル） ＞ 24" rands = [ { sides = 6, value = 2 }, { sides = 6, value = 6 }, @@ -58,7 +58,7 @@ rands = [ [[ test ]] game_system = "GranCrest" input = "3d6+7>=?" -output = "(3D6+7>=?) ＞ 13[1,6,6]+7 ＞ 20（クリティカル） ＞ 30" +output = "(3D6+7>=?) ＞ 13[1,6,6]+7 ＞ 20 ＞ （クリティカル） ＞ 30" rands = [ { sides = 6, value = 1 }, { sides = 6, value = 6 }, From a619108bdbc00ccfddb4c8a5cfb46e3b18bd8668 Mon Sep 17 00:00:00 2001 From: SAKATA Sinji Date: Fri, 4 Dec 2020 04:01:09 +0900 Subject: [PATCH 3/8] =?UTF-8?q?check=5Fxxx=E7=B3=BB=E3=82=92=E9=9D=9E?= =?UTF-8?q?=E6=8E=A8=E5=A5=A8=E3=81=A8=E3=81=97=E3=81=A6=E3=83=A2=E3=82=B8?= =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=83=AB=E3=81=AB=E9=9A=94=E9=9B=A2=E3=81=99?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/bcdice/base.rb | 57 +---------------------- lib/bcdice/deprecated/checker.rb | 78 ++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 55 deletions(-) create mode 100644 lib/bcdice/deprecated/checker.rb diff --git a/lib/bcdice/base.rb b/lib/bcdice/base.rb index 37cb634d1..80bad2c31 100644 --- a/lib/bcdice/base.rb +++ b/lib/bcdice/base.rb @@ -8,6 +8,7 @@ require "bcdice/translate" require "bcdice/result" require "bcdice/command_parser" +require "bcdice/deprecated/checker" module BCDice class Base @@ -68,6 +69,7 @@ def eval(command) end include Translate + include Deprecated::Checker def initialize(command) @raw_input = command @@ -224,41 +226,6 @@ def check_result(total, rand_results, cmp_op, target) return result_ndx(total, cmp_op, target) end - # @param total [Integer] コマンド合計値 - # @param rand_results [Array] ダイスの一覧 - # @param cmp_op [Symbol] 比較演算子 - # @param target [Integer, String] 目標値の整数か'?' - # @return [Result] - def check_result_legacy(total, rand_results, cmp_op, target) - sides_list = rand_results.map(&:sides) - value_list = rand_results.map(&:value) - dice_total = value_list.sum() - - ret = - case sides_list - when [100] - check_1D100(total, dice_total, cmp_op, target) - when [20] - check_1D20(total, dice_total, cmp_op, target) - when [6, 6] - check_2D6(total, dice_total, value_list, cmp_op, target) - end - - return Result.new(ret.delete_prefix(" ＞ ")) unless ret.nil? || ret.empty? - - ret = - case sides_list.uniq - when [10] - check_nD10(total, dice_total, value_list, cmp_op, target) - when [6] - check_nD6(total, dice_total, value_list, cmp_op, target) - end - - return Result.new(ret.delete_prefix(" ＞ ")) unless ret.nil? || ret.empty? - - return nil - end - # シャドウラン用グリッチ判定 # @param count_one [Integer] 出目1の数 # @param dice_total_count [Integer] ダイスロールしたダイスの数 @@ -324,26 +291,6 @@ def result_ndx(total, cmp_op, target) Result.new(str) end - # @param (see #check_result) - # @return [nil] - def check_1D100(total, dice_total, cmp_op, target); end - - # @param (see #check_result) - # @return [nil] - def check_1D20(total, dice_total, cmp_op, target); end - - # @param (see #check_result) - # @return [nil] - def check_nD10(total, dice_total, dice_list, cmp_op, target); end - - # @param (see #check_result) - # @return [nil] - def check_2D6(total, dice_total, dice_list, cmp_op, target); end - - # @param (see #check_result) - # @return [nil] - def check_nD6(total, dice_total, dice_list, cmp_op, target); end - def result_1d100(total, dice_total, cmp_op, target); end def result_1d20(total, dice_total, cmp_op, target); end diff --git a/lib/bcdice/deprecated/checker.rb b/lib/bcdice/deprecated/checker.rb new file mode 100644 index 000000000..881287dd1 --- /dev/null +++ b/lib/bcdice/deprecated/checker.rb @@ -0,0 +1,78 @@ +# frozen_string_literal: true + +module BCDice + module Deprecated + # 2D6などの特定の加算ダイスの結果をゲームシステムごとにカスタマイズするための + # @deprecate Base#result_2d6 等を利用してください + module Checker + private + + # @param total [Integer] コマンド合計値 + # @param rand_results [Array] ダイスの一覧 + # @param cmp_op [Symbol] 比較演算子 + # @param target [Integer, String] 目標値の整数か'?' + # @return [Result, nil] + def check_result_legacy(total, rand_results, cmp_op, target) + sides_list = rand_results.map(&:sides) + value_list = rand_results.map(&:value) + dice_total = value_list.sum() + + ret = + case sides_list + when [100] + check_1D100(total, dice_total, cmp_op, target) + when [20] + check_1D20(total, dice_total, cmp_op, target) + when [6, 6] + check_2D6(total, dice_total, value_list, cmp_op, target) + end + + return Result.new(ret.delete_prefix(" ＞ ")) unless ret.nil? || ret.empty? + + ret = + case sides_list.uniq + when [10] + check_nD10(total, dice_total, value_list, cmp_op, target) + when [6] + check_nD6(total, dice_total, value_list, cmp_op, target) + end + + return Result.new(ret.delete_prefix(" ＞ ")) unless ret.nil? || ret.empty? + + return nil + end + + # @param total [Integer] + # @param dice_total [Integer] + # @param cmp_op [Symbol] + # @param target + # @return [String, nil] + # @deprecate Base#result_1d100 を使ってください + def check_1D100(total, dice_total, cmp_op, target); end + + # @param (see #check_1D100) + # @return [String, nil] + # @deprecate Base#result_1d20 を使ってください + def check_1D20(total, dice_total, cmp_op, target); end + + # @param total [Integer] + # @param dice_total [Integer] + # @param dice_list [Array] + # @param cmp_op [Symbol] + # @param target + # @return [String, nil] + # @deprecate Base#result_nd10 を使ってください + def check_nD10(total, dice_total, dice_list, cmp_op, target); end + + # @param (see #check_nD10) + # @return [String, nil] + # @deprecate Base#result_2d6 を使ってください + def check_2D6(total, dice_total, dice_list, cmp_op, target); end + + # @param (see #check_nD10) + # @return [String, nil] + # @deprecate Base#result_nd6 を使ってください + def check_nD6(total, dice_total, dice_list, cmp_op, target); end + end + end +end From dffe83c4de0e97774cd0f0916c57c2e44d198617 Mon Sep 17 00:00:00 2001 From: SAKATA Sinji Date: Fri, 4 Dec 2020 04:30:37 +0900 Subject: [PATCH 4/8] =?UTF-8?q?result=5Fndx=E3=81=A7=E6=88=90=E5=90=A6?= =?UTF-8?q?=E3=81=AE=E3=82=B9=E3=83=86=E3=83=BC=E3=82=BF=E3=82=B9=E3=82=92?= =?UTF-8?q?=E8=BF=94=E3=81=97=E3=80=81=E7=9B=AE=E6=A8=99=E5=80=A4=3F?= =?UTF-8?q?=E3=81=AF=E9=9D=9E=E8=A1=A8=E7=A4=BA=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/bcdice/base.rb | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/bcdice/base.rb b/lib/bcdice/base.rb index 80bad2c31..c12bf31b1 100644 --- a/lib/bcdice/base.rb +++ b/lib/bcdice/base.rb @@ -274,21 +274,20 @@ def dice_command(command) # @return [String, nil] def eval_game_system_specific_command(command); end - # 成功か失敗かを文字列で返す + # 成功か失敗か返す # - # @param (see #check_result) - # @return [String] + # @param total [Integer] + # @param cmp_op [Symbol] + # @param target [Number] + # @return [Result] def result_ndx(total, cmp_op, target) - str = - if target.is_a?(String) - translate("failure") - elsif total.send(cmp_op, target) - translate("success") - else - translate("failure") - end - - Result.new(str) + if target.is_a?(String) + nil + elsif total.send(cmp_op, target) + Result.success(translate("success")) + else + Result.failure(translate("failure")) + end end def result_1d100(total, dice_total, cmp_op, target); end From 53cdb44a74c7712e8e64771fd45854c1f77582cf Mon Sep 17 00:00:00 2001 From: SAKATA Sinji Date: Fri, 4 Dec 2020 04:31:54 +0900 Subject: [PATCH 5/8] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=B1?= =?UTF-8?q?=E3=83=BC=E3=82=B9=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/data/Arianrhod.toml | 2 +- test/data/BeginningIdol.toml | 2 +- test/data/BeginningIdol_Korean.toml | 2 +- test/data/BloodCrusade.toml | 2 +- test/data/BloodMoon.toml | 2 +- test/data/CardRanker.toml | 2 +- test/data/ChaosFlare.toml | 2 +- test/data/Chill.toml | 2 +- test/data/Chill3.toml | 2 +- test/data/Cthulhu.toml | 2 + test/data/Cthulhu_ChineseTraditional.toml | 2 + test/data/Cthulhu_Korean.toml | 2 + test/data/DarkBlaze.toml | 2 +- test/data/DarkDaysDrive.toml | 2 +- test/data/DemonParasite.toml | 2 +- test/data/DoubleCross.toml | 2 +- test/data/DoubleCross_Korean.toml | 2 +- test/data/DungeonsAndDragons.toml | 8 + test/data/EclipsePhase.toml | 2 +- test/data/Elric.toml | 2 +- test/data/EmbryoMachine.toml | 2 +- test/data/GURPS.toml | 2 +- test/data/Gorilla.toml | 2 +- test/data/GranCrest.toml | 2 +- test/data/Gundog.toml | 2 +- test/data/GundogRevised.toml | 2 +- test/data/GurpsFW.toml | 2 +- test/data/HarnMaster.toml | 2 +- test/data/Hieizan.toml | 2 +- test/data/HuntersMoon.toml | 2 +- test/data/InfiniteFantasia.toml | 2 +- test/data/Insane.toml | 2 +- test/data/Insane_Korean.toml | 2 +- test/data/IthaWenUa.toml | 2 +- test/data/JamesBond.toml | 2 +- test/data/KanColle.toml | 2 +- test/data/KillDeathBusiness.toml | 2 +- test/data/KillDeathBusiness_Korean.toml | 2 +- test/data/MagicaLogia.toml | 2 +- test/data/MeikyuDays.toml | 2 +- test/data/MeikyuKingdom.toml | 2 +- test/data/MetalHead.toml | 4 +- test/data/Misonzai.toml | 1 + test/data/Nechronica.toml | 2 +- test/data/Nechronica_Korean.toml | 2 +- test/data/NjslyrBattle.toml | 2 +- test/data/None.toml | 24 + test/data/Paranoia.toml | 5 + test/data/Pathfinder.toml | 8 + test/data/Peekaboo.toml | 2 +- test/data/Pendragon.toml | 2 +- test/data/PhantasmAdventure.toml | 2 +- test/data/RoleMaster.toml | 948 +--------------------- test/data/RuneQuest.toml | 4 +- test/data/SamsaraBallad.toml | 1 + test/data/SharedFantasia.toml | 2 +- test/data/ShinMegamiTenseiKakuseihen.toml | 2 +- test/data/ShinkuuGakuen.toml | 1 + test/data/ShinobiGami.toml | 2 +- test/data/StratoShout.toml | 2 +- test/data/StratoShout_Korean.toml | 2 +- test/data/SwordWorld.toml | 2 +- test/data/SwordWorld2_0.toml | 1 + test/data/TestDummy.toml | 8 - test/data/TokumeiTenkousei.toml | 2 +- test/data/TokyoGhostResearch.toml | 7 + test/data/TokyoNova.toml | 8 + test/data/TrinitySeven.toml | 5 +- test/data/WARPS.toml | 2 +- test/data/WaresBlade.toml | 7 +- test/data/Warhammer.toml | 2 +- test/data/Warhammer4.toml | 2 +- test/data/YankeeYogSothoth.toml | 2 +- 73 files changed, 142 insertions(+), 1012 deletions(-) delete mode 100644 test/data/TestDummy.toml diff --git a/test/data/Arianrhod.toml b/test/data/Arianrhod.toml index 422447b83..26c330664 100644 --- a/test/data/Arianrhod.toml +++ b/test/data/Arianrhod.toml @@ -268,7 +268,7 @@ rands = [ [[ test ]] game_system = "Arianrhod" input = "3D6>=? 目標値?でバグらない" -output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9 ＞ 失敗" +output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, diff --git a/test/data/BeginningIdol.toml b/test/data/BeginningIdol.toml index 706dd3073..890c29274 100644 --- a/test/data/BeginningIdol.toml +++ b/test/data/BeginningIdol.toml @@ -2205,7 +2205,7 @@ rands = [ [[ test ]] game_system = "BeginningIdol" input = "3D6>=? 目標値?でバグらない" -output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9 ＞ 失敗" +output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, diff --git a/test/data/BeginningIdol_Korean.toml b/test/data/BeginningIdol_Korean.toml index 2bdd8490f..55827ec27 100644 --- a/test/data/BeginningIdol_Korean.toml +++ b/test/data/BeginningIdol_Korean.toml @@ -2167,7 +2167,7 @@ rands = [ [[ test ]] game_system = "BeginningIdol:Korean" input = "3D6>=? 目標値?でバグらない" -output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9 ＞ 失敗" +output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, diff --git a/test/data/BloodCrusade.toml b/test/data/BloodCrusade.toml index 16ba94612..c416645e9 100644 --- a/test/data/BloodCrusade.toml +++ b/test/data/BloodCrusade.toml @@ -338,7 +338,7 @@ rands = [ [[ test ]] game_system = "BloodCrusade" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/BloodMoon.toml b/test/data/BloodMoon.toml index edd2730b7..7e9808976 100644 --- a/test/data/BloodMoon.toml +++ b/test/data/BloodMoon.toml @@ -288,7 +288,7 @@ rands = [] [[ test ]] game_system = "BloodMoon" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/CardRanker.toml b/test/data/CardRanker.toml index 6a64d3b67..efe46ca91 100644 --- a/test/data/CardRanker.toml +++ b/test/data/CardRanker.toml @@ -337,7 +337,7 @@ rands = [ [[ test ]] game_system = "CardRanker" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/ChaosFlare.toml b/test/data/ChaosFlare.toml index 90ad9c9bd..66791248f 100644 --- a/test/data/ChaosFlare.toml +++ b/test/data/ChaosFlare.toml @@ -494,7 +494,7 @@ rands = [ [[ test ]] game_system = "ChaosFlare" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/Chill.toml b/test/data/Chill.toml index 55e082cdb..430d5360c 100644 --- a/test/data/Chill.toml +++ b/test/data/Chill.toml @@ -2934,7 +2934,7 @@ rands = [ [[ test ]] game_system = "Chill" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/Chill3.toml b/test/data/Chill3.toml index 63c6e2996..624a8e2d5 100644 --- a/test/data/Chill3.toml +++ b/test/data/Chill3.toml @@ -129,7 +129,7 @@ rands = [ [[ test ]] game_system = "Chill3" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/Cthulhu.toml b/test/data/Cthulhu.toml index d559a34e1..c3d21f582 100644 --- a/test/data/Cthulhu.toml +++ b/test/data/Cthulhu.toml @@ -2,6 +2,7 @@ game_system = "Cthulhu" input = "1D100<=70 ファンブルなし" output = "(1D100<=70) ＞ 100 ＞ 失敗" +failure = true rands = [ { sides = 100, value = 100 }, ] @@ -10,6 +11,7 @@ rands = [ game_system = "Cthulhu" input = "1D100<=70 クリティカルなし" output = "(1D100<=70) ＞ 1 ＞ 成功" +success = true rands = [ { sides = 100, value = 1 }, ] diff --git a/test/data/Cthulhu_ChineseTraditional.toml b/test/data/Cthulhu_ChineseTraditional.toml index de087010c..97ff36009 100644 --- a/test/data/Cthulhu_ChineseTraditional.toml +++ b/test/data/Cthulhu_ChineseTraditional.toml @@ -2,6 +2,7 @@ game_system = "Cthulhu:ChineseTraditional" input = "1D100<=70 ファンブルなし" output = "(1D100<=70) ＞ 100 ＞ 失敗" +failure = true rands = [ { sides = 100, value = 100 }, ] @@ -10,6 +11,7 @@ rands = [ game_system = "Cthulhu:ChineseTraditional" input = "1D100<=70 クリティカルなし" output = "(1D100<=70) ＞ 1 ＞ 成功" +success = true rands = [ { sides = 100, value = 1 }, ] diff --git a/test/data/Cthulhu_Korean.toml b/test/data/Cthulhu_Korean.toml index 3ceec2964..d6e15d66c 100644 --- a/test/data/Cthulhu_Korean.toml +++ b/test/data/Cthulhu_Korean.toml @@ -2,6 +2,7 @@ game_system = "Cthulhu:Korean" input = "1D100<=70 ファンブルなし" output = "(1D100<=70) ＞ 100 ＞ 실패" +failure = true rands = [ { sides = 100, value = 100 }, ] @@ -10,6 +11,7 @@ rands = [ game_system = "Cthulhu:Korean" input = "1D100<=70 クリティカルなし" output = "(1D100<=70) ＞ 1 ＞ 성공" +success = true rands = [ { sides = 100, value = 1 }, ] diff --git a/test/data/DarkBlaze.toml b/test/data/DarkBlaze.toml index de37303f7..29391e120 100644 --- a/test/data/DarkBlaze.toml +++ b/test/data/DarkBlaze.toml @@ -1084,7 +1084,7 @@ rands = [ [[ test ]] game_system = "DarkBlaze" input = "3D6>=? 目標値?でバグらない" -output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9 ＞ 失敗" +output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, diff --git a/test/data/DarkDaysDrive.toml b/test/data/DarkDaysDrive.toml index b064f9d03..849d66ac5 100644 --- a/test/data/DarkDaysDrive.toml +++ b/test/data/DarkDaysDrive.toml @@ -414,7 +414,7 @@ rands = [ [[ test ]] game_system = "DarkDaysDrive" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/DemonParasite.toml b/test/data/DemonParasite.toml index caf8ca0a4..0fcb72b17 100644 --- a/test/data/DemonParasite.toml +++ b/test/data/DemonParasite.toml @@ -1402,7 +1402,7 @@ rands = [ [[ test ]] game_system = "DemonParasite" input = "3D6>=? 目標値?でバグらない" -output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9 ＞ 失敗" +output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, diff --git a/test/data/DoubleCross.toml b/test/data/DoubleCross.toml index 7675af694..72e222239 100644 --- a/test/data/DoubleCross.toml +++ b/test/data/DoubleCross.toml @@ -2323,7 +2323,7 @@ rands = [ [[ test ]] game_system = "DoubleCross" input = "2D10>=? 目標値?でバグらない" -output = "(2D10>=?) ＞ 10[5,5] ＞ 10 ＞ 失敗" +output = "(2D10>=?) ＞ 10[5,5] ＞ 10" rands = [ { sides = 10, value = 5 }, { sides = 10, value = 5 }, diff --git a/test/data/DoubleCross_Korean.toml b/test/data/DoubleCross_Korean.toml index 5503d88cb..b344ac2f9 100644 --- a/test/data/DoubleCross_Korean.toml +++ b/test/data/DoubleCross_Korean.toml @@ -2323,7 +2323,7 @@ rands = [ [[ test ]] game_system = "DoubleCross:Korean" input = "2D10>=? 목표치?로 오작동하지 않는다" -output = "(2D10>=?) ＞ 10[5,5] ＞ 10 ＞ 실패" +output = "(2D10>=?) ＞ 10[5,5] ＞ 10" rands = [ { sides = 10, value = 5 }, { sides = 10, value = 5 }, diff --git a/test/data/DungeonsAndDragons.toml b/test/data/DungeonsAndDragons.toml index 4b2328623..a1e28d173 100644 --- a/test/data/DungeonsAndDragons.toml +++ b/test/data/DungeonsAndDragons.toml @@ -2,6 +2,7 @@ game_system = "DungeonsAndDragons" input = "1D4>=3" output = "(1D4>=3) ＞ 3 ＞ 成功" +success = true rands = [ { sides = 4, value = 3 }, ] @@ -10,6 +11,7 @@ rands = [ game_system = "DungeonsAndDragons" input = "1D6>=5" output = "(1D6>=5) ＞ 5 ＞ 成功" +success = true rands = [ { sides = 6, value = 5 }, ] @@ -18,6 +20,7 @@ rands = [ game_system = "DungeonsAndDragons" input = "1D8>=7" output = "(1D8>=7) ＞ 7 ＞ 成功" +success = true rands = [ { sides = 8, value = 7 }, ] @@ -26,6 +29,7 @@ rands = [ game_system = "DungeonsAndDragons" input = "1D10>=9" output = "(1D10>=9) ＞ 9 ＞ 成功" +success = true rands = [ { sides = 10, value = 9 }, ] @@ -34,6 +38,7 @@ rands = [ game_system = "DungeonsAndDragons" input = "1D12>=11" output = "(1D12>=11) ＞ 11 ＞ 成功" +success = true rands = [ { sides = 12, value = 11 }, ] @@ -42,6 +47,7 @@ rands = [ game_system = "DungeonsAndDragons" input = "1D20>=19" output = "(1D20>=19) ＞ 19 ＞ 成功" +success = true rands = [ { sides = 20, value = 19 }, ] @@ -50,6 +56,7 @@ rands = [ game_system = "DungeonsAndDragons" input = "(1+2)D10+3>=12" output = "(3D10+3>=12) ＞ 12[3,4,5]+3 ＞ 15 ＞ 成功" +success = true rands = [ { sides = 10, value = 3 }, { sides = 10, value = 4 }, @@ -61,6 +68,7 @@ game_system = "DungeonsAndDragons" input = "S1D10>=10" output = "(1D10>=10) ＞ 9 ＞ 失敗" secret = true +failure = true rands = [ { sides = 10, value = 9 }, ] diff --git a/test/data/EclipsePhase.toml b/test/data/EclipsePhase.toml index 3ec545b9a..16872411f 100644 --- a/test/data/EclipsePhase.toml +++ b/test/data/EclipsePhase.toml @@ -105,7 +105,7 @@ rands = [ [[ test ]] game_system = "EclipsePhase" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/Elric.toml b/test/data/Elric.toml index 35b918e93..1c3c1c2fb 100644 --- a/test/data/Elric.toml +++ b/test/data/Elric.toml @@ -241,7 +241,7 @@ rands = [ [[ test ]] game_system = "Elric" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/EmbryoMachine.toml b/test/data/EmbryoMachine.toml index 054d5e9d1..738ddeb7b 100644 --- a/test/data/EmbryoMachine.toml +++ b/test/data/EmbryoMachine.toml @@ -2371,7 +2371,7 @@ rands = [ [[ test ]] game_system = "EmbryoMachine" input = "2D10>=? 目標値?でバグらない" -output = "(2D10>=?) ＞ 10[5,5] ＞ 10 ＞ 失敗" +output = "(2D10>=?) ＞ 10[5,5] ＞ 10" rands = [ { sides = 10, value = 5 }, { sides = 10, value = 5 }, diff --git a/test/data/GURPS.toml b/test/data/GURPS.toml index 6bd33b8c8..15a419a2a 100644 --- a/test/data/GURPS.toml +++ b/test/data/GURPS.toml @@ -331,7 +331,7 @@ rands = [ [[ test ]] game_system = "GURPS" input = "3D6>=? 目標値?でバグらない" -output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9 ＞ 失敗" +output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, diff --git a/test/data/Gorilla.toml b/test/data/Gorilla.toml index e0d8e3bb1..18764c269 100644 --- a/test/data/Gorilla.toml +++ b/test/data/Gorilla.toml @@ -155,7 +155,7 @@ rands = [ [[ test ]] game_system = "Gorilla" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/GranCrest.toml b/test/data/GranCrest.toml index a70ca0598..15eaa1ddb 100644 --- a/test/data/GranCrest.toml +++ b/test/data/GranCrest.toml @@ -246,7 +246,7 @@ rands = [ [[ test ]] game_system = "GranCrest" input = "3D6>=? 目標値?でバグらない" -output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9 ＞ 失敗" +output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, diff --git a/test/data/Gundog.toml b/test/data/Gundog.toml index 5df2a7923..a038b1ffb 100644 --- a/test/data/Gundog.toml +++ b/test/data/Gundog.toml @@ -241,7 +241,7 @@ rands = [ [[ test ]] game_system = "Gundog" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/GundogRevised.toml b/test/data/GundogRevised.toml index 754dc639f..8342537fa 100644 --- a/test/data/GundogRevised.toml +++ b/test/data/GundogRevised.toml @@ -273,7 +273,7 @@ rands = [ [[ test ]] game_system = "GundogRevised" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/GurpsFW.toml b/test/data/GurpsFW.toml index 477ea8d44..9fe244616 100644 --- a/test/data/GurpsFW.toml +++ b/test/data/GurpsFW.toml @@ -344,7 +344,7 @@ rands = [ [[ test ]] game_system = "GurpsFW" input = "3D6>=? 目標値?でバグらない" -output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9 ＞ 失敗" +output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, diff --git a/test/data/HarnMaster.toml b/test/data/HarnMaster.toml index c904d41dd..7ed179ff4 100644 --- a/test/data/HarnMaster.toml +++ b/test/data/HarnMaster.toml @@ -147,7 +147,7 @@ rands = [ [[ test ]] game_system = "HarnMaster" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/Hieizan.toml b/test/data/Hieizan.toml index 078d216a0..a7948c281 100644 --- a/test/data/Hieizan.toml +++ b/test/data/Hieizan.toml @@ -241,7 +241,7 @@ rands = [ [[ test ]] game_system = "Hieizan" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/HuntersMoon.toml b/test/data/HuntersMoon.toml index 28e0f72ec..68c18b686 100644 --- a/test/data/HuntersMoon.toml +++ b/test/data/HuntersMoon.toml @@ -2065,7 +2065,7 @@ rands = [ [[ test ]] game_system = "HuntersMoon" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/InfiniteFantasia.toml b/test/data/InfiniteFantasia.toml index 396fa82f1..417476651 100644 --- a/test/data/InfiniteFantasia.toml +++ b/test/data/InfiniteFantasia.toml @@ -241,7 +241,7 @@ rands = [ [[ test ]] game_system = "InfiniteFantasia" input = "1D20>=? 目標値?でバグらない" -output = "(1D20>=?) ＞ 10 ＞ 失敗" +output = "(1D20>=?) ＞ 10" rands = [ { sides = 20, value = 10 }, ] diff --git a/test/data/Insane.toml b/test/data/Insane.toml index 5d8a1730c..9c7d35d42 100644 --- a/test/data/Insane.toml +++ b/test/data/Insane.toml @@ -550,7 +550,7 @@ rands = [ [[ test ]] game_system = "Insane" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/Insane_Korean.toml b/test/data/Insane_Korean.toml index db52760ae..51f7d1832 100644 --- a/test/data/Insane_Korean.toml +++ b/test/data/Insane_Korean.toml @@ -484,7 +484,7 @@ rands = [ [[ test ]] game_system = "Insane:Korean" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 실패" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/IthaWenUa.toml b/test/data/IthaWenUa.toml index f0ae37781..8f6027ca6 100644 --- a/test/data/IthaWenUa.toml +++ b/test/data/IthaWenUa.toml @@ -50,7 +50,7 @@ rands = [ [[ test ]] game_system = "IthaWenUa" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/JamesBond.toml b/test/data/JamesBond.toml index f9e031291..dabd9899e 100644 --- a/test/data/JamesBond.toml +++ b/test/data/JamesBond.toml @@ -129,7 +129,7 @@ rands = [ [[ test ]] game_system = "JamesBond" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/KanColle.toml b/test/data/KanColle.toml index 801860bb6..4140baeb9 100644 --- a/test/data/KanColle.toml +++ b/test/data/KanColle.toml @@ -627,7 +627,7 @@ rands = [ [[ test ]] game_system = "KanColle" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/KillDeathBusiness.toml b/test/data/KillDeathBusiness.toml index 9e49dc17f..b849da354 100644 --- a/test/data/KillDeathBusiness.toml +++ b/test/data/KillDeathBusiness.toml @@ -1138,7 +1138,7 @@ rands = [ [[ test ]] game_system = "KillDeathBusiness" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/KillDeathBusiness_Korean.toml b/test/data/KillDeathBusiness_Korean.toml index fd4dcb36d..41b42628b 100644 --- a/test/data/KillDeathBusiness_Korean.toml +++ b/test/data/KillDeathBusiness_Korean.toml @@ -1103,7 +1103,7 @@ rands = [ [[ test ]] game_system = "KillDeathBusiness:Korean" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 실패" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/MagicaLogia.toml b/test/data/MagicaLogia.toml index f2eac3e59..f6ecf5412 100644 --- a/test/data/MagicaLogia.toml +++ b/test/data/MagicaLogia.toml @@ -1918,7 +1918,7 @@ rands = [ [[ test ]] game_system = "MagicaLogia" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/MeikyuDays.toml b/test/data/MeikyuDays.toml index 736010e41..d0ca26d04 100644 --- a/test/data/MeikyuDays.toml +++ b/test/data/MeikyuDays.toml @@ -2231,7 +2231,7 @@ rands = [ [[ test ]] game_system = "MeikyuDays" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/MeikyuKingdom.toml b/test/data/MeikyuKingdom.toml index 04f76a264..8f0aa7ff1 100644 --- a/test/data/MeikyuKingdom.toml +++ b/test/data/MeikyuKingdom.toml @@ -7221,7 +7221,7 @@ rands = [ [[ test ]] game_system = "MeikyuKingdom" input = "3D6>=? 目標値?でバグらない" -output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9 ＞ 失敗" +output = "(3D6>=?) ＞ 9[3,3,3] ＞ 9" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, diff --git a/test/data/MetalHead.toml b/test/data/MetalHead.toml index 6a0223b82..7d17737fa 100644 --- a/test/data/MetalHead.toml +++ b/test/data/MetalHead.toml @@ -295,7 +295,7 @@ rands = [] [[ test ]] game_system = "MetalHead" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, @@ -304,7 +304,7 @@ rands = [ [[ test ]] game_system = "MetalHead" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/Misonzai.toml b/test/data/Misonzai.toml index ec8757ee3..a503033dc 100644 --- a/test/data/Misonzai.toml +++ b/test/data/Misonzai.toml @@ -2,6 +2,7 @@ game_system = "DiceBot" input = "2d6>=4" output = "(2D6>=4) ＞ 9[6,3] ＞ 9 ＞ 成功" +success = true rands = [ { sides = 6, value = 6 }, { sides = 6, value = 3 }, diff --git a/test/data/Nechronica.toml b/test/data/Nechronica.toml index b773863c7..db1ab92d0 100644 --- a/test/data/Nechronica.toml +++ b/test/data/Nechronica.toml @@ -1534,7 +1534,7 @@ rands = [ [[ test ]] game_system = "Nechronica" input = "2D10>=? 目標値?でバグらない" -output = "(2D10>=?) ＞ 10[5,5] ＞ 10 ＞ 失敗" +output = "(2D10>=?) ＞ 10[5,5] ＞ 10" rands = [ { sides = 10, value = 5 }, { sides = 10, value = 5 }, diff --git a/test/data/Nechronica_Korean.toml b/test/data/Nechronica_Korean.toml index 540ea8a98..35b46662d 100644 --- a/test/data/Nechronica_Korean.toml +++ b/test/data/Nechronica_Korean.toml @@ -1534,7 +1534,7 @@ rands = [ [[ test ]] game_system = "Nechronica:Korean" input = "2D10>=? 目標値?でバグらない" -output = "(2D10>=?) ＞ 10[5,5] ＞ 10 ＞ 실패" +output = "(2D10>=?) ＞ 10[5,5] ＞ 10" rands = [ { sides = 10, value = 5 }, { sides = 10, value = 5 }, diff --git a/test/data/NjslyrBattle.toml b/test/data/NjslyrBattle.toml index 82677cdcc..d8aa6f000 100644 --- a/test/data/NjslyrBattle.toml +++ b/test/data/NjslyrBattle.toml @@ -73,7 +73,7 @@ rands = [ [[ test ]] game_system = "NjslyrBattle" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/None.toml b/test/data/None.toml index bd110778e..490d5356b 100644 --- a/test/data/None.toml +++ b/test/data/None.toml @@ -355,6 +355,7 @@ rands = [ game_system = "DiceBot" input = "2D6=7" output = "(2D6=7) ＞ 7[3,4] ＞ 7 ＞ 成功" +success = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, @@ -364,6 +365,7 @@ rands = [ game_system = "DiceBot" input = "2D6=7" output = "(2D6=7) ＞ 6[3,3] ＞ 6 ＞ 失敗" +failure = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, @@ -373,6 +375,7 @@ rands = [ game_system = "DiceBot" input = "2D6=7" output = "(2D6=7) ＞ 6[3,3] ＞ 6 ＞ 失敗" +failure = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, @@ -382,6 +385,7 @@ rands = [ game_system = "DiceBot" input = "2D6<>7" output = "(2D6<>7) ＞ 7[3,4] ＞ 7 ＞ 失敗" +failure = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, @@ -391,6 +395,7 @@ rands = [ game_system = "DiceBot" input = "2D6<>7" output = "(2D6<>7) ＞ 6[3,3] ＞ 6 ＞ 成功" +success = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, @@ -400,6 +405,7 @@ rands = [ game_system = "DiceBot" input = "2D6<>7" output = "(2D6<>7) ＞ 8[3,5] ＞ 8 ＞ 成功" +success = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 5 }, @@ -409,6 +415,7 @@ rands = [ game_system = "DiceBot" input = "2D6<7" output = "(2D6<7) ＞ 6[3,3] ＞ 6 ＞ 成功" +success = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, @@ -418,6 +425,7 @@ rands = [ game_system = "DiceBot" input = "2D6<7" output = "(2D6<7) ＞ 7[3,4] ＞ 7 ＞ 失敗" +failure = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, @@ -427,6 +435,7 @@ rands = [ game_system = "DiceBot" input = "2D6>7" output = "(2D6>7) ＞ 8[3,5] ＞ 8 ＞ 成功" +success = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 5 }, @@ -436,6 +445,7 @@ rands = [ game_system = "DiceBot" input = "2D6>7" output = "(2D6>7) ＞ 7[3,4] ＞ 7 ＞ 失敗" +failure = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, @@ -445,6 +455,7 @@ rands = [ game_system = "DiceBot" input = "2D6<=7" output = "(2D6<=7) ＞ 7[3,4] ＞ 7 ＞ 成功" +success = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, @@ -454,6 +465,7 @@ rands = [ game_system = "DiceBot" input = "2D6<=7" output = "(2D6<=7) ＞ 8[3,5] ＞ 8 ＞ 失敗" +failure = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 5 }, @@ -463,6 +475,7 @@ rands = [ game_system = "DiceBot" input = "2D6>=7" output = "(2D6>=7) ＞ 7[3,4] ＞ 7 ＞ 成功" +success = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, @@ -472,6 +485,7 @@ rands = [ game_system = "DiceBot" input = "2D6>=7" output = "(2D6>=7) ＞ 6[3,3] ＞ 6 ＞ 失敗" +failure = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, @@ -481,6 +495,7 @@ rands = [ game_system = "DiceBot" input = "-2D6<-7" output = "(-2D6<-7) ＞ -8[3,5] ＞ -8 ＞ 成功" +success = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 5 }, @@ -490,6 +505,7 @@ rands = [ game_system = "DiceBot" input = "-2D6<-7" output = "(-2D6<-7) ＞ -7[3,4] ＞ -7 ＞ 失敗" +failure = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, @@ -499,6 +515,7 @@ rands = [ game_system = "DiceBot" input = "-2D6>-7" output = "(-2D6>-7) ＞ -6[3,3] ＞ -6 ＞ 成功" +success = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, @@ -508,6 +525,7 @@ rands = [ game_system = "DiceBot" input = "-2D6>-7" output = "(-2D6>-7) ＞ -7[3,4] ＞ -7 ＞ 失敗" +failure = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, @@ -517,6 +535,7 @@ rands = [ game_system = "DiceBot" input = "-2D6<=-7" output = "(-2D6<=-7) ＞ -7[3,4] ＞ -7 ＞ 成功" +success = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, @@ -526,6 +545,7 @@ rands = [ game_system = "DiceBot" input = "-2D6<=-7" output = "(-2D6<=-7) ＞ -6[3,3] ＞ -6 ＞ 失敗" +failure = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 3 }, @@ -535,6 +555,7 @@ rands = [ game_system = "DiceBot" input = "-2D6>=-7" output = "(-2D6>=-7) ＞ -7[3,4] ＞ -7 ＞ 成功" +success = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, @@ -544,6 +565,7 @@ rands = [ game_system = "DiceBot" input = "-2D6>=-7" output = "(-2D6>=-7) ＞ -8[3,5] ＞ -8 ＞ 失敗" +failure = true rands = [ { sides = 6, value = 3 }, { sides = 6, value = 5 }, @@ -553,6 +575,7 @@ rands = [ game_system = "DiceBot" input = "1d6>=1+2" output = "(1D6>=3) ＞ 3 ＞ 成功" +success = true rands = [ { sides = 6, value = 3 }, ] @@ -561,6 +584,7 @@ rands = [ game_system = "DiceBot" input = "1d6-(1-2)>=3+2" output = "(1D6+1>=5) ＞ 3[3]+1 ＞ 4 ＞ 失敗" +failure = true rands = [ { sides = 6, value = 3 }, ] diff --git a/test/data/Paranoia.toml b/test/data/Paranoia.toml index 6d2f7e469..164330ef9 100644 --- a/test/data/Paranoia.toml +++ b/test/data/Paranoia.toml @@ -19,6 +19,7 @@ rands = [ game_system = "Paranoia" input = "1d20<=15" output = "(1D20<=15) ＞ 14 ＞ 成功" +success = true rands = [ { sides = 20, value = 14 }, ] @@ -27,6 +28,7 @@ rands = [ game_system = "Paranoia" input = "1d20<15" output = "(1D20<15) ＞ 15 ＞ 失敗" +failure = true rands = [ { sides = 20, value = 15 }, ] @@ -35,6 +37,7 @@ rands = [ game_system = "Paranoia" input = "1d20<=15" output = "(1D20<=15) ＞ 16 ＞ 失敗" +failure = true rands = [ { sides = 20, value = 16 }, ] @@ -43,6 +46,7 @@ rands = [ game_system = "Paranoia" input = "S1d20<=15" output = "(1D20<=15) ＞ 16 ＞ 失敗" +failure = true secret = true rands = [ { sides = 20, value = 16 }, @@ -52,6 +56,7 @@ rands = [ game_system = "Paranoia" input = "1d20<=15" output = "(1D20<=15) ＞ 20 ＞ 失敗" +failure = true rands = [ { sides = 20, value = 20 }, ] diff --git a/test/data/Pathfinder.toml b/test/data/Pathfinder.toml index 680440254..6ce84f2ac 100644 --- a/test/data/Pathfinder.toml +++ b/test/data/Pathfinder.toml @@ -2,6 +2,7 @@ game_system = "Pathfinder" input = "1D4>=3" output = "(1D4>=3) ＞ 3 ＞ 成功" +success = true rands = [ { sides = 4, value = 3 }, ] @@ -10,6 +11,7 @@ rands = [ game_system = "Pathfinder" input = "1D6>=5" output = "(1D6>=5) ＞ 5 ＞ 成功" +success = true rands = [ { sides = 6, value = 5 }, ] @@ -18,6 +20,7 @@ rands = [ game_system = "Pathfinder" input = "1D8>=7" output = "(1D8>=7) ＞ 7 ＞ 成功" +success = true rands = [ { sides = 8, value = 7 }, ] @@ -26,6 +29,7 @@ rands = [ game_system = "Pathfinder" input = "1D10>=9" output = "(1D10>=9) ＞ 9 ＞ 成功" +success = true rands = [ { sides = 10, value = 9 }, ] @@ -34,6 +38,7 @@ rands = [ game_system = "Pathfinder" input = "1D12>=11" output = "(1D12>=11) ＞ 11 ＞ 成功" +success = true rands = [ { sides = 12, value = 11 }, ] @@ -42,6 +47,7 @@ rands = [ game_system = "Pathfinder" input = "1D20>=19" output = "(1D20>=19) ＞ 19 ＞ 成功" +success = true rands = [ { sides = 20, value = 19 }, ] @@ -50,6 +56,7 @@ rands = [ game_system = "Pathfinder" input = "(1+2)D10+3>=12" output = "(3D10+3>=12) ＞ 12[3,4,5]+3 ＞ 15 ＞ 成功" +success = true rands = [ { sides = 10, value = 3 }, { sides = 10, value = 4 }, @@ -61,6 +68,7 @@ game_system = "Pathfinder" input = "S1D10>=10" output = "(1D10>=10) ＞ 9 ＞ 失敗" secret = true +failure = true rands = [ { sides = 10, value = 9 }, ] diff --git a/test/data/Peekaboo.toml b/test/data/Peekaboo.toml index d5fcdc78b..61554adff 100644 --- a/test/data/Peekaboo.toml +++ b/test/data/Peekaboo.toml @@ -921,7 +921,7 @@ rands = [ [[ test ]] game_system = "Peekaboo" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/Pendragon.toml b/test/data/Pendragon.toml index b3cfbb90c..3d512908c 100644 --- a/test/data/Pendragon.toml +++ b/test/data/Pendragon.toml @@ -241,7 +241,7 @@ rands = [ [[ test ]] game_system = "Pendragon" input = "1D20>=? 目標値?でバグらない" -output = "(1D20>=?) ＞ 10 ＞ 失敗" +output = "(1D20>=?) ＞ 10" rands = [ { sides = 20, value = 10 }, ] diff --git a/test/data/PhantasmAdventure.toml b/test/data/PhantasmAdventure.toml index f41078982..1a579f243 100644 --- a/test/data/PhantasmAdventure.toml +++ b/test/data/PhantasmAdventure.toml @@ -271,7 +271,7 @@ rands = [ [[ test ]] game_system = "PhantasmAdventure" input = "1D20>=? 目標値?でバグらない" -output = "(1D20>=?) ＞ 10 ＞ 失敗" +output = "(1D20>=?) ＞ 10" rands = [ { sides = 20, value = 10 }, ] diff --git a/test/data/RoleMaster.toml b/test/data/RoleMaster.toml index a9c0ae0bb..9a8fd6132 100644 --- a/test/data/RoleMaster.toml +++ b/test/data/RoleMaster.toml @@ -2,958 +2,16 @@ game_system = "RoleMaster" input = "1d100>=10" output = "(1D100>=10) ＞ 65 ＞ 成功" +success = true rands = [ { sides = 100, value = 65 }, ] -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=10" -output = "(1D100>=10) ＞ 56 ＞ 成功" -rands = [ - { sides = 100, value = 56 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=10" -output = "(1D100>=10) ＞ 45 ＞ 成功" -rands = [ - { sides = 100, value = 45 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=10" -output = "(1D100>=10) ＞ 18 ＞ 成功" -rands = [ - { sides = 100, value = 18 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=10" -output = "(1D100>=10) ＞ 45 ＞ 成功" -rands = [ - { sides = 100, value = 45 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=10" -output = "(1D100>=10) ＞ 78 ＞ 成功" -rands = [ - { sides = 100, value = 78 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=10" -output = "(1D100>=10) ＞ 37 ＞ 成功" -rands = [ - { sides = 100, value = 37 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=10" -output = "(1D100>=10) ＞ 48 ＞ 成功" -rands = [ - { sides = 100, value = 48 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=10" -output = "(1D100>=10) ＞ 25 ＞ 成功" -rands = [ - { sides = 100, value = 25 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=10" -output = "(1D100>=10) ＞ 90 ＞ 成功" -rands = [ - { sides = 100, value = 90 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=50" -output = "(1D100>=50) ＞ 80 ＞ 成功" -rands = [ - { sides = 100, value = 80 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=50" -output = "(1D100>=50) ＞ 86 ＞ 成功" -rands = [ - { sides = 100, value = 86 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=50" -output = "(1D100>=50) ＞ 6 ＞ 失敗" -rands = [ - { sides = 100, value = 6 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=50" -output = "(1D100>=50) ＞ 68 ＞ 成功" -rands = [ - { sides = 100, value = 68 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=50" -output = "(1D100>=50) ＞ 55 ＞ 成功" -rands = [ - { sides = 100, value = 55 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=50" -output = "(1D100>=50) ＞ 7 ＞ 失敗" -rands = [ - { sides = 100, value = 7 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=50" -output = "(1D100>=50) ＞ 64 ＞ 成功" -rands = [ - { sides = 100, value = 64 }, -] - [[ test ]] game_system = "RoleMaster" input = "1d100>=50" -output = "(1D100>=50) ＞ 44 ＞ 失敗" -rands = [ - { sides = 100, value = 44 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=50" -output = "(1D100>=50) ＞ 46 ＞ 失敗" -rands = [ - { sides = 100, value = 46 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=50" -output = "(1D100>=50) ＞ 91 ＞ 成功" -rands = [ - { sides = 100, value = 91 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 25 ＞ 失敗" -rands = [ - { sides = 100, value = 25 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 87 ＞ 失敗" -rands = [ - { sides = 100, value = 87 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 40 ＞ 失敗" +output = "(1D100>=50) ＞ 40 ＞ 失敗" +failure = true rands = [ { sides = 100, value = 40 }, ] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 23 ＞ 失敗" -rands = [ - { sides = 100, value = 23 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 32 ＞ 失敗" -rands = [ - { sides = 100, value = 32 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 24 ＞ 失敗" -rands = [ - { sides = 100, value = 24 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 46 ＞ 失敗" -rands = [ - { sides = 100, value = 46 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 62 ＞ 失敗" -rands = [ - { sides = 100, value = 62 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 3 ＞ 失敗" -rands = [ - { sides = 100, value = 3 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 75 ＞ 失敗" -rands = [ - { sides = 100, value = 75 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 48 ＞ 失敗" -rands = [ - { sides = 100, value = 48 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 92 ＞ 失敗" -rands = [ - { sides = 100, value = 92 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 33 ＞ 失敗" -rands = [ - { sides = 100, value = 33 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 46 ＞ 失敗" -rands = [ - { sides = 100, value = 46 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 72 ＞ 失敗" -rands = [ - { sides = 100, value = 72 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 26 ＞ 失敗" -rands = [ - { sides = 100, value = 26 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 55 ＞ 失敗" -rands = [ - { sides = 100, value = 55 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 86 ＞ 失敗" -rands = [ - { sides = 100, value = 86 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 3 ＞ 失敗" -rands = [ - { sides = 100, value = 3 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 74 ＞ 失敗" -rands = [ - { sides = 100, value = 74 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 90 ＞ 失敗" -rands = [ - { sides = 100, value = 90 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 23 ＞ 失敗" -rands = [ - { sides = 100, value = 23 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 23 ＞ 失敗" -rands = [ - { sides = 100, value = 23 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 43 ＞ 失敗" -rands = [ - { sides = 100, value = 43 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 14 ＞ 失敗" -rands = [ - { sides = 100, value = 14 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 91 ＞ 失敗" -rands = [ - { sides = 100, value = 91 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 99 ＞ 失敗" -rands = [ - { sides = 100, value = 99 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 84 ＞ 失敗" -rands = [ - { sides = 100, value = 84 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 78 ＞ 失敗" -rands = [ - { sides = 100, value = 78 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 77 ＞ 失敗" -rands = [ - { sides = 100, value = 77 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 97 ＞ 失敗" -rands = [ - { sides = 100, value = 97 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 51 ＞ 失敗" -rands = [ - { sides = 100, value = 51 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 91 ＞ 失敗" -rands = [ - { sides = 100, value = 91 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 85 ＞ 失敗" -rands = [ - { sides = 100, value = 85 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 64 ＞ 失敗" -rands = [ - { sides = 100, value = 64 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 91 ＞ 失敗" -rands = [ - { sides = 100, value = 91 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 19 ＞ 失敗" -rands = [ - { sides = 100, value = 19 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 52 ＞ 失敗" -rands = [ - { sides = 100, value = 52 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 32 ＞ 失敗" -rands = [ - { sides = 100, value = 32 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 23 ＞ 失敗" -rands = [ - { sides = 100, value = 23 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 1 ＞ 失敗" -rands = [ - { sides = 100, value = 1 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 12 ＞ 失敗" -rands = [ - { sides = 100, value = 12 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 93 ＞ 失敗" -rands = [ - { sides = 100, value = 93 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 34 ＞ 失敗" -rands = [ - { sides = 100, value = 34 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 38 ＞ 失敗" -rands = [ - { sides = 100, value = 38 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 45 ＞ 失敗" -rands = [ - { sides = 100, value = 45 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 16 ＞ 失敗" -rands = [ - { sides = 100, value = 16 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 41 ＞ 失敗" -rands = [ - { sides = 100, value = 41 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 53 ＞ 失敗" -rands = [ - { sides = 100, value = 53 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 2 ＞ 失敗" -rands = [ - { sides = 100, value = 2 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 33 ＞ 失敗" -rands = [ - { sides = 100, value = 33 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 50 ＞ 失敗" -rands = [ - { sides = 100, value = 50 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 82 ＞ 失敗" -rands = [ - { sides = 100, value = 82 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 50 ＞ 失敗" -rands = [ - { sides = 100, value = 50 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 66 ＞ 失敗" -rands = [ - { sides = 100, value = 66 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 73 ＞ 失敗" -rands = [ - { sides = 100, value = 73 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 96 ＞ 失敗" -rands = [ - { sides = 100, value = 96 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 20 ＞ 失敗" -rands = [ - { sides = 100, value = 20 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 42 ＞ 失敗" -rands = [ - { sides = 100, value = 42 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 10 ＞ 失敗" -rands = [ - { sides = 100, value = 10 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 1 ＞ 失敗" -rands = [ - { sides = 100, value = 1 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 12 ＞ 失敗" -rands = [ - { sides = 100, value = 12 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 53 ＞ 失敗" -rands = [ - { sides = 100, value = 53 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 76 ＞ 失敗" -rands = [ - { sides = 100, value = 76 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 36 ＞ 失敗" -rands = [ - { sides = 100, value = 36 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 28 ＞ 失敗" -rands = [ - { sides = 100, value = 28 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 1 ＞ 失敗" -rands = [ - { sides = 100, value = 1 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 75 ＞ 失敗" -rands = [ - { sides = 100, value = 75 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 95 ＞ 失敗" -rands = [ - { sides = 100, value = 95 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 95 ＞ 失敗" -rands = [ - { sides = 100, value = 95 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 7 ＞ 失敗" -rands = [ - { sides = 100, value = 7 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 99 ＞ 失敗" -rands = [ - { sides = 100, value = 99 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 11 ＞ 失敗" -rands = [ - { sides = 100, value = 11 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 55 ＞ 失敗" -rands = [ - { sides = 100, value = 55 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 97 ＞ 失敗" -rands = [ - { sides = 100, value = 97 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 58 ＞ 失敗" -rands = [ - { sides = 100, value = 58 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 17 ＞ 失敗" -rands = [ - { sides = 100, value = 17 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 63 ＞ 失敗" -rands = [ - { sides = 100, value = 63 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 73 ＞ 失敗" -rands = [ - { sides = 100, value = 73 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 8 ＞ 失敗" -rands = [ - { sides = 100, value = 8 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 25 ＞ 失敗" -rands = [ - { sides = 100, value = 25 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 89 ＞ 失敗" -rands = [ - { sides = 100, value = 89 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 59 ＞ 失敗" -rands = [ - { sides = 100, value = 59 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 2 ＞ 失敗" -rands = [ - { sides = 100, value = 2 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 43 ＞ 失敗" -rands = [ - { sides = 100, value = 43 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 67 ＞ 失敗" -rands = [ - { sides = 100, value = 67 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 35 ＞ 失敗" -rands = [ - { sides = 100, value = 35 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 15 ＞ 失敗" -rands = [ - { sides = 100, value = 15 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 54 ＞ 失敗" -rands = [ - { sides = 100, value = 54 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 70 ＞ 失敗" -rands = [ - { sides = 100, value = 70 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 64 ＞ 失敗" -rands = [ - { sides = 100, value = 64 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 69 ＞ 失敗" -rands = [ - { sides = 100, value = 69 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 6 ＞ 失敗" -rands = [ - { sides = 100, value = 6 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 61 ＞ 失敗" -rands = [ - { sides = 100, value = 61 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 100 ＞ 失敗" -rands = [ - { sides = 100, value = 100 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 24 ＞ 失敗" -rands = [ - { sides = 100, value = 24 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 5 ＞ 失敗" -rands = [ - { sides = 100, value = 5 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 7 ＞ 失敗" -rands = [ - { sides = 100, value = 7 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 4 ＞ 失敗" -rands = [ - { sides = 100, value = 4 }, -] - -[[ test ]] -game_system = "RoleMaster" -input = "1d100>=101" -output = "(1D100>=101) ＞ 41 ＞ 失敗" -rands = [ - { sides = 100, value = 41 }, -] diff --git a/test/data/RuneQuest.toml b/test/data/RuneQuest.toml index b1d0e195e..656911a6a 100644 --- a/test/data/RuneQuest.toml +++ b/test/data/RuneQuest.toml @@ -242,6 +242,7 @@ rands = [ game_system = "RuneQuest" input = "1d100>=68+12" output = "(1D100>=80) ＞ 11 ＞ 失敗" +failure = true rands = [ { sides = 100, value = 11 }, ] @@ -250,6 +251,7 @@ rands = [ game_system = "RuneQuest" input = "1d100>=(68+12)" output = "(1D100>=80) ＞ 11 ＞ 失敗" +failure = true rands = [ { sides = 100, value = 11 }, ] @@ -337,7 +339,7 @@ rands = [ [[ test ]] game_system = "RuneQuest" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/SamsaraBallad.toml b/test/data/SamsaraBallad.toml index 49675de01..7294b2c24 100644 --- a/test/data/SamsaraBallad.toml +++ b/test/data/SamsaraBallad.toml @@ -2,6 +2,7 @@ game_system = "SamsaraBallad" input = "1D100<=90 roll 90" output = "(1D100<=90) ＞ 99 ＞ 失敗" +failure = true rands = [ { sides = 100, value = 99 }, ] diff --git a/test/data/SharedFantasia.toml b/test/data/SharedFantasia.toml index ba16d8b65..59a0810bd 100644 --- a/test/data/SharedFantasia.toml +++ b/test/data/SharedFantasia.toml @@ -117,7 +117,7 @@ rands = [ [[ test ]] game_system = "SharedFantasia" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/ShinMegamiTenseiKakuseihen.toml b/test/data/ShinMegamiTenseiKakuseihen.toml index dd427a0a4..aa446e53c 100644 --- a/test/data/ShinMegamiTenseiKakuseihen.toml +++ b/test/data/ShinMegamiTenseiKakuseihen.toml @@ -89,7 +89,7 @@ rands = [ [[ test ]] game_system = "ShinMegamiTenseiKakuseihen" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/ShinkuuGakuen.toml b/test/data/ShinkuuGakuen.toml index ad6412432..85a6d8438 100644 --- a/test/data/ShinkuuGakuen.toml +++ b/test/data/ShinkuuGakuen.toml @@ -380,6 +380,7 @@ rands = [ game_system = "ShinkuuGakuen" input = "2d6>=4" output = "(2D6>=4) ＞ 9[6,3] ＞ 9 ＞ 成功" +success = true rands = [ { sides = 6, value = 6 }, { sides = 6, value = 3 }, diff --git a/test/data/ShinobiGami.toml b/test/data/ShinobiGami.toml index 948be01d5..820c9099f 100644 --- a/test/data/ShinobiGami.toml +++ b/test/data/ShinobiGami.toml @@ -1912,7 +1912,7 @@ rands = [ [[ test ]] game_system = "ShinobiGami" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/StratoShout.toml b/test/data/StratoShout.toml index 1edd77572..778db9a61 100644 --- a/test/data/StratoShout.toml +++ b/test/data/StratoShout.toml @@ -167,7 +167,7 @@ rands = [ [[ test ]] game_system = "StratoShout" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/StratoShout_Korean.toml b/test/data/StratoShout_Korean.toml index 9e81b78ea..d7d920fed 100644 --- a/test/data/StratoShout_Korean.toml +++ b/test/data/StratoShout_Korean.toml @@ -167,7 +167,7 @@ rands = [ [[ test ]] game_system = "StratoShout:Korean" input = "2D6>=? 목표치를 달성하지 못했다" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 실패" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/SwordWorld.toml b/test/data/SwordWorld.toml index d076a0b6b..2a556c176 100644 --- a/test/data/SwordWorld.toml +++ b/test/data/SwordWorld.toml @@ -5248,7 +5248,7 @@ rands = [ [[ test ]] game_system = "SwordWorld" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/SwordWorld2_0.toml b/test/data/SwordWorld2_0.toml index 9642ff704..e95b26a57 100644 --- a/test/data/SwordWorld2_0.toml +++ b/test/data/SwordWorld2_0.toml @@ -556,6 +556,7 @@ rands = [ game_system = "SwordWorld2.0" input = "2D6>4 超成功指定なし" output = "(2D6>4) ＞ 9[6,3] ＞ 9 ＞ 成功" +success = true rands = [ { sides = 6, value = 6 }, { sides = 6, value = 3 }, diff --git a/test/data/TestDummy.toml b/test/data/TestDummy.toml deleted file mode 100644 index 47ddaa859..000000000 --- a/test/data/TestDummy.toml +++ /dev/null @@ -1,8 +0,0 @@ -[[ test ]] -game_system = "DiceBot" -input = "2d6>=4" -output = "(2D6>=4) ＞ 9[6,3] ＞ 9 ＞ 成功" -rands = [ - { sides = 6, value = 6 }, - { sides = 6, value = 3 }, -] \ No newline at end of file diff --git a/test/data/TokumeiTenkousei.toml b/test/data/TokumeiTenkousei.toml index db784a412..f58f68da9 100644 --- a/test/data/TokumeiTenkousei.toml +++ b/test/data/TokumeiTenkousei.toml @@ -382,7 +382,7 @@ rands = [ [[ test ]] game_system = "TokumeiTenkousei" input = "3D6>=? 目標値?でバグらない" -output = "(3D6>=?) ＞ 6[1,2,3] ＞ 6 ＞ 失敗" +output = "(3D6>=?) ＞ 6[1,2,3] ＞ 6" rands = [ { sides = 6, value = 1 }, { sides = 6, value = 2 }, diff --git a/test/data/TokyoGhostResearch.toml b/test/data/TokyoGhostResearch.toml index 9d40ef4d4..f4c94810a 100644 --- a/test/data/TokyoGhostResearch.toml +++ b/test/data/TokyoGhostResearch.toml @@ -162,6 +162,7 @@ rands = [ game_system = "TokyoGhostResearch" input = "1d10>=2" output = "(1D10>=2) ＞ 2 ＞ 成功" +success = true rands = [ { sides = 10, value = 2 }, ] @@ -170,6 +171,7 @@ rands = [ game_system = "TokyoGhostResearch" input = "1d10>=2" output = "(1D10>=2) ＞ 1 ＞ 失敗" +failure = true rands = [ { sides = 10, value = 1 }, ] @@ -178,6 +180,7 @@ rands = [ game_system = "TokyoGhostResearch" input = "1d10>=10" output = "(1D10>=10) ＞ 9 ＞ 失敗" +failure = true rands = [ { sides = 10, value = 9 }, ] @@ -186,6 +189,7 @@ rands = [ game_system = "TokyoGhostResearch" input = "1d10>=10" output = "(1D10>=10) ＞ 10 ＞ 成功" +success = true rands = [ { sides = 10, value = 10 }, ] @@ -194,6 +198,7 @@ rands = [ game_system = "TokyoGhostResearch" input = "1d10>=5" output = "(1D10>=5) ＞ 5 ＞ 成功" +success = true rands = [ { sides = 10, value = 5 }, ] @@ -202,6 +207,7 @@ rands = [ game_system = "TokyoGhostResearch" input = "1d10>=5" output = "(1D10>=5) ＞ 4 ＞ 失敗" +failure = true rands = [ { sides = 10, value = 4 }, ] @@ -210,6 +216,7 @@ rands = [ game_system = "TokyoGhostResearch" input = "1d10>=5" output = "(1D10>=5) ＞ 6 ＞ 成功" +success = true rands = [ { sides = 10, value = 6 }, ] diff --git a/test/data/TokyoNova.toml b/test/data/TokyoNova.toml index 1460f0ba4..bd2752fe6 100644 --- a/test/data/TokyoNova.toml +++ b/test/data/TokyoNova.toml @@ -2,6 +2,7 @@ game_system = "TokyoNova" input = "1D4>=3" output = "(1D4>=3) ＞ 3 ＞ 成功" +success = true rands = [ { sides = 4, value = 3 }, ] @@ -10,6 +11,7 @@ rands = [ game_system = "TokyoNova" input = "1D6>=5" output = "(1D6>=5) ＞ 5 ＞ 成功" +success = true rands = [ { sides = 6, value = 5 }, ] @@ -18,6 +20,7 @@ rands = [ game_system = "TokyoNova" input = "1D8>=7" output = "(1D8>=7) ＞ 7 ＞ 成功" +success = true rands = [ { sides = 8, value = 7 }, ] @@ -26,6 +29,7 @@ rands = [ game_system = "TokyoNova" input = "1D10>=9" output = "(1D10>=9) ＞ 9 ＞ 成功" +success = true rands = [ { sides = 10, value = 9 }, ] @@ -34,6 +38,7 @@ rands = [ game_system = "TokyoNova" input = "1D12>=11" output = "(1D12>=11) ＞ 11 ＞ 成功" +success = true rands = [ { sides = 12, value = 11 }, ] @@ -42,6 +47,7 @@ rands = [ game_system = "TokyoNova" input = "1D20>=19" output = "(1D20>=19) ＞ 19 ＞ 成功" +success = true rands = [ { sides = 20, value = 19 }, ] @@ -50,6 +56,7 @@ rands = [ game_system = "TokyoNova" input = "(1+2)D10+3>=12" output = "(3D10+3>=12) ＞ 12[3,4,5]+3 ＞ 15 ＞ 成功" +success = true rands = [ { sides = 10, value = 3 }, { sides = 10, value = 4 }, @@ -61,6 +68,7 @@ game_system = "TokyoNova" input = "S1D10>=10" output = "(1D10>=10) ＞ 9 ＞ 失敗" secret = true +failure = true rands = [ { sides = 10, value = 9 }, ] diff --git a/test/data/TrinitySeven.toml b/test/data/TrinitySeven.toml index 3cfbfe3f6..49d8663f0 100644 --- a/test/data/TrinitySeven.toml +++ b/test/data/TrinitySeven.toml @@ -382,6 +382,7 @@ rands = [ game_system = "TrinitySeven" input = "1D100<=50" output = "(1D100<=50) ＞ 49 ＞ 成功" +success = true rands = [ { sides = 100, value = 49 }, ] @@ -390,6 +391,7 @@ rands = [ game_system = "TrinitySeven" input = "1D100<=50" output = "(1D100<=50) ＞ 50 ＞ 成功" +success = true rands = [ { sides = 100, value = 50 }, ] @@ -398,6 +400,7 @@ rands = [ game_system = "TrinitySeven" input = "1D100<=50" output = "(1D100<=50) ＞ 51 ＞ 失敗" +failure = true rands = [ { sides = 100, value = 51 }, ] @@ -405,7 +408,7 @@ rands = [ [[ test ]] game_system = "TrinitySeven" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/WARPS.toml b/test/data/WARPS.toml index ddffc1c1f..ec1c5665f 100644 --- a/test/data/WARPS.toml +++ b/test/data/WARPS.toml @@ -271,7 +271,7 @@ rands = [ [[ test ]] game_system = "WARPS" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, diff --git a/test/data/WaresBlade.toml b/test/data/WaresBlade.toml index 5ddf2ae8e..3c421ba9b 100644 --- a/test/data/WaresBlade.toml +++ b/test/data/WaresBlade.toml @@ -2,6 +2,7 @@ game_system = "WaresBlade" input = "1D4>=3" output = "(1D4>=3) ＞ 3 ＞ 成功" +success = true rands = [ { sides = 4, value = 3 }, ] @@ -10,6 +11,7 @@ rands = [ game_system = "WaresBlade" input = "1D6>=5" output = "(1D6>=5) ＞ 5 ＞ 成功" +success = true rands = [ { sides = 6, value = 5 }, ] @@ -18,6 +20,7 @@ rands = [ game_system = "WaresBlade" input = "1D8>=7" output = "(1D8>=7) ＞ 7 ＞ 成功" +success = true rands = [ { sides = 8, value = 7 }, ] @@ -34,6 +37,7 @@ rands = [ game_system = "WaresBlade" input = "1D12>=11" output = "(1D12>=11) ＞ 11 ＞ 成功" +success = true rands = [ { sides = 12, value = 11 }, ] @@ -42,6 +46,7 @@ rands = [ game_system = "WaresBlade" input = "1D20>=19" output = "(1D20>=19) ＞ 19 ＞ 成功" +success = true rands = [ { sides = 20, value = 19 }, ] @@ -103,7 +108,7 @@ rands = [ [[ test ]] game_system = "WaresBlade" input = "2D10>=? 目標値?でバグらない" -output = "(2D10>=?) ＞ 10[5,5] ＞ 10 ＞ 失敗" +output = "(2D10>=?) ＞ 10[5,5] ＞ 10" rands = [ { sides = 10, value = 5 }, { sides = 10, value = 5 }, diff --git a/test/data/Warhammer.toml b/test/data/Warhammer.toml index 589cdd0b3..06206af7c 100644 --- a/test/data/Warhammer.toml +++ b/test/data/Warhammer.toml @@ -1921,7 +1921,7 @@ rands = [ [[ test ]] game_system = "Warhammer" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 }, ] diff --git a/test/data/Warhammer4.toml b/test/data/Warhammer4.toml index 996391840..7132c8e85 100644 --- a/test/data/Warhammer4.toml +++ b/test/data/Warhammer4.toml @@ -1722,7 +1722,7 @@ rands = [ game_system = "Warhammer4" input = "1D100>=? 目標値?でバグらない" -output = "(1D100>=?) ＞ 42 ＞ 失敗" +output = "(1D100>=?) ＞ 42" rands = [ { sides = 100, value = 42 } ] diff --git a/test/data/YankeeYogSothoth.toml b/test/data/YankeeYogSothoth.toml index 07f86bd87..3f369b1ed 100644 --- a/test/data/YankeeYogSothoth.toml +++ b/test/data/YankeeYogSothoth.toml @@ -446,7 +446,7 @@ rands = [ [[ test ]] game_system = "YankeeYogSothoth" input = "2D6>=? 目標値?でバグらない" -output = "(2D6>=?) ＞ 7[3,4] ＞ 7 ＞ 失敗" +output = "(2D6>=?) ＞ 7[3,4] ＞ 7" rands = [ { sides = 6, value = 3 }, { sides = 6, value = 4 }, From ca160ed3934659c770874a03bd038497d61b6311 Mon Sep 17 00:00:00 2001 From: SAKATA Sinji Date: Sat, 5 Dec 2020 03:47:40 +0900 Subject: [PATCH 6/8] =?UTF-8?q?SwordWorld=E3=81=A7result=5F2d6=E3=82=92?= =?UTF-8?q?=E4=BD=BF=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/bcdice/game_system/SwordWorld.rb | 12 +- lib/bcdice/result.rb | 16 ++ test/data/SwordWorld.toml | 253 +++------------------------ 3 files changed, 50 insertions(+), 231 deletions(-) diff --git a/lib/bcdice/game_system/SwordWorld.rb b/lib/bcdice/game_system/SwordWorld.rb index 8be6cb8f7..e210b4913 100644 --- a/lib/bcdice/game_system/SwordWorld.rb +++ b/lib/bcdice/game_system/SwordWorld.rb @@ -45,17 +45,17 @@ def getRatingCommandStrings "cmCM" end - def check_2D6(total, dice_total, _dice_list, cmp_op, target) + def result_2d6(total, dice_total, _dice_list, cmp_op, target) if dice_total >= 12 - " ＞ 自動的成功" + Result.critical("自動的成功") elsif dice_total <= 2 - " ＞ 自動的失敗" + Result.fumble("自動的失敗") elsif cmp_op != :>= || target == "?" - '' + nil elsif total >= target - " ＞ 成功" + Result.success("成功") else - " ＞ 失敗" + Result.failure("失敗") end end diff --git a/lib/bcdice/result.rb b/lib/bcdice/result.rb index 7688c6291..09e90440a 100644 --- a/lib/bcdice/result.rb +++ b/lib/bcdice/result.rb @@ -15,6 +15,22 @@ def failure(text) end end + def critical(text) + new.tap do |r| + r.text = text + r.critical = true + r.success = true + end + end + + def fumble(text) + new.tap do |r| + r.text = text + r.fumble = true + r.failure = true + end + end + def nothing :nothing end diff --git a/test/data/SwordWorld.toml b/test/data/SwordWorld.toml index 2a556c176..3f4e143c2 100644 --- a/test/data/SwordWorld.toml +++ b/test/data/SwordWorld.toml @@ -1,97 +1,8 @@ [[ test ]] game_system = "SwordWorld" -input = "2d6>=4" -output = "(2D6>=4) ＞ 9[6,3] ＞ 9 ＞ 成功" -rands = [ - { sides = 6, value = 6 }, - { sides = 6, value = 3 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=4" -output = "(2D6>=4) ＞ 8[2,6] ＞ 8 ＞ 成功" -rands = [ - { sides = 6, value = 2 }, - { sides = 6, value = 6 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=4" -output = "(2D6>=4) ＞ 6[2,4] ＞ 6 ＞ 成功" -rands = [ - { sides = 6, value = 2 }, - { sides = 6, value = 4 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=4" -output = "(2D6>=4) ＞ 6[1,5] ＞ 6 ＞ 成功" -rands = [ - { sides = 6, value = 1 }, - { sides = 6, value = 5 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=4" -output = "(2D6>=4) ＞ 11[6,5] ＞ 11 ＞ 成功" -rands = [ - { sides = 6, value = 6 }, - { sides = 6, value = 5 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=4" -output = "(2D6>=4) ＞ 9[4,5] ＞ 9 ＞ 成功" -rands = [ - { sides = 6, value = 4 }, - { sides = 6, value = 5 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=4" -output = "(2D6>=4) ＞ 6[2,4] ＞ 6 ＞ 成功" -rands = [ - { sides = 6, value = 2 }, - { sides = 6, value = 4 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=4" -output = "(2D6>=4) ＞ 9[4,5] ＞ 9 ＞ 成功" -rands = [ - { sides = 6, value = 4 }, - { sides = 6, value = 5 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=4" -output = "(2D6>=4) ＞ 6[2,4] ＞ 6 ＞ 成功" -rands = [ - { sides = 6, value = 2 }, - { sides = 6, value = 4 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=4" -output = "(2D6>=4) ＞ 5[1,4] ＞ 5 ＞ 成功" -rands = [ - { sides = 6, value = 1 }, - { sides = 6, value = 4 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=9" -output = "(2D6>=9) ＞ 7[4,3] ＞ 7 ＞ 失敗" +input = "2d6>=7" +output = "(2D6>=7) ＞ 7[4,3] ＞ 7 ＞ 成功" +success = true rands = [ { sides = 6, value = 4 }, { sides = 6, value = 3 }, @@ -99,173 +10,65 @@ rands = [ [[ test ]] game_system = "SwordWorld" -input = "2d6>=9" -output = "(2D6>=9) ＞ 6[2,4] ＞ 6 ＞ 失敗" -rands = [ - { sides = 6, value = 2 }, - { sides = 6, value = 4 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=9" -output = "(2D6>=9) ＞ 5[2,3] ＞ 5 ＞ 失敗" -rands = [ - { sides = 6, value = 2 }, - { sides = 6, value = 3 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=9" -output = "(2D6>=9) ＞ 8[4,4] ＞ 8 ＞ 失敗" -rands = [ - { sides = 6, value = 4 }, - { sides = 6, value = 4 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=9" -output = "(2D6>=9) ＞ 3[1,2] ＞ 3 ＞ 失敗" -rands = [ - { sides = 6, value = 1 }, - { sides = 6, value = 2 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=9" -output = "(2D6>=9) ＞ 8[5,3] ＞ 8 ＞ 失敗" +input = "2d6>=7" +output = "(2D6>=7) ＞ 6[3,3] ＞ 6 ＞ 失敗" +failure = true rands = [ - { sides = 6, value = 5 }, { sides = 6, value = 3 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=9" -output = "(2D6>=9) ＞ 5[3,2] ＞ 5 ＞ 失敗" -rands = [ { sides = 6, value = 3 }, - { sides = 6, value = 2 }, ] [[ test ]] game_system = "SwordWorld" -input = "2d6>=9" -output = "(2D6>=9) ＞ 8[2,6] ＞ 8 ＞ 失敗" +input = "2d6>=7" +output = "(2D6>=7) ＞ 12[6,6] ＞ 12 ＞ 自動的成功" +success = true +critical = true rands = [ - { sides = 6, value = 2 }, + { sides = 6, value = 6 }, { sides = 6, value = 6 }, ] [[ test ]] game_system = "SwordWorld" -input = "2d6>=9" -output = "(2D6>=9) ＞ 5[1,4] ＞ 5 ＞ 失敗" +input = "2d6>=7" +output = "(2D6>=7) ＞ 2[1,1] ＞ 2 ＞ 自動的失敗" +failure = true +fumble = true rands = [ { sides = 6, value = 1 }, - { sides = 6, value = 4 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=9" -output = "(2D6>=9) ＞ 5[4,1] ＞ 5 ＞ 失敗" -rands = [ - { sides = 6, value = 4 }, { sides = 6, value = 1 }, ] [[ test ]] game_system = "SwordWorld" -input = "2d6>=7" -output = "(2D6>=7) ＞ 8[4,4] ＞ 8 ＞ 成功" -rands = [ - { sides = 6, value = 4 }, - { sides = 6, value = 4 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=7" -output = "(2D6>=7) ＞ 8[5,3] ＞ 8 ＞ 成功" -rands = [ - { sides = 6, value = 5 }, - { sides = 6, value = 3 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=7" -output = "(2D6>=7) ＞ 7[6,1] ＞ 7 ＞ 成功" +input = "2d6>=?" +output = "(2D6>=?) ＞ 12[6,6] ＞ 12 ＞ 自動的成功" +success = true +critical = true rands = [ { sides = 6, value = 6 }, - { sides = 6, value = 1 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=7" -output = "(2D6>=7) ＞ 8[3,5] ＞ 8 ＞ 成功" -rands = [ - { sides = 6, value = 3 }, - { sides = 6, value = 5 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=7" -output = "(2D6>=7) ＞ 11[6,5] ＞ 11 ＞ 成功" -rands = [ { sides = 6, value = 6 }, - { sides = 6, value = 5 }, ] [[ test ]] game_system = "SwordWorld" -input = "2d6>=7" -output = "(2D6>=7) ＞ 7[4,3] ＞ 7 ＞ 成功" +input = "2d6>=?" +output = "(2D6>=?) ＞ 2[1,1] ＞ 2 ＞ 自動的失敗" +failure = true +fumble = true rands = [ - { sides = 6, value = 4 }, - { sides = 6, value = 3 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=7" -output = "(2D6>=7) ＞ 6[5,1] ＞ 6 ＞ 失敗" -rands = [ - { sides = 6, value = 5 }, + { sides = 6, value = 1 }, { sides = 6, value = 1 }, ] [[ test ]] game_system = "SwordWorld" -input = "2d6>=7" -output = "(2D6>=7) ＞ 7[3,4] ＞ 7 ＞ 成功" -rands = [ - { sides = 6, value = 3 }, - { sides = 6, value = 4 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=7" -output = "(2D6>=7) ＞ 7[4,3] ＞ 7 ＞ 成功" -rands = [ - { sides = 6, value = 4 }, - { sides = 6, value = 3 }, -] - -[[ test ]] -game_system = "SwordWorld" -input = "2d6>=7" -output = "(2D6>=7) ＞ 9[3,6] ＞ 9 ＞ 成功" +input = "2d6>=?" +output = "(2D6>=?) ＞ 7[2,5] ＞ 7" rands = [ - { sides = 6, value = 3 }, - { sides = 6, value = 6 }, + { sides = 6, value = 2 }, + { sides = 6, value = 5 }, ] [[ test ]] From 6d82bebb4dc2a776a9d2a87c71fc1a16bf01db36 Mon Sep 17 00:00:00 2001 From: SAKATA Sinji Date: Sat, 12 Dec 2020 14:44:15 +0900 Subject: [PATCH 7/8] =?UTF-8?q?YARD=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E8=A3=9C=E5=BC=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/bcdice/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bcdice/base.rb b/lib/bcdice/base.rb index c12bf31b1..90255ca70 100644 --- a/lib/bcdice/base.rb +++ b/lib/bcdice/base.rb @@ -190,7 +190,7 @@ def change_text(string) # @param rand_results [Array] ダイスの一覧 # @param cmp_op [Symbol] 比較演算子 # @param target [Integer, String] 目標値の整数か'?' - # @return [Result] + # @return [Result, nil] def check_result(total, rand_results, cmp_op, target) ret = check_result_legacy(total, rand_results, cmp_op, target) return ret if ret From be0005bd22a5aa045728ae5680c886609cf91b64 Mon Sep 17 00:00:00 2001 From: SAKATA Sinji Date: Sat, 12 Dec 2020 14:45:18 +0900 Subject: [PATCH 8/8] =?UTF-8?q?[Emoklore]=20AddDice=E3=81=AE=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=A4=89=E6=9B=B4=E3=81=AB=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=82=B1=E3=83=BC=E3=82=B9=E3=82=92=E8=BF=BD=E5=BE=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/data/Emoklore.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/data/Emoklore.toml b/test/data/Emoklore.toml index ca7c9e2f1..ae46c6860 100644 --- a/test/data/Emoklore.toml +++ b/test/data/Emoklore.toml @@ -2,6 +2,7 @@ game_system = "Emoklore" input = "1D10>=5" output = "(1D10>=5) ＞ 9 ＞ 成功" +success = true rands = [ { sides = 10, value = 9 }, ] @@ -252,4 +253,4 @@ rands = [ { sides = 10, value = 10 }, { sides = 10, value = 10 }, { sides = 10, value = 10 }, -] \ No newline at end of file +]