diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/1.trigger.mcfunction new file mode 100644 index 00000000000..4762da41c00 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1492.your_thoughts_frames/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1492} run function asset:artifact/1492.your_thoughts_frames/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction new file mode 100644 index 00000000000..642e2db85dd --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1492.your_thoughts_frames/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1492.your_thoughts_frames/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1492 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"『故","color":"#DAA1FF"},{"text":"想","color":"#DAA1FF"},{"text":"の","color":"#C5A5FF"},{"text":"額","color":"#B8A8FF"},{"text":"縁』","color":"#9EAEFF"}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"発動時、敵が”気持ちの欠片”を近くに落とす"}','{"text":"気持ちの欠片に触れたプレイヤーはHPを5回復し"}','{"text":"10秒間MP回復量が+5%上昇する"}','{"text":"「まだ喉元に噛みつく牙はある?」","color":"gray"}'] +# 消費アイテム ({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 +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "offhand" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onAttack" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"神器による攻撃時に3.1416%の確率で発動"}' +# 攻撃に関する情報 -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 +# 神器のクールダウン + data modify storage asset:artifact LocalCooldown set value 20 +# 種別クールダウン ({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 true +# 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/1492.your_thoughts_frames/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..26ce2ad4e18 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1492.your_thoughts_frames/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのoffhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{offhand:1492} run function asset:artifact/1492.your_thoughts_frames/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..a48c5a12db3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/2.check_condition.mcfunction @@ -0,0 +1,23 @@ +#> asset:artifact/1492.your_thoughts_frames/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1492.your_thoughts_frames/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/offhand + +# IsDoT:trueならCanUsedを削除 + execute if entity @s[tag=CanUsed] if data storage asset:context Attack{IsDoT:true} run tag @s remove CanUsed +# バニラ攻撃の場合はCanUsedを削除 + execute if data storage asset:context Attack{IsVanilla:1b} run tag @s remove CanUsed +# 64ブロック以内に攻撃対象がいなければCanUsedを削除 + execute unless entity @e[type=#lib:living,type=!player,tag=Victim,distance=..64,limit=1] run tag @s remove CanUsed + +# 3.1416%の確率でCanUsedを残す(7%*51%*88%=3.1416%) + execute unless predicate lib:random_pass_per/7 run tag @s remove CanUsed + execute unless predicate lib:random_pass_per/51 run tag @s remove CanUsed + execute unless predicate lib:random_pass_per/88 run tag @s remove CanUsed + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1492.your_thoughts_frames/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction new file mode 100644 index 00000000000..7bcd5f8d449 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/3.main.mcfunction @@ -0,0 +1,19 @@ +#> asset:artifact/1492.your_thoughts_frames/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1492.your_thoughts_frames/trigger/2.check_condition + +# 性能として、水属性のビルドで手数があるビルドか、上振れたときだとかなりMPの回復の足しになるくらいがうれしい + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/offhand + +# 攻撃対象の近くにオーブを召喚 + execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64,limit=1] run function asset:artifact/1492.your_thoughts_frames/trigger/summon + +# 演出 + playsound block.amethyst_block.chime player @a ~ ~ ~ 5 0.8 + playsound minecraft:block.enchantment_table.use player @a ~ ~ ~ 0.9 1.4 0.0 + playsound minecraft:block.amethyst_cluster.hit player @a ~ ~ ~ 5.0 1.35 0.0 + playsound minecraft:block.amethyst_block.break player @a ~ ~ ~ 10 2 0.0 diff --git a/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction new file mode 100644 index 00000000000..944b521c61c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1492.your_thoughts_frames/trigger/summon.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/1492.your_thoughts_frames/trigger/summon +# +# オーブの召喚 +# +# @within function asset:artifact/1492.your_thoughts_frames/trigger/3.main + +# 演出 + particle item pink_stained_glass ~ ~1 ~ 0.3 0.5 0.3 0.1 100 normal @a + +# 召喚 + data modify storage api: Argument.ID set value 1164 + data modify storage api: Argument.FieldOverride.Amount set value 0.05d + data modify storage api: Argument.FieldOverride.Duration set value 200 + data modify storage api: Argument.FieldOverride.Heal set value 5.0d + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + execute positioned ~ ~1 ~ run function api:object/summon diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/end.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/end.mcfunction new file mode 100644 index 00000000000..149dee12464 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0373.longevity_your_thoughts/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:373} run function asset:effect/0373.longevity_your_thoughts/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/given.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/given.mcfunction new file mode 100644 index 00000000000..a46b1f74f02 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0373.longevity_your_thoughts/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:373} run function asset:effect/0373.longevity_your_thoughts/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/register.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/register.mcfunction new file mode 100644 index 00000000000..0c32c07f6d9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0373.longevity_your_thoughts/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:373} run function asset:effect/0373.longevity_your_thoughts/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/remove.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/remove.mcfunction new file mode 100644 index 00000000000..1f9fc62f84d --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0373.longevity_your_thoughts/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:373} run function asset:effect/0373.longevity_your_thoughts/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/tick.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/tick.mcfunction new file mode 100644 index 00000000000..3324a200945 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0373.longevity_your_thoughts/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:373} run function asset:effect/0373.longevity_your_thoughts/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/reset.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/reset.mcfunction new file mode 100644 index 00000000000..da81e8bbcf9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/reset.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0373.longevity_your_thoughts/effect/reset +# +# エフェクトのリセット処理 +# +# @within function +# asset:effect/0373.longevity_your_thoughts/end/ +# asset:effect/0373.longevity_your_thoughts/remove/ + +# 補正をリセット + data modify storage api: Argument.UUID set from storage asset:context this.UUID + function api:modifier/mp_heal/remove diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction new file mode 100644 index 00000000000..dc0fc8f15e0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/effect/set.mcfunction @@ -0,0 +1,12 @@ +#> asset:effect/0373.longevity_your_thoughts/effect/set +# +# 初期化処理 +# +# @within function +# asset:effect/0373.longevity_your_thoughts/given/ + +# MP回復量 + data modify storage api: Argument.UUID set from storage asset:context this.UUID + data modify storage api: Argument.Amount set from storage asset:context this.Amount + data modify storage api: Argument.Operation set value "multiply" + function api:modifier/mp_heal/add diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/end/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/end/.mcfunction new file mode 100644 index 00000000000..809a054b3d8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0373.longevity_your_thoughts/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0373.longevity_your_thoughts/_/end + +# 補正をリセット + function asset:effect/0373.longevity_your_thoughts/effect/reset diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction new file mode 100644 index 00000000000..b7d8ce4ad8f --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0373.longevity_your_thoughts/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0373.longevity_your_thoughts/_/given + +# 初期化処理 + function asset:effect/0373.longevity_your_thoughts/effect/set diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction new file mode 100644 index 00000000000..d2fdad4f200 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/register.mcfunction @@ -0,0 +1,40 @@ +#> asset:effect/0373.longevity_your_thoughts/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0373.longevity_your_thoughts/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 373 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"遺るあなたの想い","color":"#DAA1FF"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text":"MP回復量が上昇する"}'] +# 効果時間 (int) (default = API || error) + # data modify storage asset:effect Duration set value +# スタック (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 +# 最大効果時間 (int) (default = 2147483647) + # data modify storage asset:effect MaxDuration set value +# 最大スタック (int) (default = 2147483647) + data modify storage asset:effect MaxStack set value 1 +# 悪い効果か否か (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 false + +# フィールド + data modify storage asset:effect Field.UUID set value [I;1,3,373,0] + data modify storage asset:effect Field.Amount set value 0.05d diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/remove/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/remove/.mcfunction new file mode 100644 index 00000000000..9607d156b47 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0373.longevity_your_thoughts/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0373.longevity_your_thoughts/_/remove + +# 補正をリセット + function asset:effect/0373.longevity_your_thoughts/effect/reset \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction new file mode 100644 index 00000000000..760395cace0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0373.longevity_your_thoughts/tick/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0373.longevity_your_thoughts/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0373.longevity_your_thoughts/_/tick + +# 演出 + execute if predicate lib:random_pass_per/20 run particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~ ~1 ~ 0.4 0.4 0.4 1 10 diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/_index.d.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/_index.d.mcfunction new file mode 100644 index 00000000000..7c112933b85 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:object/1164.piece_of_creation/_index.d +# @private + +#> tag +# @within function asset:object/1164.piece_of_creation/** + #declare tag 1164.Target diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/init/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/init/.mcfunction new file mode 100644 index 00000000000..e6419b67105 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/init/.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/1164.piece_of_creation/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1164/init + +# 召喚場所からランダムに少し拡散する + data modify storage lib: Argument.Bounds set value [[2d,2d],[0d,0d],[2d,2d]] + function lib:spread_entity/ + +# sound + playsound minecraft:entity.vex.charge player @a ~ ~ ~ 5.0 1.75 0.0 diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction new file mode 100644 index 00000000000..250f6da6298 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/register.mcfunction @@ -0,0 +1,23 @@ +#> asset:object/1164.piece_of_creation/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1164/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のObjectに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false +# Tickするかどうか(boolean) (オプション) + # data modify storage asset:object IsTicking set value + +# ID (int) + data modify storage asset:object ID set value 1164 +# フィールド(オプション) + data modify storage asset:object Field.Amount set value 0.05 + data modify storage asset:object Field.Duration set value 200 + data modify storage asset:object Field.Heal set value 1 + data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/summon/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/summon/.mcfunction new file mode 100644 index 00000000000..30a5f349104 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/summon/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1164.piece_of_creation/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1164/summon + +# 元となるEntityを召喚する + execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ 0 + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + function asset:object/1164.piece_of_creation/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/summon/m.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/summon/m.mcfunction new file mode 100644 index 00000000000..db5bf5d9a79 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/summon/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1164.piece_of_creation/summon/m +# +# +# +# @within function asset:object/1164.piece_of_creation/summon/ + +$summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,Tags:["ObjectInit","Uninterferable"],brightness:{sky:15,block:15},item:{id:"stick",Count:1b,tag:{CustomModelData:20620}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[1.4f,1.4f,1.4f]}} diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction new file mode 100644 index 00000000000..7b000836fbc --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/.mcfunction @@ -0,0 +1,28 @@ +#> asset:object/1164.piece_of_creation/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1164/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 下にゆっくり落ちる + execute if block ~ ~-0.6 ~ #lib:no_collision/ run tp @s ~ ~-0.03 ~ +# ゆっくり回転 + execute at @s run tp @s ~ ~ ~ ~3 ~ + +#一番近くのプレイヤーにタグをつける + tag @p[gamemode=!spectator,tag=!Death,distance=..3] add 1164.Target + +# 近くのプレイヤーに自身の向きを変えずに追尾 + execute at @s facing entity @p[tag=1164.Target,distance=..3] eyes positioned ^ ^ ^0.25 run tp @s ~ ~ ~ + +# playerとの接触処理 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=1164.Target,dx=0] run function asset:object/1164.piece_of_creation/tick/hit_player + +# リセット + tag @a[tag=1164.Target,distance=..16] remove 1164.Target + +# 消滅処理 + execute if entity @s[scores={General.Object.Tick=200..}] run function asset:object/1164.piece_of_creation/tick/kill diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction new file mode 100644 index 00000000000..40d2e1d6851 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/hit_player.mcfunction @@ -0,0 +1,37 @@ +#> asset:object/1164.piece_of_creation/tick/hit_player +# +# playerにヒットしたときの処理 +# +# @within function asset:object/1164.piece_of_creation/tick/ + +#> private +# @private + #declare score_holder $UserID + +# 演出 + playsound minecraft:entity.arrow.hit_player player @a ~0.5 ~0.5 ~0.5 0.6 2 0.0 + playsound minecraft:entity.allay.ambient_with_item player @a ~ ~ ~ 2.0 0.9 0.0 + playsound minecraft:block.glass.break player @a ~ ~ ~ 1.0 1.4 0.0 + particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~0.5 ~0.5 ~0.5 2 2 2 1 40 + particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~0.5 ~0.5 ~0.5 0.4 0.4 0.4 1 40 + particle end_rod ~0.5 ~0.5 ~0.5 0 0 0 0.2 20 + +# hitしたプレイヤーにMP回復量バフを与える + data modify storage api: Argument.ID set value 373 + data modify storage api: Argument.Duration set from storage asset:context this.Duration + data modify storage api: Argument.FieldOverride.Amount set from storage asset:context this.Amount + execute as @p[tag=1164.Target,dx=0] run function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# 回復 + data modify storage api: Argument.Heal set from storage asset:context this.Heal + execute store result score $UserID Temporary run data get storage asset:context this.UserID + execute as @a if score @s UserID = $UserID Temporary run function api:heal/modifier + execute as @p[tag=1164.Target,dx=0] run function api:heal/ + function api:heal/reset + +# リセット + scoreboard players reset $UserID Temporary + +# 消滅処理 + kill @s diff --git a/Asset/data/asset/functions/object/1164.piece_of_creation/tick/kill.mcfunction b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/kill.mcfunction new file mode 100644 index 00000000000..9f05eb1fb48 --- /dev/null +++ b/Asset/data/asset/functions/object/1164.piece_of_creation/tick/kill.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1164.piece_of_creation/tick/kill +# +# 消滅処理 +# +# @within function asset:object/1164.piece_of_creation/tick/ + +# sound + playsound minecraft:entity.allay.ambient_with_item player @a ~ ~ ~ 1.0 0.9 0.0 + playsound minecraft:block.glass.break player @a ~ ~ ~ 0.6 1.8 0.0 + particle minecraft:dust_color_transition 1 0.4 1 0.8 0.2 0.8 1 ~ ~ ~ 0.4 0.4 0.4 1 40 + +# 消去 + kill @s diff --git a/Asset/data/asset/functions/object/alias/1164/init.mcfunction b/Asset/data/asset/functions/object/alias/1164/init.mcfunction new file mode 100644 index 00000000000..1a136a87c85 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1164/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1164/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1164.piece_of_creation/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1164/register.mcfunction b/Asset/data/asset/functions/object/alias/1164/register.mcfunction new file mode 100644 index 00000000000..714f725fccd --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1164/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1164/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1164.piece_of_creation/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1164/summon.mcfunction b/Asset/data/asset/functions/object/alias/1164/summon.mcfunction new file mode 100644 index 00000000000..d1cf575d18a --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1164/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1164/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1164.piece_of_creation/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1164/tick.mcfunction b/Asset/data/asset/functions/object/alias/1164/tick.mcfunction new file mode 100644 index 00000000000..13a2d785173 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1164/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1164/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1164.piece_of_creation/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/attack.json b/Asset/data/asset/tags/functions/artifact/attack.json index 50d91a6b024..58567712338 100644 --- a/Asset/data/asset/tags/functions/artifact/attack.json +++ b/Asset/data/asset/tags/functions/artifact/attack.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1492.your_thoughts_frames/trigger/1.trigger", "asset:artifact/1390.red_refraction_prism/trigger/1.trigger", "asset:artifact/1391.blue_refraction_prism/trigger/1.trigger", "asset:artifact/1392.yellow_refraction_prism/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index a362a1954ce..50e9ffea555 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/1492.your_thoughts_frames/give/1.trigger", "asset:artifact/1661.starlight_circle/give/1.trigger", "asset:artifact/1390.red_refraction_prism/give/1.trigger", "asset:artifact/1662.salmon_canon/give/1.trigger", diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index eafa855c1f7..b26ae102e51 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/0373.longevity_your_thoughts/_/end", "asset:effect/0405.predation_of_tree/_/end", "asset:effect/0359.time_ticker_eclipse/_/end", "asset:effect/0358.time_ticker_night/_/end", diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index a361969900b..733c66a9aed 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/0373.longevity_your_thoughts/_/given", "asset:effect/0405.predation_of_tree/_/given", "asset:effect/0359.time_ticker_eclipse/_/given", "asset:effect/0358.time_ticker_night/_/given", diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 55a4d503dc8..144f7092738 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/0373.longevity_your_thoughts/_/register", "asset:effect/0405.predation_of_tree/_/register", "asset:effect/0359.time_ticker_eclipse/_/register", "asset:effect/0358.time_ticker_night/_/register", diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index b5663f76b6d..b2ae5124f08 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/0373.longevity_your_thoughts/_/remove", "asset:effect/0405.predation_of_tree/_/remove", "asset:effect/0359.time_ticker_eclipse/_/remove", "asset:effect/0358.time_ticker_night/_/remove", diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index 097fd372db7..e4359eea425 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/0373.longevity_your_thoughts/_/tick", "asset:effect/0405.predation_of_tree/_/tick", "asset:effect/0359.time_ticker_eclipse/_/tick", "asset:effect/0358.time_ticker_night/_/tick",