Merge branch 'master' of https://github.com/LTCatt/LTW3

data/lib/functions/damage_indicator/damage_dealt.mcfunction

@@ -1,5 +1,5 @@
-# 造成伤害加tag
-tag @s add damage_dealt
+# 小游戏阶段造成伤害判定
+execute if score $state mem matches 5 run function mini:main/damage_taken
 
 # 移除造成伤害advancement
 advancement revoke @s only lib:damage_dealt

data/lib/functions/damage_indicator/damage_taken.mcfunction

@@ -1,5 +1,5 @@
-# 受到伤害加tag
-tag @s add damage_taken
+# 小游戏阶段受伤判定
+execute if score $state mem matches 5 run function mini:main/damage_taken
 
 # 移除受到伤害advancement
 advancement revoke @s only lib:damage_taken

data/lib/functions/damage_indicator/init.mcfunction

@@ -1,7 +0,0 @@
-# 计分板初始化
-scoreboard objectives remove damage_counter1
-scoreboard objectives remove damage_counter2
-scoreboard objectives remove damage_taken
-scoreboard objectives add damage_counter1 dummy "伤害计算(整数)"
-scoreboard objectives add damage_counter2 dummy "伤害计算(小数)"
-scoreboard objectives add damage_taken minecraft.custom:minecraft.damage_taken "受到伤害"

data/lib/functions/damage_indicator/player_hurt_player.mcfunction

@@ -1,21 +0,0 @@
-# 重置判定值
-scoreboard players set 除数 damage_counter1 10
-
-# 分数运算
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter1 = @s damage_taken
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter2 = @s damage_taken
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter1 /= 除数 damage_counter1
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter2 %= 除数 damage_counter1
-
-# 进行受伤提示
-tellraw @a[tag=damage_taken] [{"text":"[!] ","color":"red"},{"selector":"@a[tag=damage_dealt]","color":"white"},{"text":"对你造成了","color":"white"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter1"}},{"text":".","color":"red"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter2"}},{"text":"点伤害","color":"white"}]
-tellraw @a[tag=damage_dealt] [{"text":"[!] ","color":"red"},{"text":"你对","color":"white"},{"selector":"@a[tag=damage_taken]","color":"white"},{"text":"造成了","color":"white"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter1"}},{"text":".","color":"red"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter2"}},{"text":"点伤害","color":"white"}]
-
-# 重置分数
-scoreboard players set @a[tag=damage_taken] damage_counter1 0
-scoreboard players set @a[tag=damage_taken] damage_counter2 0
-scoreboard players reset @a[tag=damage_taken] damage_taken
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt

data/lib/functions/damage_indicator/player_hurt_player2.mcfunction

@@ -1,12 +0,0 @@
-# 进行受伤提示
-tellraw @a[tag=damage_taken] [{"text":"[!] ","color":"red"},{"selector":"@a[tag=damage_dealt]","color":"white"},{"text":"对你造成了","color":"white"},{"text":"0.0","color":"red"},{"text":"点伤害","color":"white"}]
-tellraw @a[tag=damage_dealt] [{"text":"[!] ","color":"red"},{"text":"你对","color":"white"},{"selector":"@a[tag=damage_taken]"},{"text":"造成了","color":"white"},{"text":"0.0","color":"red"},{"text":"点伤害","color":"white"}]
-
-# 重置分数
-scoreboard players set @a[tag=damage_taken] damage_counter1 0
-scoreboard players set @a[tag=damage_taken] damage_counter2 0
-scoreboard players reset @a[tag=damage_taken] damage_taken
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt

data/lib/functions/damage_indicator/player_hurt_self.mcfunction

