diff --git a/Asset/data/asset/functions/artifact/1432.ouroboros_ball/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1432.ouroboros_ball/give/1.trigger.mcfunction new file mode 100644 index 00000000000..3d203151d73 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1432.ouroboros_ball/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1432.ouroboros_ball/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1432} run function asset:artifact/1432.ouroboros_ball/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1432.ouroboros_ball/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1432.ouroboros_ball/give/2.give.mcfunction new file mode 100644 index 00000000000..5cdc195106f --- /dev/null +++ b/Asset/data/asset/functions/artifact/1432.ouroboros_ball/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1432.ouroboros_ball/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1432.ouroboros_ball/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1432 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"廻蛇の玉","color":"light_purple"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"敵に玉を投げつけて攻撃する"}','{"text":"ヒット時、5回まで近くの敵に向かって跳ね返り"}','{"text":"2.5秒の間、与えたダメージの80%分"}','{"text":"次のダメージがアップする(最大2000)"}','{"text":"増加するダメージは自身のステータス補正の影響を受けない"}','{"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 "mainhand" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onClick" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value [40,80] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] +# 攻撃に関する情報 -攻撃属性 (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 30 +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 60 +# 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 "longRange" + data modify storage asset:artifact TypeCooldown.Duration set value 30 +# グローバルクールダウン (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","Urban", "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/1432.ouroboros_ball/register.mcfunction b/Asset/data/asset/functions/artifact/1432.ouroboros_ball/register.mcfunction new file mode 100644 index 00000000000..b2c45c0b953 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1432.ouroboros_ball/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1432.ouroboros_ball/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[4] append value [1432] +data modify storage asset:artifact RarityRegistryWithColor.Red[4] append value [1432] diff --git a/Asset/data/asset/functions/artifact/1432.ouroboros_ball/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1432.ouroboros_ball/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..3c61250590c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1432.ouroboros_ball/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1432.ouroboros_ball/trigger/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:1432} run function asset:artifact/1432.ouroboros_ball/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1432.ouroboros_ball/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1432.ouroboros_ball/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..ed172fc4182 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1432.ouroboros_ball/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1432.ouroboros_ball/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1432.ouroboros_ball/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1432.ouroboros_ball/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1432.ouroboros_ball/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1432.ouroboros_ball/trigger/3.main.mcfunction new file mode 100644 index 00000000000..595564c8939 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1432.ouroboros_ball/trigger/3.main.mcfunction @@ -0,0 +1,30 @@ +#> asset:artifact/1432.ouroboros_ball/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1432.ouroboros_ball/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# 演出 + execute anchored eyes positioned ^ ^ ^0.5 run playsound minecraft:entity.breeze.jump player @a ~ ~ ~ 1.0 0.8 0.0 + execute anchored eyes positioned ^ ^ ^0.5 run playsound minecraft:entity.breeze.jump player @a ~ ~ ~ 1.0 0.65 0.0 + +# ここから先は神器側の効果の処理を書く + +# 玉を発射(ダメージは8発連続で当てられれば4倍くらいになる。単体の敵に4回連続当て続けられたら強いくらいの感覚) + data modify storage api: Argument.ID set value 1158 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + #ダメージ + execute store result storage api: Argument.FieldOverride.Damage double 1 run random value 40..80 + #引継ぎダメージ保持時間 + data modify storage api: Argument.FieldOverride.Duration set value 50 + #引継ぎダメージ上限 + data modify storage api: Argument.FieldOverride.AdditionalDamageLimit set value 2000 + #反射回数上限 + data modify storage api: Argument.FieldOverride.ReflectionLimit set value 5 + #射程(Range*0.5m) + data modify storage api: Argument.FieldOverride.Range set value 60 + + execute anchored eyes positioned ^-0.2 ^-0.2 ^ run function api:object/summon diff --git a/Asset/data/asset/functions/effect/0361.ouroboros_echo/_/register.mcfunction b/Asset/data/asset/functions/effect/0361.ouroboros_echo/_/register.mcfunction new file mode 100644 index 00000000000..fb5b7808048 --- /dev/null +++ b/Asset/data/asset/functions/effect/0361.ouroboros_echo/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0361.ouroboros_echo/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:361} run function asset:effect/0361.ouroboros_echo/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/0361.ouroboros_echo/register.mcfunction b/Asset/data/asset/functions/effect/0361.ouroboros_echo/register.mcfunction new file mode 100644 index 00000000000..5a916b9307d --- /dev/null +++ b/Asset/data/asset/functions/effect/0361.ouroboros_echo/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/0361.ouroboros_echo/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0361.ouroboros_echo/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 361 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"ウロボロス・エコー","color":"light_purple"}' +# 説明文 (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 1 +# 効果時間の操作方法 (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.DamageHolder set value 0 diff --git a/Asset/data/asset/functions/object/1158.ouroboros_ball/_index.d.mcfunction b/Asset/data/asset/functions/object/1158.ouroboros_ball/_index.d.mcfunction new file mode 100644 index 00000000000..931f22e6ff5 --- /dev/null +++ b/Asset/data/asset/functions/object/1158.ouroboros_ball/_index.d.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1158.ouroboros_ball/_index.d +# @private + +#> score_holder +# @within +# function asset:object/1158.ouroboros_ball/hit_entity/** + #declare score_holder $Temporary + #declare score_holder $HitEnemyID + +#> tag +# @within function asset:object/1158.ouroboros_ball/hit_entity/** + #declare tag 13S.Owner + #declare tag 13S.HitEnemy diff --git a/Asset/data/asset/functions/object/1158.ouroboros_ball/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1158.ouroboros_ball/detect_hit_entity/.mcfunction new file mode 100644 index 00000000000..2a88059453f --- /dev/null +++ b/Asset/data/asset/functions/object/1158.ouroboros_ball/detect_hit_entity/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1158.ouroboros_ball/detect_hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1158/detect_hit_entity + +# ヒット検知 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/.mcfunction new file mode 100644 index 00000000000..9d680349a24 --- /dev/null +++ b/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/.mcfunction @@ -0,0 +1,48 @@ +#> asset:object/1158.ouroboros_ball/hit_entity/ +# +# ヒット時の処理 +# +# @within function asset:object/alias/1158/hit_entity +#> private +# @private + #declare score_holder $OwnerID + +#Hitした敵にTagを付与 + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run tag @s add 13S.HitEnemy + +#直前にヒットしている敵ならリセットしてreturn(対象がExtendedCollisionを持っている場合はForwardTargetMobUUIDと比較) + execute store result score $HitEnemyID Temporary run data get storage asset:context this.HitEnemyID + execute if score @e[tag=13S.HitEnemy,tag=!ExtendedCollision,distance=..5,sort=nearest,limit=1] MobUUID = $HitEnemyID Temporary run return run function asset:object/1158.ouroboros_ball/hit_entity/reset + execute if score @e[tag=13S.HitEnemy,tag=ExtendedCollision,distance=..5,sort=nearest,limit=1] ForwardTargetMobUUID = $HitEnemyID Temporary run return run function asset:object/1158.ouroboros_ball/hit_entity/reset + +#vfx + playsound minecraft:entity.ender_dragon.hurt neutral @a ~ ~ ~ 0.6 1.33 0.0 + playsound minecraft:entity.player.attack.strong neutral @a ~ ~ ~ 1.0 0.7 0.0 + particle block lapis_block ~ ~ ~ 0 0 0 1 20 + +# オーナーの特定 + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute as @a if score @s UserID = $OwnerID Temporary run tag @s add 13S.Owner + +#ダメージ処理 + execute as @e[tag=13S.HitEnemy,distance=..5,sort=nearest,limit=1] run function asset:object/1158.ouroboros_ball/hit_entity/damage + +#同じ本体に属する敵(本体・追加当たり判定)も反射先の候補から外す + execute store result score $HitEnemyID Temporary run data get storage asset:context this.HitEnemyID + execute as @e[type=#lib:living_without_player,tag=!13S.HitEnemy,tag=!ExtendedCollision,distance=..8] if score @s MobUUID = $HitEnemyID Temporary run tag @s add 13S.HitEnemy + execute as @e[type=#lib:living_without_player,tag=ExtendedCollision,tag=!13S.HitEnemy,distance=..8] if score @s ForwardTargetMobUUID = $HitEnemyID Temporary run tag @s add 13S.HitEnemy + +# リセット + scoreboard players reset $OwnerID Temporary + scoreboard players reset $HitEnemyID Temporary + tag @a remove 13S.Owner + +#反射回数が0になったら玉を消す + execute if data storage asset:context this{ReflectionLimit:0} run function asset:object/call.m {method:"kill"} + +#8m以内に敵がいるなら、向きを変える。そうでない時は玉を消す。 + execute unless data storage asset:context this{ReflectionLimit:0} if entity @e[type=#lib:living_without_player,tag=!13S.HitEnemy,tag=!Uninterferable,distance=..8] run function asset:object/1158.ouroboros_ball/hit_entity/reflect + execute unless data storage asset:context this{ReflectionLimit:0} unless entity @e[type=#lib:living_without_player,tag=!13S.HitEnemy,tag=!Uninterferable,distance=..8] run function asset:object/call.m {method:"kill"} + +#ヒットタグもリセット + tag @e[type=#lib:living_without_player,distance=..5] remove 13S.HitEnemy diff --git a/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/damage.mcfunction b/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/damage.mcfunction new file mode 100644 index 00000000000..b590ffc384b --- /dev/null +++ b/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/damage.mcfunction @@ -0,0 +1,47 @@ +#> asset:object/1158.ouroboros_ball/hit_entity/damage +# +# damage処理 +# +# @within function asset:object/1158.ouroboros_ball/hit_entity/ + +#> private +# @private + #declare score_holder $DamageHolder + #declare score_holder $AdditionalDamageLimit + +#ヒットした敵のIDを取得(対象がExtendedCollisionを持っている場合はForwardTargetMobUUIDを取得) + execute if entity @s[tag=!ExtendedCollision] store result storage asset:context this.HitEnemyID int 1 run scoreboard players get @s MobUUID + execute if entity @s[tag=ExtendedCollision] store result storage asset:context this.HitEnemyID int 1 run scoreboard players get @s ForwardTargetMobUUID + +# effectの情報を取得 + data modify storage api: Argument.ID set value 361 + execute as @a[tag=13S.Owner] run function api:entity/mob/effect/get/from_id + execute if entity @a[tag=13S.Owner] store result score $DamageHolder Temporary run data get storage api: Return.Effect.Field.DamageHolder + + +# ダメージ計算 + # 今回追加するダメージの攻撃補正後のダメージを計算する。 + data modify storage api: Argument.Damage set from storage asset:context this.Damage + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "Water" + execute if entity @a[tag=13S.Owner] as @a[tag=13S.Owner] run function api:damage/modifier + # 前に計算したダメージ量(10倍)に保持している前のダメージ量(8倍)を足して0.1倍して与えるダメージに入れる。 + execute store result score $Temporary Temporary run data get storage api: Argument.Damage 10 + scoreboard players operation $Temporary Temporary += $DamageHolder Temporary + execute store result storage api: Argument.Damage double 0.1 run scoreboard players get $Temporary Temporary + # 今回与えるダメージの八割の10倍(8倍)を保持する。(最大でAdditionalDamageLimitの値まで) + execute store result score $Temporary Temporary run data get storage api: Argument.Damage 8 + execute store result score $AdditionalDamageLimit Temporary run data get storage asset:context this.AdditionalDamageLimit 10 + scoreboard players operation $Temporary Temporary < $AdditionalDamageLimit Temporary + scoreboard players operation $DamageHolder Temporary = $Temporary Temporary + # 相手の耐性を考慮してダメージをあたえる。 + function api:damage/ + function api:damage/reset + +# effectの付与 + execute if entity @a[tag=13S.Owner] as @a[tag=13S.Owner] run function asset:object/1158.ouroboros_ball/hit_entity/effect_give + +# リセット + scoreboard players reset $Temporary Temporary + scoreboard players reset $DamageHolder Temporary + scoreboard players reset $AdditionalDamageLimit Temporary diff --git a/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/effect_give.mcfunction b/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/effect_give.mcfunction new file mode 100644 index 00000000000..a7c50cefab2 --- /dev/null +++ b/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/effect_give.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/1158.ouroboros_ball/hit_entity/effect_give +# +# effect付与用 +# +# @within function asset:object/1158.ouroboros_ball/hit_entity/damage + +# エフェクト付与 + data modify storage api: Argument.ID set value 361 + data modify storage api: Argument.Duration set from storage asset:context this.Duration + execute store result storage api: Argument.FieldOverride.DamageHolder int 1 run scoreboard players get $Temporary Temporary + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/reflect.mcfunction b/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/reflect.mcfunction new file mode 100644 index 00000000000..2961d40058c --- /dev/null +++ b/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/reflect.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/1158.ouroboros_ball/hit_entity/reflect +# +# 反射処理 +# +# @within function asset:object/1158.ouroboros_ball/hit_entity/ + +#反射回数を1減らす + execute store result storage asset:context this.ReflectionLimit int 0.9999999999 run data get storage asset:context this.ReflectionLimit 1 +#向きを変える + tp @s ^ ^ ^ facing entity @e[type=#lib:living_without_player,tag=!13S.HitEnemy,tag=!Uninterferable,distance=..8,sort=random,limit=1] eyes +#vfx + playsound minecraft:block.glass.break player @a ~ ~ ~ 1.0 0.65 0.0 diff --git a/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/reset.mcfunction b/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/reset.mcfunction new file mode 100644 index 00000000000..75f8942c6f5 --- /dev/null +++ b/Asset/data/asset/functions/object/1158.ouroboros_ball/hit_entity/reset.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1158.ouroboros_ball/hit_entity/reset +# +# return用リセット処理 +# +# @within function asset:object/1158.ouroboros_ball/hit_entity/ + +# リセット + scoreboard players reset $HitEnemyID Temporary + tag @e[type=#lib:living_without_player,distance=..5] remove 13S.HitEnemy diff --git a/Asset/data/asset/functions/object/1158.ouroboros_ball/register.mcfunction b/Asset/data/asset/functions/object/1158.ouroboros_ball/register.mcfunction new file mode 100644 index 00000000000..62490b17d0d --- /dev/null +++ b/Asset/data/asset/functions/object/1158.ouroboros_ball/register.mcfunction @@ -0,0 +1,30 @@ +#> asset:object/1158.ouroboros_ball/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1158/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 + +# ID (int) + data modify storage asset:object ID set value 1158 +# フィールド(オプション) + data modify storage asset:object Field.Speed set value 2 + data modify storage asset:object Field.Range set value 1 + data modify storage asset:object Field.MovePerStep set value 0.5 + 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.Duration set value 1 + data modify storage asset:object Field.Spin set value 4 + data modify storage asset:object Field.SpinInterval set value 2 + data modify storage asset:object Field.AdditionalDamageLimit set value 1 + data modify storage asset:object Field.ReflectionLimit set value 1 + data modify storage asset:object Field.HitEnemyID set value -1 diff --git a/Asset/data/asset/functions/object/1158.ouroboros_ball/summon/.mcfunction b/Asset/data/asset/functions/object/1158.ouroboros_ball/summon/.mcfunction new file mode 100644 index 00000000000..d299945803e --- /dev/null +++ b/Asset/data/asset/functions/object/1158.ouroboros_ball/summon/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1158.ouroboros_ball/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1158/summon + +# 召喚 + execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ ~ + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + function asset:object/1158.ouroboros_ball/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1158.ouroboros_ball/summon/m.mcfunction b/Asset/data/asset/functions/object/1158.ouroboros_ball/summon/m.mcfunction new file mode 100644 index 00000000000..38007312e96 --- /dev/null +++ b/Asset/data/asset/functions/object/1158.ouroboros_ball/summon/m.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1158.ouroboros_ball/summon/m +# +# +# +# @within function asset:object/1158.ouroboros_ball/summon/ + +# 元となるEntityを召喚する + $summon item_display ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"],teleport_duration:1,interpolation_duration:2,billboard:"center",item:{id:"minecraft:carrot_on_a_stick",Count:1b,tag:{CustomModelData:1432}}} diff --git a/Asset/data/asset/functions/object/1158.ouroboros_ball/tick/.mcfunction b/Asset/data/asset/functions/object/1158.ouroboros_ball/tick/.mcfunction new file mode 100644 index 00000000000..04b9b8a43b9 --- /dev/null +++ b/Asset/data/asset/functions/object/1158.ouroboros_ball/tick/.mcfunction @@ -0,0 +1,16 @@ +#> asset:object/1158.ouroboros_ball/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1158/tick + +# 軌跡のエフェクト + particle dust 0.204 0.09 0.62 1 ~ ~ ~ 0 0 0 0 1 + +# 回転のInterval + execute store result storage asset:context this.SpinInterval int 0.9999999999 run data get storage asset:context this.SpinInterval + execute if data storage asset:context this{SpinInterval:0} run function asset:object/1158.ouroboros_ball/tick/spin + execute if data storage asset:context this{SpinInterval:0} run data modify storage asset:context this.SpinInterval set value 2 + +# super.tick + execute at @s run function asset:object/super.tick diff --git a/Asset/data/asset/functions/object/1158.ouroboros_ball/tick/spin.mcfunction b/Asset/data/asset/functions/object/1158.ouroboros_ball/tick/spin.mcfunction new file mode 100644 index 00000000000..44e044951c8 --- /dev/null +++ b/Asset/data/asset/functions/object/1158.ouroboros_ball/tick/spin.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1158.ouroboros_ball/tick/spin +# +# +# +# @within function asset:object/1158.ouroboros_ball/tick/ +#vfx + execute unless data storage asset:context this{Spin:0} unless data storage asset:context this{Spin:2} run playsound minecraft:entity.witch.throw neutral @a ~ ~ ~ 0.6 0.8 + +# start_interpolation + data modify entity @s start_interpolation set value 0 + +# 回転 + execute store result storage asset:context this.Spin int 0.9999999999 run data get storage asset:context this.Spin + execute if data storage asset:context this{Spin:3} run data modify entity @s transformation.left_rotation set value [0.0f,0.0f,0.7071f,0.7071f] + execute if data storage asset:context this{Spin:2} run data modify entity @s transformation.left_rotation set value [0.0f,0.0f,1.0f,0.0f] + execute if data storage asset:context this{Spin:1} run data modify entity @s transformation.left_rotation set value [0.0f,0.0f,0.7071f,-0.7071f] + execute if data storage asset:context this{Spin:0} run data modify entity @s transformation.left_rotation set value [0.0f,0.0f,0.0f,1.0f] + execute if data storage asset:context this{Spin:0} run data modify storage asset:context this.Spin set value 4 diff --git a/Asset/data/asset/functions/object/alias/1158/detect_hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1158/detect_hit_entity.mcfunction new file mode 100644 index 00000000000..090bfaac664 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1158/detect_hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1158/detect_hit_entity +# +# +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1158.ouroboros_ball/detect_hit_entity/ diff --git a/Asset/data/asset/functions/object/alias/1158/hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1158/hit_entity.mcfunction new file mode 100644 index 00000000000..1d512ad0d54 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1158/hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1158/hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1158.ouroboros_ball/hit_entity/ diff --git a/Asset/data/asset/functions/object/alias/1158/register.mcfunction b/Asset/data/asset/functions/object/alias/1158/register.mcfunction new file mode 100644 index 00000000000..beb71bdb9f8 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1158/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1158/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1158.ouroboros_ball/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1158/summon.mcfunction b/Asset/data/asset/functions/object/alias/1158/summon.mcfunction new file mode 100644 index 00000000000..51d68eae3be --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1158/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1158/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1158.ouroboros_ball/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1158/tick.mcfunction b/Asset/data/asset/functions/object/alias/1158/tick.mcfunction new file mode 100644 index 00000000000..f3a5c92d436 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1158/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1158/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1158.ouroboros_ball/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index b52518691d0..54785596940 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1432.ouroboros_ball/trigger/1.trigger", "asset:artifact/1661.starlight_circle/trigger/1.trigger", "asset:artifact/1662.salmon_canon/trigger/1.trigger", "asset:artifact/1632.photon_burst/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..3212310c38d 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/1432.ouroboros_ball/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/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 26a2324e12b..ec0f3f2bbed 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/1432.ouroboros_ball/register", "asset:artifact/1661.starlight_circle/register", "asset:artifact/1662.salmon_canon/register", "asset:artifact/1626.years_magic_index/register", diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 55a4d503dc8..7fd0d51ef99 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/0361.ouroboros_echo/_/register", "asset:effect/0405.predation_of_tree/_/register", "asset:effect/0359.time_ticker_eclipse/_/register", "asset:effect/0358.time_ticker_night/_/register",