diff --git a/TheSkyBlessing/data/api/functions/heal/.mcfunction b/TheSkyBlessing/data/api/functions/heal/.mcfunction index 2a2aeaca3d..549db6f7f5 100644 --- a/TheSkyBlessing/data/api/functions/heal/.mcfunction +++ b/TheSkyBlessing/data/api/functions/heal/.mcfunction @@ -6,7 +6,7 @@ # # @input # as living entity -# storage api: Argument.Heal : float +# storage api: Argument.Heal : double # storage api: Argument.FixedHeal? : boolean(default: false) # storage api: Argument.DisableLog? : boolean(default: false) # storage api: Argument.ApplyTrigger? : boolean(default: true) diff --git a/TheSkyBlessing/data/api/functions/heal/core/modifier/multiply_by_heal_modifier.mcfunction b/TheSkyBlessing/data/api/functions/heal/core/modifier/multiply_by_heal_modifier.mcfunction index ebc8977929..c27ea32287 100644 --- a/TheSkyBlessing/data/api/functions/heal/core/modifier/multiply_by_heal_modifier.mcfunction +++ b/TheSkyBlessing/data/api/functions/heal/core/modifier/multiply_by_heal_modifier.mcfunction @@ -17,7 +17,7 @@ # 補正 scoreboard players operation $Heal Temporary *= $Modifier Temporary # 代入 - execute store result storage api: Argument.Heal float 0.0001 run scoreboard players get $Heal Temporary + execute store result storage api: Argument.Heal double 0.0001 run scoreboard players get $Heal Temporary # リセット scoreboard players reset $Heal Temporary scoreboard players reset $Modifier Temporary diff --git a/TheSkyBlessing/data/api/functions/heal/core/push_heal_events/.mcfunction b/TheSkyBlessing/data/api/functions/heal/core/push_heal_events/.mcfunction index 62af32d680..0a25b30a31 100644 --- a/TheSkyBlessing/data/api/functions/heal/core/push_heal_events/.mcfunction +++ b/TheSkyBlessing/data/api/functions/heal/core/push_heal_events/.mcfunction @@ -14,7 +14,7 @@ function oh_my_dat:please data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.ReceiveHeal append value {} data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.ReceiveHeal[-1].Amount.Base set from storage api: Argument.Fluctuation - execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.ReceiveHeal[-1].Amount.Over float 0.01 run scoreboard players get $OverHeal Temporary + execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.ReceiveHeal[-1].Amount.Over double 0.01 run scoreboard players get $OverHeal Temporary data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.ReceiveHeal[-1].PreviousHealth set from storage api: Health execute if data storage api: Argument{ApplyTrigger:true} run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.ReceiveHeal[-1].IsHoT set value false execute if data storage api: Argument{ApplyTrigger:false} run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.ReceiveHeal[-1].IsHoT set value true diff --git a/TheSkyBlessing/data/api/functions/heal/core/push_heal_events/from_healer/push.mcfunction b/TheSkyBlessing/data/api/functions/heal/core/push_heal_events/from_healer/push.mcfunction index cb35ee49f2..e3278c22d2 100644 --- a/TheSkyBlessing/data/api/functions/heal/core/push_heal_events/from_healer/push.mcfunction +++ b/TheSkyBlessing/data/api/functions/heal/core/push_heal_events/from_healer/push.mcfunction @@ -18,11 +18,11 @@ execute unless score $LastIndex Temporary = $ModifierIndex Global run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal append value {} execute unless score $LastIndex Temporary = $ModifierIndex Global run execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].Index int 1 run scoreboard players get $ModifierIndex Global # ヒール対象に追加する - data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].Amounts.Base append value -1f - data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].Amounts.Over append value -1f + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].Amounts.Base append value -1d + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].Amounts.Over append value -1d data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].Amounts.Base[-1] set from storage api: Argument.Fluctuation - execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].Amounts.Over[-1] float 0.01 run scoreboard players get $OverHeal Temporary - data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].PreviousHealth append value -1f + execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].Amounts.Over[-1] double 0.01 run scoreboard players get $OverHeal Temporary + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].PreviousHealth append value -1d data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].PreviousHealth[-1] set from storage api: Health data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].To append value -1 execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Heal[-1].To[-1] int 1 run scoreboard players get $ReceiverUUID Temporary diff --git a/TheSkyBlessing/data/api/functions/heal/core/receive_modifier.mcfunction b/TheSkyBlessing/data/api/functions/heal/core/receive_modifier.mcfunction index 39d1187f5b..ec15065491 100644 --- a/TheSkyBlessing/data/api/functions/heal/core/receive_modifier.mcfunction +++ b/TheSkyBlessing/data/api/functions/heal/core/receive_modifier.mcfunction @@ -17,7 +17,7 @@ # 補正 scoreboard players operation $Heal Temporary *= $Modifier Temporary # 代入 - execute store result storage api: Argument.Fluctuation float 0.0001 run scoreboard players get $Heal Temporary + execute store result storage api: Argument.Fluctuation double 0.0001 run scoreboard players get $Heal Temporary # リセット scoreboard players reset $Heal Temporary scoreboard players reset $Modifier Temporary diff --git a/TheSkyBlessing/data/api/functions/heal/modifier.mcfunction b/TheSkyBlessing/data/api/functions/heal/modifier.mcfunction index d6c89b71a0..0bceacdac1 100644 --- a/TheSkyBlessing/data/api/functions/heal/modifier.mcfunction +++ b/TheSkyBlessing/data/api/functions/heal/modifier.mcfunction @@ -4,9 +4,9 @@ # # @input # as entity -# storage api: Argument.Heal : float +# storage api: Argument.Heal : double # storage api: Argument.FIxedHeal : boolean -# @output storage api: Argument.Heal : float +# @output storage api: Argument.Heal : double # @api # 補正