Ver Fonte

修改时间,给予缓降,地板减少到 15 种

LTCatt há 6 anos atrás
pai
commit
1ad5e262fb

+ 1 - 11
data/mini/functions/colormatch/game/generate_parts.mcfunction

@@ -16,17 +16,7 @@ execute if score $floor_generate_part mem matches 12 positioned 1000 10 4000 run
 execute if score $floor_generate_part mem matches 13 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_13",integrity:0.07692307692307693f}
 execute if score $floor_generate_part mem matches 14 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_14",integrity:0.07142857142857142f}
 execute if score $floor_generate_part mem matches 15 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_15",integrity:0.06666666666666667f}
-execute if score $floor_generate_part mem matches 16 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_16",integrity:0.0625f}
-execute if score $floor_generate_part mem matches 17 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_17",integrity:0.058823529411764705f}
-execute if score $floor_generate_part mem matches 18 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_18",integrity:0.05555555555555555f}
-execute if score $floor_generate_part mem matches 19 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_19",integrity:0.05263157894736842f}
-execute if score $floor_generate_part mem matches 20 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_20",integrity:0.05f}
-execute if score $floor_generate_part mem matches 21 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_21",integrity:0.047619047619047616f}
-execute if score $floor_generate_part mem matches 22 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_22",integrity:0.045454545454545456f}
-execute if score $floor_generate_part mem matches 23 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_23",integrity:0.043478260869565216f}
-execute if score $floor_generate_part mem matches 24 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_24",integrity:0.041666666666666664f}
-execute if score $floor_generate_part mem matches 25 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_25",integrity:0.04f}
 setblock 1000 9 4000 redstone_block
 setblock 1000 9 4000 air
 setblock 1000 10 4000 air
-execute if score $floor_generate_part mem matches 1..24 run schedule function mini:colormatch/game/generate_parts 1t replace
+execute if score $floor_generate_part mem matches 1..14 run schedule function mini:colormatch/game/generate_parts 1t replace

+ 1 - 11
data/mini/functions/colormatch/game/get_random_floor.mcfunction

@@ -1,5 +1,5 @@
 scoreboard players set $random_min mem 1
-scoreboard players set $random_max mem 24
+scoreboard players set $random_max mem 15
 function lib:random
 
 # TODO 更换地板方块-增强对比+辨识度
@@ -20,16 +20,6 @@ execute positioned 1001 10 4000 if score $random mem matches 12 run clone ~ ~ ~
 execute positioned 1001 10 4000 if score $random mem matches 13 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered melon
 execute positioned 1001 10 4000 if score $random mem matches 14 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered dark_prismarine
 execute positioned 1001 10 4000 if score $random mem matches 15 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered green_wool
-execute positioned 1001 10 4000 if score $random mem matches 16 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered diamond_block
-execute positioned 1001 10 4000 if score $random mem matches 17 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered prismarine
-execute positioned 1001 10 4000 if score $random mem matches 18 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered blue_ice
-execute positioned 1001 10 4000 if score $random mem matches 19 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered warped_wart_block
-execute positioned 1001 10 4000 if score $random mem matches 20 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered prismarine_bricks
-execute positioned 1001 10 4000 if score $random mem matches 21 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered red_wool
-execute positioned 1001 10 4000 if score $random mem matches 22 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered red_concrete
-execute positioned 1001 10 4000 if score $random mem matches 23 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered netherrack
-execute positioned 1001 10 4000 if score $random mem matches 24 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered red_nether_bricks
-execute positioned 1001 10 4000 if score $random mem matches 25 run clone ~ ~ ~ ~24 ~ ~24 ~ ~1 ~ filtered bricks
 
 # 存计分板
 scoreboard players operation $color_match_floor mem = $random mem

+ 1 - 1
data/mini/functions/colormatch/game/prepare_round.mcfunction

