ProjectTSB · haiiro2gou · Mar 20, 2025 · Jan 29, 2025 · Jan 29, 2025 · Mar 6, 2025
diff --git a/Asset/data/asset/functions/artifact/0012.sketchy_herb/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0012.sketchy_herb/trigger/3.main.mcfunction
@@ -13,8 +13,25 @@
     effect give @s minecraft:strength 60 10 true
     effect give @s minecraft:resistance 60 1 true
     effect give @s minecraft:nausea 60 0 true
-    effect give @s minecraft:poison 15 3 true
-    effect give @s minecraft:instant_damage 1 1 true
+
+# 毒
+    data modify storage api: Argument.ID set value 29
+    data modify storage api: Argument.Stack set value 4
+    data modify storage api: Argument.Duration set value 300
+    function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset
+
+# ダメージ
+    data modify storage api: Argument.Damage set value 6
+    data modify storage api: Argument.BypassModifier set value true
+    function api:damage/modifier
+    data modify storage api: Argument.BypassArmorDefense set value true
+    data modify storage api: Argument.BypassArmorToughness set value true
+    data modify storage api: Argument.BypassEnchantments set value true
+    data modify storage api: Argument.BypassDifficulty set value true
+    data modify storage api: Argument.DeathMessage set value ['{"translate":"%1$s はハッパの中毒性に耐えられなかった","with":[{"selector":"@s"}]}']
+    function api:damage/
+    function api:damage/reset
 
 # 演出
     particle minecraft:smoke ~ ~ ~ 1 1 1 0.1 500 force @s

diff --git a/Asset/data/asset/functions/artifact/0190.amor_wand/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0190.amor_wand/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"アモールの杖","color":"aqua"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"周囲のプレイヤーの体力を少しだけ回復する"}']
+    data modify storage asset:artifact Lore set value ['{"text":"自身と周囲8mのプレイヤーの体力を7.0回復し"}','{"text":"その後10秒間かけて15.0回復する"}']
 # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
     # data modify storage asset:artifact ConsumeItem.Item set value
     # data modify storage asset:artifact ConsumeItem.Count set value
@@ -41,14 +41,14 @@
 # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション)
     # data modify storage asset:artifact AttackInfo.AttackRange set value
 # MP消費量 (int)
-    data modify storage asset:artifact MPCost set value 22
+    data modify storage asset:artifact MPCost set value 40
 # MP必要量 (int) (オプション)
     # data modify storage asset:artifact MPRequire set value
 # 神器のクールダウン (int) (オプション)
     # data modify storage asset:artifact LocalCooldown set value 160
 # 種別クールダウン ({Type: string, Duration: int}) (オプション)
     data modify storage asset:artifact TypeCooldown.Type set value "heal"
-    data modify storage asset:artifact TypeCooldown.Duration set value 76
+    data modify storage asset:artifact TypeCooldown.Duration set value 80
 # グローバルクールダウン (int) (オプション)
     # data modify storage asset:artifact SpecialCooldown set value
 # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション)

diff --git a/Asset/data/asset/functions/artifact/0190.amor_wand/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0190.amor_wand/trigger/3.main.mcfunction
@@ -15,9 +15,15 @@
     execute positioned ~ ~4 ~ run function asset:artifact/0190.amor_wand/trigger/vfx/
 
 # 回復
-    data modify storage api: Argument.Heal set value 8.4
+    data modify storage api: Argument.Heal set value 7.0f
     function api:heal/modifier
     execute as @a[distance=..8] run function api:heal/
-
-# リセット
     function api:heal/reset
+
+# 再生
+    data modify storage api: Argument.ID set value 301
+    data modify storage api: Argument.Stack set value 1
+    execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID
+    data modify storage api: Argument.FieldOverride.Heal set value 1.5
+    execute as @a[distance=..8] run function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset
diff --git a/Asset/data/asset/functions/artifact/0191.horus_wand/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0191.horus_wand/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"ホルスの杖","color":"gold"}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"周囲のプレイヤーの体力をそこそこ回復する"}']
+    data modify storage asset:artifact Lore set value ['{"text":"自身と周囲8mのプレイヤーの体力を17.0回復し"}','{"text":"その後10秒間かけて24.0回復する"}']
 # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
     # data modify storage asset:artifact ConsumeItem.Item set value
     # data modify storage asset:artifact ConsumeItem.Count set value
@@ -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 72
+    data modify storage asset:artifact MPCost set value 65
 # MP必要量 (int) (オプション)
     # data modify storage asset:artifact MPRequire set value
 # 神器のクールダウン (int) (オプション)

