版本推进至3.2.3

+ 重放掷骰功能完成
+ 更新帮助文档

OlivaDiceCore/app.json

@@ -4,8 +4,8 @@
  "namespace" : "OlivaDiceCore",
  "message_mode" : "old_string",
  "info" : "本模块为OlivaDice的核心模块，提供了所有必须的骰子功能以及基础的管理支持，几乎所有的其它模块都依赖这个模块。",
- "version" : "3.2.2",
- "svn" : 1032,
+ "version" : "3.2.3",
+ "svn" : 1033,
  "compatible_svn" : 101,
  "priority" : 20000,
  "support" : [

OlivaDiceCore/data.py

@@ -22,8 +22,8 @@
 import OlivOS
 
 OlivaDiceCore_name = 'OlivaDice核心模块'
-OlivaDiceCore_ver = '3.2.2'
-OlivaDiceCore_svn = 1032
+OlivaDiceCore_ver = '3.2.3'
+OlivaDiceCore_svn = 1033
 OlivaDiceCore_ver_short = '%s(%s)' % (str(OlivaDiceCore_ver), str(OlivaDiceCore_svn))
 
 exce_path = os.getcwd()

OlivaDiceCore/helpDocData.py

@@ -169,6 +169,12 @@
 .dxx [掷骰表达式] [理由] 掷双重十字骰，但不显示细节
 .dx[数字] 快速掷骰 [数字]c10''',
 
+
+ 'rr': '''重放掷骰指令
+.rr [重放模式] 本指令可以以不同模式重放最后一次掷骰
+支持的重放模式有: 默认/default/美化/preety/无限/ww/双重十字/dx
+''',
+
  'ra': '''检定指令
 .ra [技能名] [技能值] 技能检定
 .rah [技能名] [技能值] 暗技能检定
@@ -317,6 +323,8 @@
  'help': '&default',
  '帮助': '&default',
  '掷骰': '&r',
+ '重放掷骰': '&rr',
+ '重放': '&rr',
  '检定': '&ra',
  '理智检定': '&sc',
  '成长检定': '&en',

OlivaDiceCore/msgReply.py

@@ -3424,11 +3424,11 @@ def unity_reply(plugin_event, Proc):
  tmp_reast_str = getMatchWordStartRight(tmp_reast_str, 'rr')
  tmp_reast_str = skipSpaceStart(tmp_reast_str)
  tmp_reast_str = tmp_reast_str.rstrip(' ')
- flag_mode = 'default'
+ flag_mode = '默认'
  tmp_user_platform = plugin_event.platform['platform']
  if len(tmp_reast_str) > 0:
  if not flag_is_from_master and tmp_reast_str in ['debug']:
- flag_mode = 'default'
+ pass
  else:
  flag_mode = tmp_reast_str
  tmp_RDData_str = OlivaDiceCore.onediceOverride.RDDataFormat(

OlivaDiceCore/onediceOverride.py

@@ -190,18 +190,28 @@ def getRDDataIntUserByHash(botHash:str, userHash:str):
  return res
 
 # format
+dictFormatMappingMode = {
+ '默认': 'default',
+ '美化': 'pretty',
+ '无限': 'ww',
+ '双重十字': 'dx'
+}
+
 def RDDataFormat(data:'list|None', mode:str = 'default'):
  res = None
+ mode_real = mode
+ if mode in dictFormatMappingMode:
+ mode_real = dictFormatMappingMode[mode]
  if data != None and type(data) == list:
- if mode == 'debug':
+ if mode_real == 'debug':
  res = RDDataFormat_debug(data)
- elif mode == 'default':
+ elif mode_real == 'default':
  res = RDDataFormat_default(data)
- elif mode == 'pretty':
+ elif mode_real == 'pretty':
  res = RDDataFormat_default(data, 'pretty')
- elif mode == 'dx':
+ elif mode_real == 'dx':
  res = RDDataFormat_default(data, 'dx')
- elif mode == 'ww':
+ elif mode_real == 'ww':
  res = RDDataFormat_default(data, 'ww')
  return res
 
@@ -276,9 +286,9 @@ def RDDataFormat_default(data:list, mode = 'default'):
  ])) for data_this_this_0 in data_this['result'][0]
  ]
  if mode in ['dx', 'ww']:
- res += '{\n%s\n轮数: %s\n}' % (
- '+\n'.join(tmp_data_this_list_0),
- str(len(data_this['result'][0]))
+ res += '{轮数: %s\n%s\n}' % (
+ str(len(data_this['result'][0])),
+ '+\n'.join(tmp_data_this_list_0)
  )
  elif mode == 'pretty':
  res += '{\n%s\n}' % (',\n'.join(tmp_data_this_list_0))
@@ -299,7 +309,12 @@ def RDDataFormat_default(data:list, mode = 'default'):
  for data_this_this_0_this in data_this_this_0
  ])) for data_this_this_0 in data_this['result'][0]
  ]
- if mode == 'pretty':
+ if mode in ['dx', 'ww']:
+ res += '{轮数: %s\n%s\n}' % (
+ str(len(data_this['result'][0])),
+ ',\n'.join(tmp_data_this_list_0)
+ )
+ elif mode == 'pretty':
  res += '{\n%s\n}' % (',\n'.join(tmp_data_this_list_0))
  else:
  res += '{%s}' % (', '.join(tmp_data_this_list_0))