Explorar o código

搬移伤害显示函数的位置

HerobrineXia %!s(int64=6) %!d(string=hai) anos
pai
achega
b30fb72d55

+ 1 - 1
data/mini/advancements/damage_dealt.json → data/lib/advancements/damage_dealt.json

@@ -12,6 +12,6 @@
         }
     },
     "rewards": {
-        "function": "mini:hotpm/damage_indicator/damage_dealt"
+        "function": "lib:damage_indicator/damage_dealt"
     }
 }

+ 1 - 1
data/mini/advancements/damage_taken.json → data/lib/advancements/damage_taken.json

@@ -12,6 +12,6 @@
         }
     },
     "rewards": {
-        "function": "mini:hotpm/damage_indicator/damage_taken"
+        "function": "lib:damage_indicator/damage_taken"
     }
 }

+ 8 - 0
data/lib/functions/damage_indicator/damage_dealt.mcfunction

@@ -0,0 +1,8 @@
+# 造成伤害加tag
+tag @s add damage_dealt
+
+# 播放攻击音效
+playsound minecraft:entity.arrow.hit_player ambient @s ~ ~ ~ 1 1 1
+
+# 移除造成伤害advancement
+advancement revoke @s only lib:damage_dealt

+ 1 - 1
data/mini/functions/hotpm/damage_indicator/damage_taken.mcfunction → data/lib/functions/damage_indicator/damage_taken.mcfunction

@@ -2,4 +2,4 @@
 tag @s add damage_taken
 
 # 移除受到伤害advancement
-advancement revoke @s only mini:damage_taken
+advancement revoke @s only lib:damage_taken

+ 0 - 0
data/mini/functions/hotpm/damage_indicator/init.mcfunction → data/lib/functions/damage_indicator/init.mcfunction


+ 0 - 0
data/mini/functions/hotpm/damage_indicator/player_hurt_player.mcfunction → data/lib/functions/damage_indicator/player_hurt_player.mcfunction


+ 0 - 0
data/mini/functions/hotpm/damage_indicator/player_hurt_player2.mcfunction → data/lib/functions/damage_indicator/player_hurt_player2.mcfunction


+ 0 - 0
data/mini/functions/hotpm/damage_indicator/player_hurt_self.mcfunction → data/lib/functions/damage_indicator/player_hurt_self.mcfunction


+ 0 - 0
data/mini/functions/hotpm/damage_indicator/player_hurt_self2.mcfunction → data/lib/functions/damage_indicator/player_hurt_self2.mcfunction


+ 0 - 0
data/mini/functions/hotpm/damage_indicator/self_hurt.mcfunction → data/lib/functions/damage_indicator/self_hurt.mcfunction


+ 0 - 0
data/mini/functions/hotpm/damage_indicator/self_hurt2.mcfunction → data/lib/functions/damage_indicator/self_hurt2.mcfunction


+ 6 - 6
data/mini/functions/hotpm/damage_indicator/tick1.mcfunction → data/lib/functions/damage_indicator/tick1.mcfunction

@@ -1,20 +1,20 @@
 # 检测玩家对玩家造成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 mini:hotpm/damage_indicator/player_hurt_player
+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 mini:hotpm/damage_indicator/player_hurt_player2
+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 mini:hotpm/damage_indicator/player_hurt_self
+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 mini:hotpm/damage_indicator/player_hurt_self2
+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 mini:hotpm/damage_indicator/self_hurt
+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 mini:hotpm/damage_indicator/self_hurt2
+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

+ 0 - 8
data/mini/functions/hotpm/damage_indicator/damage_dealt.mcfunction

@@ -1,8 +0,0 @@
-# 造成伤害加tag
-tag @s add damage_dealt
-
-# 播放攻击音效
-playsound minecraft:entity.arrow.hit_player ambient @s[scores={damage_system=1..}] ~ ~ ~ 1 1 1
-
-# 移除造成伤害advancement
-advancement revoke @s only mini:damage_dealt