diff --git a/Asset/data/asset/functions/artifact/0191.horus_wand/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0191.horus_wand/trigger/3.main.mcfunction
@@ -15,10 +15,15 @@
     execute positioned ~ ~4 ~ run function asset:artifact/0191.horus_wand/trigger/vfx/
 
 # 回復
-    data modify storage api: Argument.Heal set value 15
+    data modify storage api: Argument.Heal set value 17.0f
     function api:heal/modifier
     execute as @a[distance=..8] run function api:heal/
-    effect give @a[distance=..8] regeneration 15 2 true
-
-# リセット
     function api:heal/reset
+
+# 再生
+    data modify storage api: Argument.ID set value 301
+    data modify storage api: Argument.Stack set value 2
+    execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID
+    data modify storage api: Argument.FieldOverride.Heal set value 2.4
+    execute as @a[distance=..8] run function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset
diff --git a/Asset/data/asset/functions/artifact/0192.falcios_wand/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/0192.falcios_wand/give/2.give.mcfunction
@@ -15,7 +15,7 @@
 # 神器の名前 (TextComponentString)
     data modify storage asset:artifact Name set value '{"text":"ファルシオスの杖","color":"white","bold":true}'
 # 神器の説明文 (TextComponentString[])
-    data modify storage asset:artifact Lore set value ['{"text":"周囲のプレイヤーの体力を大きく回復する"}']
+    data modify storage asset:artifact Lore set value ['{"text":"自身と周囲8mのプレイヤーの体力を28.0回復し"}','{"text":"その後10秒間かけて30.0回復する"}']
 # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション)
     # data modify storage asset:artifact ConsumeItem.Item set value
     # data modify storage asset:artifact ConsumeItem.Count set value
@@ -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 82
+    data modify storage asset:artifact MPCost set value 80
 # MP必要量 (int) (オプション)
     # data modify storage asset:artifact MPRequire set value
 # 神器のクールダウン (int) (オプション)

diff --git a/Asset/data/asset/functions/artifact/0192.falcios_wand/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0192.falcios_wand/trigger/3.main.mcfunction
@@ -15,10 +15,15 @@
     execute positioned ~ ~4 ~ run function asset:artifact/0192.falcios_wand/trigger/vfx/
 
 # 回復
-    data modify storage api: Argument.Heal set value 26
+    data modify storage api: Argument.Heal set value 28.0f
     function api:heal/modifier
     execute as @a[distance=..8] run function api:heal/
-    effect give @a[distance=..8] regeneration 15 2 true
-
-# リセット
     function api:heal/reset
+
+# 再生
+    data modify storage api: Argument.ID set value 301
+    data modify storage api: Argument.Stack set value 3
+    execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID
+    data modify storage api: Argument.FieldOverride.Heal set value 3.0
+    execute as @a[distance=..8] run function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset
diff --git a/Asset/data/asset/functions/artifact/0252.void_transaction/register.mcfunction b/Asset/data/asset/functions/artifact/0252.void_transaction/register.mcfunction
@@ -4,4 +4,5 @@
 #
 # @within tag/function asset:artifact/register
 
-data modify storage asset:artifact RarityRegistry[3] append value [252]
+# 一時的な封印指定
+# data modify storage asset:artifact RarityRegistry[3] append value [252]
diff --git a/...ta/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/awful_taste.mcfunction b/...ta/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/awful_taste.mcfunction
@@ -1,17 +1,20 @@
 #> asset:artifact/0437.only_the_crabs_know/trigger/taste/awful_taste
 #
-# MP減少,毒 + 酷い味だ
+# 毒 & MP減少 (酷い味だ)
 #
 # @within function asset:artifact/0437.only_the_crabs_know/trigger/3.main
 
-# MP減少
-    # 減少する量 = 50
-        data modify storage api: Argument.Fluctuation set value -50
-        function api:mp/fluctuation
-
-# 毒
-    effect give @s poison 15 2 true
-
 # 演出
     tellraw @a[distance=..10] [{"selector":"@s","bold":true},{"text":"は酷い味だと酷評した"}]
     playsound entity.llama.ambient player @a ~ ~ ~ 1.0 1.0
+
+# 毒
+    data modify storage api: Argument.ID set value 29
+    data modify storage api: Argument.Stack set value 3
+    data modify storage api: Argument.Duration set value 300
+    function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset
+
+# MP減少
+    data modify storage api: Argument.Fluctuation set value -50
+    function api:mp/fluctuation
diff --git a/...asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/excellent_soup.mcfunction b/...asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/excellent_soup.mcfunction
@@ -1,22 +1,21 @@
 #> asset:artifact/0437.only_the_crabs_know/trigger/taste/excellent_soup
 #
