From 207e570ba54db334dcc62c1ce86b926f2cdd59ad Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Mon, 12 Jan 2026 22:26:29 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=E3=82=A4=E3=83=81=E3=82=B4=E3=81=8B?=
 =?UTF-8?q?=E3=81=8D=E6=B0=B7=E3=81=AE=E3=83=86=E3=83=B3=E3=83=97=E3=83=AC?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E3=81=BE=E3=81=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../give/1.trigger.mcfunction                 |  7 ++
 .../give/2.give.mcfunction                    | 68 +++++++++++++++++++
 .../register.mcfunction                       |  8 +++
 .../trigger/1.trigger.mcfunction              |  8 +++
 .../trigger/2.check_condition.mcfunction      | 12 ++++
 .../trigger/3.main.mcfunction                 | 11 +++
 .../asset/tags/functions/artifact/give.json   |  3 +-
 .../tags/functions/artifact/register.json     |  3 +-
 .../tags/functions/artifact/use_item.json     |  1 +
 9 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/1.trigger.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/register.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/1.trigger.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/2.check_condition.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/3.main.mcfunction

diff --git a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/1.trigger.mcfunction
new file mode 100644
index 0000000000..ea8b2c41b4
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/1.trigger.mcfunction
@@ -0,0 +1,7 @@
+#> asset:artifact/1364.shaved_ice_strawberry/give/1.trigger
+#
+# 神器の取得処理の呼び出し時に実行されるfunction
+#
+# @within tag/function asset:artifact/give
+
+execute if data storage asset:context {id:1364} run function asset:artifact/1364.shaved_ice_strawberry/give/2.give
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction
new file mode 100644
index 0000000000..6719cd5524
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction
@@ -0,0 +1,68 @@
+#> asset:artifact/1364.shaved_ice_strawberry/give/2.give
+#
+# 神器の作成部 ここでID等を定義する
+#
+# @user
+# @within function asset:artifact/1364.shaved_ice_strawberry/give/1.trigger
+
+# 神器の説明や消費MPなどをここで設定する。
+# 最後にasset:artifact/common/giveを実行することで入手可能。
+
+# 神器のID (int) スプレッドシートの値を入れる
+    data modify storage asset:artifact ID set value 1364
+# 神器のベースアイテム
+    data modify storage asset:artifact Item set value "minecraft:cookie"
+# 神器の名前 (TextComponentString)
+    data modify storage asset:artifact Name set value '{"text":"かき氷(イチゴ)","color":"#ff457d"}'
+# 神器の説明文 (TextComponentString[])
+    data modify storage asset:artifact Lore set value []
+# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
+    # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}'
+    # data modify storage asset:artifact ConsumeItem.Count set value 1
+    # data modify storage asset:artifact ConsumeItem.Extra set value
+# 使用回数 (int) (オプション)
+    data modify storage asset:artifact RemainingCount set value 5
+# 神器を発動できるスロット (string) Wikiを参照
+    data modify storage asset:artifact Slot set value "auto"
+# 神器のトリガー (string) Wikiを参照
+    data modify storage asset:artifact Trigger set value "itemUse"
+# 神器の発動条件 (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
+# MP必要量 (int) (オプション)
+    # data modify storage asset:artifact MPRequire set value
+# MP回復量 (int)
+    # data modify storage asset:artifact MPHealWhenHit set value
+# 神器のクールダウン (int) (オプション)
+    # data modify storage asset:artifact LocalCooldown set value
+# 種別クールダウン ({Type: string, Duration: int}) (オプション)
+    # data modify storage asset:artifact TypeCooldown.Type set value
+    # data modify storage asset:artifact TypeCooldown.Duration 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/1364.shaved_ice_strawberry/register.mcfunction b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/register.mcfunction
new file mode 100644
index 0000000000..8e61b89b10
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/register.mcfunction
@@ -0,0 +1,8 @@
+#> asset:artifact/1364.shaved_ice_strawberry/register
+#
+# 神器プールへの登録処理
+#
+# @within tag/function asset:artifact/register
+
+# 加工機ではなく日替わり商人に登録する
+# data modify storage asset:artifact RarityRegistry[4] append value [1364]
diff --git a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/1.trigger.mcfunction
new file mode 100644
index 0000000000..ec4dd025ba
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/1.trigger.mcfunction
@@ -0,0 +1,8 @@
+#> asset:artifact/1364.shaved_ice_strawberry/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{auto:1364} run function asset:artifact/1364.shaved_ice_strawberry/trigger/2.check_condition
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/2.check_condition.mcfunction
new file mode 100644
index 0000000000..9b448b6628
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/2.check_condition.mcfunction
@@ -0,0 +1,12 @@
+#> asset:artifact/1364.shaved_ice_strawberry/trigger/2.check_condition
+#
+# 神器の発動条件をチェックします
+#
+# @within function asset:artifact/1364.shaved_ice_strawberry/trigger/1.trigger
+
+# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く
+    function asset:artifact/common/check_condition/auto
+# 他にアイテム等確認する場合はここに書く
+    
+# CanUsedタグをチェックして3.main.mcfunctionを実行する
+    execute if entity @s[tag=CanUsed] run function asset:artifact/1364.shaved_ice_strawberry/trigger/3.main
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/3.main.mcfunction
new file mode 100644
index 0000000000..a5b689b108
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/3.main.mcfunction
@@ -0,0 +1,11 @@
+#> asset:artifact/1364.shaved_ice_strawberry/trigger/3.main
+#
+# 神器のメイン処理部
+#
+# @within function asset:artifact/1364.shaved_ice_strawberry/trigger/2.check_condition
+
+# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う
+    function asset:artifact/common/use/auto
+
+# ここから先は神器側の効果の処理を書く
+    say test: 1364.shaved_ice_strawberry
\ No newline at end of file
diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json
index f3eb008857..bf0d285419 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/1364.shaved_ice_strawberry/give/1.trigger",
         "asset:artifact/1140.over_pulse_booster/give/1.trigger",
         "asset:artifact/1139.over_pulse_legframe/give/1.trigger",
         "asset:artifact/1138.over_pulse_bodyarmor/give/1.trigger",
