Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Harvey_Husky
|
eb9931ea06 | ||
|
Harvey_Husky
|
1971888161 | ||
|
延皓
|
82b1f0dcdd | ||
|
Harvey_Husky
|
79ee77b42d | ||
|
Harvey_Husky
|
e9ad855fd9 |
@@ -2,7 +2,11 @@
|
||||
|
||||
为FZ服务器写的Minecraft生存辅助数据包
|
||||
|
||||
[](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [](https://minecraft.net/)
|
||||
<<<<<<< HEAD
|
||||
[](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [](https://minecraft.net/)
|
||||
=======
|
||||
[](https://gitee.com/harvey-husky/FZ-sDatapack/releases) [](https://minecraft.net/)
|
||||
>>>>>>> 82b1f0dcddcbfbb46d1ab272ded9c453531be507
|
||||
|
||||
> 其他版本见[发行页面](https://gitee.com/harvey-husky/FZ-sDatapack/releases)
|
||||
|
||||
@@ -78,7 +82,6 @@
|
||||
- ***使用前请务必备份存档！请报告不符预期的结果***
|
||||
- ***使用前请务必备份存档！请报告不符预期的结果***
|
||||
- ***使用前请务必备份存档！请报告不符预期的结果***
|
||||
- `updateFrom <version>`：用于从给定的数据包版本恢复计分板数据（需要测试！）
|
||||
- `recalculate`：重新计算所有计分板总分
|
||||
- `recalculate <scoreboardID>`：重新计算该计分板总分
|
||||
- `set <player> <scoreboardID> <score>`：设置该玩家该计分板的分数
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
{
|
||||
"parent": "fzsd:game_event",
|
||||
"criteria": {
|
||||
"on_killed_mob_or_player": {
|
||||
"trigger": "minecraft:player_killed_entity",
|
||||
"conditions": {
|
||||
"player": [
|
||||
{
|
||||
"condition": "minecraft:reference",
|
||||
"name": "fzsd:is_real_player"
|
||||
}
|
||||
],
|
||||
"entity": [
|
||||
{
|
||||
"condition": "minecraft:inverted",
|
||||
"term": {
|
||||
"condition": "minecraft:entity_properties",
|
||||
"entity": "this",
|
||||
"predicate": {
|
||||
"type": "#fzsd:ignore_on_player_killed_entity"
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"killing_blow": {
|
||||
"bypasses_invulnerability": false
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"rewards": {
|
||||
"function": "fzsd:game_event/advancement/on_killed_mob_or_player"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"minecraft:armor_stand",
|
||||
"minecraft:boat",
|
||||
"minecraft:shulker_bullet",
|
||||
"minecraft:item_frame",
|
||||
"minecraft:glow_item_frame",
|
||||
"minecraft:painting",
|
||||
"minecraft:end_crystal"
|
||||
]
|
||||
}
|
||||
@@ -21,10 +21,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"killing_blow": {
|
||||
"bypasses_invulnerability": false
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.10'}}
|
||||
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.12'}}
|
||||
execute if data storage fzsd:version fzsd{need_update: 1b} run function fzsd:system/update
|
||||
function fzsd:system/carpet/try_load_fzsd_score
|
||||
function #fzsd:load
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.11'}}
|
||||
execute store success storage fzsd:version fzsd.need_update byte 1 run data merge storage fzsd:version {fzsd: {version: '3.1.12'}}
|
||||
execute if data storage fzsd:version fzsd{need_update: 1b} run function fzsd:system/update
|
||||
function fzsd:system/carpet/try_load_fzsd_score
|
||||
function #fzsd:load
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"replace": false,
|
||||
"values": [
|
||||
"minecraft:armor_stand",
|
||||
"minecraft:boat",
|
||||
"#minecraft:boat",
|
||||
"minecraft:minecart",
|
||||
"minecraft:shulker_bullet",
|
||||
"minecraft:item_frame",
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"#fzsd:module/scoreboard/assign/scoreboard/general/activation",
|
||||
"#fzsd:module/scoreboard/assign/scoreboard/general/aviating_distance",
|
||||
"#fzsd:module/scoreboard/assign/scoreboard/general/bedrock_broke_count",
|
||||
"#fzsd:module/scoreboard/assign/scoreboard/general/damage_taken",
|
||||
"#fzsd:module/scoreboard/assign/scoreboard/general/death_count",
|
||||
"#fzsd:module/scoreboard/assign/scoreboard/general/dig_count",
|
||||
"#fzsd:module/scoreboard/assign/scoreboard/general/fishing_count",
|
||||
"#fzsd:module/scoreboard/assign/scoreboard/general/kill_count",
|
||||
"#fzsd:module/scoreboard/assign/scoreboard/general/placement_count",
|
||||
"#fzsd:module/scoreboard/assign/scoreboard/general/trade_count"
|
||||
]
|
||||
}
|
||||
+9
-2
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"pack": {
|
||||
"description": "FZ Survival Datapack 3.1 | Author: Harvey_Husky",
|
||||
"pack_format": 15,
|
||||
"pack_format": 61,
|
||||
"supported_formats": {
|
||||
"min_inclusive": 15,
|
||||
"max_inclusive": 48
|
||||
"max_inclusive": 61
|
||||
}
|
||||
},
|
||||
"overlays": {
|
||||
@@ -29,6 +29,13 @@
|
||||
"min_inclusive": 42,
|
||||
"max_inclusive": 48
|
||||
}
|
||||
},
|
||||
{
|
||||
"directory": "compat_49",
|
||||
"formats": {
|
||||
"min_inclusive": 49,
|
||||
"max_inclusive": 61
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -257,10 +257,12 @@ help() -> (
|
||||
command_reset(player, scoreboard_id) -> (
|
||||
if(scoreboard_id == null,
|
||||
run('scoreboard players reset ' + player);
|
||||
recalculate_general(null);
|
||||
print('已重置' + player + '的所有分数');
|
||||
return();
|
||||
);
|
||||
scoreboard_remove(scoreboard_id, player);
|
||||
recalculate_general(scoreboard_id);
|
||||
print('已重置' + player + '的' + scoreboard_id + '分数');
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user