HealAPIにArgument.DisableLogを追加

ProjectTSB · Sep 27, 2024 · b05ab8a · b05ab8a
1 parent 8fae752
commit b05ab8a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/TheSkyBlessing/data/api/functions/heal/.mcfunction b/TheSkyBlessing/data/api/functions/heal/.mcfunction
@@ -8,11 +8,12 @@
 #   as living entity
 #   storage api: Argument.Heal : float
 #   storage api: Argument.FixedHeal? : boolean(default: false)
+#   storage api: Argument.DisableLog? : boolean(default: false)
 # @api
 
 # 引数チェック
     execute unless data storage api: Argument.Heal run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"引数が足りません","color":"white"},{"text":" Heal","color":"red"}]
 # プレイヤー
     execute if entity @s[type=player] run function api:heal/core/player
 # non-プレイヤー
-    execute if entity @s[type=#lib:living,type=!player,tag=!Uninterferable] run function api:heal/core/non-player
+    execute if entity @s[type=#lib:living,type=!player,tag=!Uninterferable] run function api:heal/core/non-player
diff --git a/TheSkyBlessing/data/api/functions/heal/reset.mcfunction b/TheSkyBlessing/data/api/functions/heal/reset.mcfunction
@@ -5,4 +5,5 @@
 # @api
 
 data remove storage api: Argument.Heal
-data remove storage api: Argument.FixedHeal
+data remove storage api: Argument.FixedHeal
+data remove storage api: Argument.DisableLog
diff --git a/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/fluctuation.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/fluctuation.mcfunction
@@ -8,6 +8,7 @@
 #   storage api: Argument.Attacker?: int(MobUUID)
 #   storage api: Argument.AttackType?: Enum(AttackType)
 #   storage api: Argument.ElementType?: Enum(ElementType)
+#   storage api: Argument.DisableLog?: boolean(default: false)
 # @within function
 #   lib:**
 #   api:**
@@ -23,6 +24,6 @@
 # 攻撃情報を記録する
     execute if score $Fluctuation Lib matches ..-1 run function lib:score_to_health_wrapper/core/store_attack_info
 # ログ表示
-    execute at @s run function lib:status_log/show_health
+    execute unless data storage api: Argument{DisableLog:true} at @s run function lib:status_log/show_health
 # リセット
-    scoreboard players reset $Fluctuation Lib
+    scoreboard players reset $Fluctuation Lib