fix
This commit is contained in:
延皓
parent
3d2348dd61
commit
ed3c0e5077
@ -1,7 +1,7 @@
|
|||||||
// 计分板模块扩展插件
|
// 计分板模块扩展插件
|
||||||
// 忽略假人分数
|
// 忽略假人分数
|
||||||
// **请勿修改文件名！！**
|
// **请勿修改文件名！！**
|
||||||
global_app_version = '1.0-beta.4';
|
global_app_version = '1.0-beta.5';
|
||||||
|
|
||||||
__config() -> {
|
__config() -> {
|
||||||
'scope' -> 'global',
|
'scope' -> 'global',
|
||||||
@ -13,148 +13,174 @@ __config() -> {
|
|||||||
'commands' -> {
|
'commands' -> {
|
||||||
'' -> 'help',
|
'' -> 'help',
|
||||||
'help' -> 'help',
|
'help' -> 'help',
|
||||||
'delete_old' -> 'delete_old',
|
'delete_old <fzsd_version>' -> 'delete_old',
|
||||||
'merge_old' -> 'restore_merge_old',
|
'update_from <fzsd_version>' -> 'update_from',
|
||||||
'restore_from_stats' -> 'restore_from_stats',
|
'restore_from_stats' -> 'restore_from_stats',
|
||||||
'recalculate_total' -> 'recalculate_total_scores'
|
'recalculate_total' -> 'recalculate_total_scores',
|
||||||
|
'commandPlayer <boolean>' -> 'command_player'
|
||||||
|
},
|
||||||
|
'arguments' -> {
|
||||||
|
'boolean' -> {
|
||||||
|
'type' -> 'bool'
|
||||||
|
},
|
||||||
|
'fzsd_version' -> {
|
||||||
|
'type' -> 'term',
|
||||||
|
'suggest' -> [
|
||||||
|
'2.x',
|
||||||
|
'3.0-beta.4'
|
||||||
|
]
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
__on_start() -> (
|
__on_start() -> (
|
||||||
global_team_cache = read_file('team_cache', 'json');
|
global_team_cache = read_file('team_cache', 'json');
|
||||||
debug(global_team_cache);
|
if(global_team_cache == null, // carpet 1.4.69 兼容
|
||||||
|
global_team_cache = {};
|
||||||
|
);
|
||||||
print(player('all'), 'fzsd_score.sc已加载！');
|
print(player('all'), 'fzsd_score.sc已加载！');
|
||||||
);
|
);
|
||||||
|
|
||||||
__on_close() -> (
|
__on_close() -> (
|
||||||
debug(global_team_cache);
|
|
||||||
delete_file('team_cache', 'json');
|
delete_file('team_cache', 'json');
|
||||||
write_file('team_cache', 'json', global_team_cache);
|
write_file('team_cache', 'json', global_team_cache);
|
||||||
);
|
);
|
||||||
|
|
||||||
__on_player_connects(player) -> (
|
__on_player_connects(player) -> (
|
||||||
debug(player ~ 'name');
|
player_type = player ~ 'player_type';
|
||||||
debug(player ~ 'player_type');
|
player_team = player ~ 'team';
|
||||||
debug(player ~ 'team');
|
player_name = player ~ 'name';
|
||||||
debug(global_team_cache);
|
if(player_type == 'fake' && player_team != 'fzsd.module.scoreboard.fake',
|
||||||
if(player ~ 'player_type' == 'fake' && player ~ 'team' != 'fz.module.scoreboard.fake',
|
|
||||||
(
|
(
|
||||||
debug('1~');
|
global_team_cache:player_name = player_team;
|
||||||
global_team_cache:(player ~ 'name') = player ~ 'team';
|
team_add('fzsd.module.scoreboard.fake', player);
|
||||||
debug(global_team_cache);
|
|
||||||
team_add('fz.module.scoreboard.fake', player);
|
|
||||||
),
|
),
|
||||||
player ~ 'player_type' == 'shadow' && player ~ 'team' != 'fz.module.scoreboard.shadow',
|
player_type == 'shadow' && player_team != 'fzsd.module.scoreboard.shadow',
|
||||||
(
|
(
|
||||||
debug('2~');
|
global_team_cache:player_name = player_team;
|
||||||
global_team_cache:(player ~ 'name') = player ~ 'team';
|
team_add('fzsd.module.scoreboard.shadow', player);
|
||||||
team_add('fz.module.scoreboard.shadow', player);
|
|
||||||
),
|
),
|
||||||
try_restore_team_from_cache(player);
|
try_restore_team_from_cache(player);
|
||||||
);
|
);
|
||||||
debug(global_team_cache);
|
|
||||||
);
|
);
|
||||||
|
|
||||||
__on_player_disconnects(player, reason) -> (
|
__on_player_disconnects(player, reason) -> (
|
||||||
debug(player ~ 'name');
|
|
||||||
debug(player ~ 'player_type');
|
|
||||||
debug(player ~ 'team');
|
|
||||||
debug(global_team_cache);
|
|
||||||
try_restore_team_from_cache(player);
|
try_restore_team_from_cache(player);
|
||||||
);
|
);
|
||||||
|
|
||||||
try_restore_team_from_cache(player) -> (
|
try_restore_team_from_cache(player) -> (
|
||||||
|
player_team = player ~ 'team';
|
||||||
|
player_name = player ~ 'name';
|
||||||
debug('restore_team_from_cache');
|
debug('restore_team_from_cache');
|
||||||
if(player ~ 'team' == 'fz.module.scoreboard.fake'
|
if(player_team == 'fzsd.module.scoreboard.fake'
|
||||||
|| player ~ 'team' == 'fz.module.scoreboard.shadow',
|
|| player_team == 'fzsd.module.scoreboard.shadow',
|
||||||
debug(global_team_cache);
|
if(global_team_cache:player_name == null,
|
||||||
if(global_team_cache:(player ~ 'name') == null,
|
|
||||||
(
|
(
|
||||||
debug('global_team_cache:(player ~ \'name\') == null');
|
|
||||||
team_leave(player);
|
team_leave(player);
|
||||||
),
|
),
|
||||||
debug('global_team_cache:(player ~ \'name\') != null');
|
team_add(global_team_cache:player_name , player);
|
||||||
team_add(global_team_cache:(player ~ 'name') , player);
|
delete(global_team_cache:player_name);
|
||||||
delete(global_team_cache:(player ~ 'name'));
|
|
||||||
);
|
);
|
||||||
);
|
);
|
||||||
);
|
);
|
||||||
|
|
||||||
help() -> (
|
help() -> (
|
||||||
print('这是一条帮助');
|
print('暂未开发');
|
||||||
return(0);
|
return(0);
|
||||||
);
|
);
|
||||||
|
|
||||||
delete_old() -> (
|
delete_old(fzsd_version) -> (
|
||||||
old_scoreboards = [
|
old_scoreboards = [];
|
||||||
'usedDiaAxe', 'usedDiaPickaxe', 'usedDiaShovel', 'usedDiaHoe', 'usedIroAxe', 'usedIroPickaxe',
|
if(fzsd_version == '2.x',
|
||||||
'usedIroShovel', 'usedIroHoe', 'usedStoAxe', 'usedStoPickaxe', 'usedStoShovel', 'usedStoHoe',
|
(
|
||||||
'usedWooAxe', 'usedWooPickaxe', 'usedWooShovel', 'usedWooHoe', 'usedGolAxe', 'usedGolPickaxe',
|
old_scoreboards = ['usedDiaAxe', 'usedDiaPickaxe', 'usedDiaShovel', 'usedDiaHoe', 'usedIroAxe','usedIroPickaxe', 'usedIroShovel', 'usedIroHoe', 'usedStoAxe', 'usedStoPickaxe', 'usedStoShovel', 'usedStoHoe', 'usedWooAxe', 'usedWooPickaxe', 'usedWooShovel', 'usedWooHoe', 'usedGolAxe', 'usedGolPickaxe', 'usedGolShovel', 'usedGolHoe', 'usedNetAxe', 'usedNetPickaxe', 'usedNetShovel', 'usedNetHoe', 'usedShears', 'damageTaken', '10xDamageTaken', 'deathCounter', 'deathTester', 'digCounter', 'fishingCounter', 'fishingTester', 'killCounter', 'tradingCounter', 'totalList', 'bedrockBreaked', 'fz.bbl', 'fz.aviate1m', 'fz.aviateCounter', 'fz.aviateOneTime', 'Health', 'carpetBot', 'parameter'];
|
||||||
'usedGolShovel', 'usedGolHoe', 'usedNetAxe', 'usedNetPickaxe', 'usedNetShovel', 'usedNetHoe',
|
team_remove('carpetBot');
|
||||||
'usedShears', 'damageTaken', '10xDamageTaken', 'deathCounter', 'deathTester', 'digCounter',
|
team_remove('shadowedPlayer');
|
||||||
'fishingCounter', 'fishingTester', 'killCounter', 'tradingCounter', 'totalList',
|
),
|
||||||
'bedrockBreaked', 'fz.bbl', 'fz.aviate1m', 'fz.aviateCounter', 'fz.aviateOneTime', 'Health',
|
fzsd_version == '3.0-beta.4',
|
||||||
'carpetBot', 'parameter'
|
(
|
||||||
];
|
old_scoreboards = ['fz.module.scoreboard.display.activation', 'fz.module.scoreboard.display.damage_taken', 'fz.module.scoreboard.display.death_count', 'fz.module.scoreboard.display.dig_count', 'fz.module.scoreboard.display.fishing_count', 'fz.module.scoreboard.display.kill_count', 'fz.module.scoreboard.display.trade_count', 'fz.module.scoreboard.display.bedrock_broke_count', 'fz.module.scoreboard.display.aviating_distance', 'fz.module.scoreboard.display.placement_count', 'fz.module.scoreboard.assign.general', 'fz.module.scoreboard.display.general', 'fz.module.scoreboard.interactor'];
|
||||||
|
team_remove('fz.module.scoreboard.fake');
|
||||||
|
team_remove('fz.module.scoreboard.shadow');
|
||||||
|
)
|
||||||
|
);
|
||||||
for(old_scoreboards, scoreboard_remove(_));
|
for(old_scoreboards, scoreboard_remove(_));
|
||||||
team_remove('carpetBot');
|
|
||||||
team_remove('shadowedPlayer');
|
|
||||||
print('已清除旧版计分板！');
|
print('已清除旧版计分板！');
|
||||||
return(0);
|
return(0);
|
||||||
);
|
);
|
||||||
|
|
||||||
restore_merge_old() -> (
|
update_from(fzsd_version) -> (
|
||||||
|
params = [];
|
||||||
merge_score('activation', 'fz.module.scoreboard.display.activation');
|
if(fzsd_version == '2.x',
|
||||||
merge_score('damageTaken', 'fz.module.scoreboard.display.damage_taken');
|
(
|
||||||
merge_score('deathCounter', 'fz.module.scoreboard.display.death_count');
|
params = [
|
||||||
merge_score('digCounter', 'fz.module.scoreboard.display.dig_count');
|
['activation', 'fzsd.module.scoreboard.display.activation'],
|
||||||
merge_score('fishingCounter', 'fz.module.scoreboard.display.fishing_count');
|
['damageTaken', 'fzsd.module.scoreboard.display.damage_taken'],
|
||||||
merge_score('killCounter', 'fz.module.scoreboard.display.kill_count');
|
['deathCounter', 'fzsd.module.scoreboard.display.death_count'],
|
||||||
merge_score('tradingCounter', 'fz.module.scoreboard.display.trade_count');
|
['digCounter', 'fzsd.module.scoreboard.display.dig_count'],
|
||||||
merge_score('bedrockBreaked', 'fz.module.scoreboard.display.bedrock_broke_count');
|
['fishingCounter', 'fzsd.module.scoreboard.display.fishing_count'],
|
||||||
merge_score('fz.aviate1m', 'fz.module.scoreboard.display.aviating_distance');
|
['killCounter', 'fzsd.module.scoreboard.display.kill_count'],
|
||||||
// restore_score('fz.module.scoreboard.display.placement_count', );
|
['tradingCounter', 'fzsd.module.scoreboard.display.trade_count'],
|
||||||
|
['bedrockBreaked', 'fzsd.module.scoreboard.display.bedrock_broke_count'],
|
||||||
|
['fz.aviate1m', 'fzsd.module.scoreboard.display.aviating_distance']
|
||||||
|
]
|
||||||
|
),
|
||||||
|
fzsd_version == '3.0-beta.4',
|
||||||
|
(
|
||||||
|
params = [
|
||||||
|
['fz.module.scoreboard.display.activation', 'fzsd.module.scoreboard.display.activation'],
|
||||||
|
['fz.module.scoreboard.display.damage_taken', 'fzsd.module.scoreboard.display.damage_taken'],
|
||||||
|
['fz.module.scoreboard.display.death_count', 'fzsd.module.scoreboard.display.death_count'],
|
||||||
|
['fz.module.scoreboard.display.dig_count', 'fzsd.module.scoreboard.display.dig_count'],
|
||||||
|
['fz.module.scoreboard.display.fishing_count', 'fzsd.module.scoreboard.display.fishing_count'],
|
||||||
|
['fz.module.scoreboard.display.kill_count', 'fzsd.module.scoreboard.display.kill_count'],
|
||||||
|
['fz.module.scoreboard.display.trade_count', 'fzsd.module.scoreboard.display.trade_count'],
|
||||||
|
['fz.module.scoreboard.display.bedrock_broke_count', 'fzsd.module.scoreboard.display.bedrock_broke_count'],
|
||||||
|
['fz.module.scoreboard.display.aviating_distance', 'fzsd.module.scoreboard.display.aviating_distance'],
|
||||||
|
['fz.module.scoreboard.display.placement_count', 'fzsd.module.scoreboard.display.placement_count']
|
||||||
|
]
|
||||||
|
)
|
||||||
|
);
|
||||||
|
for(params, merge_score(..._, fzsd_version));
|
||||||
|
|
||||||
// 清除旧计分板
|
// 清除旧计分板
|
||||||
delete_old();
|
delete_old(fzsd_version);
|
||||||
|
|
||||||
print('完成！');
|
print('完成！');
|
||||||
return(0);
|
return(0);
|
||||||
);
|
);
|
||||||
|
|
||||||
merge_score(from, to) -> (
|
merge_score(from, to, fzsd_version) -> (
|
||||||
// 如果目标计分板不存在则创建
|
// 如果目标计分板不存在则创建
|
||||||
if(scoreboard() ~ to == null, scoreboard_add(to));
|
if(scoreboard() ~ to == null, scoreboard_add(to));
|
||||||
|
|
||||||
// 旧版数据包的假人列表
|
if(fzsd_version == '2.x',
|
||||||
fake_players = team_list('carpetBot');
|
(
|
||||||
|
// 2.x数据包的假人列表
|
||||||
|
fake_players = team_list('carpetBot');
|
||||||
|
|
||||||
|
// 新数据包的计分板中存储的玩家列表
|
||||||
|
new_players = scoreboard('fzsd.module.interactor.trigger');
|
||||||
|
|
||||||
|
for(fake_players, delete(new_players, _));
|
||||||
|
),
|
||||||
|
fzsd_version == '3.0-beta.4',
|
||||||
|
(
|
||||||
|
new_players = scoreboard('fz.module.interactor.trigger');
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
// 新数据包的计分板中存储的玩家列表
|
|
||||||
new_players = scoreboard('fz.module.interactor.trigger');
|
|
||||||
debug('2' + new_players);
|
|
||||||
for(scoreboard(from),
|
for(scoreboard(from),
|
||||||
debug('3' + _);
|
if(contains(new_players, _) && !(_ ~ '\\W'),
|
||||||
debug('3.1' + contains(fake_players, _));
|
|
||||||
debug('3.2' + contains(new_players, _));
|
|
||||||
debug('3.3' + str(_ != total_name_old));
|
|
||||||
debug('3.4' + str((!contains(fake_players, _)
|
|
||||||
|| contains(new_players, _)
|
|
||||||
) && !(_ ~ '\\W')));
|
|
||||||
if((!contains(fake_players, _)
|
|
||||||
|| contains(new_players, _)
|
|
||||||
) && !(_ ~ '\\W'),
|
|
||||||
debug('4' + _);
|
|
||||||
debug('from' + scoreboard(from, _));
|
|
||||||
debug('to' + scoreboard(to, _));
|
|
||||||
scoreboard(to, _, scoreboard(to, _) + scoreboard(from, _));
|
scoreboard(to, _, scoreboard(to, _) + scoreboard(from, _));
|
||||||
);
|
);
|
||||||
);
|
);
|
||||||
|
|
||||||
|
print('已合并：' + to);
|
||||||
|
|
||||||
// 重新计算总分
|
// 重新计算总分
|
||||||
recalculate_total_score(to, get_total_score_name_new(to));
|
recalculate_total_score(to, get_total_score_name_new(to));
|
||||||
|
|
||||||
print('已合并：' + to);
|
|
||||||
return(0);
|
return(0);
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -167,10 +193,10 @@ get_total_score_name_new(scoreboard) -> (
|
|||||||
|
|
||||||
// 将系统总榜分数加上最小int值，使其成为最低分
|
// 将系统总榜分数加上最小int值，使其成为最低分
|
||||||
scoreboard(
|
scoreboard(
|
||||||
'fz.module.scoreboard.assign.general',
|
'fzsd.module.scoreboard.assign.general',
|
||||||
system_total_name,
|
system_total_name,
|
||||||
scoreboard(
|
scoreboard(
|
||||||
'fz.module.scoreboard.assign.general',
|
'fzsd.module.scoreboard.assign.general',
|
||||||
system_total_name
|
system_total_name
|
||||||
) + INT_MIN
|
) + INT_MIN
|
||||||
);
|
);
|
||||||
@ -189,15 +215,14 @@ get_total_score_name_new(scoreboard) -> (
|
|||||||
last_min_player = _;
|
last_min_player = _;
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
debug(_);
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// 恢复总榜分数
|
// 恢复总榜分数
|
||||||
scoreboard(
|
scoreboard(
|
||||||
'fz.module.scoreboard.assign.general',
|
'fzsd.module.scoreboard.assign.general',
|
||||||
system_total_name,
|
system_total_name,
|
||||||
scoreboard(
|
scoreboard(
|
||||||
'fz.module.scoreboard.assign.general',
|
'fzsd.module.scoreboard.assign.general',
|
||||||
system_total_name
|
system_total_name
|
||||||
) - INT_MIN
|
) - INT_MIN
|
||||||
);
|
);
|
||||||
@ -209,15 +234,15 @@ get_total_score_name_new(scoreboard) -> (
|
|||||||
|
|
||||||
recalculate_total_scores() -> (
|
recalculate_total_scores() -> (
|
||||||
scoreboards = [
|
scoreboards = [
|
||||||
'fz.module.scoreboard.display.activation',
|
'fzsd.module.scoreboard.display.activation',
|
||||||
'fz.module.scoreboard.display.damage_taken',
|
'fzsd.module.scoreboard.display.damage_taken',
|
||||||
'fz.module.scoreboard.display.death_count',
|
'fzsd.module.scoreboard.display.death_count',
|
||||||
'fz.module.scoreboard.display.dig_count',
|
'fzsd.module.scoreboard.display.dig_count',
|
||||||
'fz.module.scoreboard.display.fishing_count',
|
'fzsd.module.scoreboard.display.fishing_count',
|
||||||
'fz.module.scoreboard.display.kill_count',
|
'fzsd.module.scoreboard.display.kill_count',
|
||||||
'fz.module.scoreboard.display.trade_count',
|
'fzsd.module.scoreboard.display.trade_count',
|
||||||
'fz.module.scoreboard.display.bedrock_broke_count',
|
'fzsd.module.scoreboard.display.bedrock_broke_count',
|
||||||
'fz.module.scoreboard.display.aviating_distance'
|
'fzsd.module.scoreboard.display.aviating_distance'
|
||||||
];
|
];
|
||||||
for(scoreboards,recalculate_total_score(_, get_total_score_name_new(_)));
|
for(scoreboards,recalculate_total_score(_, get_total_score_name_new(_)));
|
||||||
print('完成！');
|
print('完成！');
|
||||||
@ -234,7 +259,7 @@ recalculate_total_score(scoreboard, total_score_name_new) -> (
|
|||||||
);
|
);
|
||||||
// 赋值总分到系统总分计分板
|
// 赋值总分到系统总分计分板
|
||||||
scoreboard(
|
scoreboard(
|
||||||
'fz.module.scoreboard.assign.general',
|
'fzsd.module.scoreboard.assign.general',
|
||||||
replace(scoreboard, 'display', 'total'),
|
replace(scoreboard, 'display', 'total'),
|
||||||
total_score
|
total_score
|
||||||
);
|
);
|
||||||
@ -248,12 +273,11 @@ display_total_score(scoreboard) -> (
|
|||||||
str_1 = split('\\.', scoreboard);
|
str_1 = split('\\.', scoreboard);
|
||||||
function_name = str_1:(length(str_1) - 1);
|
function_name = str_1:(length(str_1) - 1);
|
||||||
// 运行函数，将分数赋值到显示计分板上
|
// 运行函数，将分数赋值到显示计分板上
|
||||||
run('function #fz:module/scoreboard/assign/scoreboard/general/' + function_name);
|
run('function #fzsd:module/scoreboard/assign/scoreboard/general/' + function_name);
|
||||||
return(0);
|
return(0);
|
||||||
);
|
);
|
||||||
|
|
||||||
restore_from_stats() -> (
|
restore_from_stats() -> (
|
||||||
|
|
||||||
print('暂未开发');
|
print('暂未开发');
|
||||||
return(0);
|
return(0);
|
||||||
);
|
);
|
||||||
@ -263,6 +287,12 @@ merge_stat(scoreboard, ...stats) -> (
|
|||||||
return(0);
|
return(0);
|
||||||
);
|
);
|
||||||
|
|
||||||
|
command_player(boolean) -> (
|
||||||
|
print(run('carpet setDefault commandPlayer ' + str(boolean)):1:0);
|
||||||
|
);
|
||||||
|
|
||||||
|
// 工具函数
|
||||||
|
|
||||||
contains(list, value) -> (
|
contains(list, value) -> (
|
||||||
return(list ~ value != null);
|
return(list ~ value != null);
|
||||||
);
|
);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user