Merge c5be5c9 into a2cd6f6

bcdice · Feb 26, 2021 · 11475f9 · 11475f9
2 parents a2cd6f6 + c5be5c9
commit 11475f9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/lib/bcdice/game_system/Cthulhu.rb b/lib/bcdice/game_system/Cthulhu.rb
@@ -97,7 +97,11 @@ def eval_game_system_specific_command(command)
       private
 
       def getCheckResult(command)
-        m = %r{CCB?(\d+)?(?:<=([+-/*\d]+))?}i.match(command)
+        m = %r{^CCB?(\d+)?(?:<=([+-/*\d]+))?$}i.match(command)
+        unless m
+          return nil
+        end
+
         broken_num = m[1].to_i
         diff = ArithmeticEvaluator.eval(m[2])
 
@@ -189,7 +193,7 @@ def compare(total, target, broken_number = 0)
       end
 
       def getRegistResult(command)
-        m = /RES(B)?([-\d]+)/i.match(command)
+        m = /^RES(B)?([-\d]+)$/i.match(command)
         unless m
           return nil
         end
@@ -215,7 +219,7 @@ def getRegistResult(command)
       end
 
       def getCombineRoll(command)
-        m = /CBR(B)?\((\d+),(\d+)\)/i.match(command)
+        m = /^CBR(B)?\((\d+),(\d+)\)$/i.match(command)
         unless m
           return nil
         end

diff --git a/test/data/Cthulhu.toml b/test/data/Cthulhu.toml
@@ -461,6 +461,11 @@ rands = [
   { sides = 100, value = 77 },
 ]
 
+[[ test ]]
+game_system = "Cthulhu"
+input = "CCさくら 完全一致"
+output = ""
+rands = []
 
 ##### 戦闘用技能判定 CCB #####
 
@@ -670,6 +675,11 @@ rands = [
   { sides = 100, value = 30 },
 ]
 
+[[ test ]]
+game_system = "Cthulhu"
+input = "CCBさくら 完全一致"
+output = ""
+rands = []
 
 ##### 戦闘用対抗判定 RESB #####