@@ -2,4 +2,4 @@
 function mini:colormatch/game/generate_floor
 
 # 获取保留地板
-schedule function mini:colormatch/game/get_random_floor 26t replace
+schedule function mini:colormatch/game/get_random_floor 16t replace

+ 2 - 2
data/mini/functions/colormatch/game/remove_ground.mcfunction

@@ -5,9 +5,9 @@ execute positioned 1001 11 4000 run clone ~ ~ ~ ~24 ~ ~24 1050 15 4000
 execute as @a at @s run function lib:sounds/hit2
 
 # 重置分数
-scoreboard players set $countdown_fast mem 35
+scoreboard players set $countdown_fast mem 38
 scoreboard players operation $countdown_fast mem < $color_match_time mem
-scoreboard players remove $countdown_fast mem 5
+scoreboard players remove $countdown_fast mem 3
 scoreboard players set $color_match_type mem 1
 
 # 预备下一轮

+ 1 - 41
data/mini/functions/colormatch/game/replace_wall.mcfunction

@@ -57,44 +57,4 @@ execute if score $color_match_floor mem matches 14 run fill 1049 11 4025 1075 40
 execute if score $color_match_floor mem matches 15 run fill 1075 11 3999 1075 40 4025 green_wool
 execute if score $color_match_floor mem matches 15 run fill 1075 11 3999 1049 40 3999 green_wool
 execute if score $color_match_floor mem matches 15 run fill 1049 11 3999 1049 40 4025 green_wool
-execute if score $color_match_floor mem matches 15 run fill 1049 11 4025 1075 40 4025 green_wool
-execute if score $color_match_floor mem matches 16 run fill 1075 11 3999 1075 40 4025 diamond_block
-execute if score $color_match_floor mem matches 16 run fill 1075 11 3999 1049 40 3999 diamond_block
-execute if score $color_match_floor mem matches 16 run fill 1049 11 3999 1049 40 4025 diamond_block
-execute if score $color_match_floor mem matches 16 run fill 1049 11 4025 1075 40 4025 diamond_block
-execute if score $color_match_floor mem matches 17 run fill 1075 11 3999 1075 40 4025 prismarine
-execute if score $color_match_floor mem matches 17 run fill 1075 11 3999 1049 40 3999 prismarine
-execute if score $color_match_floor mem matches 17 run fill 1049 11 3999 1049 40 4025 prismarine
-execute if score $color_match_floor mem matches 17 run fill 1049 11 4025 1075 40 4025 prismarine
-execute if score $color_match_floor mem matches 18 run fill 1075 11 3999 1075 40 4025 blue_ice
-execute if score $color_match_floor mem matches 18 run fill 1075 11 3999 1049 40 3999 blue_ice
-execute if score $color_match_floor mem matches 18 run fill 1049 11 3999 1049 40 4025 blue_ice
-execute if score $color_match_floor mem matches 18 run fill 1049 11 4025 1075 40 4025 blue_ice
-execute if score $color_match_floor mem matches 19 run fill 1075 11 3999 1075 40 4025 warped_wart_block
-execute if score $color_match_floor mem matches 19 run fill 1075 11 3999 1049 40 3999 warped_wart_block
-execute if score $color_match_floor mem matches 19 run fill 1049 11 3999 1049 40 4025 warped_wart_block
-execute if score $color_match_floor mem matches 19 run fill 1049 11 4025 1075 40 4025 warped_wart_block
-execute if score $color_match_floor mem matches 20 run fill 1075 11 3999 1075 40 4025 prismarine_bricks
-execute if score $color_match_floor mem matches 20 run fill 1075 11 3999 1049 40 3999 prismarine_bricks
-execute if score $color_match_floor mem matches 20 run fill 1049 11 3999 1049 40 4025 prismarine_bricks
-execute if score $color_match_floor mem matches 20 run fill 1049 11 4025 1075 40 4025 prismarine_bricks
-execute if score $color_match_floor mem matches 21 run fill 1075 11 3999 1075 40 4025 red_wool
-execute if score $color_match_floor mem matches 21 run fill 1075 11 3999 1049 40 3999 red_wool
-execute if score $color_match_floor mem matches 21 run fill 1049 11 3999 1049 40 4025 red_wool
-execute if score $color_match_floor mem matches 21 run fill 1049 11 4025 1075 40 4025 red_wool
-execute if score $color_match_floor mem matches 22 run fill 1075 11 3999 1075 40 4025 red_concrete
-execute if score $color_match_floor mem matches 22 run fill 1075 11 3999 1049 40 3999 red_concrete
-execute if score $color_match_floor mem matches 22 run fill 1049 11 3999 1049 40 4025 red_concrete
-execute if score $color_match_floor mem matches 22 run fill 1049 11 4025 1075 40 4025 red_concrete
-execute if score $color_match_floor mem matches 23 run fill 1075 11 3999 1075 40 4025 netherrack
-execute if score $color_match_floor mem matches 23 run fill 1075 11 3999 1049 40 3999 netherrack
-execute if score $color_match_floor mem matches 23 run fill 1049 11 3999 1049 40 4025 netherrack
-execute if score $color_match_floor mem matches 23 run fill 1049 11 4025 1075 40 4025 netherrack
-execute if score $color_match_floor mem matches 24 run fill 1075 11 3999 1075 40 4025 red_nether_bricks
-execute if score $color_match_floor mem matches 24 run fill 1075 11 3999 1049 40 3999 red_nether_bricks
-execute if score $color_match_floor mem matches 24 run fill 1049 11 3999 1049 40 4025 red_nether_bricks
-execute if score $color_match_floor mem matches 24 run fill 1049 11 4025 1075 40 4025 red_nether_bricks
-execute if score $color_match_floor mem matches 25 run fill 1075 11 3999 1075 40 4025 bricks
-execute if score $color_match_floor mem matches 25 run fill 1075 11 3999 1049 40 3999 bricks
-execute if score $color_match_floor mem matches 25 run fill 1049 11 3999 1049 40 4025 bricks
-execute if score $color_match_floor mem matches 25 run fill 1049 11 4025 1075 40 4025 bricks
+execute if score $color_match_floor mem matches 15 run fill 1049 11 4025 1075 40 4025 green_wool