@@ -1,20 +0,0 @@
-# 重置判定值
-scoreboard players set 除数 damage_counter1 10
-
-# 分数运算
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter1 = @s damage_taken
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter2 = @s damage_taken
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter1 /= 除数 damage_counter1
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter2 %= 除数 damage_counter1
-
-# 进行受伤提示
-tellraw @a[tag=damage_taken,tag=damage_dealt,scores={damage_taken=0..}] [{"text":"[!] ","color":"red"},{"text":"你对自己造成了","color":"white"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter1"}},{"text":".","color":"red"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter2"}},{"text":"点伤害","color":"white"}]
-
-# 重置分数
-scoreboard players set @a[tag=damage_taken] damage_counter1 0
-scoreboard players set @a[tag=damage_taken] damage_counter2 0
-scoreboard players reset @a[tag=damage_taken] damage_taken
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt

data/lib/functions/damage_indicator/player_hurt_self2.mcfunction

@@ -1,11 +0,0 @@
-# 进行受伤提示
-tellraw @a[tag=damage_taken,tag=damage_dealt] [{"text":"[!] ","color":"red"},{"text":"你对自己造成了","color":"white"},{"text":"0.0","color":"red"},{"text":"点伤害","color":"white"}]
-
-# 重置分数
-scoreboard players set @a[tag=damage_taken] damage_counter1 0
-scoreboard players set @a[tag=damage_taken] damage_counter2 0
-scoreboard players reset @a[tag=damage_taken] damage_taken
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt

data/lib/functions/damage_indicator/self_hurt.mcfunction

@@ -1,20 +0,0 @@
-# 重置判定值
-scoreboard players set 除数 damage_counter1 10
-
-# 分数运算
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter1 = @s damage_taken
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter2 = @s damage_taken
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter1 /= 除数 damage_counter1
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter2 %= 除数 damage_counter1
-
-# 进行伤害提示
-tellraw @a[tag=damage_taken,scores={damage_taken=0..}] [{"text":"[!] ","color":"red"},{"text":"你受到了","color":"white"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter1"}},{"text":".","color":"red"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter2"}},{"text":"点伤害","color":"white"}]
-
-# 重置分数
-scoreboard players set @a[tag=damage_taken] damage_counter1 0
-scoreboard players set @a[tag=damage_taken] damage_counter2 0
-scoreboard players reset @a[tag=damage_taken] damage_taken
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt

data/lib/functions/damage_indicator/self_hurt2.mcfunction

@@ -1,11 +0,0 @@
-# 进行伤害提示
-tellraw @a[tag=damage_taken] [{"text":"[!] ","color":"red"},{"text":"你受到了","color":"white"},{"text":"0.0","color":"red"},{"text":"点伤害","color":"white"}]
-
-# 重置分数
-scoreboard players set @a[tag=damage_taken] damage_counter1 0
-scoreboard players set @a[tag=damage_taken] damage_counter2 0
-scoreboard players reset @a[tag=damage_taken] damage_taken
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt

data/lib/functions/damage_indicator/tick1.mcfunction

@@ -1,26 +0,0 @@
-# 检测玩家对玩家造成0点以上伤害
-execute if entity @a[tag=damage_dealt] if entity @a[tag=damage_taken,scores={damage_taken=0..}] unless entity @a[tag=damage_dealt,tag=damage_taken] run function lib:damage_indicator/player_hurt_player
-
-# 检测玩家对玩家造成0点伤害
-execute if entity @a[tag=damage_dealt] if entity @a[tag=damage_taken] unless entity @a[scores={damage_taken=0..}] unless entity @a[tag=damage_dealt,tag=damage_taken] run function lib:damage_indicator/player_hurt_player2
-
-# 检测玩家对自己造成0点以上伤害
-execute if entity @a[tag=damage_dealt,tag=damage_taken,scores={damage_taken=0..}] run function lib:damage_indicator/player_hurt_self
-
-# 检测玩家对自己造成0点伤害
-execute if entity @a[tag=damage_dealt,tag=damage_taken] unless entity @a[tag=damage_dealt,tag=damage_taken,scores={damage_taken=0..}] run function lib:damage_indicator/player_hurt_self2
-
-# 检测玩家因特殊原因受到0点以上伤害
-execute if entity @a[tag=damage_taken,scores={damage_taken=0..}] unless entity @a[tag=damage_dealt] run function lib:damage_indicator/self_hurt
-
-# 检测玩家因特殊原因受到0点伤害
-execute if entity @a[tag=damage_taken] unless entity @a[tag=damage_dealt] unless entity @a[tag=damage_taken,scores={damamge_taken=0..}] run function lib:damage_indicator/self_hurt2
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt
-
-# 重置分数
-scoreboard players set @a[scores={damage_taken=0..}] damage_counter1 0
-scoreboard players set @a[scores={damage_taken=0..}] damage_counter2 0
-scoreboard players reset @a[scores={damage_taken=0..}] damage_taken

