[NinjaSlayer2] 正規表現を整理

bcdice · Dec 4, 2023 · 52a468a · 52a468a
1 parent b755b76
commit 52a468a
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/lib/bcdice/game_system/NinjaSlayer2.rb b/lib/bcdice/game_system/NinjaSlayer2.rb
@@ -270,7 +270,7 @@ def proc_text(command)
       RE_COUNT_CRITICAL = /C([1-6])?/i.freeze
       RE_COUNT_JUDGE = /(=|!=|>=|>|<=|<)([1-6])/.freeze
 
-      RE_JUDGE_DICEROLL = /^(UH|[KENHU])([\d,]+)(?:\[((?:(?:#{RE_COUNT_SATZ_BATZ}|#{RE_COUNT_CRITICAL}|#{RE_COUNT_JUDGE})(?:\]\[)?)+)\])?$/i.freeze
+      RE_JUDGE_DICEROLL = /^(UH|[KENHU])([\d,]+)(?:\[((?:(?:S([1-6])?|C([1-6])?|(=|!=|>=|>|<=|<)([1-6]))(?:\]\[)?)+)\])?$/i.freeze
       RE_JUDGE_SATZ_BATZ = /^SB(?:@([1-6]))?$/i.freeze
       RE_JUDGE_WASSHOI = /^WS([1-9]|10|11|12)$/i.freeze
       RE_JUDGE_WASSHOI_ENTRY = /^WSE(?:@([1-6]))?$/i.freeze
@@ -287,11 +287,12 @@ def proc_text(command)
       }.freeze
 
       register_prefix(
-        RE_JUDGE_DICEROLL,
-        RE_JUDGE_SATZ_BATZ,
-        RE_JUDGE_WASSHOI,
-        RE_JUDGE_WASSHOI_ENTRY,
-        RE_JUDGE_NRS
+        "UH",
+        "[KENHU]",
+        "SB",
+        "WS",
+        "WSE",
+        "NRS"
       )
     end
   end