diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/attack/.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/attack/.mcfunction new file mode 100644 index 00000000000..2fc86c57d5e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/attack/.mcfunction @@ -0,0 +1,33 @@ +#> asset:artifact/1620.satelite_drop/attack/attack +# +# +# +# @within function asset:artifact/1620.satelite_drop/** + +# ランダムなObject 1192からO1192.Idleを外す + execute as @e[type=marker,tag=O1192.Idle,distance=..3] if score @s O1192.UserID = @p[tag=this] UserID run tag @s add O1192.Launchable + #なんらかの理由でObjectが近くに存在しない場合、LaunchInstantlyをtrueにした状態のObjectを新しく召喚 + execute unless entity @e[type=marker,tag=O1192.Launchable,distance=..3] run function asset:artifact/1620.satelite_drop/attack/launch_new + + execute anchored eyes positioned ^ ^-0.1 ^0.5 as @e[type=marker,tag=O1192.Launchable,distance=..3,sort=arbitrary,limit=1] if score @s O1192.UserID = @p[tag=this] UserID run function asset:artifact/1620.satelite_drop/attack/launch + tag @e[type=marker,tag=O1192.Launchable,distance=..3] remove O1192.Launchable + +# Effect396のスタックを1減らす + data modify storage api: Argument.ID set value 396 + function api:entity/mob/effect/get/from_id + data modify storage asset:context this.Return set from storage api: Return.Effect + + data modify storage api: Argument.ID set value 396 + execute store result storage api: Argument.Stack int 0.9999999999 run data get storage asset:context this.Return.Stack + data modify storage api: Argument.Duration set from storage asset:context this.Return.Duration + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# クールダウン用Effect397を付与 + data modify storage api: Argument.ID set value 397 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# 演出 + playsound entity.drowned.death player @a ~ ~ ~ 1 1.7 + playsound entity.zombie.converted_to_drowned player @a ~ ~ ~ 1 1.4 diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/attack/launch.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/attack/launch.mcfunction new file mode 100644 index 00000000000..3e42a94819e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/attack/launch.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1620.satelite_drop/attack/launch +# +# +# +# @within function asset:artifact/1620.satelite_drop/attack/ + +# O1192.Idleを外す + tag @s remove O1192.Idle + +# 位置を調整 + tp @s ^ ^ ^ ~ ~ diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/attack/launch_new.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/attack/launch_new.mcfunction new file mode 100644 index 00000000000..3e988d31af3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/attack/launch_new.mcfunction @@ -0,0 +1,22 @@ +#> asset:artifact/1620.satelite_drop/attack/launch_new +# +# +# +# @within function asset:artifact/1620.satelite_drop/attack/ + + data modify storage api: Argument.FieldOverride.LaunchInstantly set value true + data modify storage api: Argument.FieldOverride.Count set value 1 + # 攻撃情報 + data modify storage api: Argument.FieldOverride.Damage set value 150 + data modify storage api: Argument.FieldOverride.AttackType set value "Magic" + data modify storage api: Argument.FieldOverride.ElementType set value "Water" + + # 発射体のField + data modify storage api: Argument.FieldOverride.Speed set value 3 + data modify storage api: Argument.FieldOverride.Range set value 30 + + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + data modify storage api: Argument.ID set value 1192 + function api:object/summon + + execute anchored eyes positioned ^ ^-0.1 ^0.5 as @e[type=marker,scores={ObjectID=1192},distance=..3] if score @s O1192.UserID = @p[tag=this] UserID rotated as @p[tag=this] run tp @s ^ ^ ^ ~ ~ diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/dis_equip/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/dis_equip/1.trigger.mcfunction new file mode 100644 index 00000000000..5d668ccd578 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/dis_equip/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1620.satelite_drop/dis_equip/1.trigger +# +# +# +# @within tag/function asset:artifact/dis_equip + +# storage asset:idのmainhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{mainhand:1620} run function asset:artifact/1620.satelite_drop/dis_equip/2.main diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/dis_equip/2.main.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/dis_equip/2.main.mcfunction new file mode 100644 index 00000000000..92783c2e248 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/dis_equip/2.main.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/1620.satelite_drop/dis_equip/2.main +# +# +# +# @within function asset:artifact/1620.satelite_drop/dis_equip/1.trigger + +# Effect395を削除 + data modify storage api: Argument.ID set value 395 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/give/1.trigger.mcfunction new file mode 100644 index 00000000000..c7480483c04 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1620.satelite_drop/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1620} run function asset:artifact/1620.satelite_drop/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/give/2.give.mcfunction new file mode 100644 index 00000000000..bfc252aaa85 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1620.satelite_drop/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1620.satelite_drop/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1620 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:ender_eye" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text": "サテライトドロップ", "color": "#6abcf6"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text": "クールダウンと消費MPを無視して発射ができる弾を召喚する(最大3個)。"}', '{"translate": "弾はチャージ時間1.5秒につき数が一つ増え、%sの間残る。", "with":[{"text": "召喚した数x30秒", "color": "aqua"}]}'] +# 消費アイテム ({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 "mainhand" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "releaseUsingItem" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value "150x1-3" +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [Water] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackRange set value 15 +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 40 +# 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 200 +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + data modify storage asset:artifact TypeCooldown.Type set value "longRange" + data modify storage asset:artifact TypeCooldown.Duration set value 15 +# グローバルクールダウン (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 ['Flora', 'Wi-ki', 'Rumor'] +# カスタム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/1620.satelite_drop/register.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/register.mcfunction new file mode 100644 index 00000000000..cd400a8c4f9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1620.satelite_drop/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[3] append value [1620] +data modify storage asset:artifact RarityRegistryWithColor.Red[3] append value [1620] diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/release_using_item/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/release_using_item/1.trigger.mcfunction new file mode 100644 index 00000000000..5ec72d94055 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/release_using_item/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1620.satelite_drop/release_using_item/1.trigger +# +# +# +# @within tag/function asset:artifact/using_item/release/ + +# storage asset:idのmainhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{mainhand:1620} run function asset:artifact/1620.satelite_drop/release_using_item/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/release_using_item/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/release_using_item/2.check_condition.mcfunction new file mode 100644 index 00000000000..a37edda5727 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/release_using_item/2.check_condition.mcfunction @@ -0,0 +1,15 @@ +#> asset:artifact/1620.satelite_drop/release_using_item/2.main +# +# +# +# @within function asset:artifact/1620.satelite_drop/release_using_item/1.trigger + +# Effect396があるならキャンセル + data modify storage api: Argument.ID set value 396 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect run return fail + +# Effect395がある(=チャージ中)ならチャージ終了処理 + data modify storage api: Argument.ID set value 395 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect run function asset:artifact/1620.satelite_drop/release_using_item/3.main diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/release_using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/release_using_item/3.main.mcfunction new file mode 100644 index 00000000000..75134004665 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/release_using_item/3.main.mcfunction @@ -0,0 +1,39 @@ +#> asset:artifact/1620.satelite_drop/release_using_item/3.main +# +# +# +# @within function asset:artifact/1620.satelite_drop/release_using_item/2.check_condition + +#> private +# @private + #declare score_holder $A1620.Stack + +# Effect396を付与 + data modify storage api: Argument.ID set value 395 + function api:entity/mob/effect/get/from_id + data modify storage api: Argument.ID set value 396 + + # チャージ段階に応じて効果時間とスタックを設定 + execute store result score $A1620.Stack Temporary run data get storage api: Return.Effect.Stack + execute store result storage api: Argument.Stack int 1 run scoreboard players get $A1620.Stack Temporary + execute store result storage api: Argument.Duration int 600 run scoreboard players get $A1620.Stack Temporary + + # 攻撃情報 + data modify storage api: Argument.FieldOverride.Damage set value 150 + data modify storage api: Argument.FieldOverride.AttackType set value "Magic" + data modify storage api: Argument.FieldOverride.ElementType set value "Water" + + # 発射体のField + data modify storage api: Argument.FieldOverride.Speed set value 3 + data modify storage api: Argument.FieldOverride.Range set value 30 + + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# Effect395を削除 + data modify storage api: Argument.ID set value 395 + function api:entity/mob/effect/remove/from_id + function api:entity/mob/effect/reset + +# リセット + scoreboard players reset $A1620.Stack diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/1.trigger.mcfunction new file mode 100644 index 00000000000..f01d1749007 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1620.satelite_drop/using_item/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのmainhandに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{mainhand:1620} run function asset:artifact/1620.satelite_drop/using_item/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/2.check_condition.mcfunction new file mode 100644 index 00000000000..222c9b19b02 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/2.check_condition.mcfunction @@ -0,0 +1,26 @@ +#> asset:artifact/1620.satelite_drop/using_item/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1620.satelite_drop/using_item/1.trigger + +# クールダウン中(Effect397保持中)ならキャンセル + data modify storage api: Argument.ID set value 397 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect run return fail + +# チャージ中(Effect395保持中)ならチャージ続行 + data modify storage api: Argument.ID set value 395 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect run return run function asset:artifact/1620.satelite_drop/using_item/charge/check + +# Effect396があるなら攻撃 + data modify storage api: Argument.ID set value 396 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect run return run function asset:artifact/1620.satelite_drop/attack/ + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1620.satelite_drop/using_item/3.main diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/3.main.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/3.main.mcfunction new file mode 100644 index 00000000000..3d83161275a --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/3.main.mcfunction @@ -0,0 +1,17 @@ +#> asset:artifact/1620.satelite_drop/using_item/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1620.satelite_drop/using_item/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# 既にチャージ済みでないならEffect395を付与 + data modify storage api: Argument.ID set value 395 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# 演出 + playsound entity.boat.paddle_water player @a ~ ~ ~ 2 0.5 + playsound block.conduit.activate player @a ~ ~ ~ 1 1.5 diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/charge/.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/charge/.mcfunction new file mode 100644 index 00000000000..5b4909be828 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/charge/.mcfunction @@ -0,0 +1,35 @@ +#> asset:artifact/1620.satelite_drop/using_item/charge/ +# +# +# +# @within function asset:artifact/1620.satelite_drop/using_item/charge/check + +#> private +# @private + #declare score_holder $A1620.Stack + +# Effect395のスタックを1増やして付与 + data modify storage api: Argument.ID set value 395 + function api:entity/mob/effect/get/from_id + + data modify storage api: Argument.ID set value 395 + execute store result score $A1620.Stack Temporary run data get storage api: Return.Effect.Stack + execute store result storage api: Argument.Stack int 1 run scoreboard players add $A1620.Stack Temporary 1 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# スタックが最大ならこの先の処理はスキップ + execute if score $A1620.Stack Temporary matches 4.. run return run scoreboard players reset $A1620.Stack Temporary + +# MP消費 + data modify storage api: Argument.Fluctuation set value -40 + data modify storage api: Argument.DisableLog set value 1b + function api:mp/fluctuation + +# 演出 + playsound item.bucket.empty player @a ~ ~ ~ 1 1.3 + playsound entity.experience_orb.pickup player @a ~ ~ ~ 1 2.0 + particle wax_off ~ ~0.5 ~ 0.2 0.5 0.2 3 15 + +# リセット + scoreboard players reset $A1620.Stack diff --git a/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/charge/check.mcfunction b/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/charge/check.mcfunction new file mode 100644 index 00000000000..412efd56fdb --- /dev/null +++ b/Asset/data/asset/functions/artifact/1620.satelite_drop/using_item/charge/check.mcfunction @@ -0,0 +1,20 @@ +#> asset:artifact/1620.satelite_drop/using_item/charge +# +# +# +# @within function asset:artifact/1620.satelite_drop/using_item/** + +#> private +# @private + #declare score_holder $A1620.Charge + #declare score_holder $30 + +# MPとチャージ時間チェック + data modify storage api: Argument.Threshold set value 40 + function api:mp/check + execute store result score $A1620.Charge Temporary run data get storage asset:context UsingItemTime.mainhand + scoreboard players operation $A1620.Charge Temporary %= $30 Const + execute if score $A1620.Charge Temporary matches 0 if data storage api: Return{IsThresholdOrMore:true} run function asset:artifact/1620.satelite_drop/using_item/charge/ + +# リセット + scoreboard players reset $A1620.Charge diff --git a/Asset/data/asset/functions/effect/0395.charge_satelite_drop/_/register.mcfunction b/Asset/data/asset/functions/effect/0395.charge_satelite_drop/_/register.mcfunction new file mode 100644 index 00000000000..2b887097474 --- /dev/null +++ b/Asset/data/asset/functions/effect/0395.charge_satelite_drop/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0395.charge_satelite_drop/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:395} run function asset:effect/0395.charge_satelite_drop/register diff --git a/Asset/data/asset/functions/effect/0395.charge_satelite_drop/register.mcfunction b/Asset/data/asset/functions/effect/0395.charge_satelite_drop/register.mcfunction new file mode 100644 index 00000000000..fd3c4b18460 --- /dev/null +++ b/Asset/data/asset/functions/effect/0395.charge_satelite_drop/register.mcfunction @@ -0,0 +1,38 @@ +#> asset:effect/0395.charge_satelite_drop/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0395.charge_satelite_drop/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 395 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text": "チャージ・サテライトドロップ", "color": "#a4f1eb"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text": "チャージ終了時、段階に応じた数の弾を召喚する"}'] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2147483647 +# スタック (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 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 + +# フィールド diff --git a/Asset/data/asset/functions/effect/0396.satelite_drop/_/given.mcfunction b/Asset/data/asset/functions/effect/0396.satelite_drop/_/given.mcfunction new file mode 100644 index 00000000000..179a27c0fc6 --- /dev/null +++ b/Asset/data/asset/functions/effect/0396.satelite_drop/_/given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0396.satelite_drop/_/given +# +# Effectが付与された時に実行されるfunction +# +# @within tag/function asset:effect/given + +execute if data storage asset:context {id:396} run function asset:effect/0396.satelite_drop/given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0396.satelite_drop/_/register.mcfunction b/Asset/data/asset/functions/effect/0396.satelite_drop/_/register.mcfunction new file mode 100644 index 00000000000..e0745aa3457 --- /dev/null +++ b/Asset/data/asset/functions/effect/0396.satelite_drop/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0396.satelite_drop/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:396} run function asset:effect/0396.satelite_drop/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0396.satelite_drop/_/remove.mcfunction b/Asset/data/asset/functions/effect/0396.satelite_drop/_/remove.mcfunction new file mode 100644 index 00000000000..6ebe2c4d05d --- /dev/null +++ b/Asset/data/asset/functions/effect/0396.satelite_drop/_/remove.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0396.satelite_drop/_/remove +# +# Effectが神器や牛乳によって削除された時に実行されるfunction +# +# @within tag/function asset:effect/remove + +execute if data storage asset:context {id:396} run function asset:effect/0396.satelite_drop/remove/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0396.satelite_drop/_/tick.mcfunction b/Asset/data/asset/functions/effect/0396.satelite_drop/_/tick.mcfunction new file mode 100644 index 00000000000..a4587c3576c --- /dev/null +++ b/Asset/data/asset/functions/effect/0396.satelite_drop/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0396.satelite_drop/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:396} run function asset:effect/0396.satelite_drop/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0396.satelite_drop/given/.mcfunction b/Asset/data/asset/functions/effect/0396.satelite_drop/given/.mcfunction new file mode 100644 index 00000000000..92a86ec992f --- /dev/null +++ b/Asset/data/asset/functions/effect/0396.satelite_drop/given/.mcfunction @@ -0,0 +1,23 @@ +#> asset:effect/0396.satelite_drop/given/ +# +# Effectが付与された時の処理 +# +# @within function asset:effect/0396.satelite_drop/_/given + +#> Private +# @within function asset:effect/0396.satelite_drop/given/** + #declare score_holder $E0396.Stack + #declare score_holder $E0396.360 + +# (Stack)個のObject1192を召喚 + execute store result score $E0396.Stack Temporary run data get storage asset:context Stack + #(360/Stack)°間隔で召喚 + scoreboard players set $E0396.360 Temporary 360 + execute store result storage asset:temp Args.Angle int 1 run scoreboard players operation $E0396.360 Temporary /= $E0396.Stack Temporary + execute store result storage asset:temp Args.Count int 1 run scoreboard players get $E0396.Stack Temporary + execute at @s positioned ~ ~0.75 ~ run function asset:effect/0396.satelite_drop/given/summon.m with storage asset:temp Args + +# リセット + scoreboard players reset $E0396.Stack + scoreboard players reset $E0396.360 + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/effect/0396.satelite_drop/given/summon.m.mcfunction b/Asset/data/asset/functions/effect/0396.satelite_drop/given/summon.m.mcfunction new file mode 100644 index 00000000000..87602b9caf4 --- /dev/null +++ b/Asset/data/asset/functions/effect/0396.satelite_drop/given/summon.m.mcfunction @@ -0,0 +1,36 @@ +#> asset:effect/0396.satelite_drop/given/summon.m +# +# +# +# @within function asset:effect/0396.satelite_drop/given/** + +#> Private +# @private + #declare score_holder $E0396.Rotation + +# $E0396.Stackを再帰用にリサイクル + scoreboard players remove $E0396.Stack Temporary 1 + +# Object1192召喚 + # 攻撃情報 + data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage + data modify storage api: Argument.FieldOverride.AttackType set from storage asset:context this.AttackType + data modify storage api: Argument.FieldOverride.ElementType set from storage asset:context this.ElementType + + # 発射体のField + data modify storage api: Argument.FieldOverride.Speed set from storage asset:context this.Speed + data modify storage api: Argument.FieldOverride.Range set from storage asset:context this.Range + + data modify storage api: Argument.ID set value 1192 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + #$(Angle)°ずつ角度をを変えて召喚 + $scoreboard players set $E0396.Rotation Temporary $(Angle) + execute store result storage api: Argument.FieldOverride.Angle int 1 run scoreboard players operation $E0396.Rotation Temporary *= $E0396.Stack Temporary + $data modify storage api: Argument.FieldOverride.Count set value $(Count) + execute rotated ~ 0 positioned ^ ^ ^0.75 run function api:object/summon + +# リセット + scoreboard players reset $E0396.Rotation + +# 回転して再帰 + $execute rotated ~$(Angle) ~ if score $E0396.Stack Temporary matches 1.. run function asset:effect/0396.satelite_drop/given/summon.m with storage asset:temp Args diff --git a/Asset/data/asset/functions/effect/0396.satelite_drop/register.mcfunction b/Asset/data/asset/functions/effect/0396.satelite_drop/register.mcfunction new file mode 100644 index 00000000000..2bb91f8e250 --- /dev/null +++ b/Asset/data/asset/functions/effect/0396.satelite_drop/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0396.satelite_drop/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0396.satelite_drop/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 396 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text": "玉露の星", "color": "#a4f1eb"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value ['{"text": "スタックの数だけ、弾が発射できる"}'] +# 効果時間 (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 "forceReplace" +# スタックの操作方法 (default = API || "replace") + data modify storage asset:effect StackOperation set value "forceReplace" +# 最大効果時間 (int) (default = 2147483647) + data modify storage asset:effect MaxDuration set value 1800 +# 最大スタック (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 set value {} diff --git a/Asset/data/asset/functions/effect/0396.satelite_drop/remove/.mcfunction b/Asset/data/asset/functions/effect/0396.satelite_drop/remove/.mcfunction new file mode 100644 index 00000000000..119ed55fddb --- /dev/null +++ b/Asset/data/asset/functions/effect/0396.satelite_drop/remove/.mcfunction @@ -0,0 +1,16 @@ +#> asset:effect/0396.satelite_drop/remove/ +# +# Effectが削除された時の処理 +# +# @within function asset:effect/0396.satelite_drop/_/remove + +#> Private +# @private + #declare score_holder $E0396.UserID + +# 自身に紐づいていて、Idleタグを持つObject 1192を削除 + scoreboard players operation $E0396.UserID Temporary = @s UserID + execute as @e[type=marker,tag=O1192.Idle,distance=..3] if score @s O1192.UserID = $E0396.UserID Temporary run kill @s + +# リセット + scoreboard players reset $E0396.UserID diff --git a/Asset/data/asset/functions/effect/0396.satelite_drop/tick/.mcfunction b/Asset/data/asset/functions/effect/0396.satelite_drop/tick/.mcfunction new file mode 100644 index 00000000000..1ece2331f49 --- /dev/null +++ b/Asset/data/asset/functions/effect/0396.satelite_drop/tick/.mcfunction @@ -0,0 +1,26 @@ +#> asset:effect/0396.satelite_drop/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0396.satelite_drop/_/tick + +#> Private +# @private + #declare score_holder $E0396.Stack + #declare score_holder $E0396.UserID + #declare score_holder $E0396.BulletCount + #declare tag E0396.RemovalCandidate + +# スタックと周囲のObject 1192の数を比較 + execute store result score $E0396.Stack Temporary run data get storage asset:context Stack + scoreboard players operation $E0396.UserID Temporary = @s UserID + execute as @e[type=marker,tag=O1192.Idle,distance=..3] if score @s O1192.UserID = $E0396.UserID Temporary run tag @s add E0396.RemovalCandidate + execute store result score $E0396.BulletCount Temporary if entity @e[type=marker,tag=E0396.RemovalCandidate,distance=..3] + #数が合わないならObjectを削除する + execute if score $E0396.Stack Temporary < $E0396.BulletCount Temporary as @e[type=marker,tag=E0396.RemovalCandidate,distance=..3,sort=arbitrary,limit=1] if score @s O1192.UserID = $E0396.UserID Temporary run kill @s + +# リセット + scoreboard players reset $E0396.Stack + scoreboard players reset $E0396.UserID + scoreboard players reset $E0396.BulletCount + tag @e[type=marker,tag=E0396.RemovalCandidate,distance=..3] remove E0396.RemovalCandidate diff --git a/Asset/data/asset/functions/effect/0397.satelite_drop_cooldown/_/register.mcfunction b/Asset/data/asset/functions/effect/0397.satelite_drop_cooldown/_/register.mcfunction new file mode 100644 index 00000000000..721095dc267 --- /dev/null +++ b/Asset/data/asset/functions/effect/0397.satelite_drop_cooldown/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0397.satelite_drop_cooldown/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:397} run function asset:effect/0397.satelite_drop_cooldown/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0397.satelite_drop_cooldown/register.mcfunction b/Asset/data/asset/functions/effect/0397.satelite_drop_cooldown/register.mcfunction new file mode 100644 index 00000000000..9c01693df0e --- /dev/null +++ b/Asset/data/asset/functions/effect/0397.satelite_drop_cooldown/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0397.satelite_drop_cooldown/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0397.satelite_drop_cooldown/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 397 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text": "サテライトドロップ・攻撃クールダウン"}' +# 説明文 (TextComponentString[]) + data modify storage asset:effect Description set value [] +# 効果時間 (int) (default = API || error) + data modify storage asset:effect Duration set value 2 +# スタック (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 +# 悪い効果か否か (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 false +# エフェクトのスタックををUIに表示するか (boolean) (default = true) + # data modify storage asset:effect StackVisible set value + +# フィールド + # data modify storage asset:effect Field set value {} diff --git a/Asset/data/asset/functions/object/1192.satelite_drop/_index.d.mcfunction b/Asset/data/asset/functions/object/1192.satelite_drop/_index.d.mcfunction new file mode 100644 index 00000000000..62afb32704f --- /dev/null +++ b/Asset/data/asset/functions/object/1192.satelite_drop/_index.d.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/1192.satelite_drop/_index.d +# @private + +#> tag +# @within function asset:object/1192.satelite_drop/** +# @within function asset:artifact/1620.satelite_drop/** +# @within function asset:effect/0396.satelite_drop/** + #declare tag O1192.Idle + #declare tag O1192.Launchable + +#> scoreboard +# @within function asset:object/1192.satelite_drop/** +# @within function asset:artifact/1620.satelite_drop/** +# @within function asset:effect/0396.satelite_drop/** + #declare objective O1192.UserID diff --git a/Asset/data/asset/functions/object/1192.satelite_drop/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1192.satelite_drop/detect_hit_entity/.mcfunction new file mode 100644 index 00000000000..7f291c0e882 --- /dev/null +++ b/Asset/data/asset/functions/object/1192.satelite_drop/detect_hit_entity/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1192.satelite_drop/detect_hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1192/detect_hit_entity + +# 判定 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1192.satelite_drop/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1192.satelite_drop/hit_entity/.mcfunction new file mode 100644 index 00000000000..472f96d1ab5 --- /dev/null +++ b/Asset/data/asset/functions/object/1192.satelite_drop/hit_entity/.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1192.satelite_drop/hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1192/hit_entity + +# ダメージを与えてkill + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,sort=random,limit=1] run function asset:object/1192.satelite_drop/hit_entity/damage + function asset:object/call.m {method:kill} diff --git a/Asset/data/asset/functions/object/1192.satelite_drop/hit_entity/damage.mcfunction b/Asset/data/asset/functions/object/1192.satelite_drop/hit_entity/damage.mcfunction new file mode 100644 index 00000000000..f7435690ade --- /dev/null +++ b/Asset/data/asset/functions/object/1192.satelite_drop/hit_entity/damage.mcfunction @@ -0,0 +1,23 @@ +#> asset:object/1192.satelite_drop/hit_entity/damage +# +# +# +# @within function asset:object/1192.satelite_drop/hit_entity/ + +#> Private +# @private + #declare score_holder $O1192.UserID + + data modify storage api: Argument.Damage set from storage asset:context this.Damage + data modify storage api: Argument.AttackType set from storage asset:context this.AttackType + data modify storage api: Argument.ElementType set from storage asset:context this.ElementType + execute store result score $O1192.UserID Temporary run data get storage asset:context this.UserID + execute as @a if score @s UserID = $O1192.UserID Temporary run function api:damage/modifier + function api:damage/ + function api:damage/reset + +# 演出 + playsound entity.shulker_bullet.hit player @a ~ ~ ~ 1 1.4 + +# リセット + scoreboard players reset $O1192.UserID diff --git a/Asset/data/asset/functions/object/1192.satelite_drop/init/.mcfunction b/Asset/data/asset/functions/object/1192.satelite_drop/init/.mcfunction new file mode 100644 index 00000000000..9422f20d052 --- /dev/null +++ b/Asset/data/asset/functions/object/1192.satelite_drop/init/.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1192.satelite_drop/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1192/init + +# タイマー設定(召喚数×600Tick) + execute store result score @s General.Object.Tick run data get storage asset:context this.Count 600 + +# Artifact側からアクセスする用のID紐づけ + execute store result score @s O1192.UserID run data get storage asset:context this.UserID + +# 即発射の場合はIdleタグを外す + execute if data storage asset:context this{LaunchInstantly:true} run tag @s remove O1192.Idle + +# super.init + function asset:object/super.init + +# 演出 + playsound entity.drowned.swim player @a ~ ~ ~ 1 1.4 diff --git a/Asset/data/asset/functions/object/1192.satelite_drop/load.mcfunction b/Asset/data/asset/functions/object/1192.satelite_drop/load.mcfunction new file mode 100644 index 00000000000..191b5aef545 --- /dev/null +++ b/Asset/data/asset/functions/object/1192.satelite_drop/load.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1192.satelite_drop/load +# +# Objectに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:object/load + +#> 定義類はここに +# @within function asset:object/1192.satelite_drop/** + scoreboard objectives add O1192.UserID dummy diff --git a/Asset/data/asset/functions/object/1192.satelite_drop/register.mcfunction b/Asset/data/asset/functions/object/1192.satelite_drop/register.mcfunction new file mode 100644 index 00000000000..a7c11cc45d1 --- /dev/null +++ b/Asset/data/asset/functions/object/1192.satelite_drop/register.mcfunction @@ -0,0 +1,27 @@ +#> asset:object/1192.satelite_drop/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1192/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1 + 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 true + +# ID (int) + data modify storage asset:object ID set value 1192 +# フィールド(オプション) + data modify storage asset:object Field.Damage set value -1 + data modify storage asset:object Field.UserID set value -1 + data modify storage asset:object Field.Angle set value -1 + data modify storage asset:object Field.Count set value -1 + data modify storage asset:object Field.LaunchInstantly set value false + #発射体のField + data modify storage asset:object Field.Speed set value -1 + data modify storage asset:object Field.Range set value -1 diff --git a/Asset/data/asset/functions/object/1192.satelite_drop/summon/.mcfunction b/Asset/data/asset/functions/object/1192.satelite_drop/summon/.mcfunction new file mode 100644 index 00000000000..6cb937733db --- /dev/null +++ b/Asset/data/asset/functions/object/1192.satelite_drop/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1192.satelite_drop/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1192/summon + +# 元となるEntityを召喚する + summon marker ~ ~ ~ {Tags:["ObjectInit","O1192.Idle"]} diff --git a/Asset/data/asset/functions/object/1192.satelite_drop/summon/debug.mcfunction b/Asset/data/asset/functions/object/1192.satelite_drop/summon/debug.mcfunction new file mode 100644 index 00000000000..1a95dd73c53 --- /dev/null +++ b/Asset/data/asset/functions/object/1192.satelite_drop/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1192.satelite_drop/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1192 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1192.satelite_drop/tick/.mcfunction b/Asset/data/asset/functions/object/1192.satelite_drop/tick/.mcfunction new file mode 100644 index 00000000000..645760b8a67 --- /dev/null +++ b/Asset/data/asset/functions/object/1192.satelite_drop/tick/.mcfunction @@ -0,0 +1,30 @@ +#> asset:object/1192.satelite_drop/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1192/tick + +#> Private +# @private + #declare score_holder $UserID + +# Tick加算 + scoreboard players remove @s[tag=O1192.Idle] General.Object.Tick 1 + +# O1192.Idleの有無で処理を分岐 + #あるならプレイヤーの周りを回転 + execute store result score $UserID Temporary run data get storage asset:context this.UserID + execute if entity @s[tag=O1192.Idle] as @a if score @s UserID = $UserID Temporary at @s as @e[type=marker,tag=this,limit=1] run function asset:object/1192.satelite_drop/tick/idle/ + + #ないならsuper.tick + execute unless entity @s[tag=O1192.Idle] run function asset:object/super.tick + +# 演出 + particle dust 0.2 0.4 0.8 0.5 ~ ~ ~ 0.01 0.01 0.01 1 5 + particle dust 0.722 1 0.984 0.25 ~ ~ ~ 0.05 0.05 0.05 1 15 + +# リセット + scoreboard players reset $UserID + +# 消滅処理 + kill @s[scores={General.Object.Tick=..0}] diff --git a/Asset/data/asset/functions/object/1192.satelite_drop/tick/idle/.mcfunction b/Asset/data/asset/functions/object/1192.satelite_drop/tick/idle/.mcfunction new file mode 100644 index 00000000000..add66f8b758 --- /dev/null +++ b/Asset/data/asset/functions/object/1192.satelite_drop/tick/idle/.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/1192.satelite_drop/tick/idle/ +# +# 発射待機中の動き +# +# @within function asset:object/1192.satelite_drop/tick/ + +#> Private +# @private + #declare score_holder $Angle + +# 回転 + execute store result score $Angle Temporary run data get storage asset:context this.Angle + execute store result storage asset:context this.Angle int 1 run scoreboard players add $Angle Temporary 4 +# 角度をマクロにわたす + execute positioned ~ ~0.75 ~ rotated ~ ~ run function asset:object/1192.satelite_drop/tick/idle/m with storage asset:context this diff --git a/Asset/data/asset/functions/object/1192.satelite_drop/tick/idle/m.mcfunction b/Asset/data/asset/functions/object/1192.satelite_drop/tick/idle/m.mcfunction new file mode 100644 index 00000000000..9b88117d6f9 --- /dev/null +++ b/Asset/data/asset/functions/object/1192.satelite_drop/tick/idle/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1192.satelite_drop/tick/idle/m +# +# +# +# @within function asset:object/1192.satelite_drop/tick/idle/ + + $execute rotated $(Angle) 0 run tp @s ^ ^ ^0.75 diff --git a/Asset/data/asset/functions/object/alias/1192/detect_hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1192/detect_hit_entity.mcfunction new file mode 100644 index 00000000000..85cf7a844f2 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1192/detect_hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1192/detect_hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1192.satelite_drop/detect_hit_entity/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1192/hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1192/hit_entity.mcfunction new file mode 100644 index 00000000000..c483ed24fe0 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1192/hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1192/hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1192.satelite_drop/hit_entity/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1192/init.mcfunction b/Asset/data/asset/functions/object/alias/1192/init.mcfunction new file mode 100644 index 00000000000..e9d7d27b474 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1192/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1192/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1192.satelite_drop/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1192/register.mcfunction b/Asset/data/asset/functions/object/alias/1192/register.mcfunction new file mode 100644 index 00000000000..8227e61c96b --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1192/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1192/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1192.satelite_drop/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1192/summon.mcfunction b/Asset/data/asset/functions/object/alias/1192/summon.mcfunction new file mode 100644 index 00000000000..7bbe6c16ffc --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1192/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1192/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1192.satelite_drop/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1192/tick.mcfunction b/Asset/data/asset/functions/object/alias/1192/tick.mcfunction new file mode 100644 index 00000000000..98af269b392 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1192/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1192/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1192.satelite_drop/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/dis_equip.json b/Asset/data/asset/tags/functions/artifact/dis_equip.json index 9199c71c1f4..910be362838 100644 --- a/Asset/data/asset/tags/functions/artifact/dis_equip.json +++ b/Asset/data/asset/tags/functions/artifact/dis_equip.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1620.satelite_drop/dis_equip/1.trigger", "asset:artifact/1360.vintage_wine/dis_equip/", "asset:artifact/1269.apocalypse/dis_equip/1.trigger", "asset:artifact/1615.ema_of_abundance/trigger/dis_equip/", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 4d1d5891d99..60de4173528 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/1620.satelite_drop/give/1.trigger", "asset:artifact/1360.vintage_wine/give/1.trigger", "asset:artifact/1661.starlight_circle/give/1.trigger", "asset:artifact/1390.red_refraction_prism/give/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 7c7788a92e7..c4057d24302 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/1620.satelite_drop/register", "asset:artifact/1360.vintage_wine/register", "asset:artifact/1661.starlight_circle/register", "asset:artifact/1662.salmon_canon/register", diff --git a/Asset/data/asset/tags/functions/artifact/using_item/keep/.json b/Asset/data/asset/tags/functions/artifact/using_item/keep/.json index 5ad644a7dce..09a9af5c6f0 100644 --- a/Asset/data/asset/tags/functions/artifact/using_item/keep/.json +++ b/Asset/data/asset/tags/functions/artifact/using_item/keep/.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1620.satelite_drop/using_item/1.trigger", "asset:artifact/1421.toaster/trigger/1.trigger", "asset:artifact/1637.precise_mana_controller/trigger/1.trigger", "asset:artifact/1453.frost_flake_bow/using_item/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/using_item/release/.json b/Asset/data/asset/tags/functions/artifact/using_item/release/.json index 5c922d2bbf0..08320de6ade 100644 --- a/Asset/data/asset/tags/functions/artifact/using_item/release/.json +++ b/Asset/data/asset/tags/functions/artifact/using_item/release/.json @@ -1,5 +1,5 @@ { "values": [ - + "asset:artifact/1620.satelite_drop/release_using_item/1.trigger" ] } diff --git a/Asset/data/asset/tags/functions/effect/given.json b/Asset/data/asset/tags/functions/effect/given.json index a361969900b..0cf409ec426 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/0396.satelite_drop/_/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 e3fc8c0b460..3a6cd57757a 100644 --- a/Asset/data/asset/tags/functions/effect/register.json +++ b/Asset/data/asset/tags/functions/effect/register.json @@ -1,5 +1,8 @@ { "values": [ + "asset:effect/0397.satelite_drop_cooldown/_/register", + "asset:effect/0396.satelite_drop/_/register", + "asset:effect/0395.charge_satelite_drop/_/register", "asset:effect/0369.elevage/_/register", "asset:effect/0405.predation_of_tree/_/register", "asset:effect/0359.time_ticker_eclipse/_/register", diff --git a/Asset/data/asset/tags/functions/effect/remove.json b/Asset/data/asset/tags/functions/effect/remove.json index b5663f76b6d..86fd656cac7 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/0396.satelite_drop/_/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..404fbde5fb4 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/0396.satelite_drop/_/tick", "asset:effect/0405.predation_of_tree/_/tick", "asset:effect/0359.time_ticker_eclipse/_/tick", "asset:effect/0358.time_ticker_night/_/tick", diff --git a/Asset/data/asset/tags/functions/object/load.json b/Asset/data/asset/tags/functions/object/load.json index 370cd7f01be..c1647ba1f56 100644 --- a/Asset/data/asset/tags/functions/object/load.json +++ b/Asset/data/asset/tags/functions/object/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:object/1192.satelite_drop/load", "asset:object/1061.azure_jelly/load", "asset:object/2251.wall_laser_clock/load", "asset:object/2212.eclael_upper_shot/load", @@ -58,4 +59,4 @@ "asset:object/1059.book_of_hero/load", "asset:object/2031.giant_pumpkin/load" ] -} +} \ No newline at end of file