From e3f42167cce7cd18ecd06d9abbd0aa832caa443f Mon Sep 17 00:00:00 2001
From: lunzhipenxil <lunzhipenxil@gmail.com>
Date: Wed, 8 Dec 2021 18:27:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E9=A1=B9=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

+ 优化ra奖惩骰解析细节问题
+ 新的DND5E检定规则
---
 OlivaDiceCore/msgCustom.py  |  2 +-
 OlivaDiceCore/msgReply.py   |  1 +
 OlivaDiceCore/pcCardData.py | 12 ++++++------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/OlivaDiceCore/msgCustom.py b/OlivaDiceCore/msgCustom.py
index 39a5e36..b7db202 100644
--- a/OlivaDiceCore/msgCustom.py
+++ b/OlivaDiceCore/msgCustom.py
@@ -111,7 +111,7 @@
     'strPcSkillCheckFate09' : '[+6 惊异]',
     'strPcSkillCheckFate10' : '[+7 史诗]',
     'strPcSkillCheckFate11' : '[+8 传奇]',
-    'strPcSkillCheckNope' : '无事发生',
+    'strPcSkillCheckNope' : '需要解释',
     'strPcSkillCheckError' : '发生错误'
 }
 
diff --git a/OlivaDiceCore/msgReply.py b/OlivaDiceCore/msgReply.py
index 2bb8508..ef823d9 100644
--- a/OlivaDiceCore/msgReply.py
+++ b/OlivaDiceCore/msgReply.py
@@ -1234,6 +1234,7 @@ def unity_reply(plugin_event, Proc):
                     if tmp_reast_str[0].isdigit():
                         flag_bp_count = tmp_reast_str[0]
                         tmp_reast_str = tmp_reast_str[1:]
+                tmp_reast_str = skipSpaceStart(tmp_reast_str)
             if len(tmp_reast_str) > 0:
                 [tmp_skill_name, tmp_reast_str] = getToNumberPara(tmp_reast_str)
                 tmp_reast_str = skipSpaceStart(tmp_reast_str)
diff --git a/OlivaDiceCore/pcCardData.py b/OlivaDiceCore/pcCardData.py
index 4b102c2..353548e 100644
--- a/OlivaDiceCore/pcCardData.py
+++ b/OlivaDiceCore/pcCardData.py
@@ -582,14 +582,14 @@
         'checkRules': {
             'default': {
                 'checkList': [
-                    'success',
-                    'fail'
+                    'greatSuccess',
+                    'greatFail'
                 ],
-                'success': {
-                    '.<=': ['$roll', '$skill']
+                'greatSuccess': {
+                    '.>=': ['$roll', 20]
                 },
-                'fail': {
-                    '.>': ['$roll', '$skill']
+                'greatFail': {
+                    '.<=': ['$roll', 1]
                 }
             }
         }