From 916f6b681635d811c0e2410440dff3765630683f Mon Sep 17 00:00:00 2001 From: ChenCMD Date: Sat, 2 Nov 2024 16:04:56 +0900 Subject: [PATCH] =?UTF-8?q?:adhesive=5Fbandage:=20=E6=AD=A3=E3=81=97?= =?UTF-8?q?=E3=81=8F=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E3=81=8C=E8=A8=98?= =?UTF-8?q?=E9=8C=B2=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../non-player/attack_and_hurt/push_from_attacker.mcfunction | 4 ++-- .../player/attack_and_damage/push_from_attacker.mcfunction | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/attack_and_hurt/push_from_attacker.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/attack_and_hurt/push_from_attacker.mcfunction index d47c5d7540..c33c07ce61 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/attack_and_hurt/push_from_attacker.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/trigger_events/non-player/attack_and_hurt/push_from_attacker.mcfunction @@ -15,12 +15,12 @@ # Index が同一 (即ち、同一の modifier 後の対象) ではない場合は、新規に追加する execute store result score $LastIndex Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Attack[-1].Index execute unless score $LastIndex Temporary = $ModifierIndex Global run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Attack append value {Type: "api",IsVanilla:false} - execute unless score $LastIndex Temporary = $ModifierIndex Global run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Attack[-1].Amounts append value -1d - execute unless score $LastIndex Temporary = $ModifierIndex Global store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Attack[-1].Amounts[-1] double 0.01 run scoreboard players get $Damage Temporary execute unless score $LastIndex Temporary = $ModifierIndex Global run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Attack[-1].AttackType set from storage api: Argument.AttackType execute unless score $LastIndex Temporary = $ModifierIndex Global run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Attack[-1].ElementType set from storage api: Argument.ElementType execute unless score $LastIndex Temporary = $ModifierIndex Global run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Attack[-1].Metadata set from storage api: Argument.Metadata # 攻撃対象に追加する + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Attack[-1].Amounts append value -1d + execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Attack[-1].Amounts[-1] double 0.01 run scoreboard players get $Damage Temporary data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Attack[-1].To append value -1 execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].ArtifactEvents.Attack[-1].To[-1] int 1 run scoreboard players get $DamagerUUID Temporary diff --git a/TheSkyBlessing/data/api/functions/damage/core/trigger_events/player/attack_and_damage/push_from_attacker.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/trigger_events/player/attack_and_damage/push_from_attacker.mcfunction index 4a096fc24e..125cc09dd1 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/trigger_events/player/attack_and_damage/push_from_attacker.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/trigger_events/player/attack_and_damage/push_from_attacker.mcfunction @@ -15,12 +15,12 @@ # Index が同一 (即ち、同一の modifier 後の対象) ではない場合は、新規に追加する execute store result score $LastIndex Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Attack[-1].Index execute unless score $LastIndex Temporary = $ModifierIndex Global run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Attack append value {Type: "api",IsVanilla:false} - execute unless score $LastIndex Temporary = $ModifierIndex Global run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Attack[-1].Amounts append value -1d - execute unless score $LastIndex Temporary = $ModifierIndex Global store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Attack[-1].Amounts[-1] double 0.0001 run scoreboard players get $Damage Temporary execute unless score $LastIndex Temporary = $ModifierIndex Global run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Attack[-1].AttackType set from storage api: Argument.AttackType execute unless score $LastIndex Temporary = $ModifierIndex Global run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Attack[-1].ElementType set from storage api: Argument.ElementType execute unless score $LastIndex Temporary = $ModifierIndex Global run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Attack[-1].Metadata set from storage api: Argument.Metadata # 攻撃対象に追加する + data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Attack[-1].Amounts append value -1d + execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Attack[-1].Amounts[-1] double 0.0001 run scoreboard players get $Damage Temporary data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Attack[-1].To append value -1 execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].MobEvents.Attack[-1].To[-1] int 1 run scoreboard players get $DamagerUUID Temporary # リセット