@@ -517,4 +518,4 @@
         "asset:artifact/0735.collision_plate/give/1.trigger",
         "asset:artifact/0745.blade_of_whirlwind/give/1.trigger"
     ]
-}
+}
\ No newline at end of file
diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json
index deba166150..9bc6c24586 100644
--- a/Asset/data/asset/tags/functions/artifact/register.json
+++ b/Asset/data/asset/tags/functions/artifact/register.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:artifact/1364.shaved_ice_strawberry/register",
         "asset:artifact/1137.over_pulse_headgear/register",
         "asset:artifact/1228.fatalerror/register",
         "asset:artifact/1273.maidchan_plush/register",
@@ -295,4 +296,4 @@
         "asset:artifact/1027.fire_of_rebirth/register",
         "asset:artifact/1111.rod_o_redeem/register"
     ]
-}
+}
\ No newline at end of file
diff --git a/Asset/data/asset/tags/functions/artifact/use_item.json b/Asset/data/asset/tags/functions/artifact/use_item.json
index 1550db24f2..bf4df1cb03 100644
--- a/Asset/data/asset/tags/functions/artifact/use_item.json
+++ b/Asset/data/asset/tags/functions/artifact/use_item.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:artifact/1364.shaved_ice_strawberry/trigger/1.trigger",
         "asset:artifact/0185.increased_cookie/trigger/1.trigger",
         "asset:artifact/1116.honey_tart/trigger/1.trigger",
         "asset:artifact/1115.pain_chocolate/trigger/1.trigger",

From 7c318eba5a21ad596494005621ae4924158d86d3 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 24 Jan 2026 19:16:58 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../give/2.give.mcfunction                    |  4 +-
 .../trigger/3.main.mcfunction                 | 13 +++-
 .../trigger/damage_and_clear_buff.mcfunction  | 23 +++++++
 .../trigger/heal_and_buff.mcfunction          | 16 +++++
 .../give/1.trigger.mcfunction                 |  7 ++
 .../give/2.give.mcfunction                    | 68 +++++++++++++++++++
 .../register.mcfunction                       |  8 +++
 .../trigger/1.trigger.mcfunction              |  8 +++
 .../trigger/2.check_condition.mcfunction      | 12 ++++
 .../trigger/3.main.mcfunction                 | 22 ++++++
 .../trigger/damage_and_clear_buff.mcfunction  | 23 +++++++
 .../trigger/heal_and_buff.mcfunction          | 16 +++++
 .../give/1.trigger.mcfunction                 |  7 ++
 .../give/2.give.mcfunction                    | 68 +++++++++++++++++++
 .../1366.shaved_ice_melon/register.mcfunction |  8 +++
 .../trigger/1.trigger.mcfunction              |  8 +++
 .../trigger/2.check_condition.mcfunction      | 12 ++++
 .../trigger/3.main.mcfunction                 | 22 ++++++
 .../trigger/damage_and_clear_buff.mcfunction  | 23 +++++++
 .../trigger/heal_and_buff.mcfunction          | 16 +++++
 .../effect/0348.cool_feeling/_/end.mcfunction |  7 ++
 .../0348.cool_feeling/_/given.mcfunction      |  7 ++
 .../0348.cool_feeling/_/re-given.mcfunction   |  7 ++
 .../0348.cool_feeling/_/register.mcfunction   |  7 ++
 .../0348.cool_feeling/_/remove.mcfunction     |  7 ++
 .../0348.cool_feeling/_/tick.mcfunction       |  7 ++
 .../effect/0348.cool_feeling/end/.mcfunction  |  8 +++
 .../0348.cool_feeling/given/.mcfunction       |  8 +++
 .../0348.cool_feeling/modifier/add.mcfunction | 13 ++++
 .../modifier/remove.mcfunction                | 12 ++++
 .../0348.cool_feeling/re-given/.mcfunction    |  9 +++
 .../0348.cool_feeling/register.mcfunction     | 40 +++++++++++
 .../0348.cool_feeling/remove/.mcfunction      |  8 +++
 .../effect/0348.cool_feeling/tick/.mcfunction |  8 +++
 .../asset/tags/functions/artifact/give.json   |  2 +
 .../tags/functions/artifact/register.json     |  2 +
 .../tags/functions/artifact/use_item.json     |  2 +
 .../data/asset/tags/functions/effect/end.json |  3 +-
 .../asset/tags/functions/effect/given.json    |  3 +-
 .../asset/tags/functions/effect/re-given.json |  3 +-
 .../asset/tags/functions/effect/register.json |  1 +
 .../asset/tags/functions/effect/remove.json   |  3 +-
 .../asset/tags/functions/effect/tick.json     |  3 +-
 43 files changed, 546 insertions(+), 8 deletions(-)
 create mode 100644 Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/damage_and_clear_buff.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/heal_and_buff.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/1.trigger.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/2.give.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/register.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/1.trigger.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/2.check_condition.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/3.main.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/damage_and_clear_buff.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/heal_and_buff.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/1.trigger.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/2.give.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1366.shaved_ice_melon/register.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/1.trigger.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/2.check_condition.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/3.main.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/damage_and_clear_buff.mcfunction
 create mode 100644 Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/heal_and_buff.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/_/end.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/_/given.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/_/re-given.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/_/register.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/_/remove.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/_/tick.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/end/.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/given/.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/modifier/add.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/modifier/remove.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/re-given/.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/register.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/remove/.mcfunction
 create mode 100644 Asset/data/asset/functions/effect/0348.cool_feeling/tick/.mcfunction

diff --git a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction
index 6719cd5524..8ff0ce79c6 100644
--- a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"かき氷(イチゴ)","color":"#ff457d"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value []
+    data modify storage asset:artifact Lore set value ['{"translate":"体力を5回復し、%1$sを10秒間得る","color":"white","with":[{"text":"水攻撃+6%","color":"aqua"}]}','{"translate":"-%1$s水攻撃バフは最大2スタックまで重複する","color":"white","with":[{"text":"\\u0003","font":"space"}]}','{"translate":"-%1$s3スタックになるとバフが解除され、10の固定ダメージを受ける","color":"white","with":[{"text":"\\u0003","font":"space"}]}']
 # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
     # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}'
     # data modify storage asset:artifact ConsumeItem.Count set value 1