-# HP,MP回復 + うまいっ！
+# HPMP回復 (うまいっ！)
 #
 # @within function asset:artifact/0437.only_the_crabs_know/trigger/3.main
 
-# HP回復
-    # 回復する量 = 20
-        data modify storage api: Argument.Heal set value 20f
-        function api:heal/modifier
-        function api:heal/
-    # リセット
-        function api:heal/reset
-
-# MP回復
-    # 回復する量 = 50
-        data modify storage api: Argument.Fluctuation set value 50
-        function api:mp/fluctuation
-
 # 演出
     tellraw @a[distance=..10] [{"selector":"@s","bold":true},{"text":"はうまいっ！ と賞賛した"}]
     playsound entity.experience_orb.pickup player @a ~ ~ ~ 1.0 2.0
+
+# HP回復
+    data modify storage api: Argument.Heal set value 20f
+    data modify storage api: Argument.FixedHeal set value true
+    function api:heal/modifier
+    data modify storage api: Argument.FixedHeal set value false
+    function api:heal/
+    function api:heal/reset
+
+# MP回復
+    data modify storage api: Argument.Fluctuation set value 50
+    function api:mp/fluctuation
diff --git a/...ta/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/great_stock.mcfunction b/...ta/asset/functions/artifact/0437.only_the_crabs_know/trigger/taste/great_stock.mcfunction
@@ -1,18 +1,23 @@
 #> asset:artifact/0437.only_the_crabs_know/trigger/taste/great_stock
-# 回復,リジェネ + 出汁美味
+#
+# 回復 & リジェネ (出汁美味)
 #
 # @within function asset:artifact/0437.only_the_crabs_know/trigger/3.main
 
 # HP回復
-    # 回復する量 = 10
-        data modify storage api: Argument.Heal set value 10f
-        function api:heal/modifier
-        function api:heal/
-    # リセット
-        function api:heal/reset
+    data modify storage api: Argument.Heal set value 10f
+    data modify storage api: Argument.FixedHeal set value true
+    function api:heal/modifier
+    data modify storage api: Argument.FixedHeal set value false
+    function api:heal/
+    function api:heal/reset
 
 # リジェネ
-    effect give @s regeneration 600 3 true
+    data modify storage api: Argument.ID set value 84
+    data modify storage api: Argument.Stack set value 4
+    data modify storage api: Argument.Duration set value 12000
+    function api:entity/mob/effect/give
+    function api:entity/mob/effect/reset
 
 # 演出
     tellraw @a[distance=..10] [{"selector":"@s","bold":true},{"text":"は出汁が良く出ていると絶賛した"}]

diff --git a/...set/functions/artifact/0437.only_the_crabs_know/trigger/taste/heavenly_feeling.mcfunction b/...set/functions/artifact/0437.only_the_crabs_know/trigger/taste/heavenly_feeling.mcfunction
@@ -1,25 +1,22 @@
 #> asset:artifact/0437.only_the_crabs_know/trigger/taste/heavenly_feeling
 #
-# 初期ワープ,HPMP全快 + 天国にのぼるような
+# 初期リスワープ & HPMP全快 (天国にのぼるような)
 #
 # @within function asset:artifact/0437.only_the_crabs_know/trigger/3.main
 
+# 演出
+    tellraw @a [{"selector":"@s","bold":true},{"text":"は天国に上るような錯覚がした"}]
+    playsound ui.toast.challenge_complete player @a 23 3 24 1.0 1.2
+
 # 初期地点ワープ
     execute in minecraft:overworld run tp @s 23 3 24
 
 # HP、MP全快
-    # HP回復
-        function api:modifier/max_health/get
-        data modify storage api: Argument.Heal set from storage api: Return.MaxHealth
-        data modify storage api: Argument.FixedHeal set value true
-        function api:heal/modifier
-        function api:heal/
-        function api:heal/reset
+    execute store result storage api: Argument.Heal double 0.01 run data get storage api: Return.MaxHealth 100
+    data modify storage api: Argument.FixedHeal set value true
+    function api:heal/modifier
+    function api:heal/
+    function api:heal/reset
 
-    # MP回復
-        data modify storage api: Argument.Fluctuation set value 10000
-        function api:mp/fluctuation
-
-# 演出
-    tellraw @a [{"selector":"@s","bold":true},{"text":"は天国に上るような錯覚がした"}]
-    playsound ui.toast.challenge_complete player @a 23 3 24 1.0 1.2
+    data modify storage api: Argument.Fluctuation set value 10000
+    function api:mp/fluctuation
diff --git a/...sset/functions/artifact/0437.only_the_crabs_know/trigger/taste/sanity_decrease.mcfunction b/...sset/functions/artifact/0437.only_the_crabs_know/trigger/taste/sanity_decrease.mcfunction
@@ -1,6 +1,6 @@
 #> asset:artifact/0437.only_the_crabs_know/trigger/taste/sanity_decrease
 #
