Merge pull request #7 from KeleMC/dev

BETA v0.1.0

Author: wang-yupu

README.md

@@ -19,10 +19,11 @@
 
 #### 等级介绍
 
-1. 根玩家：无需介绍
-2. 3级玩家：
-3. 2级玩家：
-4. 1级玩家：没有任何权限，只能进行普通的“原版游戏”
+0. 管理员: 干啥都行
+1. 根玩家：回档
+2. 3级玩家：可以使用假人
+3. 2级玩家：可以使用假人&tp&spec
+4. 1级玩家：可以进行tpa
 
 #### 升级消耗
 

kmts/utils/command/__init__.py

@@ -8,7 +8,7 @@
 from .classes import upgradeRequest
 
 from ...shared import gctx
-from ..permissionUtils.point import getUpgradeCost, getUpgradeAddInt, canUpgrade, getPointName, getUpgradeLevel
+from ..permissionUtils.point import getUpgradeCost, isUpgradeUseless, canUpgrade, getPointName, getUpgradeLevel
 from ..permissionUtils import updateAllPermissions
 from ..configUtils import readPlayerInfo, Player, savePlayerInfo
 from ..configUtils import writeFile
@@ -22,7 +22,7 @@ def printHelp(source: CommandSource, context: CommandContext):
         RText(" 玩家信任服务 帮助") + RText(" >", RColor.dark_purple)
     body = RText('''\
 !!ts: 输出本条消息
-!!ts upgrade <玩家名称>: 升级某个玩家，同时消耗你的信任点数''')
+!!ts upgrade <玩家名称> <点数>: 升级某个玩家，同时消耗你的信任点数''')
 
     if not source.is_console:
         try:
@@ -69,15 +69,28 @@ def upgradePlayer(source: CommandSource, context: CommandContext):
         except KeyError:
             source.reply(RText("您为1级玩家，无法升级！", RColor.red))
             return
-        if not canUpgrade(player):
+
+        try:
+            player2 = readPlayerInfo(context['playerName'])
+        except KeyError:
+            player2 = Player(context["playerName"], False, 0)
+        addPoint = context['point']
+        costPoint = getUpgradeCost(player, addPoint)
+
+        upgradeState = canUpgrade(player, costPoint)
+        if upgradeState == False:
             source.reply(RText("您的信任点不足，无法升级！", RColor.red))
             return
 
-        req = upgradeRequest(playerStorageName, context['playerName'], getUpgradeCost(player), getUpgradeAddInt(player))
-        source.reply(f"您将花费{req.cost}信任点以为 {context['playerName']} 增加{req.add}信任点。为对方升级后您的等级为{getUpgradeLevel(player)}。确认请输入`!!ts confirm`")
+        if isUpgradeUseless(player2, addPoint):
+            source.reply(RText("此次升级部分/全部无用（因为对方可加的点数少于您的请求点数）", RColor.red))
+
+        req = upgradeRequest(playerStorageName, context['playerName'], costPoint, addPoint)
+        source.reply(
+            f"您将花费{req.cost}信任点以为 {context['playerName']} 增加{req.add}信任点。为对方升级后您的等级为{getUpgradeLevel(player, costPoint)}。确认请输入`!!ts confirm`")
         gctx.playerUpgradeAwaits[playerStorageName] = req
     elif source.is_console:
-        source.reply(f"以控制台执行的upgrade子命令将以根玩家的权限执行(为目标增加17点数)。确认请输入`!!ts confirm`")
+        source.reply(f"以控制台执行的`upgrade`子命令类似于`setPoint`子命令。执行此命令将为目标增加{context['point']}点数。确认请输入`!!ts confirm`")
 
 
 def playerUpgradeConfirm(source: CommandSource, context: CommandContext):
@@ -117,14 +130,18 @@ def playerUpgradeConfirm(source: CommandSource, context: CommandContext):
         if player2.isRootPlayer:
             source.reply(RText("不能给根玩家升级", RColor.red))
             return
+        if gctx.upgrade.acquire(False):
 
-        # 然后先扣钱
-        player1.trustPoint -= alreadyExistRequest.cost
-        savePlayerInfo(player1)
+            # 然后先扣钱
+            player1.trustPoint -= alreadyExistRequest.cost
+            savePlayerInfo(player1)
 
-        # 然后给target增加
-        player2.trustPoint = min(player2.trustPoint+alreadyExistRequest.add, 27)
-        savePlayerInfo(player2)
+            # 然后给target增加
+            player2.trustPoint = min(player2.trustPoint + alreadyExistRequest.add, 27)
+            savePlayerInfo(player2)
+            gctx.upgrade.release()
+        else:
+            source.reply(RText("当前正在升级，请重试", RColor.red))
 
         source.reply(RText(f"升级成功，对方现有 {player2.trustPoint} 信任点。", RColor.green))
         source.get_server().tell(alreadyExistRequest.targetPlayer, RText(
@@ -167,7 +184,7 @@ def getTSCmdBuilder():
     cmdBuilder = SimpleCommandBuilder()
 
     cmdBuilder.command("!!ts", printHelp)
-    cmdBuilder.command("!!ts upgrade <playerName>", upgradePlayer)
+    cmdBuilder.command("!!ts upgrade <playerName> <point>", upgradePlayer)
     cmdBuilder.command("!!ts confirm", playerUpgradeConfirmWrapper)
     cmdBuilder.command("!!ts save", savePermissionFile)
 

kmts/utils/configUtils/__init__.py

@@ -32,7 +32,6 @@ def savePlayerInfo(playerInfo: Player) -> None:
 
 def readFile():  # 插件加载时调用
     PSI: PluginServerInterface = ServerInterface.psi()
-    print(PSI)
     cfg = PSI.load_config_simple("permission.json", defaultPermissionFile)
     gctx.playerLevelsConfigFileContent = cfg
 

kmts/utils/misc/context.py

@@ -9,3 +9,5 @@ def __init__(self):
 
         self.upgradeProcessing = Lock()
         self.saveLock = Lock()
+        self.upgrade = Lock()
+  

kmts/utils/permissionUtils/point.py

@@ -2,23 +2,15 @@
 from ..configUtils.classes import Player
 
 
-def getUpgradeCost(player: Player) -> int:
+def getUpgradeCost(player, addPoint: int) -> int:
     if player.isRootPlayer:
         return 0
-    elif player.trustPoint == 0:
-        return False
-    else:
-        p = player.trustPoint
-        match p:
-            case p if 1 <= p < 13:
-                return 5
-            case p if 14 <= p <= 27:
-                return 8
-            case p if p > 27:
-                return 0
+    costPoint = max(int(addPoint / 10) + addPoint, addPoint+1)
+    return costPoint
+
 
-def getUpgradeLevel(player: Player) -> int:
-    UpgradedtrustPoint = player.trustPoint - getUpgradeCost(player)
+def getUpgradeLevel(player: Player, costPoint: int) -> int:
+    UpgradedtrustPoint = player.trustPoint - costPoint
     if player.isRootPlayer:
         return "根玩家"
     elif UpgradedtrustPoint == 0:
@@ -33,6 +25,7 @@ def getUpgradeLevel(player: Player) -> int:
             case p if p > 27:
                 return "管理员或根玩家"
 
+
 def getUpgradeAddInt(player: Player) -> int:
     if player.isRootPlayer:
         return 16
@@ -49,10 +42,10 @@ def getUpgradeAddInt(player: Player) -> int:
                 return 8
 
 
-def canUpgrade(player: Player):
+def canUpgrade(player: Player, costPoint: int):
     if (player.isRootPlayer):
         return True
-    if player.trustPoint - getUpgradeCost(player) < 0:
+    if player.trustPoint - costPoint < 0:
         return False
     return True
 
@@ -87,3 +80,11 @@ def getMCDRPermissionLevel(player: Player) -> int:
                 return 2
             case p if p > 27:
                 return None
+
+
+def isUpgradeUseless(player1: Player, addPoint: int) -> bool:
+    if player1.isRootPlayer:
+        return True
+    elif player1.trustPoint + addPoint > 27:
+        return True
+    return False