diff --git a/Asset/data/asset/functions/artifact/1677.osmanthus_takt/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1677.osmanthus_takt/give/1.trigger.mcfunction new file mode 100644 index 0000000000..9a46fb3d63 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1677.osmanthus_takt/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1677.osmanthus_takt/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1677} run function asset:artifact/1677.osmanthus_takt/give/2.give diff --git a/Asset/data/asset/functions/artifact/1677.osmanthus_takt/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1677.osmanthus_takt/give/2.give.mcfunction new file mode 100644 index 0000000000..06df58ea85 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1677.osmanthus_takt/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1677.osmanthus_takt/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1677.osmanthus_takt/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する +# 最後にasset:artifact/common/giveを実行することで入手可能 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1677 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"金木犀のタクト","color":"#E8A33D"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"金木犀の力が込められたタクト"}','{"text":"使用時、敵に当たるとはじける魔法を放ち"}','{"text":"当たった敵の内3体が1.5秒後に小さく爆発する"}','{"text":"この爆発のダメージと回復するMP量は元の50%になる"}'] +# 消費アイテム ({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 +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "every" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackRange set value 15 +# MP消費量 (int) + #data modify storage asset:artifact MPCost set value +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# MP回復量 (int) + data modify storage asset:artifact MPHealWhenHit set value 6 +# 神器のクールダウン (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 ["Wi-ki", "Flora", "Nyaptov"] +# カスタム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/1677.osmanthus_takt/register.mcfunction b/Asset/data/asset/functions/artifact/1677.osmanthus_takt/register.mcfunction new file mode 100644 index 0000000000..eb88abe497 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1677.osmanthus_takt/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1677.osmanthus_takt/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[2] append value [1677] +data modify storage asset:artifact RarityRegistryWithColor.Red[2] append value [1677] diff --git a/Asset/data/asset/functions/artifact/1677.osmanthus_takt/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1677.osmanthus_takt/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..25bb2bee31 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1677.osmanthus_takt/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1677.osmanthus_takt/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:1677} run function asset:artifact/1677.osmanthus_takt/trigger/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1677.osmanthus_takt/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1677.osmanthus_takt/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..b829d14c8a --- /dev/null +++ b/Asset/data/asset/functions/artifact/1677.osmanthus_takt/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1677.osmanthus_takt/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1677.osmanthus_takt/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/1677.osmanthus_takt/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1677.osmanthus_takt/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1677.osmanthus_takt/trigger/3.main.mcfunction new file mode 100644 index 0000000000..bfe92cf101 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1677.osmanthus_takt/trigger/3.main.mcfunction @@ -0,0 +1,35 @@ +#> asset:artifact/1677.osmanthus_takt/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1677.osmanthus_takt/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く + +# 演出 + playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1.0 2 0.0 + playsound minecraft:block.note_block.chime player @a ~ ~ ~ 1.0 1.8 0.0 + playsound minecraft:entity.arrow.hit_player player @a ~ ~ ~ 1.0 1.6 0.0 + playsound minecraft:entity.arrow.hit_player player @a ~ ~ ~ 1.0 1.8 0.0 + playsound entity.illusioner.cast_spell player @a ~ ~ ~ 0.6 1.8 + particle dust 1 0.75 0.2 1 ~ ~1 ~ 0.3 0.3 0.3 0 15 normal @a + +# 召喚 +# 一回目の爆発のダメージ + data modify storage api: Argument.FieldOverride.Damage set value 40d +# 二回目の爆発の威力(ダメージ・MP回復量に掛ける割合 %) + data modify storage api: Argument.FieldOverride.SecondRate set value 50 +# 二回目の爆発の半径(m) + data modify storage api: Argument.FieldOverride.SecondRadius set value 1.0d +# 金木犀の香りが爆発するまでの時間(tick) + data modify storage api: Argument.FieldOverride.DebuffDuration set value 30 +# 金木犀の香りを付与する敵の最大数 + data modify storage api: Argument.FieldOverride.MaxDebuffTargets set value 3 +# 一回目の爆発によるMP回復量 + data modify storage api: Argument.FieldOverride.MPHeal set from storage api: PersistentArgument.AdditionalMPHeal + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + data modify storage api: Argument.ID set value 1208 + execute anchored eyes positioned ^ ^-0.3 ^0.3 run function api:object/summon diff --git a/Asset/data/asset/functions/effect/0421.osmanthus_scent/_/end.mcfunction b/Asset/data/asset/functions/effect/0421.osmanthus_scent/_/end.mcfunction new file mode 100644 index 0000000000..bb7a6fd603 --- /dev/null +++ b/Asset/data/asset/functions/effect/0421.osmanthus_scent/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0421.osmanthus_scent/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:421} run function asset:effect/0421.osmanthus_scent/end/ diff --git a/Asset/data/asset/functions/effect/0421.osmanthus_scent/_/re-given.mcfunction b/Asset/data/asset/functions/effect/0421.osmanthus_scent/_/re-given.mcfunction new file mode 100644 index 0000000000..442bb059f9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0421.osmanthus_scent/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0421.osmanthus_scent/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:421} run function asset:effect/0421.osmanthus_scent/re-given/ diff --git a/Asset/data/asset/functions/effect/0421.osmanthus_scent/_/register.mcfunction b/Asset/data/asset/functions/effect/0421.osmanthus_scent/_/register.mcfunction new file mode 100644 index 0000000000..7135cc2fe9 --- /dev/null +++ b/Asset/data/asset/functions/effect/0421.osmanthus_scent/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0421.osmanthus_scent/_/register +# +# Effectのデータ登録時に実行されるfunction +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:421} run function asset:effect/0421.osmanthus_scent/register diff --git a/Asset/data/asset/functions/effect/0421.osmanthus_scent/_/tick.mcfunction b/Asset/data/asset/functions/effect/0421.osmanthus_scent/_/tick.mcfunction new file mode 100644 index 0000000000..8d968c99e2 --- /dev/null +++ b/Asset/data/asset/functions/effect/0421.osmanthus_scent/_/tick.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/0421.osmanthus_scent/_/tick +# +# Effectが発動している間毎tick実行されるfunction +# +# @within tag/function asset:effect/tick + +execute if data storage asset:context {id:421} run function asset:effect/0421.osmanthus_scent/tick/ diff --git a/Asset/data/asset/functions/effect/0421.osmanthus_scent/detonate/.mcfunction b/Asset/data/asset/functions/effect/0421.osmanthus_scent/detonate/.mcfunction new file mode 100644 index 0000000000..a07140f767 --- /dev/null +++ b/Asset/data/asset/functions/effect/0421.osmanthus_scent/detonate/.mcfunction @@ -0,0 +1,25 @@ +#> asset:effect/0421.osmanthus_scent/detonate/ +# +# 付与先の位置で演出を行い、攻撃者のプレイヤーを実行者にしてSecondRadiusの範囲の敵を攻撃する +# +# @within function +# asset:effect/0421.osmanthus_scent/end/ +# asset:effect/0421.osmanthus_scent/re-given/ + +#> Private +# @private + #declare score_holder $UserID + +# 演出 + particle dust 1 0.75 0.2 1.2 ~ ~0.8 ~ 0.6 0.5 0.6 0 25 normal @a + particle minecraft:wax_on ~ ~0.8 ~ 0 0 0 15 40 normal @a + particle composter ~ ~0.8 ~ 0.6 0.5 0.6 0 20 normal @a + playsound block.amethyst_block.break player @a ~ ~ ~ 0.8 1.6 + +# 攻撃者のプレイヤーを実行者にして爆発させる + execute store result score $UserID Temporary run data get storage asset:temp 421.Field.UserID + execute as @a if score @s UserID = $UserID Temporary run function asset:effect/0421.osmanthus_scent/detonate/explode.m with storage asset:temp 421.Field + +# リセット + scoreboard players reset $UserID Temporary + data remove storage asset:temp 421 diff --git a/Asset/data/asset/functions/effect/0421.osmanthus_scent/detonate/explode.m.mcfunction b/Asset/data/asset/functions/effect/0421.osmanthus_scent/detonate/explode.m.mcfunction new file mode 100644 index 0000000000..f56b6c83b1 --- /dev/null +++ b/Asset/data/asset/functions/effect/0421.osmanthus_scent/detonate/explode.m.mcfunction @@ -0,0 +1,34 @@ +#> asset:effect/0421.osmanthus_scent/detonate/explode.m +# +# 付与先の半径SecondRadiusの敵へ、元のダメージとMP回復量にSecondRate%を掛けた値で攻撃する +# +# @input args: +# SecondRadius : double +# @within function asset:effect/0421.osmanthus_scent/detonate/ + +#> Private +# @private + #declare score_holder $Rate + #declare score_holder $Damage + #declare score_holder $MPHeal + +# ダメージ + # SecondRate%攻撃力を下げて攻撃 + execute store result score $Rate Temporary run data get storage asset:temp 421.Field.SecondRate + execute store result score $Damage Temporary run data get storage asset:temp 421.Field.Damage 100 + scoreboard players operation $Damage Temporary *= $Rate Temporary + execute store result storage api: Argument.Damage double 0.0001 run scoreboard players get $Damage Temporary + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "None" + execute store result score $MPHeal Temporary run data get storage asset:temp 421.Field.MPHeal 100 + scoreboard players operation $MPHeal Temporary *= $Rate Temporary + execute store result storage api: Argument.AdditionalMPHeal double 0.0001 run scoreboard players get $MPHeal Temporary + #reset + scoreboard players reset $Rate Temporary + scoreboard players reset $Damage Temporary + scoreboard players reset $MPHeal Temporary + function api:damage/modifier + function api:damage/single_damage_session/open + $execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..$(SecondRadius)] run function api:damage/ + function api:damage/single_damage_session/close + function api:damage/reset diff --git a/Asset/data/asset/functions/effect/0421.osmanthus_scent/end/.mcfunction b/Asset/data/asset/functions/effect/0421.osmanthus_scent/end/.mcfunction new file mode 100644 index 0000000000..ca9aa545b0 --- /dev/null +++ b/Asset/data/asset/functions/effect/0421.osmanthus_scent/end/.mcfunction @@ -0,0 +1,9 @@ +#> asset:effect/0421.osmanthus_scent/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/0421.osmanthus_scent/_/end + +# 爆発 + data modify storage asset:temp 421.Field set from storage asset:context this + function asset:effect/0421.osmanthus_scent/detonate/ diff --git a/Asset/data/asset/functions/effect/0421.osmanthus_scent/re-given/.mcfunction b/Asset/data/asset/functions/effect/0421.osmanthus_scent/re-given/.mcfunction new file mode 100644 index 0000000000..23723f4dc5 --- /dev/null +++ b/Asset/data/asset/functions/effect/0421.osmanthus_scent/re-given/.mcfunction @@ -0,0 +1,10 @@ +#> asset:effect/0421.osmanthus_scent/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/0421.osmanthus_scent/_/re-given + +# 爆発 +# 先に香りを付けたプレイヤーの攻撃として扱うため、上書き前のFieldで爆発させる + data modify storage asset:temp 421.Field set from storage asset:context PreviousField + function asset:effect/0421.osmanthus_scent/detonate/ diff --git a/Asset/data/asset/functions/effect/0421.osmanthus_scent/register.mcfunction b/Asset/data/asset/functions/effect/0421.osmanthus_scent/register.mcfunction new file mode 100644 index 0000000000..6b25c0c49c --- /dev/null +++ b/Asset/data/asset/functions/effect/0421.osmanthus_scent/register.mcfunction @@ -0,0 +1,43 @@ +#> asset:effect/0421.osmanthus_scent/register +# +# Effectのデータを指定 +# +# @within function asset:effect/0421.osmanthus_scent/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 421 +# 名前 (TextComponentString) + data modify storage asset:effect Name set value '{"text":"金木犀の香り","color":"#E8A33D"}' +# 説明文 (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 +# スタックの操作方法 (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 true +# 死亡時のエフェクトの処理 (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 false + +# フィールド + data modify storage asset:effect Field.Damage set value 1 + data modify storage asset:effect Field.MPHeal set value 1 + data modify storage asset:effect Field.UserID set value -1 + data modify storage asset:effect Field.SecondRate set value 50 + data modify storage asset:effect Field.SecondRadius set value 1.0d diff --git a/Asset/data/asset/functions/effect/0421.osmanthus_scent/tick/.mcfunction b/Asset/data/asset/functions/effect/0421.osmanthus_scent/tick/.mcfunction new file mode 100644 index 0000000000..3de90baa43 --- /dev/null +++ b/Asset/data/asset/functions/effect/0421.osmanthus_scent/tick/.mcfunction @@ -0,0 +1,8 @@ +#> asset:effect/0421.osmanthus_scent/tick/ +# +# Effectのtick処理 +# +# @within function asset:effect/0421.osmanthus_scent/_/tick + +# 演出 + particle dust 1 0.75 0.2 1 ~ ~0.8 ~ 0.3 0.5 0.3 0 1 normal @a diff --git a/Asset/data/asset/functions/object/1208.osmanthus_scent/_index.d.mcfunction b/Asset/data/asset/functions/object/1208.osmanthus_scent/_index.d.mcfunction new file mode 100644 index 0000000000..b9ccb3200b --- /dev/null +++ b/Asset/data/asset/functions/object/1208.osmanthus_scent/_index.d.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/1208.osmanthus_scent/_index.d +# @private + +#> score_holder +# @within function asset:object/1208.osmanthus_scent/kill/** + #declare score_holder $BodyID + +#> tag +# @within function asset:object/1208.osmanthus_scent/kill/** + #declare tag 1208.DebuffTarget + #declare tag 1208.Grouped + #declare tag 1208.SameBody diff --git a/Asset/data/asset/functions/object/1208.osmanthus_scent/detect_hit_block/.mcfunction b/Asset/data/asset/functions/object/1208.osmanthus_scent/detect_hit_block/.mcfunction new file mode 100644 index 0000000000..9cba97cf07 --- /dev/null +++ b/Asset/data/asset/functions/object/1208.osmanthus_scent/detect_hit_block/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1208.osmanthus_scent/detect_hit_block/ +# +# 進行方向のブロックとの接触を判定する +# +# @within asset:object/alias/1208/detect_hit_block + +# 判定 + execute unless block ^ ^ ^0.5 #lib:no_collision/ run data modify storage asset:context IsHitBlock set value true diff --git a/Asset/data/asset/functions/object/1208.osmanthus_scent/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1208.osmanthus_scent/detect_hit_entity/.mcfunction new file mode 100644 index 0000000000..f43e07947d --- /dev/null +++ b/Asset/data/asset/functions/object/1208.osmanthus_scent/detect_hit_entity/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1208.osmanthus_scent/detect_hit_entity/ +# +# 敵との接触を判定する +# +# @within asset:object/alias/1208/detect_hit_entity + +# 判定 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1208.osmanthus_scent/kill/.mcfunction b/Asset/data/asset/functions/object/1208.osmanthus_scent/kill/.mcfunction new file mode 100644 index 0000000000..32c8ab4ca1 --- /dev/null +++ b/Asset/data/asset/functions/object/1208.osmanthus_scent/kill/.mcfunction @@ -0,0 +1,26 @@ +#> asset:object/1208.osmanthus_scent/kill/ +# +# 現在位置で攻撃判定を発生させて消滅する +# 敵・ブロックへの接触と射程限界の各経路から呼ばれる +# +# @within asset:object/alias/1208/kill + +#> Private +# @private + #declare score_holder $UserID + +# 演出 + particle dust 1 0.75 0.2 1.5 ~ ~ ~ 0.8 0.8 0.8 0 40 normal @a + particle minecraft:wax_on ~ ~ ~ 0.8 0.8 0.8 5 50 normal @a + particle end_rod ~ ~ ~ 0 0 0 0.2 15 normal @a + particle minecraft:dripping_lava ~ ~ ~ 0.9 0.8 0.9 0 40 normal @a + playsound block.amethyst_block.break player @a ~ ~ ~ 1 1.4 + playsound block.amethyst_block.break player @a ~ ~ ~ 1 1.2 + +# 攻撃者のプレイヤーを実行者にして攻撃する + execute store result score $UserID Temporary run data get storage asset:context this.UserID + execute as @a if score @s UserID = $UserID Temporary run function asset:object/1208.osmanthus_scent/kill/attack.m with storage asset:context this + scoreboard players reset $UserID Temporary + +# 消滅 + kill @s diff --git a/Asset/data/asset/functions/object/1208.osmanthus_scent/kill/attack.m.mcfunction b/Asset/data/asset/functions/object/1208.osmanthus_scent/kill/attack.m.mcfunction new file mode 100644 index 0000000000..4ddd41f975 --- /dev/null +++ b/Asset/data/asset/functions/object/1208.osmanthus_scent/kill/attack.m.mcfunction @@ -0,0 +1,39 @@ +#> asset:object/1208.osmanthus_scent/kill/attack.m +# +# 半径3mの敵へダメージを与え、近い順に最大MaxDebuffTargets体へEffectを付与する +# +# @input args: +# MaxDebuffTargets : int +# @within function asset:object/1208.osmanthus_scent/kill/ + +# ダメージ + data modify storage api: Argument.Damage set from storage asset:context this.Damage + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "None" + data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.MPHeal + function api:damage/modifier + function api:damage/single_damage_session/open + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..3] run function api:damage/ + function api:damage/single_damage_session/close + function api:damage/reset + +# 付与対象の候補を決める + # 追加当たり判定ではない敵はそのまま候補にする + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!ExtendedCollision,tag=!Uninterferable,tag=!Death,distance=..3] add 1208.DebuffTarget + # 追加当たり判定は、近い順に本体ごとに1体だけ候補にする + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=ExtendedCollision,tag=!Uninterferable,tag=!Death,distance=..3,sort=nearest] run function asset:object/1208.osmanthus_scent/kill/select_extended_collision + +# 爆心に近い順に最大MaxDebuffTargets体へ金木犀の香りを付与する + data modify storage api: Argument.ID set value 421 + data modify storage api: Argument.Duration set from storage asset:context this.DebuffDuration + data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage + data modify storage api: Argument.FieldOverride.MPHeal set from storage asset:context this.MPHeal + data modify storage api: Argument.FieldOverride.UserID set from storage asset:context this.UserID + data modify storage api: Argument.FieldOverride.SecondRate set from storage asset:context this.SecondRate + data modify storage api: Argument.FieldOverride.SecondRadius set from storage asset:context this.SecondRadius + $execute as @e[type=#lib:living_without_player,tag=1208.DebuffTarget,distance=..3,sort=nearest,limit=$(MaxDebuffTargets)] run function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# リセット + tag @e[type=#lib:living_without_player,distance=..3] remove 1208.DebuffTarget + tag @e[type=#lib:living_without_player,distance=..3] remove 1208.Grouped diff --git a/Asset/data/asset/functions/object/1208.osmanthus_scent/kill/select_extended_collision.mcfunction b/Asset/data/asset/functions/object/1208.osmanthus_scent/kill/select_extended_collision.mcfunction new file mode 100644 index 0000000000..fea9c531fa --- /dev/null +++ b/Asset/data/asset/functions/object/1208.osmanthus_scent/kill/select_extended_collision.mcfunction @@ -0,0 +1,23 @@ +#> asset:object/1208.osmanthus_scent/kill/select_extended_collision +# +# 同じ本体の当たり判定がまだ候補になっていなければ、この追加当たり判定を候補にする +# +# @within function asset:object/1208.osmanthus_scent/kill/attack.m + +# 近い判定で同じ本体を処理済みならスキップ + execute if entity @s[tag=1208.Grouped] run return fail + +# 同じ本体に属する敵(本体と追加当たり判定)に一時タグを付ける + scoreboard players operation $BodyID Temporary = @s ForwardTargetMobUUID + execute as @e[type=#lib:living_without_player,tag=!ExtendedCollision,distance=..3] if score @s MobUUID = $BodyID Temporary run tag @s add 1208.SameBody + execute as @e[type=#lib:living_without_player,tag=ExtendedCollision,distance=..3] if score @s ForwardTargetMobUUID = $BodyID Temporary run tag @s add 1208.SameBody + +# 本体がまだ候補になっていなければ、この判定を候補にする + execute unless entity @e[type=#lib:living_without_player,tag=1208.DebuffTarget,tag=1208.SameBody,distance=..3] run tag @s add 1208.DebuffTarget + +# 同じ本体の追加当たり判定を処理済みにする + tag @e[type=#lib:living_without_player,tag=1208.SameBody,tag=ExtendedCollision,distance=..3] add 1208.Grouped + +# リセット + tag @e[type=#lib:living_without_player,tag=1208.SameBody,distance=..3] remove 1208.SameBody + scoreboard players reset $BodyID Temporary diff --git a/Asset/data/asset/functions/object/1208.osmanthus_scent/recursive/.mcfunction b/Asset/data/asset/functions/object/1208.osmanthus_scent/recursive/.mcfunction new file mode 100644 index 0000000000..d6690d4063 --- /dev/null +++ b/Asset/data/asset/functions/object/1208.osmanthus_scent/recursive/.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1208.osmanthus_scent/recursive/ +# +# 飛行中の軌跡を描画する +# +# @within asset:object/alias/1208/recursive + +# 演出 + particle dust 1 0.75 0.2 0.8 ~ ~ ~ 0.05 0.05 0.05 0 1 normal @a + particle composter ~ ~ ~ 0.1 0.1 0.1 0 1 normal @a diff --git a/Asset/data/asset/functions/object/1208.osmanthus_scent/register.mcfunction b/Asset/data/asset/functions/object/1208.osmanthus_scent/register.mcfunction new file mode 100644 index 0000000000..d3639aeb35 --- /dev/null +++ b/Asset/data/asset/functions/object/1208.osmanthus_scent/register.mcfunction @@ -0,0 +1,29 @@ +#> asset:object/1208.osmanthus_scent/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1208/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 1208 +# フィールド(オプション) + data modify storage asset:object Field.Speed set value 5 + data modify storage asset:object Field.Range set value 30 + 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.MPHeal set value 1 + data modify storage asset:object Field.UserID set value -1 + data modify storage asset:object Field.SecondRate set value 50 + data modify storage asset:object Field.SecondRadius set value 1.0d + data modify storage asset:object Field.DebuffDuration set value 30 + data modify storage asset:object Field.MaxDebuffTargets set value 3 diff --git a/Asset/data/asset/functions/object/1208.osmanthus_scent/summon/.mcfunction b/Asset/data/asset/functions/object/1208.osmanthus_scent/summon/.mcfunction new file mode 100644 index 0000000000..fd8648f766 --- /dev/null +++ b/Asset/data/asset/functions/object/1208.osmanthus_scent/summon/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1208.osmanthus_scent/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1208/summon + +# 元となるEntityを召喚する + 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/1208.osmanthus_scent/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1208.osmanthus_scent/summon/m.mcfunction b/Asset/data/asset/functions/object/1208.osmanthus_scent/summon/m.mcfunction new file mode 100644 index 0000000000..d9205eaa02 --- /dev/null +++ b/Asset/data/asset/functions/object/1208.osmanthus_scent/summon/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1208.osmanthus_scent/summon/m +# +# @input args: +# Rotation : float @ 2 +# @within function asset:object/1208.osmanthus_scent/summon/ + +$summon marker ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"],teleport_duration:1} diff --git a/Asset/data/asset/functions/object/alias/1208/detect_hit_block.mcfunction b/Asset/data/asset/functions/object/alias/1208/detect_hit_block.mcfunction new file mode 100644 index 0000000000..7e81f1241a --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1208/detect_hit_block.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1208/detect_hit_block +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1208.osmanthus_scent/detect_hit_block/ diff --git a/Asset/data/asset/functions/object/alias/1208/detect_hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1208/detect_hit_entity.mcfunction new file mode 100644 index 0000000000..db4d25bf12 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1208/detect_hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1208/detect_hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1208.osmanthus_scent/detect_hit_entity/ diff --git a/Asset/data/asset/functions/object/alias/1208/kill.mcfunction b/Asset/data/asset/functions/object/alias/1208/kill.mcfunction new file mode 100644 index 0000000000..c475c28e3b --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1208/kill.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1208/kill +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1208.osmanthus_scent/kill/ diff --git a/Asset/data/asset/functions/object/alias/1208/recursive.mcfunction b/Asset/data/asset/functions/object/alias/1208/recursive.mcfunction new file mode 100644 index 0000000000..62a4f586e9 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1208/recursive.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1208/recursive +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1208.osmanthus_scent/recursive/ diff --git a/Asset/data/asset/functions/object/alias/1208/register.mcfunction b/Asset/data/asset/functions/object/alias/1208/register.mcfunction new file mode 100644 index 0000000000..ed5af93861 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1208/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1208/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1208.osmanthus_scent/register diff --git a/Asset/data/asset/functions/object/alias/1208/summon.mcfunction b/Asset/data/asset/functions/object/alias/1208/summon.mcfunction new file mode 100644 index 0000000000..55111475a1 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1208/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1208/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1208.osmanthus_scent/summon/ 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 b52518691d..90de5c8ef3 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/1677.osmanthus_takt/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 a362a1954c..e5d19c9532 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/1677.osmanthus_takt/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 26a2324e12..cdc0401a25 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/1677.osmanthus_takt/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/end.json b/Asset/data/asset/tags/functions/effect/end.json index eafa855c1f..1173eb24d9 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/0421.osmanthus_scent/_/end", "asset:effect/0405.predation_of_tree/_/end", "asset:effect/0359.time_ticker_eclipse/_/end", "asset:effect/0358.time_ticker_night/_/end", diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index e8154fd9bc..907e3d3364 100644 --- a/Asset/data/asset/tags/functions/effect/re-given.json +++ b/Asset/data/asset/tags/functions/effect/re-given.json @@ -1,5 +1,6 @@ { "values": [ + "asset:effect/0421.osmanthus_scent/_/re-given", "asset:effect/0357.time_ticker_day/_/re-given", "asset:effect/0358.time_ticker_night/_/re-given", "asset:effect/0359.time_ticker_eclipse/_/re-given", diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 55a4d503dc..8f5c969708 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/0421.osmanthus_scent/_/register", "asset:effect/0405.predation_of_tree/_/register", "asset:effect/0359.time_ticker_eclipse/_/register", "asset:effect/0358.time_ticker_night/_/register", diff --git a/Asset/data/asset/tags/functions/effect/tick.json b/Asset/data/asset/tags/functions/effect/tick.json index 097fd372db..5017a9a973 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/0421.osmanthus_scent/_/tick", "asset:effect/0405.predation_of_tree/_/tick", "asset:effect/0359.time_ticker_eclipse/_/tick", "asset:effect/0358.time_ticker_night/_/tick",