data/mini/advancements/hotpm/damage_dealt.json

@@ -1,17 +0,0 @@
-{
-    "criteria": {
-        "hurt": {
-            "trigger": "minecraft:player_hurt_entity",
-            "conditions": {
-                "damage": {
-                    "taken": {
-                        "min": 0.1
-                    }
-                }
-            }
-        }
-    },
-    "rewards": {
-        "function": "mini:hotpm/game/damage_dealt"
-    }
-}

data/mini/advancements/hotpm/damage_taken.json

@@ -1,17 +0,0 @@
-{
-    "criteria": {
-        "hurt": {
-            "trigger": "minecraft:entity_hurt_player",
-            "conditions": {
-                "damage": {
-                    "taken": {
-                        "min": 0.1
-                    }
-                }
-            }
-        }
-    },
-    "rewards": {
-        "function": "mini:hotpm/game/damage_taken"
-    }
-}

data/mini/functions/colormatch/game_init.mcfunction

@@ -8,6 +8,8 @@ fill 1075 11 3999 1075 40 4025 stone
 fill 1075 11 3999 1049 40 3999 stone
 fill 1049 11 3999 1049 40 4025 stone
 fill 1049 11 4025 1075 40 4025 stone
+fill 1074 40 4000 1050 40 4024 barrier
+
 
 # 初始化
 scoreboard players set $finish_mode mem 0

data/mini/functions/hotpm/game/damage_dealt.mcfunction

@@ -1,8 +1,5 @@
-# 造成伤害时由玩家触发
-advancement revoke @s only mini:hotpm/damage_dealt
-
 # 如果是土豆持有者在热土豆游戏中打到人，才执行下一步
-execute as @s[tag=pm_holding] at @s if score $state mem matches 5 if score $mini_type mem matches 3 run function mini:hotpm/game/damage_dealt2
+execute if entity @s[tag=pm_holding] at @s run function mini:hotpm/game/damage_dealt2
 
 # 结束伤害判断
 tag @a remove pm_damage_dealt

data/mini/functions/hotpm/game/damage_dealt2.mcfunction

@@ -1,5 +1,4 @@
 # 土豆持有者打到人时执行
-
 tag @s add pm_damage_dealt
 function lib:sounds/hit
 

data/mini/functions/hotpm/game/damage_taken.mcfunction

@@ -1,5 +1,2 @@
-# 受到伤害时由玩家触发
-advancement revoke @s only mini:hotpm/damage_taken
-
 # 添加受伤 Tag
-execute if score $state mem matches 5 if score $mini_type mem matches 3 run tag @s add pm_damage_taken
+tag @s add pm_damage_taken

data/mini/functions/main/damage_dealt.mcfunction

@@ -0,0 +1,2 @@
+# 检测分数调用对应函数
+execute if score $mini_type mem matches 3 run function mini:hotpm/game/damage_dealt

data/mini/functions/main/damage_taken.mcfunction

@@ -0,0 +1,3 @@
+# 检测分数调用对应函数
+execute if score $mini_type mem matches 3 run function mini:hotpm/game/damage_taken
+execute if score $mini_type mem matches 5 run function mini:zombie/game/damage_taken

data/mini/functions/zombie/game/damage_taken.mcfunction

@@ -0,0 +1,2 @@
+effect give @s resistance 2 4
+effect give @s speed 2 1