From 8f81734f96e1dbaed038b0598aaab09f03e1be5e Mon Sep 17 00:00:00 2001 From: NonameSister Date: Sun, 27 Oct 2024 03:43:44 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E7=9A=84=E3=81=AA?= =?UTF-8?q?=E5=87=A6=E7=90=86=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 +++ .../give/2.give.mcfunction | 63 +++++++++++++++++++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 14 +++++ .../trigger/3.main.mcfunction | 25 ++++++++ .../trigger/dis_equip/.mcfunction | 7 +++ .../trigger/dis_equip/main.mcfunction | 13 ++++ .../tags/functions/artifact/dis_equip.json | 1 + .../asset/tags/functions/artifact/equip.json | 1 + .../asset/tags/functions/artifact/give.json | 3 +- 10 files changed, 141 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/artifact/1122.guardian_ironlump/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1122.guardian_ironlump/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/main.mcfunction diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/give/1.trigger.mcfunction new file mode 100644 index 0000000000..4e48c3c0dc --- /dev/null +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1122.guardian_ironlump/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1122} run function asset:artifact/1122.guardian_ironlump/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/give/2.give.mcfunction new file mode 100644 index 0000000000..6b76c58625 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/give/2.give.mcfunction @@ -0,0 +1,63 @@ +#> asset:artifact/1122.guardian_ironlump/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1122.guardian_ironlump/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1122 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"守護者の鉄塊"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"灰の守護者の一部"}','{"text":"守護の力を感じる"}','{"text":"防御力+3 ノックバック耐性+99 全属性耐性+5%","color":"green"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "hotbar" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "equipping" +# 効果が重複可能か否か (boolean) (オプション) + # data modify storage asset:artifact EnableDuplication set value +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 0 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value "ALL" +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..8b08c4aa02 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1122.guardian_ironlump/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのautoに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{hotbar:[1122]} run function asset:artifact/1122.guardian_ironlump/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..2921d8af55 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/2.check_condition.mcfunction @@ -0,0 +1,14 @@ +#> asset:artifact/1122.guardian_ironlump/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1122.guardian_ironlump/trigger/1.trigger + +# ID指定する + data modify storage asset:artifact TargetID set value 1122 +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/hotbar +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1122.guardian_ironlump/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction new file mode 100644 index 0000000000..cdf432f7f0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction @@ -0,0 +1,25 @@ +#> asset:artifact/1122.guardian_ironlump/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1122.guardian_ironlump/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/hotbar + +# ここから先は神器側の効果の処理を書く + attribute @s minecraft:generic.armor modifier add 1-0-1-0-46200000007 "1122" 3 add + attribute @s minecraft:generic.knockback_resistance modifier add 1-0-1-0-46200000007 "1122" 99 add + +# 防御力+5% + data modify storage api: Argument.UUID set value [I;1,1,1122,6] + data modify storage api: Argument.Amount set value 0.05 + data modify storage api: Argument.Operation set value "multiply_base" + function api:modifier/defense/base/add + +# 演出 + particle block iron_block ~ ~1 ~ 0.3 0.3 0.3 0 20 + playsound entity.iron_golem.death hostile @a ~ ~ ~ 1 2 + playsound minecraft:entity.skeleton.converted_to_stray player @a ~ ~ ~ 1 0 + playsound ogg:block.smithing_table.smithing_table2 player @a ~ ~ ~ 1 1 + playsound minecraft:item.armor.equip_iron player @a ~ ~ ~ 1 1 diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/.mcfunction new file mode 100644 index 0000000000..61ca2cf531 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1122.guardian_ironlump/trigger/dis_equip/ +# +# 装備を外した時に外した部位にのみのidが入った状態でトリガーされる +# +# @within tag/function asset:artifact/dis_equip + +execute if data storage asset:context id{auto:1122} run function asset:artifact/1122.guardian_ironlump/trigger/dis_equip/main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/main.mcfunction new file mode 100644 index 0000000000..27b8d09881 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/main.mcfunction @@ -0,0 +1,13 @@ +#> asset:artifact/1122.guardian_ironlump/trigger/dis_equip/main +# +# 装備を外した時のメイン処理 +# +# @within function asset:artifact/1122.guardian_ironlump/trigger/dis_equip/ + +# ここから先は神器側の効果の処理を書く + attribute @s minecraft:generic.armor modifier remove 1-0-1-0-46200000007 + attribute @s minecraft:generic.attack_knockback modifier remove 1-0-1-0-46200000007 + +# 防御力+5% + data modify storage api: Argument.UUID set value [I;1,1,1122,6] + function api:modifier/defense/base/remove diff --git a/Asset/data/asset/tags/functions/artifact/dis_equip.json b/Asset/data/asset/tags/functions/artifact/dis_equip.json index e2f7a1d9b4..e7c25b8730 100644 --- a/Asset/data/asset/tags/functions/artifact/dis_equip.json +++ b/Asset/data/asset/tags/functions/artifact/dis_equip.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1122.guardian_ironlump/trigger/dis_equip/", "asset:artifact/1032.life_charm/trigger/dis_equip/", "asset:artifact/0667.soul_fire_armor/trigger/dis_equip/", "asset:artifact/0666.soul_fire_armor/trigger/dis_equip/", diff --git a/Asset/data/asset/tags/functions/artifact/equip.json b/Asset/data/asset/tags/functions/artifact/equip.json index 908275cef7..1554f9233d 100644 --- a/Asset/data/asset/tags/functions/artifact/equip.json +++ b/Asset/data/asset/tags/functions/artifact/equip.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1122.guardian_ironlump/trigger/1.trigger", "asset:artifact/1032.life_charm/trigger/1.trigger", "asset:artifact/0667.soul_fire_armor/trigger/1.trigger", "asset:artifact/0666.soul_fire_armor/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 9da6d1a772..4855b56645 100644 --- a/Asset/data/asset/tags/functions/artifact/give.json +++ b/Asset/data/asset/tags/functions/artifact/give.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1122.guardian_ironlump/give/1.trigger", "asset:artifact/0002.blessing/give/1.trigger", "asset:artifact/1108.white_lily_of_priestess/give/1.trigger", "asset:artifact/1106.rainbow_candy/give/1.trigger", @@ -381,4 +382,4 @@ "asset:artifact/0735.collision_plate/give/1.trigger", "asset:artifact/0745.blade_of_whirlwind/give/1.trigger" ] -} +} \ No newline at end of file From 7a89a6ff37975b507420e89bf2e767a38e711856 Mon Sep 17 00:00:00 2001 From: NonameSister Date: Sun, 27 Oct 2024 03:58:22 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=E8=AA=AC=E6=98=8E=E6=96=87=E5=A4=89?= =?UTF-8?q?=E3=81=88=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1122.guardian_ironlump/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/give/2.give.mcfunction index 6b76c58625..d4e06585e0 100644 --- a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"守護者の鉄塊"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"灰の守護者の一部"}','{"text":"守護の力を感じる"}','{"text":"防御力+3 ノックバック耐性+99 全属性耐性+5%","color":"green"}'] + data modify storage asset:artifact Lore set value ['{"text":"守護者が遺した鎧の一部","color":"gray"}','{"text":"揺るぎ無き守護の意志が感じられる","color":"gray"}','{"text":"防御力+3 ノックバック耐性+99 全属性耐性+5%","color":"green"}'] # MP以外の消費物 (TextComponentString) (オプション) # data modify storage asset:artifact CostText set value # 使用回数 (int) (オプション) From 86adef20869c0297089a029daf7cabdbe2baebaf Mon Sep 17 00:00:00 2001 From: NonameSister Date: Thu, 31 Oct 2024 01:05:57 +0900 Subject: [PATCH 3/8] =?UTF-8?q?dis=5Fequip=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1122.guardian_ironlump/trigger/dis_equip/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/.mcfunction index 61ca2cf531..a0a38966c2 100644 --- a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/.mcfunction +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/.mcfunction @@ -4,4 +4,4 @@ # # @within tag/function asset:artifact/dis_equip -execute if data storage asset:context id{auto:1122} run function asset:artifact/1122.guardian_ironlump/trigger/dis_equip/main \ No newline at end of file +execute if data storage asset:context id{hotbar:[1122]} run function asset:artifact/1122.guardian_ironlump/trigger/dis_equip/main From 613fb73b6b9319029d3f6af186cdec8711a43a27 Mon Sep 17 00:00:00 2001 From: NonameSister Date: Thu, 31 Oct 2024 01:23:25 +0900 Subject: [PATCH 4/8] =?UTF-8?q?=E5=8A=B9=E6=9E=9C=E9=87=8D=E8=A4=87?= =?UTF-8?q?=E3=81=99=E3=82=8B=E5=95=8F=E9=A1=8C=E3=81=A8=E3=80=81=E8=A4=87?= =?UTF-8?q?=E6=95=B0=E5=80=8B=E6=8C=81=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B?= =?UTF-8?q?=E7=8A=B6=E6=85=8B=E3=82=92=E8=80=83=E6=85=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 4 ++++ .../trigger/dis_equip/main.mcfunction | 17 ++++++++++++----- .../trigger/removal.mcfunction | 17 +++++++++++++++++ 3 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/removal.mcfunction diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction index cdf432f7f0..2771356c6b 100644 --- a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction @@ -8,6 +8,10 @@ function asset:artifact/common/use/hotbar # ここから先は神器側の効果の処理を書く + +# リセット処理 + function asset:artifact/1122.guardian_ironlump/trigger/removal + attribute @s minecraft:generic.armor modifier add 1-0-1-0-46200000007 "1122" 3 add attribute @s minecraft:generic.knockback_resistance modifier add 1-0-1-0-46200000007 "1122" 99 add diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/main.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/main.mcfunction index 27b8d09881..4b61aac677 100644 --- a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/main.mcfunction +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/dis_equip/main.mcfunction @@ -4,10 +4,17 @@ # # @within function asset:artifact/1122.guardian_ironlump/trigger/dis_equip/ +#> private +# @private + #declare score_holder $ItemCount + # ここから先は神器側の効果の処理を書く - attribute @s minecraft:generic.armor modifier remove 1-0-1-0-46200000007 - attribute @s minecraft:generic.attack_knockback modifier remove 1-0-1-0-46200000007 -# 防御力+5% - data modify storage api: Argument.UUID set value [I;1,1,1122,6] - function api:modifier/defense/base/remove +# 神器ID930がホットバー内にあるか確認する。 + execute store result score $ItemCount Temporary if data storage asset:context New.Items.hotbar[{tag:{TSB:{ID:1122}}}] + +# ホットバー内に残ってない場合、削除する。 + execute if score $ItemCount Temporary matches ..0 run function asset:artifact/1122.guardian_ironlump/trigger/removal + +# リセット + scoreboard players reset $ItemCount Temporary diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/removal.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/removal.mcfunction new file mode 100644 index 0000000000..93a23224d6 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/removal.mcfunction @@ -0,0 +1,17 @@ +#> asset:artifact/1122.guardian_ironlump/trigger/removal +# +# +# +# @within function +# asset:artifact/1122.guardian_ironlump/trigger/main +# asset:artifact/1122.guardian_ironlump/trigger/dis_equip/main + +# attribute削除 + attribute @s minecraft:generic.armor modifier remove 1-0-1-0-46200000007 + attribute @s minecraft:generic.attack_knockback modifier remove 1-0-1-0-46200000007 + +# 防御力+5% + data modify storage api: Argument.UUID set value [I;1,1,1122,6] + function api:modifier/defense/base/remove + +say リセットしたよ From 649cb32e45e9fbab7a280fb31eeec11b526a8ad5 Mon Sep 17 00:00:00 2001 From: NonameSister Date: Thu, 31 Oct 2024 01:25:55 +0900 Subject: [PATCH 5/8] =?UTF-8?q?within=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1122.guardian_ironlump/trigger/removal.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/removal.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/removal.mcfunction index 93a23224d6..4cefab1184 100644 --- a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/removal.mcfunction +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/removal.mcfunction @@ -3,7 +3,7 @@ # # # @within function -# asset:artifact/1122.guardian_ironlump/trigger/main +# asset:artifact/1122.guardian_ironlump/trigger/3.main # asset:artifact/1122.guardian_ironlump/trigger/dis_equip/main # attribute削除 From 26f8d37221cdb5f29d320ff5e3c0e9b9f6e04ee6 Mon Sep 17 00:00:00 2001 From: NonameSister Date: Thu, 31 Oct 2024 01:27:23 +0900 Subject: [PATCH 6/8] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0?= =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1122.guardian_ironlump/trigger/removal.mcfunction | 2 -- 1 file changed, 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/removal.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/removal.mcfunction index 4cefab1184..5876504e5b 100644 --- a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/removal.mcfunction +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/removal.mcfunction @@ -13,5 +13,3 @@ # 防御力+5% data modify storage api: Argument.UUID set value [I;1,1,1122,6] function api:modifier/defense/base/remove - -say リセットしたよ From 1b5596e5bf5437f33e78b41d66b5a3181d2d16c3 Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Sun, 10 Nov 2024 18:30:25 +0900 Subject: [PATCH 7/8] Update 3.main.mcfunction --- .../artifact/1122.guardian_ironlump/trigger/3.main.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction index 2771356c6b..5531890a53 100644 --- a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction @@ -23,7 +23,7 @@ # 演出 particle block iron_block ~ ~1 ~ 0.3 0.3 0.3 0 20 - playsound entity.iron_golem.death hostile @a ~ ~ ~ 1 2 + playsound entity.iron_golem.death player @a ~ ~ ~ 1 2 playsound minecraft:entity.skeleton.converted_to_stray player @a ~ ~ ~ 1 0 playsound ogg:block.smithing_table.smithing_table2 player @a ~ ~ ~ 1 1 playsound minecraft:item.armor.equip_iron player @a ~ ~ ~ 1 1 From 3fe10c1aaf3a1ed973caeefcfb80a1f774b8b6d8 Mon Sep 17 00:00:00 2001 From: NonameSister <46847586+quikku@users.noreply.github.com> Date: Sun, 10 Nov 2024 18:39:26 +0900 Subject: [PATCH 8/8] Update 3.main.mcfunction --- .../artifact/1122.guardian_ironlump/trigger/3.main.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction index 5531890a53..69048c2fe1 100644 --- a/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1122.guardian_ironlump/trigger/3.main.mcfunction @@ -16,7 +16,7 @@ attribute @s minecraft:generic.knockback_resistance modifier add 1-0-1-0-46200000007 "1122" 99 add # 防御力+5% - data modify storage api: Argument.UUID set value [I;1,1,1122,6] + data modify storage api: Argument.UUID set value [I;1,1,1122,7] data modify storage api: Argument.Amount set value 0.05 data modify storage api: Argument.Operation set value "multiply_base" function api:modifier/defense/base/add