+ 1 - 1
data/mini/functions/colormatch/game/start_new_round.mcfunction

@@ -5,7 +5,7 @@ execute positioned 1001 10 4000 run clone ~ ~ ~ ~24 ~ ~24 1050 15 4000
 
 # 设置倒计时
 execute if score $color_match_time mem matches 42.. run scoreboard players remove $color_match_time mem 5
-execute if score $color_match_time mem matches 26..41 run scoreboard players remove $color_match_time mem 1
+execute if score $color_match_time mem matches 21..41 run scoreboard players remove $color_match_time mem 1
 scoreboard players operation $countdown_fast mem = $color_match_time mem
 
 # 重置分数

+ 1 - 1
data/mini/functions/colormatch/game_init.mcfunction

@@ -17,7 +17,7 @@ scoreboard players set $color_match_type mem 0
 
 # 刷新地基
 function mini:colormatch/game/prepare_round
-schedule function mini:colormatch/game_init2 28t replace
+schedule function mini:colormatch/game_init2 18t replace
 
 # 关闭伤害
 gamerule fallDamage false

+ 1 - 0
data/mini/functions/colormatch/player_enter.mcfunction

@@ -11,6 +11,7 @@ effect give @s saturation 1000000 0 true
 effect give @s instant_health 10 0 true
 effect give @s night_vision 1000000 0 true
 effect give @s resistance 1000000 4 true
+effect give @s jump_boost 1000000 2 true
 
 # 传送玩家
 tp @s[tag=!watcher,tag=!rejoining] 1062 20 4012