From ba6bba1d131fdbf0ac2af86cc942bd80c5d1c3b6 Mon Sep 17 00:00:00 2001
From: FredGreenfield <fgfbyt@gmail.com>
Date: Mon, 11 May 2020 07:30:15 +0900
Subject: [PATCH 1/5] =?UTF-8?q?=E3=83=95=E3=82=A3=E3=82=A2=E3=82=B9?=
 =?UTF-8?q?=E3=82=B3=E3=83=80=E3=82=A4=E3=82=B9=E3=83=9C=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E3=82=92=E4=BD=9C=E6=88=90=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/diceBot/Fiasco.rb    | 117 ++++++++++++++++++++++++++++++++++++++
 src/test/data/Fiasco.txt | 119 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 236 insertions(+)
 create mode 100644 src/diceBot/Fiasco.rb
 create mode 100644 src/test/data/Fiasco.txt

diff --git a/src/diceBot/Fiasco.rb b/src/diceBot/Fiasco.rb
new file mode 100644
index 000000000..13712aad4
--- /dev/null
+++ b/src/diceBot/Fiasco.rb
@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
+class Fiasco < DiceBot
+  # ゲームシステムの識別子
+  ID = 'Fiasco'
+
+  # ゲームシステム名
+  NAME = 'フィアスコ'
+
+  # ゲームシステム名の読みがな
+  SORT_KEY = 'ふいあすこ'
+
+  # ダイスボットの使い方
+  HELP_MESSAGE = <<INFO_MESSAGE_TEXT
+  ・判定コマンド(FSSx, FSWxBx)
+    相関図・転落要素用(FSSx)：相関図や転落要素のためにx個ダイスを振り、出目ごとに分類する
+    黒白差分判定用(FSWxBx)  ：転落、残響のために白ダイス(W指定)と黒ダイス(B指定)で差分を求める
+      ※ WとBは省略(FSBx, FSWx)、入替(FSWxBx,FSBxWx)可能
+
+INFO_MESSAGE_TEXT
+
+  COMMAND_TYPE_INDEX = 1
+
+  START_DICE_INDEX = 2
+
+  BW_FIRST_DICE_INDEX = 2
+  BW_SECOND_DICE_INDEX = 5
+  BW_SECOND_DICE_TAG_INDEX = 4
+
+  BW_SECOND_DICE_WHITE_TAG = "W"
+  BW_SECOND_DICE_BLACK_TAG = "B"
+
+  START_COMMAND_TAG = "FSS"
+  WB_DICEROLL_COMMAND_TAG = "FSW"
+  BW_DICEROLL_COMMAND_TAG = "FSB"
+
+  setPrefixes(['FS.*'])
+
+  def rollDiceCommand(command)
+    m = /\A(FS[SWB]?)(\d+)(([WB])(\d+))?/.match(command)
+    unless m
+      return ''
+    end
+
+    type = m[COMMAND_TYPE_INDEX]
+    if type == START_COMMAND_TAG
+      return makeStartDiceRoll(m)
+    else
+      return makeWhiteBlackDiceRoll(type, m)
+    end
+  end
+
+  def makeStartDiceRoll(m)
+    dice = m[START_DICE_INDEX]
+    _, diceText, = roll(dice, 6)
+
+    diceList = [0, 0, 0, 0, 0, 0]
+
+    diceText.split(',').each do |takeDice|
+      diceList[takeDice.to_i - 1] += 1
+    end
+
+    return "１ => #{diceList[0]}個 ２ => #{diceList[1]}個 ３ => #{diceList[2]}個 ４ => #{diceList[3]}個 ５ => #{diceList[4]}個 ６ => #{diceList[5]}個"
+  end
+
+  def makeWhiteBlackDiceRoll(type, m)
+    if type == WB_DICEROLL_COMMAND_TAG
+      whiteTotal, whiteDiceText, blackTotal, blackDiceText = makeDiceRoll(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
+      result = "白ダイス[#{whiteDiceText}]"
+      if blackDiceText
+        if m[BW_SECOND_DICE_TAG_INDEX][0] == BW_SECOND_DICE_WHITE_TAG
+          return "#{m}：白ダイス指定(#{BW_SECOND_DICE_WHITE_TAG})は重複できません。"
+        end
+
+        result += " 黒ダイス[#{blackDiceText}]"
+      end
+    elsif type == BW_DICEROLL_COMMAND_TAG
+      blackTotal, blackDiceText, whiteTotal, whiteDiceText = makeDiceRoll(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
+      result = "黒ダイス[#{blackDiceText}]"
+      if whiteDiceText
+        if m[BW_SECOND_DICE_TAG_INDEX][0] == BW_SECOND_DICE_BLACK_TAG
+          return "#{m}：黒ダイス指定(#{BW_SECOND_DICE_BLACK_TAG})は重複できません。"
+        end
+
+        result += " 白ダイス[#{whiteDiceText}]"
+      end
+
+    else
+      return ''
+    end
+
+    if blackTotal > whiteTotal
+      return "#{result} ＞ 黒#{blackTotal - whiteTotal}"
+    elsif blackTotal < whiteTotal
+      return "#{result} ＞ 白#{whiteTotal - blackTotal}"
+    end
+
+    return "#{result} ＞ 0"
+  end
+
+  def makeDiceRoll(firstDice, secondDice)
+    secondTotal = 0
+
+    firstTotal, firstDiceText, = roll(firstDice, 6)
+
+    if secondDice
+      if secondDice.to_i > 0
+        secondTotal, secondDiceText, = roll(secondDice, 6)
+      else
+        secondDiceText = "0"
+      end
+    end
+
+    return firstTotal, firstDiceText, secondTotal, secondDiceText
+  end
+end
diff --git a/src/test/data/Fiasco.txt b/src/test/data/Fiasco.txt
new file mode 100644
index 000000000..c2de9628a
--- /dev/null
+++ b/src/test/data/Fiasco.txt
@@ -0,0 +1,119 @@
+input:
+FSS12
+output:
+Fiasco : １ => 3個 ２ => 2個 ３ => 1個 ４ => 3個 ５ => 1個 ６ => 2個
+rand:1/6,2/6,1/6,3/6,4/6,6/6,4/6,5/6,6/6,4/6,2/6,1/6
+============================
+input:
+FSW3B3
+output:
+Fiasco : 白ダイス[1,2,3] 黒ダイス[4,5,6] ＞ 黒9
+rand:1/6,2/6,3/6,4/6,5/6,6/6
+============================
+input:
+FSW3B3
+output:
+Fiasco : 白ダイス[4,5,3] 黒ダイス[1,5,2] ＞ 白4
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+FSW6
+output:
+Fiasco : 白ダイス[4,5,3,1,5,2] ＞ 白20
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+FSB6
+output:
+Fiasco : 黒ダイス[4,5,3,1,5,2] ＞ 黒20
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+FSW6B0
+output:
+Fiasco : 白ダイス[4,5,3,1,5,2] 黒ダイス[0] ＞ 白20
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+FSB6W0
+output:
+Fiasco : 黒ダイス[4,5,3,1,5,2] 白ダイス[0] ＞ 黒20
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+FSB3W3
+output:
+Fiasco : 黒ダイス[1,5,2] 白ダイス[1,5,2] ＞ 0
+rand:1/6,5/6,2/6,1/6,5/6,2/6
+============================
+input:
+FSW3W3
+output:
+Fiasco : FSW3W3：白ダイス指定(W)は重複できません。
+rand:1/6,2/6,3/6,4/6,5/6,6/6
+============================
+input:
+FSB3B3
+output:
+Fiasco : FSB3B3：黒ダイス指定(B)は重複できません。
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+SFSS12
+output:
+Fiasco : １ => 3個 ２ => 2個 ３ => 1個 ４ => 3個 ５ => 1個 ６ => 2個###secret dice###
+rand:1/6,2/6,1/6,3/6,4/6,6/6,4/6,5/6,6/6,4/6,2/6,1/6
+============================
+input:
+SFSW3B3
+output:
+Fiasco : 白ダイス[1,2,3] 黒ダイス[4,5,6] ＞ 黒9###secret dice###
+rand:1/6,2/6,3/6,4/6,5/6,6/6
+============================
+input:
+SFSW3B3
+output:
+Fiasco : 白ダイス[4,5,3] 黒ダイス[1,5,2] ＞ 白4###secret dice###
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+SFSW6
+output:
+Fiasco : 白ダイス[4,5,3,1,5,2] ＞ 白20###secret dice###
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+SFSB6
+output:
+Fiasco : 黒ダイス[4,5,3,1,5,2] ＞ 黒20###secret dice###
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+SFSW6B0
+output:
+Fiasco : 白ダイス[4,5,3,1,5,2] 黒ダイス[0] ＞ 白20###secret dice###
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+SFSB6W0
+output:
+Fiasco : 黒ダイス[4,5,3,1,5,2] 白ダイス[0] ＞ 黒20###secret dice###
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+SFSB3W3
+output:
+Fiasco : 黒ダイス[1,5,2] 白ダイス[1,5,2] ＞ 0###secret dice###
+rand:1/6,5/6,2/6,1/6,5/6,2/6
+============================
+input:
+SFSW3W3
+output:
+Fiasco : FSW3W3：白ダイス指定(W)は重複できません。###secret dice###
+rand:1/6,2/6,3/6,4/6,5/6,6/6
+============================
+input:
+SFSB3B3
+output:
+Fiasco : FSB3B3：黒ダイス指定(B)は重複できません。###secret dice###
+rand:4/6,5/6,3/6,1/6,5/6,2/6

From abd35c249306bf2b9d68ea15040a57a50698a7cd Mon Sep 17 00:00:00 2001
From: FredGreenfield <fgfbyt@gmail.com>
Date: Mon, 11 May 2020 22:25:10 +0900
Subject: [PATCH 2/5] =?UTF-8?q?=E3=83=BB=E9=96=A2=E6=95=B0=E5=90=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/diceBot/Fiasco.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/diceBot/Fiasco.rb b/src/diceBot/Fiasco.rb
index 13712aad4..26ededd50 100644
--- a/src/diceBot/Fiasco.rb
+++ b/src/diceBot/Fiasco.rb
@@ -66,7 +66,7 @@ def makeStartDiceRoll(m)
 
   def makeWhiteBlackDiceRoll(type, m)
     if type == WB_DICEROLL_COMMAND_TAG
-      whiteTotal, whiteDiceText, blackTotal, blackDiceText = makeDiceRoll(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
+      whiteTotal, whiteDiceText, blackTotal, blackDiceText = makeWhiteBlackDiceRoll_s(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
       result = "白ダイス[#{whiteDiceText}]"
       if blackDiceText
         if m[BW_SECOND_DICE_TAG_INDEX][0] == BW_SECOND_DICE_WHITE_TAG
@@ -76,7 +76,7 @@ def makeWhiteBlackDiceRoll(type, m)
         result += " 黒ダイス[#{blackDiceText}]"
       end
     elsif type == BW_DICEROLL_COMMAND_TAG
-      blackTotal, blackDiceText, whiteTotal, whiteDiceText = makeDiceRoll(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
+      blackTotal, blackDiceText, whiteTotal, whiteDiceText = makeWhiteBlackDiceRoll_s(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
       result = "黒ダイス[#{blackDiceText}]"
       if whiteDiceText
         if m[BW_SECOND_DICE_TAG_INDEX][0] == BW_SECOND_DICE_BLACK_TAG
@@ -99,7 +99,7 @@ def makeWhiteBlackDiceRoll(type, m)
     return "#{result} ＞ 0"
   end
 
-  def makeDiceRoll(firstDice, secondDice)
+  def makeWhiteBlackDiceRoll_s(firstDice, secondDice)
     secondTotal = 0
 
     firstTotal, firstDiceText, = roll(firstDice, 6)

From 6136504140b3f1d3bb5cedfb87efbb052d26079d Mon Sep 17 00:00:00 2001
From: FredGreenfield <fgfbyt@gmail.com>
Date: Mon, 11 May 2020 22:25:10 +0900
Subject: [PATCH 3/5] =?UTF-8?q?=E9=96=A2=E6=95=B0=E5=90=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/diceBot/Fiasco.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/diceBot/Fiasco.rb b/src/diceBot/Fiasco.rb
index 13712aad4..26ededd50 100644
--- a/src/diceBot/Fiasco.rb
+++ b/src/diceBot/Fiasco.rb
@@ -66,7 +66,7 @@ def makeStartDiceRoll(m)
 
   def makeWhiteBlackDiceRoll(type, m)
     if type == WB_DICEROLL_COMMAND_TAG
-      whiteTotal, whiteDiceText, blackTotal, blackDiceText = makeDiceRoll(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
+      whiteTotal, whiteDiceText, blackTotal, blackDiceText = makeWhiteBlackDiceRoll_s(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
       result = "白ダイス[#{whiteDiceText}]"
       if blackDiceText
         if m[BW_SECOND_DICE_TAG_INDEX][0] == BW_SECOND_DICE_WHITE_TAG
@@ -76,7 +76,7 @@ def makeWhiteBlackDiceRoll(type, m)
         result += " 黒ダイス[#{blackDiceText}]"
       end
     elsif type == BW_DICEROLL_COMMAND_TAG
-      blackTotal, blackDiceText, whiteTotal, whiteDiceText = makeDiceRoll(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
+      blackTotal, blackDiceText, whiteTotal, whiteDiceText = makeWhiteBlackDiceRoll_s(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
       result = "黒ダイス[#{blackDiceText}]"
       if whiteDiceText
         if m[BW_SECOND_DICE_TAG_INDEX][0] == BW_SECOND_DICE_BLACK_TAG
@@ -99,7 +99,7 @@ def makeWhiteBlackDiceRoll(type, m)
     return "#{result} ＞ 0"
   end
 
-  def makeDiceRoll(firstDice, secondDice)
+  def makeWhiteBlackDiceRoll_s(firstDice, secondDice)
     secondTotal = 0
 
     firstTotal, firstDiceText, = roll(firstDice, 6)

From b1197f836d053918326c39ae2e34533b4cccef59 Mon Sep 17 00:00:00 2001
From: FredGreenfield <fgfbyt@gmail.com>
Date: Tue, 12 May 2020 20:01:10 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=E3=83=95=E3=82=A3=E3=82=A2=E3=82=B9?=
 =?UTF-8?q?=E3=82=B3=E3=83=80=E3=82=A4=E3=82=B9=E3=83=9C=E3=83=83=E3=83=88?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/diceBot/Fiasco.rb    | 117 ++++++++++++++++++++++++++++++++++++++
 src/test/data/Fiasco.txt | 119 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 236 insertions(+)
 create mode 100644 src/diceBot/Fiasco.rb
 create mode 100644 src/test/data/Fiasco.txt

diff --git a/src/diceBot/Fiasco.rb b/src/diceBot/Fiasco.rb
new file mode 100644
index 000000000..34f39e676
--- /dev/null
+++ b/src/diceBot/Fiasco.rb
@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+# frozen_string_literal: true
+
+class Fiasco < DiceBot
+  # ゲームシステムの識別子
+  ID = 'Fiasco'
+
+  # ゲームシステム名
+  NAME = 'フィアスコ'
+
+  # ゲームシステム名の読みがな
+  SORT_KEY = 'ふいあすこ'
+
+  # ダイスボットの使い方
+  HELP_MESSAGE = <<INFO_MESSAGE_TEXT
+  ・判定コマンド(FSSx, FSWxBx)
+    相関図・転落要素用(FSSx)：相関図や転落要素のためにx個ダイスを振り、出目ごとに分類する
+    黒白差分判定用(FSWxBx)  ：転落、残響のために白ダイス(W指定)と黒ダイス(B指定)で差分を求める
+      ※ WとBは省略(FSBx, FSWx)、入替(FSWxBx,FSBxWx)可能
+
+INFO_MESSAGE_TEXT
+
+  COMMAND_TYPE_INDEX = 1
+
+  START_DICE_INDEX = 2
+
+  BW_FIRST_DICE_INDEX = 2
+  BW_SECOND_DICE_INDEX = 5
+  BW_SECOND_DICE_TAG_INDEX = 4
+
+  BW_SECOND_DICE_WHITE_TAG = "W"
+  BW_SECOND_DICE_BLACK_TAG = "B"
+
+  START_COMMAND_TAG = "FSS"
+  WB_DICEROLL_COMMAND_TAG = "FSW"
+  BW_DICEROLL_COMMAND_TAG = "FSB"
+
+  setPrefixes(['FS.*'])
+
+  def rollDiceCommand(command)
+    m = /\A(FS[SWB]?)(\d+)(([WB])(\d+))?/.match(command)
+    unless m
+      return ''
+    end
+
+    type = m[COMMAND_TYPE_INDEX]
+    if type == START_COMMAND_TAG
+      return makeStartDiceRoll(m)
+    else
+      return makeWhiteBlackDiceRoll(type, m)
+    end
+  end
+
+  def makeStartDiceRoll(m)
+    dice = m[START_DICE_INDEX]
+    _, diceText, = roll(dice, 6)
+
+    diceList = [0, 0, 0, 0, 0, 0]
+
+    diceText.split(',').each do |takeDice|
+      diceList[takeDice.to_i - 1] += 1
+    end
+
+    return "１ => #{diceList[0]}個 ２ => #{diceList[1]}個 ３ => #{diceList[2]}個 ４ => #{diceList[3]}個 ５ => #{diceList[4]}個 ６ => #{diceList[5]}個"
+  end
+
+  def makeWhiteBlackDiceRoll(type, m)
+    if type == WB_DICEROLL_COMMAND_TAG
+      whiteTotal, whiteDiceText, blackTotal, blackDiceText = makeArgsDiceRoll(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
+      result = "白ダイス[#{whiteDiceText}]"
+      if blackDiceText
+        if m[BW_SECOND_DICE_TAG_INDEX][0] == BW_SECOND_DICE_WHITE_TAG
+          return "#{m}：白ダイス指定(#{BW_SECOND_DICE_WHITE_TAG})は重複できません。"
+        end
+
+        result += " 黒ダイス[#{blackDiceText}]"
+      end
+    elsif type == BW_DICEROLL_COMMAND_TAG
+      blackTotal, blackDiceText, whiteTotal, whiteDiceText = makeArgsDiceRoll(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
+      result = "黒ダイス[#{blackDiceText}]"
+      if whiteDiceText
+        if m[BW_SECOND_DICE_TAG_INDEX][0] == BW_SECOND_DICE_BLACK_TAG
+          return "#{m}：黒ダイス指定(#{BW_SECOND_DICE_BLACK_TAG})は重複できません。"
+        end
+
+        result += " 白ダイス[#{whiteDiceText}]"
+      end
+
+    else
+      return ''
+    end
+
+    if blackTotal > whiteTotal
+      return "#{result} ＞ 黒#{blackTotal - whiteTotal}"
+    elsif blackTotal < whiteTotal
+      return "#{result} ＞ 白#{whiteTotal - blackTotal}"
+    end
+
+    return "#{result} ＞ 0"
+  end
+
+  def makeArgsDiceRoll(firstDice, secondDice)
+    secondTotal = 0
+
+    firstTotal, firstDiceText, = roll(firstDice, 6)
+
+    if secondDice
+      if secondDice.to_i > 0
+        secondTotal, secondDiceText, = roll(secondDice, 6)
+      else
+        secondDiceText = "0"
+      end
+    end
+
+    return firstTotal, firstDiceText, secondTotal, secondDiceText
+  end
+end
diff --git a/src/test/data/Fiasco.txt b/src/test/data/Fiasco.txt
new file mode 100644
index 000000000..c2de9628a
--- /dev/null
+++ b/src/test/data/Fiasco.txt
@@ -0,0 +1,119 @@
+input:
+FSS12
+output:
+Fiasco : １ => 3個 ２ => 2個 ３ => 1個 ４ => 3個 ５ => 1個 ６ => 2個
+rand:1/6,2/6,1/6,3/6,4/6,6/6,4/6,5/6,6/6,4/6,2/6,1/6
+============================
+input:
+FSW3B3
+output:
+Fiasco : 白ダイス[1,2,3] 黒ダイス[4,5,6] ＞ 黒9
+rand:1/6,2/6,3/6,4/6,5/6,6/6
+============================
+input:
+FSW3B3
+output:
+Fiasco : 白ダイス[4,5,3] 黒ダイス[1,5,2] ＞ 白4
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+FSW6
+output:
+Fiasco : 白ダイス[4,5,3,1,5,2] ＞ 白20
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+FSB6
+output:
+Fiasco : 黒ダイス[4,5,3,1,5,2] ＞ 黒20
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+FSW6B0
+output:
+Fiasco : 白ダイス[4,5,3,1,5,2] 黒ダイス[0] ＞ 白20
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+FSB6W0
+output:
+Fiasco : 黒ダイス[4,5,3,1,5,2] 白ダイス[0] ＞ 黒20
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+FSB3W3
+output:
+Fiasco : 黒ダイス[1,5,2] 白ダイス[1,5,2] ＞ 0
+rand:1/6,5/6,2/6,1/6,5/6,2/6
+============================
+input:
+FSW3W3
+output:
+Fiasco : FSW3W3：白ダイス指定(W)は重複できません。
+rand:1/6,2/6,3/6,4/6,5/6,6/6
+============================
+input:
+FSB3B3
+output:
+Fiasco : FSB3B3：黒ダイス指定(B)は重複できません。
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+SFSS12
+output:
+Fiasco : １ => 3個 ２ => 2個 ３ => 1個 ４ => 3個 ５ => 1個 ６ => 2個###secret dice###
+rand:1/6,2/6,1/6,3/6,4/6,6/6,4/6,5/6,6/6,4/6,2/6,1/6
+============================
+input:
+SFSW3B3
+output:
+Fiasco : 白ダイス[1,2,3] 黒ダイス[4,5,6] ＞ 黒9###secret dice###
+rand:1/6,2/6,3/6,4/6,5/6,6/6
+============================
+input:
+SFSW3B3
+output:
+Fiasco : 白ダイス[4,5,3] 黒ダイス[1,5,2] ＞ 白4###secret dice###
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+SFSW6
+output:
+Fiasco : 白ダイス[4,5,3,1,5,2] ＞ 白20###secret dice###
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+SFSB6
+output:
+Fiasco : 黒ダイス[4,5,3,1,5,2] ＞ 黒20###secret dice###
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+SFSW6B0
+output:
+Fiasco : 白ダイス[4,5,3,1,5,2] 黒ダイス[0] ＞ 白20###secret dice###
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+SFSB6W0
+output:
+Fiasco : 黒ダイス[4,5,3,1,5,2] 白ダイス[0] ＞ 黒20###secret dice###
+rand:4/6,5/6,3/6,1/6,5/6,2/6
+============================
+input:
+SFSB3W3
+output:
+Fiasco : 黒ダイス[1,5,2] 白ダイス[1,5,2] ＞ 0###secret dice###
+rand:1/6,5/6,2/6,1/6,5/6,2/6
+============================
+input:
+SFSW3W3
+output:
+Fiasco : FSW3W3：白ダイス指定(W)は重複できません。###secret dice###
+rand:1/6,2/6,3/6,4/6,5/6,6/6
+============================
+input:
+SFSB3B3
+output:
+Fiasco : FSB3B3：黒ダイス指定(B)は重複できません。###secret dice###
+rand:4/6,5/6,3/6,1/6,5/6,2/6

From 04a74f2b492981acdc4a4ebcf4cc9b5e532e5f47 Mon Sep 17 00:00:00 2001
From: FredGreenfield <fgfbyt@gmail.com>
Date: Fri, 15 May 2020 18:28:45 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89?=
 =?UTF-8?q?=E3=81=AE=E8=A6=8B=E7=9B=B4=E3=81=97(FSSx=E2=86=92FSx,FSWxBx?=
 =?UTF-8?q?=E2=86=92WxBx)=20WxBx=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89?=
 =?UTF-8?q?=E6=99=82=E3=81=AE=E3=83=80=E3=82=A4=E3=82=B9=E8=A1=A8=E8=A8=98?=
 =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97=E3=80=81=E7=99=BD=E3=81=AE?=
 =?UTF-8?q?=E5=90=88=E8=A8=88=E3=80=81=E9=BB=92=E3=81=AE=E5=90=88=E8=A8=88?=
 =?UTF-8?q?=E3=82=92=E8=A1=A8=E8=A8=98=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/diceBot/Fiasco.rb    | 42 ++++++++++------------
 src/test/data/Fiasco.txt | 76 ++++++++++++++++++++--------------------
 2 files changed, 57 insertions(+), 61 deletions(-)

diff --git a/src/diceBot/Fiasco.rb b/src/diceBot/Fiasco.rb
index 5d9dd91c1..34bee85de 100644
--- a/src/diceBot/Fiasco.rb
+++ b/src/diceBot/Fiasco.rb
@@ -13,10 +13,10 @@ class Fiasco < DiceBot
 
   # ダイスボットの使い方
   HELP_MESSAGE = <<INFO_MESSAGE_TEXT
-  ・判定コマンド(FSSx, FSWxBx)
-    相関図・転落要素用(FSSx)：相関図や転落要素のためにx個ダイスを振り、出目ごとに分類する
-    黒白差分判定用(FSWxBx)  ：転落、残響のために白ダイス(W指定)と黒ダイス(B指定)で差分を求める
-      ※ WとBは省略(FSBx, FSWx)、入替(FSWxBx,FSBxWx)可能
+  ・判定コマンド(FSx, WxBx)
+    相関図・転落要素用(FSx)：相関図や転落要素のためにx個ダイスを振り、出目ごとに分類する
+    黒白差分判定用(WxBx)  ：転落、残響のために白ダイス(W指定)と黒ダイス(B指定)で差分を求める
+      ※ WとBは片方指定(Bx, Wx)、入替指定(WxBx,BxWx)可能
 
 INFO_MESSAGE_TEXT
 
@@ -28,17 +28,14 @@ class Fiasco < DiceBot
   BW_SECOND_DICE_INDEX = 5
   BW_SECOND_DICE_TAG_INDEX = 4
 
-  BW_SECOND_DICE_WHITE_TAG = "W"
-  BW_SECOND_DICE_BLACK_TAG = "B"
+  START_COMMAND_TAG = "FS"
+  W_DICEROLL_COMMAND_TAG = "W"
+  B_DICEROLL_COMMAND_TAG = "B"
 
-  START_COMMAND_TAG = "FSS"
-  WB_DICEROLL_COMMAND_TAG = "FSW"
-  BW_DICEROLL_COMMAND_TAG = "FSB"
-
-  setPrefixes(['FS.*'])
+  setPrefixes(['(FS|[WB])(\d+).*'])
 
   def rollDiceCommand(command)
-    m = /\A(FS[SWB]?)(\d+)(([WB])(\d+))?/.match(command)
+    m = /\A(FS|[WB])(\d+)(([WB])(\d+))?/.match(command)
     unless m
       return ''
     end
@@ -65,27 +62,26 @@ def makeStartDiceRoll(m)
   end
 
   def makeWhiteBlackDiceRoll(type, m)
-    if type == WB_DICEROLL_COMMAND_TAG
+    if type == W_DICEROLL_COMMAND_TAG
       whiteTotal, whiteDiceText, blackTotal, blackDiceText = makeArgsDiceRoll(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
-      result = "白ダイス[#{whiteDiceText}]"
+      result = "白#{whiteTotal}[#{whiteDiceText}]"
       if blackDiceText
-        if m[BW_SECOND_DICE_TAG_INDEX].start_with?(BW_SECOND_DICE_WHITE_TAG)
-          return "#{m}：白ダイス指定(#{BW_SECOND_DICE_WHITE_TAG})は重複できません。"
+        if m[BW_SECOND_DICE_TAG_INDEX] == W_DICEROLL_COMMAND_TAG
+          return "#{m}：白指定(#{W_DICEROLL_COMMAND_TAG})は重複できません。"
         end
 
-        result += " 黒ダイス[#{blackDiceText}]"
+        result += " 黒#{blackTotal}[#{blackDiceText}]"
       end
-    elsif type == BW_DICEROLL_COMMAND_TAG
+    elsif type == B_DICEROLL_COMMAND_TAG
       blackTotal, blackDiceText, whiteTotal, whiteDiceText = makeArgsDiceRoll(m[BW_FIRST_DICE_INDEX], m[BW_SECOND_DICE_INDEX])
-      result = "黒ダイス[#{blackDiceText}]"
+      result = "黒#{blackTotal}[#{blackDiceText}]"
       if whiteDiceText
-        if m[BW_SECOND_DICE_TAG_INDEX].start_with?(BW_SECOND_DICE_BLACK_TAG)
-          return "#{m}：黒ダイス指定(#{BW_SECOND_DICE_BLACK_TAG})は重複できません。"
+        if m[BW_SECOND_DICE_TAG_INDEX] == B_DICEROLL_COMMAND_TAG
+          return "#{m}：黒指定(#{B_DICEROLL_COMMAND_TAG})は重複できません。"
         end
 
-        result += " 白ダイス[#{whiteDiceText}]"
+        result += " 白#{whiteTotal}[#{whiteDiceText}]"
       end
-
     else
       return ''
     end
diff --git a/src/test/data/Fiasco.txt b/src/test/data/Fiasco.txt
index c2de9628a..67599f2a7 100644
--- a/src/test/data/Fiasco.txt
+++ b/src/test/data/Fiasco.txt
@@ -1,119 +1,119 @@
 input:
-FSS12
+FS12
 output:
 Fiasco : １ => 3個 ２ => 2個 ３ => 1個 ４ => 3個 ５ => 1個 ６ => 2個
 rand:1/6,2/6,1/6,3/6,4/6,6/6,4/6,5/6,6/6,4/6,2/6,1/6
 ============================
 input:
-FSW3B3
+W3B3
 output:
-Fiasco : 白ダイス[1,2,3] 黒ダイス[4,5,6] ＞ 黒9
+Fiasco : 白6[1,2,3] 黒15[4,5,6] ＞ 黒9
 rand:1/6,2/6,3/6,4/6,5/6,6/6
 ============================
 input:
-FSW3B3
+W3B3
 output:
-Fiasco : 白ダイス[4,5,3] 黒ダイス[1,5,2] ＞ 白4
+Fiasco : 白12[4,5,3] 黒8[1,5,2] ＞ 白4
 rand:4/6,5/6,3/6,1/6,5/6,2/6
 ============================
 input:
-FSW6
+W6
 output:
-Fiasco : 白ダイス[4,5,3,1,5,2] ＞ 白20
+Fiasco : 白20[4,5,3,1,5,2] ＞ 白20
 rand:4/6,5/6,3/6,1/6,5/6,2/6
 ============================
 input:
-FSB6
+B6
 output:
-Fiasco : 黒ダイス[4,5,3,1,5,2] ＞ 黒20
+Fiasco : 黒20[4,5,3,1,5,2] ＞ 黒20
 rand:4/6,5/6,3/6,1/6,5/6,2/6
 ============================
 input:
-FSW6B0
+W6B0
 output:
-Fiasco : 白ダイス[4,5,3,1,5,2] 黒ダイス[0] ＞ 白20
+Fiasco : 白20[4,5,3,1,5,2] 黒0[0] ＞ 白20
 rand:4/6,5/6,3/6,1/6,5/6,2/6
 ============================
 input:
-FSB6W0
+B6W0
 output:
-Fiasco : 黒ダイス[4,5,3,1,5,2] 白ダイス[0] ＞ 黒20
+Fiasco : 黒20[4,5,3,1,5,2] 白0[0] ＞ 黒20
 rand:4/6,5/6,3/6,1/6,5/6,2/6
 ============================
 input:
-FSB3W3
+B3W3
 output:
-Fiasco : 黒ダイス[1,5,2] 白ダイス[1,5,2] ＞ 0
+Fiasco : 黒8[1,5,2] 白8[1,5,2] ＞ 0
 rand:1/6,5/6,2/6,1/6,5/6,2/6
 ============================
 input:
-FSW3W3
+W3W3
 output:
-Fiasco : FSW3W3：白ダイス指定(W)は重複できません。
+Fiasco : W3W3：白指定(W)は重複できません。
 rand:1/6,2/6,3/6,4/6,5/6,6/6
 ============================
 input:
-FSB3B3
+B3B3
 output:
-Fiasco : FSB3B3：黒ダイス指定(B)は重複できません。
+Fiasco : B3B3：黒指定(B)は重複できません。
 rand:4/6,5/6,3/6,1/6,5/6,2/6
 ============================
 input:
-SFSS12
+SFS12
 output:
 Fiasco : １ => 3個 ２ => 2個 ３ => 1個 ４ => 3個 ５ => 1個 ６ => 2個###secret dice###
 rand:1/6,2/6,1/6,3/6,4/6,6/6,4/6,5/6,6/6,4/6,2/6,1/6
 ============================
 input:
-SFSW3B3
+SW3B3
 output:
-Fiasco : 白ダイス[1,2,3] 黒ダイス[4,5,6] ＞ 黒9###secret dice###
+Fiasco : 白6[1,2,3] 黒15[4,5,6] ＞ 黒9###secret dice###
 rand:1/6,2/6,3/6,4/6,5/6,6/6
 ============================
 input:
-SFSW3B3
+SW3B3
 output:
-Fiasco : 白ダイス[4,5,3] 黒ダイス[1,5,2] ＞ 白4###secret dice###
+Fiasco : 白12[4,5,3] 黒8[1,5,2] ＞ 白4###secret dice###
 rand:4/6,5/6,3/6,1/6,5/6,2/6
 ============================
 input:
-SFSW6
+SW6
 output:
-Fiasco : 白ダイス[4,5,3,1,5,2] ＞ 白20###secret dice###
+Fiasco : 白20[4,5,3,1,5,2] ＞ 白20###secret dice###
 rand:4/6,5/6,3/6,1/6,5/6,2/6
 ============================
 input:
-SFSB6
+SB6
 output:
-Fiasco : 黒ダイス[4,5,3,1,5,2] ＞ 黒20###secret dice###
+Fiasco : 黒20[4,5,3,1,5,2] ＞ 黒20###secret dice###
 rand:4/6,5/6,3/6,1/6,5/6,2/6
 ============================
 input:
-SFSW6B0
+SW6B0
 output:
-Fiasco : 白ダイス[4,5,3,1,5,2] 黒ダイス[0] ＞ 白20###secret dice###
+Fiasco : 白20[4,5,3,1,5,2] 黒0[0] ＞ 白20###secret dice###
 rand:4/6,5/6,3/6,1/6,5/6,2/6
 ============================
 input:
-SFSB6W0
+SB6W0
 output:
-Fiasco : 黒ダイス[4,5,3,1,5,2] 白ダイス[0] ＞ 黒20###secret dice###
+Fiasco : 黒20[4,5,3,1,5,2] 白0[0] ＞ 黒20###secret dice###
 rand:4/6,5/6,3/6,1/6,5/6,2/6
 ============================
 input:
-SFSB3W3
+SB3W3
 output:
-Fiasco : 黒ダイス[1,5,2] 白ダイス[1,5,2] ＞ 0###secret dice###
+Fiasco : 黒8[1,5,2] 白8[1,5,2] ＞ 0###secret dice###
 rand:1/6,5/6,2/6,1/6,5/6,2/6
 ============================
 input:
-SFSW3W3
+SW3W3
 output:
-Fiasco : FSW3W3：白ダイス指定(W)は重複できません。###secret dice###
+Fiasco : W3W3：白指定(W)は重複できません。###secret dice###
 rand:1/6,2/6,3/6,4/6,5/6,6/6
 ============================
 input:
-SFSB3B3
+SB3B3
 output:
-Fiasco : FSB3B3：黒ダイス指定(B)は重複できません。###secret dice###
+Fiasco : B3B3：黒指定(B)は重複できません。###secret dice###
 rand:4/6,5/6,3/6,1/6,5/6,2/6