From 0cae21cc3eb432111f922d71a08d7558f09b84c5 Mon Sep 17 00:00:00 2001 From: Ponpon <nepon_109@yahoo.co.jp> Date: Thu, 5 Dec 2024 20:06:38 +0900 Subject: [PATCH] =?UTF-8?q?GH-548=20Add=20=E3=82=B9=E3=82=AD=E3=83=AB?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../function/trigger/delete/delete.mcfunction | 20 +++++++++++++++++++ .../trigger/delete/detection.mcfunction | 9 +++++++++ 2 files changed, 29 insertions(+) create mode 100644 data/skill/function/trigger/delete/delete.mcfunction create mode 100644 data/skill/function/trigger/delete/detection.mcfunction diff --git a/data/skill/function/trigger/delete/delete.mcfunction b/data/skill/function/trigger/delete/delete.mcfunction new file mode 100644 index 0000000000..3986499419 --- /dev/null +++ b/data/skill/function/trigger/delete/delete.mcfunction @@ -0,0 +1,20 @@ +#> skill:trigger/delete/delete +# +# 手に持っているアイテムのスキル情報を削除する +# +# @within function skill:trigger/delete/detection + +# Lore削除 + function skill:trigger/set/remove_lore + execute unless data storage item: Item.tag.UniqueName run data remove storage item: Item.tag.display.Name + data remove storage item: Item.tag.UniqueName + data remove storage item: Item.tag.Skill + +# メインハンドの情報 + execute in area:control_area run data modify block 2 2 2 Items set value [] + execute in area:control_area run data modify block 2 2 2 Items append from storage item: Item + execute in area:control_area run item replace entity @s weapon.mainhand from block 2 2 2 container.0 + +# 演出 + tellraw @s {"translate":"スキルを削除しました。"} + function makeup:skill/shortcut/sound \ No newline at end of file diff --git a/data/skill/function/trigger/delete/detection.mcfunction b/data/skill/function/trigger/delete/detection.mcfunction new file mode 100644 index 0000000000..d8f55cf398 --- /dev/null +++ b/data/skill/function/trigger/delete/detection.mcfunction @@ -0,0 +1,9 @@ +# @within function skill:trigger/ + +# メインハンドのアイテム情報取得 +data remove storage item: Item +data modify storage item: Item set from entity @s SelectedItem + +# TUSBメモリーかどうかで分岐 +execute if data storage item: Item{tag:{Skill:{Type:"TUSBMemory"}}} run function makeup:skill/trigger/error/delete_to_tusb_memory +execute unless data storage item: Item{tag:{Skill:{Type:"TUSBMemory"}}} run function skill:trigger/delete/delete \ No newline at end of file