From 0905d460b647ffb59c3807b56e8b659ea68ffba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=B6=E7=9A=93?= <1214946206@qq.com>
Date: Mon, 12 Sep 2022 21:53:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0reset=E5=91=BD=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/fzsd_score.sc | 88 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 66 insertions(+), 22 deletions(-)

diff --git a/scripts/fzsd_score.sc b/scripts/fzsd_score.sc
index 97cd611..4f3610c 100644
--- a/scripts/fzsd_score.sc
+++ b/scripts/fzsd_score.sc
@@ -2,6 +2,18 @@
 // 忽略假人分数
 // **请勿修改文件名！！**
 global_app_version = '1.0-beta.8';
+global_current_scoreboard_list =  [
+    'fzsd.module.scoreboard.display.activation',
+    'fzsd.module.scoreboard.display.damage_taken',
+    'fzsd.module.scoreboard.display.death_count',
+    'fzsd.module.scoreboard.display.dig_count',
+    'fzsd.module.scoreboard.display.fishing_count',
+    'fzsd.module.scoreboard.display.kill_count',
+    'fzsd.module.scoreboard.display.trade_count',
+    'fzsd.module.scoreboard.display.bedrock_broken_count',
+    'fzsd.module.scoreboard.display.aviating_distance',
+    'fzsd.module.scoreboard.display.placement_count'
+];
 
 __config() -> {
     'scope' -> 'global',
@@ -13,17 +25,28 @@ __config() -> {
     'commands' -> {
         '' -> 'help',
         'help' -> 'help',
-        'delete_old <delete_old>' -> 'delete_old',
-        'update_from <update_from>' -> 'update_from',
-        'restore_from_stats' -> 'restore_from_stats',
-        'recalculate_total' -> 'recalculate_total_scores',
-        'commandPlayer <boolean>' -> 'command_player'
+        'deleteOld <deleteOld>' -> 'delete_old',
+        'updateFrom <updateFrom>' -> 'update_from',
+        'restoreFrom' -> 'restore_from',
+        'recalculate <scoreboardID>' -> 'recalculate_total_score',
+        'recalculate' -> 'recalculate_total_scores',
+        'commandPlayer <boolean>' -> 'command_player',
+        'reset <scoreboardPlayer> <scoreboardID>' -> 'reset',
+        'reset <scoreboardPlayer>' -> ['reset', null]
     },
     'arguments' -> {
+        'scoreboardID' -> {
+            'type' -> 'term',
+            'suggest' -> global_current_scoreboard_list
+        },
+        'scoreboardPlayer' -> {
+            'type' -> 'term',
+            'suggester' -> _(args) -> get_scoreboard_player_list()
+        },
         'boolean' -> {
             'type' -> 'bool'
         },
-        'update_from' -> {
+        'updateFrom' -> {
             'type' -> 'term',
             'suggest' -> [
                 '2.x',
@@ -32,7 +55,7 @@ __config() -> {
                 '3.0-beta.10'
             ]
         },
-        'delete_old' -> {
+        'deleteOld' -> {
             'type' -> 'term',
             'suggest' -> [
                 '2.x',
@@ -79,6 +102,37 @@ __on_player_disconnects(player, reason) -> (
     try_restore_team_from_cache(player);
 );
 
+get_scoreboard_player_list() -> (
+    // 获取所有计分板下的所有玩家列表
+    set = m();
+    for(global_current_scoreboard_list, 
+        for(scoreboard(_),
+            if(_ ~ '\\w',
+                put(set:_, null);
+            );
+        );
+    );
+    return(keys(set));
+);
+
+reset(player, scoreboard) -> (
+    if(scoreboard == null,
+        (
+            for(global_current_scoreboard_list,
+                scoreboard_remove(_, player);
+            );
+            recalculate_total_scores();
+            print('已重置' + player + '的所有分数');
+        ),
+        (
+            scoreboard_remove(scoreboard, player);
+            recalculate_total_score(scoreboard);
+            print('已重置' + player + '的' + scoreboard + '分数');
+        )
+    );
+    return();
+);
+
 try_restore_team_from_cache(player) -> (
     player_team = player ~ 'team';
     player_name = player ~ 'name';
@@ -265,24 +319,13 @@ get_total_score_name_new(scoreboard) -> (
 );
 
 recalculate_total_scores() -> (
-    scoreboards = [
-        'fzsd.module.scoreboard.display.activation', 
-        'fzsd.module.scoreboard.display.damage_taken', 
-        'fzsd.module.scoreboard.display.death_count', 
-        'fzsd.module.scoreboard.display.dig_count', 
-        'fzsd.module.scoreboard.display.fishing_count', 
-        'fzsd.module.scoreboard.display.kill_count', 
-        'fzsd.module.scoreboard.display.trade_count', 
-        'fzsd.module.scoreboard.display.bedrock_broken_count', 
-        'fzsd.module.scoreboard.display.placement_count', 
-        'fzsd.module.scoreboard.display.aviating_distance'
-    ];
-    for(scoreboards,recalculate_total_score(_, get_total_score_name_new(_)));
+    for(global_current_scoreboard_list, recalculate_total_score(_));
     print('已重新计算总分！');
     return();
 );
 
-recalculate_total_score(scoreboard, total_score_name_new) -> (
+recalculate_total_score(scoreboard) -> (
+    total_score_name_new = get_total_score_name_new(scoreboard);
     // 计算总分
     total_score = 0;
     for(scoreboard(scoreboard), 
@@ -309,7 +352,7 @@ display_total_score(scoreboard) -> (
     return();
 );
 
-restore_from_stats() -> (
+restore_from() -> (
     print('暂未开发');
     return();
 );
@@ -321,6 +364,7 @@ merge_stat(scoreboard, ...stats) -> (
 
 command_player(boolean) -> (
     print(run('carpet setDefault commandPlayer ' + str(boolean)):1:0);
+    return();
 );
 
 // 工具函数