-# HP減少MP回復 + 正気度減少
+# HP減少MP回復 (正気度減少)
 #
 # @within function asset:artifact/0437.only_the_crabs_know/trigger/3.main
 
@@ -9,16 +9,14 @@
     playsound entity.squid.death player @a ~ ~ ~ 1.0 1.5
 
 # HP減少
-    # 防御無視・補正なし・魔法・無属性の15のダメージを与える
-        data modify storage api: Argument.Damage set value 15f
-        data modify storage api: Argument.AttackType set value "Magic"
-        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
+    data modify storage api: Argument.Damage set value 15f
+    data modify storage api: Argument.AttackType set value "Magic"
+    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
 
 # MP回復
-    # 回復する量 = 100
-        data modify storage api: Argument.Fluctuation set value 100
-        function api:mp/fluctuation
+    data modify storage api: Argument.Fluctuation set value 100
+    function api:mp/fluctuation
diff --git a/Asset/data/asset/functions/artifact/0563.heartland/trigger/0.load.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/trigger/0.load.mcfunction
@@ -0,0 +1,9 @@
+#> asset:artifact/0563.heartland/trigger/0.load
+#
+# 神器に利用するスコアボード等の初期化処理
+#
+# @within tag/function asset:artifact/load
+
+#> 定義類はここに
+# @within function asset:artifact/0563.heartland/trigger/**
+    scoreboard objectives add FN.LatestFullEffect dummy
diff --git a/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/foreach.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/foreach.mcfunction
@@ -0,0 +1,13 @@
+#> asset:artifact/0563.heartland/trigger/fullset/tick/foreach
+#
+#
+#
+# @within function asset:artifact/0563.heartland/trigger/fullset/tick/main
+
+data modify storage api: Argument.ID set value 266
+function api:entity/mob/effect/get/from_id
+execute if data storage api: Return.Effect run return fail
+
+data modify storage api: Argument.ID set value 266
+function api:entity/mob/effect/give
+function api:entity/mob/effect/reset
diff --git a/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/main.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/main.mcfunction
@@ -4,5 +4,13 @@
 #
 # @within function asset:artifact/0563.heartland/trigger/fullset/tick/trigger
 
-# 周囲5mのプレイヤーに既に自然回復エフェクトが付与されているかどうかを検知し、自然回復エフェクトを付与
-    execute as @a[distance=..5] if predicate asset:artifact/0563.heartland/regene_check run effect give @a[distance=..5] regeneration 15 1 false
+#> private
+# @private
+    #declare score_holder $FN.Temp
+
+# 1秒に1回
+    execute store result score $FN.Temp Temporary run data get storage global Time
+    scoreboard players operation $FN.Temp Temporary -= @s FN.LatestFullEffect
+    execute if score $FN.Temp Temporary matches 20.. as @a[distance=..5] run function asset:artifact/0563.heartland/trigger/fullset/tick/foreach
+    execute if score $FN.Temp Temporary matches 20.. store result score @s FN.LatestFullEffect run data get storage global Time
+    scoreboard players reset $FN.Temp Temporary
diff --git a/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/trigger.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/trigger/fullset/tick/trigger.mcfunction
@@ -4,4 +4,4 @@
 #
 # @within tag/function asset:artifact/tick
 
-    execute if entity @s[tag=FN.Fullset] run function asset:artifact/0563.heartland/trigger/fullset/tick/main
+execute if entity @s[tag=FN.Fullset] run function asset:artifact/0563.heartland/trigger/fullset/tick/main
diff --git a/...on_head/trigger/tick/1.trigger.mcfunction → ...great_demon_head/trigger/tick/.mcfunction b/...on_head/trigger/tick/1.trigger.mcfunction → ...great_demon_head/trigger/tick/.mcfunction
@@ -1,8 +1,8 @@
-#> asset:artifact/1057.great_demon_head/trigger/tick/1.trigger
+#> asset:artifact/1057.great_demon_head/trigger/tick/
 #
 # フルセット時の毎Tick処理
 #
 # @within tag/function asset:artifact/tick
 
 # フルセットなら実行
-    execute if data storage asset:context id{head:1057} if score @s TD.EquipCount matches 4 run function asset:artifact/1057.great_demon_head/trigger/tick/2.heal
+    execute if data storage asset:context id{head:1057} if score @s TD.EquipCount matches 4 run function asset:artifact/1057.great_demon_head/trigger/tick/check