@@ -41,7 +41,7 @@
 # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション)
     # data modify storage asset:artifact AttackInfo.AttackRange set value
 # MP消費量 (int)
-    # data modify storage asset:artifact MPCost set value
+    data modify storage asset:artifact MPCost set value 0
 # MP必要量 (int) (オプション)
     # data modify storage asset:artifact MPRequire set value
 # MP回復量 (int)
diff --git a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/3.main.mcfunction
index a5b689b108..d9cde35cde 100644
--- a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/3.main.mcfunction
+++ b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/3.main.mcfunction
@@ -8,4 +8,15 @@
     function asset:artifact/common/use/auto
 
 # ここから先は神器側の効果の処理を書く
-    say test: 1364.shaved_ice_strawberry
\ No newline at end of file
+
+# 他のかき氷のところの数値調整も忘れずに！！！！！！！！！！！
+
+# バフがあるかチェック
+    data modify storage api: Argument.ID set value 348
+    function api:entity/mob/effect/get/from_id
+
+# スタックがNでないなら回復とバフ
+    execute unless data storage api: Return.Effect{Stack:2} run function asset:artifact/1364.shaved_ice_strawberry/trigger/heal_and_buff
+
+# スタックがNなら回復とバフ
+    execute if data storage api: Return.Effect{Stack:2} run function asset:artifact/1364.shaved_ice_strawberry/trigger/damage_and_clear_buff
diff --git a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/damage_and_clear_buff.mcfunction b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/damage_and_clear_buff.mcfunction
new file mode 100644
index 0000000000..66079adfbc
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/damage_and_clear_buff.mcfunction
@@ -0,0 +1,23 @@
+#> asset:artifact/1364.shaved_ice_strawberry/trigger/damage_and_clear_buff
+#
+#
+#
+# @within function asset:artifact/1364.shaved_ice_strawberry/trigger/3.main
+
+# 演出
+    playsound minecraft:block.amethyst_cluster.break player @a ~ ~ ~ 1 0.8
+
+# バフ解除
+    data modify storage api: Argument.ID set value 348
+    function api:entity/mob/effect/remove/from_id
+    function api:entity/mob/effect/reset
+
+# ダメージ
+    data modify storage api: Argument.Damage set value 10
+    data modify storage api: Argument.AttackType set value "Physical"
+    data modify storage api: Argument.ElementType set value "Water"
+    data modify storage api: Argument.FixedDamage set value true
+    data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sは頭がキーンとした","with":[{"selector":"@s"}]}]'
+    function api:damage/modifier
+    function api:damage/
+    function api:damage/reset
diff --git a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/heal_and_buff.mcfunction b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/heal_and_buff.mcfunction
new file mode 100644
index 0000000000..4652fa0f2d
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/trigger/heal_and_buff.mcfunction
@@ -0,0 +1,16 @@
+#> asset:artifact/1364.shaved_ice_strawberry/trigger/heal_and_buff
+#
+#
+#
+# @within function asset:artifact/1364.shaved_ice_strawberry/trigger/3.main
+
+# 体力を回復する
+    data modify storage api: Argument.Heal set value 5
+    function api:heal/modifier
+    function api:heal/
+    function api:heal/reset
+
+# バフ
+    data modify storage api: Argument.ID set value 348
+    function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset
diff --git a/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/1.trigger.mcfunction
new file mode 100644
index 0000000000..98cf5906dd
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/1.trigger.mcfunction
@@ -0,0 +1,7 @@
+#> asset:artifact/1365.shaved_ice_blue_hawaii/give/1.trigger
+#
+# 神器の取得処理の呼び出し時に実行されるfunction
+#
+# @within tag/function asset:artifact/give
+
+execute if data storage asset:context {id:1365} run function asset:artifact/1365.shaved_ice_blue_hawaii/give/2.give
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/2.give.mcfunction
new file mode 100644
index 0000000000..7dedd83386
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/2.give.mcfunction
@@ -0,0 +1,68 @@
+#> asset:artifact/1365.shaved_ice_blue_hawaii/give/2.give
+#
+# 神器の作成部 ここでID等を定義する
+#
+# @user
+# @within function asset:artifact/1365.shaved_ice_blue_hawaii/give/1.trigger
+
+# 神器の説明や消費MPなどをここで設定する。
+# 最後にasset:artifact/common/giveを実行することで入手可能。
+
+# 神器のID (int) スプレッドシートの値を入れる
+    data modify storage asset:artifact ID set value 1365
+# 神器のベースアイテム
+    data modify storage asset:artifact Item set value "minecraft:cookie"
+# 神器の名前 (TextComponentString)
+    data modify storage asset:artifact Name set value '{"text":"かき氷(ブルーハワイ)","color":"#36a1ff"}'
+# 神器の説明文 (TextComponentString[])
+    data modify storage asset:artifact Lore set value ['{"translate":"体力を5回復し、%1$sを10秒間得る","color":"white","with":[{"text":"水攻撃+6%","color":"aqua"}]}','{"translate":"-%1$s水攻撃バフは最大2スタックまで重複する","color":"white","with":[{"text":"\\u0003","font":"space"}]}','{"translate":"-%1$s3スタックになるとバフが解除され、10の固定ダメージを受ける","color":"white","with":[{"text":"\\u0003","font":"space"}]}']
+# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
+    # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}'
+    # data modify storage asset:artifact ConsumeItem.Count set value 1
+    # data modify storage asset:artifact ConsumeItem.Extra set value
+# 使用回数 (int) (オプション)
+    data modify storage asset:artifact RemainingCount set value 5
+# 神器を発動できるスロット (string) Wikiを参照
+    data modify storage asset:artifact Slot set value "auto"
+# 神器のトリガー (string) Wikiを参照
+    data modify storage asset:artifact Trigger set value "itemUse"
+# 神器の発動条件 (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
+# MP回復量 (int)
+    # data modify storage asset:artifact MPHealWhenHit set value
+# 神器のクールダウン (int) (オプション)
+    # data modify storage asset:artifact LocalCooldown set value
+# 種別クールダウン ({Type: string, Duration: int}) (オプション)
+    # data modify storage asset:artifact TypeCooldown.Type set value
+    # data modify storage asset:artifact TypeCooldown.Duration 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/1365.shaved_ice_blue_hawaii/register.mcfunction b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/register.mcfunction
new file mode 100644
index 0000000000..4730c9d23a
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/register.mcfunction
@@ -0,0 +1,8 @@
+#> asset:artifact/1365.shaved_ice_blue_hawaii/register
+#
+# 神器プールへの登録処理
+#
+# @within tag/function asset:artifact/register
+
+# 加工機ではなく日替わり商人に登録する
+# data modify storage asset:artifact RarityRegistry[4] append value [1365]
diff --git a/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/1.trigger.mcfunction
new file mode 100644
index 0000000000..e41fed84c1
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/1.trigger.mcfunction
@@ -0,0 +1,8 @@
+#> asset:artifact/1365.shaved_ice_blue_hawaii/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{auto:1365} run function asset:artifact/1365.shaved_ice_blue_hawaii/trigger/2.check_condition
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/2.check_condition.mcfunction
new file mode 100644
index 0000000000..adbbaf21dd
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/2.check_condition.mcfunction
@@ -0,0 +1,12 @@
+#> asset:artifact/1365.shaved_ice_blue_hawaii/trigger/2.check_condition
+#
+# 神器の発動条件をチェックします
+#
+# @within function asset:artifact/1365.shaved_ice_blue_hawaii/trigger/1.trigger
+
+# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く
+    function asset:artifact/common/check_condition/auto
+# 他にアイテム等確認する場合はここに書く
+    
+# CanUsedタグをチェックして3.main.mcfunctionを実行する
+    execute if entity @s[tag=CanUsed] run function asset:artifact/1365.shaved_ice_blue_hawaii/trigger/3.main
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/3.main.mcfunction
new file mode 100644
index 0000000000..ffdb77b80a
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/3.main.mcfunction
@@ -0,0 +1,22 @@
+#> asset:artifact/1365.shaved_ice_blue_hawaii/trigger/3.main
+#
+# 神器のメイン処理部
+#
+# @within function asset:artifact/1365.shaved_ice_blue_hawaii/trigger/2.check_condition
+
+# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う
+    function asset:artifact/common/use/auto
+
+# ここから先は神器側の効果の処理を書く
+
+# 他のかき氷のところの数値調整も忘れずに！！！！！！！！！！！
+
+# バフがあるかチェック
+    data modify storage api: Argument.ID set value 348
+    function api:entity/mob/effect/get/from_id
+
+# スタックがNでないなら回復とバフ
+    execute unless data storage api: Return.Effect{Stack:2} run function asset:artifact/1365.shaved_ice_blue_hawaii/trigger/heal_and_buff
+
+# スタックがNなら回復とバフ
+    execute if data storage api: Return.Effect{Stack:2} run function asset:artifact/1365.shaved_ice_blue_hawaii/trigger/damage_and_clear_buff
diff --git a/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/damage_and_clear_buff.mcfunction b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/damage_and_clear_buff.mcfunction
new file mode 100644
index 0000000000..27a64f4ace
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/damage_and_clear_buff.mcfunction
@@ -0,0 +1,23 @@
+#> asset:artifact/1365.shaved_ice_blue_hawaii/trigger/damage_and_clear_buff
+#
+#
+#
+# @within function asset:artifact/1365.shaved_ice_blue_hawaii/trigger/3.main
+
+# 演出
+    playsound minecraft:block.amethyst_cluster.break player @a ~ ~ ~ 1 0.8
+
+# バフ解除
+    data modify storage api: Argument.ID set value 348
+    function api:entity/mob/effect/remove/from_id
+    function api:entity/mob/effect/reset
+
+# ダメージ
+    data modify storage api: Argument.Damage set value 10
+    data modify storage api: Argument.AttackType set value "Physical"
+    data modify storage api: Argument.ElementType set value "Water"
+    data modify storage api: Argument.FixedDamage set value true
+    data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sは頭がキーンとした","with":[{"selector":"@s"}]}]'
+    function api:damage/modifier
+    function api:damage/
+    function api:damage/reset
diff --git a/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/heal_and_buff.mcfunction b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/heal_and_buff.mcfunction
new file mode 100644
index 0000000000..15c247c541
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/trigger/heal_and_buff.mcfunction
@@ -0,0 +1,16 @@
+#> asset:artifact/1365.shaved_ice_blue_hawaii/trigger/heal_and_buff
+#
+#
+#
+# @within function asset:artifact/1365.shaved_ice_blue_hawaii/trigger/3.main
+
+# 体力を回復する
+    data modify storage api: Argument.Heal set value 5
+    function api:heal/modifier
+    function api:heal/
+    function api:heal/reset
+
+# バフ
+    data modify storage api: Argument.ID set value 348
+    function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset
diff --git a/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/1.trigger.mcfunction
new file mode 100644
index 0000000000..c1c71f300c
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/1.trigger.mcfunction
@@ -0,0 +1,7 @@
+#> asset:artifact/1366.shaved_ice_melon/give/1.trigger
+#
+# 神器の取得処理の呼び出し時に実行されるfunction
+#
+# @within tag/function asset:artifact/give
+
+execute if data storage asset:context {id:1366} run function asset:artifact/1366.shaved_ice_melon/give/2.give
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/2.give.mcfunction
new file mode 100644
index 0000000000..3051a7c9c4
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/2.give.mcfunction
@@ -0,0 +1,68 @@
+#> asset:artifact/1366.shaved_ice_melon/give/2.give
+#
+# 神器の作成部 ここでID等を定義する
+#
+# @user
+# @within function asset:artifact/1366.shaved_ice_melon/give/1.trigger
+
+# 神器の説明や消費MPなどをここで設定する。
+# 最後にasset:artifact/common/giveを実行することで入手可能。
+
+# 神器のID (int) スプレッドシートの値を入れる
+    data modify storage asset:artifact ID set value 1366
+# 神器のベースアイテム
+    data modify storage asset:artifact Item set value "minecraft:cookie"
+# 神器の名前 (TextComponentString)
+    data modify storage asset:artifact Name set value '{"text":"かき氷(メロン)","color":"#33ff52"}'
+# 神器の説明文 (TextComponentString[])
+    data modify storage asset:artifact Lore set value ['{"translate":"体力を5回復し、%1$sを10秒間得る","color":"white","with":[{"text":"水攻撃+6%","color":"aqua"}]}','{"translate":"-%1$s水攻撃バフは最大2スタックまで重複する","color":"white","with":[{"text":"\\u0003","font":"space"}]}','{"translate":"-%1$s3スタックになるとバフが解除され、10の固定ダメージを受ける","color":"white","with":[{"text":"\\u0003","font":"space"}]}']
+# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
+    # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}'
+    # data modify storage asset:artifact ConsumeItem.Count set value 1
+    # data modify storage asset:artifact ConsumeItem.Extra set value
+# 使用回数 (int) (オプション)
+    data modify storage asset:artifact RemainingCount set value 5
+# 神器を発動できるスロット (string) Wikiを参照
+    data modify storage asset:artifact Slot set value "auto"
+# 神器のトリガー (string) Wikiを参照
+    data modify storage asset:artifact Trigger set value "itemUse"
+# 神器の発動条件 (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
+# MP回復量 (int)
+    # data modify storage asset:artifact MPHealWhenHit set value
+# 神器のクールダウン (int) (オプション)
+    # data modify storage asset:artifact LocalCooldown set value
+# 種別クールダウン ({Type: string, Duration: int}) (オプション)
+    # data modify storage asset:artifact TypeCooldown.Type set value
+    # data modify storage asset:artifact TypeCooldown.Duration 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/1366.shaved_ice_melon/register.mcfunction b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/register.mcfunction
new file mode 100644
index 0000000000..5a1df3a7df
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/register.mcfunction
@@ -0,0 +1,8 @@
+#> asset:artifact/1366.shaved_ice_melon/register
+#
+# 神器プールへの登録処理
+#
+# @within tag/function asset:artifact/register
+
+# 加工機ではなく日替わり商人に登録する
+# data modify storage asset:artifact RarityRegistry[4] append value [1366]
diff --git a/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/1.trigger.mcfunction
new file mode 100644
index 0000000000..54c9d5d1a7
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/1.trigger.mcfunction
@@ -0,0 +1,8 @@
+#> asset:artifact/1366.shaved_ice_melon/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{auto:1366} run function asset:artifact/1366.shaved_ice_melon/trigger/2.check_condition
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/2.check_condition.mcfunction
new file mode 100644
index 0000000000..c1edf5df1d
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/2.check_condition.mcfunction
@@ -0,0 +1,12 @@
+#> asset:artifact/1366.shaved_ice_melon/trigger/2.check_condition
+#
+# 神器の発動条件をチェックします
+#
+# @within function asset:artifact/1366.shaved_ice_melon/trigger/1.trigger
+
+# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く
+    function asset:artifact/common/check_condition/auto
+# 他にアイテム等確認する場合はここに書く
+    
+# CanUsedタグをチェックして3.main.mcfunctionを実行する
+    execute if entity @s[tag=CanUsed] run function asset:artifact/1366.shaved_ice_melon/trigger/3.main
\ No newline at end of file
diff --git a/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/3.main.mcfunction
new file mode 100644
index 0000000000..ac60da720c
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/3.main.mcfunction
@@ -0,0 +1,22 @@
+#> asset:artifact/1366.shaved_ice_melon/trigger/3.main
+#
+# 神器のメイン処理部
+#
+# @within function asset:artifact/1366.shaved_ice_melon/trigger/2.check_condition
+
+# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う
+    function asset:artifact/common/use/auto
+
+# ここから先は神器側の効果の処理を書く
+
+# 他のかき氷のところの数値調整も忘れずに！！！！！！！！！！！
+
+# バフがあるかチェック
+    data modify storage api: Argument.ID set value 348
+    function api:entity/mob/effect/get/from_id
+
+# スタックがNでないなら回復とバフ
+    execute unless data storage api: Return.Effect{Stack:2} run function asset:artifact/1366.shaved_ice_melon/trigger/heal_and_buff
+
+# スタックがNなら回復とバフ
+    execute if data storage api: Return.Effect{Stack:2} run function asset:artifact/1366.shaved_ice_melon/trigger/damage_and_clear_buff
diff --git a/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/damage_and_clear_buff.mcfunction b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/damage_and_clear_buff.mcfunction
new file mode 100644
index 0000000000..209304e529
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/damage_and_clear_buff.mcfunction
@@ -0,0 +1,23 @@
+#> asset:artifact/1366.shaved_ice_melon/trigger/damage_and_clear_buff
+#
+#
+#
+# @within function asset:artifact/1366.shaved_ice_melon/trigger/3.main
+
+# 演出
+    playsound minecraft:block.amethyst_cluster.break player @a ~ ~ ~ 1 0.8
+
+# バフ解除
+    data modify storage api: Argument.ID set value 348
+    function api:entity/mob/effect/remove/from_id
+    function api:entity/mob/effect/reset
+
+# ダメージ
+    data modify storage api: Argument.Damage set value 10
+    data modify storage api: Argument.AttackType set value "Physical"
+    data modify storage api: Argument.ElementType set value "Water"
+    data modify storage api: Argument.FixedDamage set value true
+    data modify storage api: Argument.DeathMessage append value '[{"translate": "%1$sは頭がキーンとした","with":[{"selector":"@s"}]}]'
+    function api:damage/modifier
+    function api:damage/
+    function api:damage/reset
diff --git a/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/heal_and_buff.mcfunction b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/heal_and_buff.mcfunction
new file mode 100644
index 0000000000..c7a4352dab
--- /dev/null
+++ b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/trigger/heal_and_buff.mcfunction
@@ -0,0 +1,16 @@
+#> asset:artifact/1366.shaved_ice_melon/trigger/heal_and_buff
+#
+#
+#
+# @within function asset:artifact/1366.shaved_ice_melon/trigger/3.main
+
+# 体力を回復する
+    data modify storage api: Argument.Heal set value 5
+    function api:heal/modifier
+    function api:heal/
+    function api:heal/reset
+
+# バフ
+    data modify storage api: Argument.ID set value 348
+    function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/_/end.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/_/end.mcfunction
new file mode 100644
index 0000000000..08c4a856b6
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/_/end.mcfunction
@@ -0,0 +1,7 @@
+#> asset:effect/0348.cool_feeling/_/end
+#
+# Effectの効果の終了時に実行されるfunction
+#
+# @within tag/function asset:effect/end
+
+execute if data storage asset:context {id:348} run function asset:effect/0348.cool_feeling/end/
\ No newline at end of file
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/_/given.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/_/given.mcfunction
new file mode 100644
index 0000000000..bd0d4797c9
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/_/given.mcfunction
@@ -0,0 +1,7 @@
+#> asset:effect/0348.cool_feeling/_/given
+#
+# Effectが付与された時に実行されるfunction
+#
+# @within tag/function asset:effect/given
+
+execute if data storage asset:context {id:348} run function asset:effect/0348.cool_feeling/given/
\ No newline at end of file
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/_/re-given.mcfunction
new file mode 100644
index 0000000000..607b91bb87
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/_/re-given.mcfunction
@@ -0,0 +1,7 @@
+#> asset:effect/0348.cool_feeling/_/re-given
+#
+# Effectが上書きされた時に実行されるfunction
+#
+# @within tag/function asset:effect/re-given
+
+execute if data storage asset:context {id:348} run function asset:effect/0348.cool_feeling/re-given/
\ No newline at end of file
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/_/register.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/_/register.mcfunction
new file mode 100644
index 0000000000..4f26fd24df
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/_/register.mcfunction
@@ -0,0 +1,7 @@
+#> asset:effect/0348.cool_feeling/_/register
+#
+#
+#
+# @within tag/function asset:effect/register
+
+execute if data storage asset:context {id:348} run function asset:effect/0348.cool_feeling/register
\ No newline at end of file
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/_/remove.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/_/remove.mcfunction
new file mode 100644
index 0000000000..23ffd7e05d
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/_/remove.mcfunction
@@ -0,0 +1,7 @@
+#> asset:effect/0348.cool_feeling/_/remove
+#
+# Effectが神器や牛乳によって削除された時に実行されるfunction
+#
+# @within tag/function asset:effect/remove
+
+execute if data storage asset:context {id:348} run function asset:effect/0348.cool_feeling/remove/
\ No newline at end of file
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/_/tick.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/_/tick.mcfunction
new file mode 100644
index 0000000000..fd4b930f9d
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/_/tick.mcfunction
@@ -0,0 +1,7 @@
+#> asset:effect/0348.cool_feeling/_/tick
+#
+# Effectが発動している間毎tick実行されるfunction
+#
+# @within tag/function asset:effect/tick
+
+execute if data storage asset:context {id:348} run function asset:effect/0348.cool_feeling/tick/
\ No newline at end of file
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/end/.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/end/.mcfunction
new file mode 100644
index 0000000000..e669916d09
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/end/.mcfunction
@@ -0,0 +1,8 @@
+#> asset:effect/0348.cool_feeling/end/
+#
+# Effectの効果が切れた時の処理
+#
+# @within function asset:effect/0348.cool_feeling/_/end
+
+# 補正を削除
+    function asset:effect/0348.cool_feeling/modifier/remove
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/given/.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/given/.mcfunction
new file mode 100644
index 0000000000..076bffd16c
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/given/.mcfunction
@@ -0,0 +1,8 @@
+#> asset:effect/0348.cool_feeling/given/
+#
+# Effectが付与された時の処理
+#
+# @within function asset:effect/0348.cool_feeling/_/given
+
+# 補正を付与
+    function asset:effect/0348.cool_feeling/modifier/add
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/modifier/add.mcfunction
new file mode 100644
index 0000000000..a0bb397456
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/modifier/add.mcfunction
@@ -0,0 +1,13 @@
+#> asset:effect/0348.cool_feeling/modifier/add
+#
+#
+#
+# @within function
+#   asset:effect/0348.cool_feeling/given/
+#   asset:effect/0348.cool_feeling/re-given/
+
+# 水攻撃
+    data modify storage api: Argument.UUID set from storage asset:context this.UUID
+    execute store result storage api: Argument.Amount double 0.06 run data get storage asset:context Stack
+    data modify storage api: Argument.Operation set value "multiply"
+    function api:modifier/attack/water/add
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/modifier/remove.mcfunction
new file mode 100644
index 0000000000..ae1940d9a7
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/modifier/remove.mcfunction
@@ -0,0 +1,12 @@
+#> asset:effect/0348.cool_feeling/modifier/remove
+#
+#
+#
+# @within function
+#   asset:effect/0348.cool_feeling/end/
+#   asset:effect/0348.cool_feeling/re-given/
+#   asset:effect/0348.cool_feeling/remove/
+
+# 水攻撃
+    data modify storage api: Argument.UUID set from storage asset:context this.UUID
+    function api:modifier/attack/water/remove
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/re-given/.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/re-given/.mcfunction
new file mode 100644
index 0000000000..1486a41fba
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/re-given/.mcfunction
@@ -0,0 +1,9 @@
+#> asset:effect/0348.cool_feeling/re-given/
+#
+# Effectが上書きされた時の処理
+#
+# @within function asset:effect/0348.cool_feeling/_/re-given
+
+# 補正を更新
+    function asset:effect/0348.cool_feeling/modifier/remove
+    function asset:effect/0348.cool_feeling/modifier/add
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/register.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/register.mcfunction
new file mode 100644
index 0000000000..eff6b958f3
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/register.mcfunction
@@ -0,0 +1,40 @@
+#> asset:effect/0348.cool_feeling/register
+#
+# Effectのデータを指定
+#
+# @within function asset:effect/0348.cool_feeling/_/register
+
+# ExtendsSafe (boolean) (default = false)
+    # data modify storage asset:effect ExtendsSafe set value true
+# ID (int)
+    data modify storage asset:effect ID set value 348
+# 名前 (TextComponentString)
+    data modify storage asset:effect Name set value '{"text":"清涼感","color":"aqua"}'
+# 説明文 (TextComponentString[])
+    data modify storage asset:effect Description set value ['{"text":"水属性与ダメージが上昇するが","color":"white"}','{"text":"スタックが一定値になるとバフ効果が解除され、移動速度が低下する。","color":"white"}']
+# 効果時間 (int) (default = API || error)
+    data modify storage asset:effect Duration set value 200
+# スタック (int) (default = API || 1)
+    # data modify storage asset:effect Stack set value
+# 効果時間の操作方法 (default = API || "replace")
+    # data modify storage asset:effect DurationOperation set value
+# スタックの操作方法 (default = API || "replace")
+    data modify storage asset:effect StackOperation set value "add"
+# 最大効果時間 (int) (default = 2147483647)
+    # data modify storage asset:effect MaxDuration set value
+# 最大スタック (int) (default = 2147483647)
+    # data modify storage asset:effect MaxStack set value 3
+# 悪い効果か否か (boolean)
+    data modify storage asset:effect IsBadEffect set value false
+# 死亡時のエフェクトの処理 (default = "remove")
+    # data modify storage asset:effect ProcessOnDied set value
+# 消すのに必要なレベル (int) (default = 1)
+    data modify storage asset:effect RequireClearLv set value 3
+# エフェクトをUIに表示するか (boolean) (default = true)
+    # data modify storage asset:effect Visible set value
+# エフェクトのスタックををUIに表示するか (boolean) (default = true)
+    # data modify storage asset:effect StackVisible set value
+
+# フィールド
+    data modify storage asset:effect Field.UUID set value [I;1,3,348,0]
+    data modify storage asset:effect Field.MaxStack set value 3
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/remove/.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/remove/.mcfunction
new file mode 100644
index 0000000000..257c45dfd7
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/remove/.mcfunction
@@ -0,0 +1,8 @@
+#> asset:effect/0348.cool_feeling/remove/
+#
+# Effectが削除された時の処理
+#
+# @within function asset:effect/0348.cool_feeling/_/remove
+
+# 補正を削除
+    function asset:effect/0348.cool_feeling/modifier/remove
diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/tick/.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/tick/.mcfunction
new file mode 100644
index 0000000000..4c63a05449
--- /dev/null
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/tick/.mcfunction
@@ -0,0 +1,8 @@
+#> asset:effect/0348.cool_feeling/tick/
+#
+# Effectのtick処理
+#
+# @within function asset:effect/0348.cool_feeling/_/tick
+
+# 演出
+    execute if predicate lib:random_pass_per/30 run particle dust 0.4 1 1 0.4 ~ ~1.2 ~ 0.4 0.4 0.4 0 1
diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json
index bf0d285419..ab601a3961 100644
--- a/Asset/data/asset/tags/functions/artifact/give.json
+++ b/Asset/data/asset/tags/functions/artifact/give.json
@@ -1,5 +1,7 @@
 {
     "values": [
+        "asset:artifact/1366.shaved_ice_melon/give/1.trigger",
+        "asset:artifact/1365.shaved_ice_blue_hawaii/give/1.trigger",
         "asset:artifact/1364.shaved_ice_strawberry/give/1.trigger",
         "asset:artifact/1140.over_pulse_booster/give/1.trigger",
         "asset:artifact/1139.over_pulse_legframe/give/1.trigger",
diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json
index 9bc6c24586..371ae23a45 100644
--- a/Asset/data/asset/tags/functions/artifact/register.json
+++ b/Asset/data/asset/tags/functions/artifact/register.json
@@ -1,5 +1,7 @@
 {
     "values": [
+        "asset:artifact/1365.shaved_ice_blue_hawaii/register",
+        "asset:artifact/1366.shaved_ice_melon/register",
         "asset:artifact/1364.shaved_ice_strawberry/register",
         "asset:artifact/1137.over_pulse_headgear/register",
         "asset:artifact/1228.fatalerror/register",
diff --git a/Asset/data/asset/tags/functions/artifact/use_item.json b/Asset/data/asset/tags/functions/artifact/use_item.json
index bf4df1cb03..f928b782a8 100644
--- a/Asset/data/asset/tags/functions/artifact/use_item.json
+++ b/Asset/data/asset/tags/functions/artifact/use_item.json
@@ -1,5 +1,7 @@
 {
     "values": [
+        "asset:artifact/1366.shaved_ice_melon/trigger/1.trigger",
+        "asset:artifact/1365.shaved_ice_blue_hawaii/trigger/1.trigger",
         "asset:artifact/1364.shaved_ice_strawberry/trigger/1.trigger",
         "asset:artifact/0185.increased_cookie/trigger/1.trigger",
         "asset:artifact/1116.honey_tart/trigger/1.trigger",
diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json
index 81710cbe5a..3ea2990df5 100644
--- a/Asset/data/asset/tags/functions/effect/end.json
+++ b/Asset/data/asset/tags/functions/effect/end.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:effect/0348.cool_feeling/_/end",
         "asset:effect/0025.levitation/_/end",
         "asset:effect/0621.loyalty_shield/_/end",
         "asset:effect/0653.absolute_drive/_/end",
@@ -103,4 +104,4 @@
         "asset:effect/0007.defense_base_debuff/_/end",
         "asset:effect/0258.spirit_melody/_/end"
     ]
-}
\ No newline at end of file
+}
diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json
index c20c6c5587..18092c874d 100644
--- a/Asset/data/asset/tags/functions/effect/given.json
+++ b/Asset/data/asset/tags/functions/effect/given.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:effect/0348.cool_feeling/_/given",
         "asset:effect/0315.charge_of_aurora_scythe/_/given",
         "asset:effect/0621.loyalty_shield/_/given",
         "asset:effect/0653.absolute_drive/_/given",
@@ -97,4 +98,4 @@
         "asset:effect/0007.defense_base_debuff/_/given",
         "asset:effect/0258.spirit_melody/_/given"
     ]
-}
\ No newline at end of file
+}
diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json
index baf0379fc2..c32641d203 100644
--- a/Asset/data/asset/tags/functions/effect/re-given.json
+++ b/Asset/data/asset/tags/functions/effect/re-given.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:effect/0348.cool_feeling/_/re-given",
         "asset:effect/0029.poison/_/re-given",
         "asset:effect/0030.wither/_/re-given",
         "asset:effect/0621.loyalty_shield/_/re-given",
