diff --git a/Asset/data/asset/functions/artifact/1401.yuzu/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1401.yuzu/give/1.trigger.mcfunction new file mode 100644 index 0000000000..f6b48af943 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1401.yuzu/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1401.yuzu/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1401} run function asset:artifact/1401.yuzu/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1401.yuzu/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1401.yuzu/give/2.give.mcfunction new file mode 100644 index 0000000000..3ef5906894 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1401.yuzu/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1401.yuzu/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1401.yuzu/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1401 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:apple" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"ゆず","color":"#ffd712"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"translate":"%1$s秒間、最大MPが%2$s増加する","with":[{"text":"20"},{"text":"20"}]}'] +# 消費アイテム ({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 3 +# 神器を発動できるスロット (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 true +# 扱える神 (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/1401.yuzu/register.mcfunction b/Asset/data/asset/functions/artifact/1401.yuzu/register.mcfunction new file mode 100644 index 0000000000..edc375edab --- /dev/null +++ b/Asset/data/asset/functions/artifact/1401.yuzu/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1401.yuzu/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[1] append value [1401] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1401.yuzu/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1401.yuzu/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..83eceecd20 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1401.yuzu/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1401.yuzu/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:1401} run function asset:artifact/1401.yuzu/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1401.yuzu/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1401.yuzu/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..9a3691e09c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1401.yuzu/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1401.yuzu/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1401.yuzu/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/1401.yuzu/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1401.yuzu/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1401.yuzu/trigger/3.main.mcfunction new file mode 100644 index 0000000000..f9de05a242 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1401.yuzu/trigger/3.main.mcfunction @@ -0,0 +1,21 @@ +#> asset:artifact/1401.yuzu/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1401.yuzu/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/auto + +# ここから先は神器側の効果の処理を書く + +# 演出 + particle dust 1 0.9 0.3 1 ~ ~1.2 ~ 0.4 0.4 0.4 0 40 normal @a + playsound ogg:random.levelup player @a ~ ~ ~ 0.8 1.95 + +# バフを付与 + data modify storage api: Argument.ID set value 350 + data modify storage api: Argument.Duration set value 400 + data modify storage api: Argument.FieldOverride.Amount set value 20 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/effect/0350.yuzu/_/end.mcfunction b/Asset/data/asset/functions/effect/0350.yuzu/_/end.mcfunction new file mode 100644 index 0000000000..6ecb05fbda --- /dev/null +++ b/Asset/data/asset/functions/effect/0350.yuzu/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0350.yuzu/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:350} run function asset:effect/0350.yuzu/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0350.yuzu/_/given.mcfunction b/Asset/data/asset/functions/effect/0350.yuzu/_/given.mcfunction new file mode 100644 index 0000000000..43715584d8 --- /dev/null +++ b/Asset/data/asset/functions/effect/0350.yuzu/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0350.yuzu/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:350} run function asset:effect/0350.yuzu/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0350.yuzu/_/register.mcfunction b/Asset/data/asset/functions/effect/0350.yuzu/_/register.mcfunction new file mode 100644 index 0000000000..54a45cdef3 --- /dev/null +++ b/Asset/data/asset/functions/effect/0350.yuzu/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0350.yuzu/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:350} run function asset:effect/0350.yuzu/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0350.yuzu/_/remove.mcfunction b/Asset/data/asset/functions/effect/0350.yuzu/_/remove.mcfunction new file mode 100644 index 0000000000..1c96d4ffab --- /dev/null +++ b/Asset/data/asset/functions/effect/0350.yuzu/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0350.yuzu/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:350} run function asset:effect/0350.yuzu/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0350.yuzu/_/tick.mcfunction b/Asset/data/asset/functions/effect/0350.yuzu/_/tick.mcfunction new file mode 100644 index 0000000000..785426dc58 --- /dev/null +++ b/Asset/data/asset/functions/effect/0350.yuzu/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0350.yuzu/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:350} run function asset:effect/0350.yuzu/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0350.yuzu/end/.mcfunction b/Asset/data/asset/functions/effect/0350.yuzu/end/.mcfunction new file mode 100644 index 0000000000..5c37ce43af --- /dev/null +++ b/Asset/data/asset/functions/effect/0350.yuzu/end/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0350.yuzu/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0350.yuzu/_/end + +# 削除 + function asset:effect/0350.yuzu/modifier/remove diff --git a/Asset/data/asset/functions/effect/0350.yuzu/given/.mcfunction b/Asset/data/asset/functions/effect/0350.yuzu/given/.mcfunction new file mode 100644 index 0000000000..ab1df59d5c --- /dev/null +++ b/Asset/data/asset/functions/effect/0350.yuzu/given/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0350.yuzu/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0350.yuzu/_/given + +# 付与 + function asset:effect/0350.yuzu/modifier/add diff --git a/Asset/data/asset/functions/effect/0350.yuzu/modifier/add.mcfunction b/Asset/data/asset/functions/effect/0350.yuzu/modifier/add.mcfunction new file mode 100644 index 0000000000..39816fa267 --- /dev/null +++ b/Asset/data/asset/functions/effect/0350.yuzu/modifier/add.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0350.yuzu/modifier/add +# +# +# +# @within function asset:effect/0350.yuzu/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 "add" + function api:modifier/max_mp/add diff --git a/Asset/data/asset/functions/effect/0350.yuzu/modifier/remove.mcfunction b/Asset/data/asset/functions/effect/0350.yuzu/modifier/remove.mcfunction new file mode 100644 index 0000000000..bbba94ea55 --- /dev/null +++ b/Asset/data/asset/functions/effect/0350.yuzu/modifier/remove.mcfunction @@ -0,0 +1,11 @@ +#> asset:effect/0350.yuzu/modifier/remove +# +# +# +# @within function +# asset:effect/0350.yuzu/end/ +# asset:effect/0350.yuzu/remove/ + +# 最大MP + data modify storage api: Argument.UUID set from storage asset:context this.UUID + function api:modifier/max_mp/remove diff --git a/Asset/data/asset/functions/effect/0350.yuzu/register.mcfunction b/Asset/data/asset/functions/effect/0350.yuzu/register.mcfunction new file mode 100644 index 0000000000..f6d2c07622 --- /dev/null +++ b/Asset/data/asset/functions/effect/0350.yuzu/register.mcfunction @@ -0,0 +1,40 @@ +#> asset:effect/0350.yuzu/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0350.yuzu/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 350 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"ゆずの香り","color":"#ffd712"}' +# 説明文 (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,350,0] + data modify storage asset:effect Field.Amount set value 10 diff --git a/Asset/data/asset/functions/effect/0350.yuzu/remove/.mcfunction b/Asset/data/asset/functions/effect/0350.yuzu/remove/.mcfunction new file mode 100644 index 0000000000..eaa6c3cf1f --- /dev/null +++ b/Asset/data/asset/functions/effect/0350.yuzu/remove/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0350.yuzu/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0350.yuzu/_/remove + +# 削除 + function asset:effect/0350.yuzu/modifier/remove diff --git a/Asset/data/asset/functions/effect/0350.yuzu/tick/.mcfunction b/Asset/data/asset/functions/effect/0350.yuzu/tick/.mcfunction new file mode 100644 index 0000000000..ae0510c77d --- /dev/null +++ b/Asset/data/asset/functions/effect/0350.yuzu/tick/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0350.yuzu/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0350.yuzu/_/tick + +# 演出 + execute if predicate lib:random_pass_per/10 run particle dust 1 0.9 0.3 0.5 ~ ~1.2 ~ 0.4 0.4 0.4 0 1 normal @a diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 6d62d7b380..6a99157046 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/1401.yuzu/give/1.trigger", "asset:artifact/1144.cradle_of_azure_moon/give/1.trigger", "asset:artifact/1317.oblivious_feather/give/1.trigger", "asset:artifact/1324.balance_star/give/1.trigger", @@ -520,4 +521,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 cbb226dca8..54430114ea 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/1401.yuzu/register", "asset:artifact/1144.cradle_of_azure_moon/register", "asset:artifact/1317.oblivious_feather/register", "asset:artifact/1324.balance_star/register", @@ -298,4 +299,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..fe75672c87 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/1401.yuzu/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", diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index 81710cbe5a..815c30b03d 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/0350.yuzu/_/end", "asset:effect/0025.levitation/_/end", "asset:effect/0621.loyalty_shield/_/end", "asset:effect/0653.absolute_drive/_/end", diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index c20c6c5587..49cc43f72f 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/0350.yuzu/_/given", "asset:effect/0315.charge_of_aurora_scythe/_/given", "asset:effect/0621.loyalty_shield/_/given", "asset:effect/0653.absolute_drive/_/given", diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 2df8839cf1..304bf5ad42 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/0350.yuzu/_/register", "asset:effect/0025.levitation/_/register", "asset:effect/0247.great_demon_armor/_/register", "asset:effect/0246.flame_devil_armor/_/register", @@ -167,4 +168,4 @@ "asset:effect/0007.defense_base_debuff/_/register", "asset:effect/0258.spirit_melody/_/register" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index 3e8ceea4eb..54f0bc4e05 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/0350.yuzu/_/remove", "asset:effect/0025.levitation/_/remove", "asset:effect/0245.flame_hunter_attire/_/remove", "asset:effect/0255.kaguya_s_difficulties/_/remove", diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index 8a5fbd5389..ba1e207a78 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/0350.yuzu/_/tick", "asset:effect/0025.levitation/_/tick", "asset:effect/0244.aurora_armor/_/tick", "asset:effect/0243.oblivious_snow/_/tick",