@@ -59,4 +60,4 @@
         "asset:effect/0007.defense_base_debuff/_/re-given",
         "asset:effect/0258.spirit_melody/_/re-given"
     ]
-}
\ No newline at end of file
+}
diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json
index 2df8839cf1..3aa90a817d 100644
--- a/Asset/data/asset/tags/functions/effect/register.json
+++ b/Asset/data/asset/tags/functions/effect/register.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:effect/0348.cool_feeling/_/register",
         "asset:effect/0025.levitation/_/register",
         "asset:effect/0247.great_demon_armor/_/register",
         "asset:effect/0246.flame_devil_armor/_/register",
diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json
index 3e8ceea4eb..cac2a88b14 100644
--- a/Asset/data/asset/tags/functions/effect/remove.json
+++ b/Asset/data/asset/tags/functions/effect/remove.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:effect/0348.cool_feeling/_/remove",
         "asset:effect/0025.levitation/_/remove",
         "asset:effect/0245.flame_hunter_attire/_/remove",
         "asset:effect/0255.kaguya_s_difficulties/_/remove",
@@ -111,4 +112,4 @@
         "asset:effect/0007.defense_base_debuff/_/remove",
         "asset:effect/0258.spirit_melody/_/remove"
     ]
-}
\ No newline at end of file
+}
diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json
index 8a5fbd5389..675614e8ff 100644
--- a/Asset/data/asset/tags/functions/effect/tick.json
+++ b/Asset/data/asset/tags/functions/effect/tick.json
@@ -1,5 +1,6 @@
 {
     "values": [
+        "asset:effect/0348.cool_feeling/_/tick",
         "asset:effect/0025.levitation/_/tick",
         "asset:effect/0244.aurora_armor/_/tick",
         "asset:effect/0243.oblivious_snow/_/tick",
@@ -97,4 +98,4 @@
         "asset:effect/0279.poison_of_vinderre/_/tick",
         "asset:effect/0258.spirit_melody/_/tick"
     ]
-}
\ No newline at end of file
+}

From f3562166622d85a5d00747a8331a38904b403bb2 Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 24 Jan 2026 19:23:05 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=E7=A0=B4=E5=A3=8A=E6=99=82=E3=81=AE?=
 =?UTF-8?q?=E9=9F=B3=E3=82=92=E9=B3=B4=E3=82=89=E3=81=95=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction  | 2 +-
 .../artifact/1365.shaved_ice_blue_hawaii/give/2.give.mcfunction | 2 +-
 .../artifact/1366.shaved_ice_melon/give/2.give.mcfunction       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction
index 8ff0ce79c6..e244a539a2 100644
--- a/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/1364.shaved_ice_strawberry/give/2.give.mcfunction
@@ -58,7 +58,7 @@
 # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション)
     # data modify storage asset:artifact DisableMPMessage set value
 # 破壊時の音を鳴らさないかどうか (boolean) (オプション)
-    # data modify storage asset:artifact DisableBreakSound set value
+    data modify storage asset:artifact DisableBreakSound set value true
 # 扱える神 (string[]) Wikiを参照
     data modify storage asset:artifact CanUsedGod set value "ALL"
 # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション)
diff --git a/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/2.give.mcfunction
index 7dedd83386..38157ad1bf 100644
--- a/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/1365.shaved_ice_blue_hawaii/give/2.give.mcfunction
@@ -58,7 +58,7 @@
 # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション)
     # data modify storage asset:artifact DisableMPMessage set value
 # 破壊時の音を鳴らさないかどうか (boolean) (オプション)
-    # data modify storage asset:artifact DisableBreakSound set value
+    data modify storage asset:artifact DisableBreakSound set value true
 # 扱える神 (string[]) Wikiを参照
     data modify storage asset:artifact CanUsedGod set value "ALL"
 # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション)
diff --git a/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/2.give.mcfunction
index 3051a7c9c4..9a8081c31f 100644
--- a/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/2.give.mcfunction
+++ b/Asset/data/asset/functions/artifact/1366.shaved_ice_melon/give/2.give.mcfunction
@@ -58,7 +58,7 @@
 # MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション)
     # data modify storage asset:artifact DisableMPMessage set value
 # 破壊時の音を鳴らさないかどうか (boolean) (オプション)
-    # data modify storage asset:artifact DisableBreakSound set value
+    data modify storage asset:artifact DisableBreakSound set value true
 # 扱える神 (string[]) Wikiを参照
     data modify storage asset:artifact CanUsedGod set value "ALL"
 # カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション)

From 01b4197ad09b98c30dbf6b42fcf00f78eac0f43d Mon Sep 17 00:00:00 2001
From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com>
Date: Sat, 24 Jan 2026 19:31:29 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=E3=82=A8=E3=83=95=E3=82=A7=E3=82=AF?=
 =?UTF-8?q?=E3=83=88=E3=81=AE=E8=AA=AC=E6=98=8E=E6=96=87=E3=82=92=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functions/effect/0348.cool_feeling/register.mcfunction      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Asset/data/asset/functions/effect/0348.cool_feeling/register.mcfunction b/Asset/data/asset/functions/effect/0348.cool_feeling/register.mcfunction
index eff6b958f3..3580ed5e35 100644
--- a/Asset/data/asset/functions/effect/0348.cool_feeling/register.mcfunction
+++ b/Asset/data/asset/functions/effect/0348.cool_feeling/register.mcfunction
@@ -11,7 +11,7 @@
 # 名前 (TextComponentString)
     data modify storage asset:effect Name set value '{"text":"清涼感","color":"aqua"}'
 # 説明文 (TextComponentString[])
-    data modify storage asset:effect Description set value ['{"text":"水属性与ダメージが上昇するが","color":"white"}','{"text":"スタックが一定値になるとバフ効果が解除され、移動速度が低下する。","color":"white"}']
+    data modify storage asset:effect Description set value ['{"text":"水属性与ダメージが上昇するが","color":"white"}','{"text":"スタックが一定値になるとバフ効果が解除され、固定ダメージを受ける","color":"white"}']
 # 効果時間 (int) (default = API || error)
     data modify storage asset:effect Duration set value 200
 # スタック (int) (default = API || 1)