diff --git a/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/give/1.trigger.mcfunction new file mode 100644 index 0000000000..396ebe35ef --- /dev/null +++ b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1391.blue_refraction_prism/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1391} run function asset:artifact/1391.blue_refraction_prism/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/give/2.give.mcfunction new file mode 100644 index 0000000000..da88a39145 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/give/2.give.mcfunction @@ -0,0 +1,73 @@ +#> asset:artifact/1391.blue_refraction_prism/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1391.blue_refraction_prism/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1391 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"青","color":"#7A7AFF"},{"text":"色","color":"#8484FF"},{"text":"の","color":"#8E8EFF"},{"text":"屈","color":"#9898FF"},{"text":"折","color":"#A2A2FF"},{"text":"","color":"#ACACFF"},{"text":"プ","color":"#B6B6FF"},{"text":"リ","color":"#C0C0FF"},{"text":"ズ","color":"#CACAFF"},{"text":"ム","color":"#D4D4FF"}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"攻撃対象3体にダメージ量の10%分の水属性ダメージを与える"}','{"text":"このダメージは自身のステータス補正の影響を受けない"}'] +# 消費アイテム ({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 "hotbar" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "onAttack" +# 効果が重複可能か否か (boolean) (オプション) + # data modify storage asset:artifact EnableDuplication set value +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"水属性以外で属性攻撃"}' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [Water] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 2 +# 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 + # data modify storage asset:artifact TypeCooldown.Duration set value +# 第二種別クールダウン ({Type: string, Duration: int}) (オプション) + # data modify storage asset:artifact SecondaryTypeCooldown.Type set value + # data modify storage asset:artifact SecondaryTypeCooldown.Duration set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + data modify storage asset:artifact DisableCooldownMessage set value true +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + data modify storage asset:artifact DisableMPMessage set value true +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value "ALL" +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/register.mcfunction b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/register.mcfunction new file mode 100644 index 0000000000..63c5907498 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1391.blue_refraction_prism/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +# data modify storage asset:artifact RarityRegistry[1] append value [1391] diff --git a/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..ddbaac8396 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1391.blue_refraction_prism/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idの%slot%に装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{hotbar:[1391]} run function asset:artifact/1391.blue_refraction_prism/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..8d91c3b689 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/2.check_condition.mcfunction @@ -0,0 +1,33 @@ +#> asset:artifact/1391.blue_refraction_prism/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1391.blue_refraction_prism/trigger/1.trigger + +# ID指定する + data modify storage asset:artifact TargetID set value 1391 +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/hotbar +# 他にアイテム等確認する場合はここに書く + +# CanUsedじゃないならreturn + execute if entity @s[tag=!CanUsed] run return fail + +# バニラ攻撃ならreturn + execute if data storage asset:context Attack{IsVanilla:true} run tag @s remove CanUsed + execute if entity @s[tag=!CanUsed] run return fail + +# DoTならreturn + execute if data storage asset:context Attack{IsDoT:true} run return fail + execute if entity @s[tag=!CanUsed] run return fail + +# 水属性ならreturn + execute if data storage asset:context Attack{ElementType:"Water"} run return fail + execute if entity @s[tag=!CanUsed] run return fail + +# Victimがいなければreturn + execute unless entity @e[type=#lib:living_without_player,tag=Victim,distance=..64] run return fail + execute if entity @s[tag=!CanUsed] run return fail + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1391.blue_refraction_prism/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/3.main.mcfunction new file mode 100644 index 0000000000..ea810efd76 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/3.main.mcfunction @@ -0,0 +1,32 @@ +#> asset:artifact/1391.blue_refraction_prism/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1391.blue_refraction_prism/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/hotbar + +# ここから先は神器側の効果の処理を書く + +# SingleDamageSession open + function api:damage/single_damage_session/open + +# 攻撃対象のうち近いN体にダメージ + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..64,sort=nearest,limit=3] at @s run function asset:artifact/1391.blue_refraction_prism/trigger/apply + +# SingleDamageSession close + function api:damage/single_damage_session/close + +# 音 + execute at @e[type=#lib:living_without_player,tag=Target,distance=..64] run function asset:artifact/1391.blue_refraction_prism/trigger/sound + +# 自作パーティクル + function asset:artifact/1391.blue_refraction_prism/trigger/vfx/ + function asset:artifact/1391.blue_refraction_prism/trigger/vfx/ + function asset:artifact/1391.blue_refraction_prism/trigger/vfx/ + function asset:artifact/1391.blue_refraction_prism/trigger/vfx/ + +# リセット + data remove storage asset:temp Temp + tag @e[type=#lib:living_without_player,tag=Target,distance=..64] remove Target diff --git a/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/_index.d.mcfunction b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/_index.d.mcfunction new file mode 100644 index 0000000000..916f999cdc --- /dev/null +++ b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1391.blue_refraction_prism/trigger/_index.d +# @private + +#> tag +# @within function asset:artifact/1391.blue_refraction_prism/trigger/** + #declare score_holder $TempID + #declare tag Target diff --git a/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/apply.mcfunction b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/apply.mcfunction new file mode 100644 index 0000000000..b746a615ea --- /dev/null +++ b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/apply.mcfunction @@ -0,0 +1,25 @@ +#> asset:artifact/1391.blue_refraction_prism/trigger/apply +# +# +# +# @within function asset:artifact/1391.blue_refraction_prism/trigger/3.main + +# 自身にTagを付与しておく + tag @s add Target + +# 事前処理 + data modify storage asset:temp Temp.To set from storage asset:context Attack.To + data modify storage asset:temp Temp.Amounts set from storage asset:context Attack.Amounts + function asset:artifact/1391.blue_refraction_prism/trigger/recursive + scoreboard players reset $TempID Temporary + +# ダメージ +# 自身の補正は適用されない + execute store result storage api: Argument.Damage double 0.001 run data get storage asset:temp Temp.Damage 100 + data modify storage api: Argument.AttackType set from storage asset:context Attack.AttackType + data modify storage api: Argument.ElementType set value "Water" + data modify storage api: Argument.BypassModifier set value true + execute as @p[tag=this] run function api:damage/modifier + data modify storage api: Argument.BypassModifier set value false + function api:damage/ + function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/recursive.mcfunction b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/recursive.mcfunction new file mode 100644 index 0000000000..f690728483 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/recursive.mcfunction @@ -0,0 +1,20 @@ +#> asset:artifact/1391.blue_refraction_prism/trigger/recursive +# +# +# +# @within function +# asset:artifact/1391.blue_refraction_prism/trigger/apply +# asset:artifact/1391.blue_refraction_prism/trigger/recursive + +# 最後尾の要素を取得 + execute store result score $TempID Temporary run data get storage asset:temp Temp.To[-1] + +# 最後尾のIDが自身のUUIDと一致しているなら、ダメージをTempStorageに入れておく + execute if score @s MobUUID = $TempID Temporary run data modify storage asset:temp Temp.Damage set from storage asset:temp Temp.Amounts[-1] + +# 一致していないなら最後尾の要素を削除 + execute unless score @s MobUUID = $TempID Temporary run data remove storage asset:temp Temp.To[-1] + execute unless score @s MobUUID = $TempID Temporary run data remove storage asset:temp Temp.Amounts[-1] + +# 要素がある && 一致してないなら再帰 + execute if data storage asset:temp Temp.To[0] unless score @s MobUUID = $TempID Temporary run function asset:artifact/1391.blue_refraction_prism/trigger/recursive diff --git a/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/sound.mcfunction b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/sound.mcfunction new file mode 100644 index 0000000000..a23402c736 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/sound.mcfunction @@ -0,0 +1,9 @@ +#> asset:artifact/1391.blue_refraction_prism/trigger/sound +# +# +# +# @within function asset:artifact/1391.blue_refraction_prism/trigger/3.main + + playsound block.amethyst_cluster.step player @a ~ ~ ~ 1 0.7 + playsound block.amethyst_cluster.step player @a ~ ~ ~ 1 0.65 + playsound block.amethyst_cluster.step player @a ~ ~ ~ 1 0.6 diff --git a/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/vfx/.mcfunction b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/vfx/.mcfunction new file mode 100644 index 0000000000..1a4d6d825f --- /dev/null +++ b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/vfx/.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1391.blue_refraction_prism/trigger/vfx/ +# +# +# +# @within function asset:artifact/1391.blue_refraction_prism/trigger/3.main + +# Targetのうちランダムな1体の箇所で演出 + execute as @e[type=#lib:living_without_player,tag=Target,distance=..64,sort=random,limit=1] at @s anchored eyes rotated ~ 0 positioned ^ ^-0.5 ^ run function asset:artifact/1391.blue_refraction_prism/trigger/vfx/summon diff --git a/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/vfx/summon.mcfunction b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/vfx/summon.mcfunction new file mode 100644 index 0000000000..670e45a3aa --- /dev/null +++ b/Asset/data/asset/functions/artifact/1391.blue_refraction_prism/trigger/vfx/summon.mcfunction @@ -0,0 +1,9 @@ +#> asset:artifact/1391.blue_refraction_prism/trigger/vfx/summon +# +# +# +# @within function asset:artifact/1391.blue_refraction_prism/trigger/vfx/ + + data modify storage api: Argument.ID set value 1156 + data modify storage api: Argument.FieldOverride.Font set value 2 + function api:object/summon diff --git a/Asset/data/asset/functions/object/alias/1156/init.mcfunction b/Asset/data/asset/functions/object/alias/1156/init.mcfunction index 7cca2cfa71..2b690f2e74 100644 --- a/Asset/data/asset/functions/object/alias/1156/init.mcfunction +++ b/Asset/data/asset/functions/object/alias/1156/init.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/init/init.m # 元のInit処理を呼び出す - function asset:object/1156.refraction_prism/init/ \ No newline at end of file + function asset:object/1156.refraction_prism/init/ diff --git a/Asset/data/asset/functions/object/alias/1156/register.mcfunction b/Asset/data/asset/functions/object/alias/1156/register.mcfunction index 36f188283d..d3e5d8ac3e 100644 --- a/Asset/data/asset/functions/object/alias/1156/register.mcfunction +++ b/Asset/data/asset/functions/object/alias/1156/register.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/summon/register.m # 元の登録処理を呼び出す - function asset:object/1156.refraction_prism/register \ No newline at end of file + function asset:object/1156.refraction_prism/register diff --git a/Asset/data/asset/functions/object/alias/1156/summon.mcfunction b/Asset/data/asset/functions/object/alias/1156/summon.mcfunction index 9875505ed0..0b481c2269 100644 --- a/Asset/data/asset/functions/object/alias/1156/summon.mcfunction +++ b/Asset/data/asset/functions/object/alias/1156/summon.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/summon/summon.m # 元の召喚処理を呼び出す - function asset:object/1156.refraction_prism/summon/ \ No newline at end of file + function asset:object/1156.refraction_prism/summon/ diff --git a/Asset/data/asset/functions/object/alias/1156/tick.mcfunction b/Asset/data/asset/functions/object/alias/1156/tick.mcfunction index 5aa2822bec..137fbcb328 100644 --- a/Asset/data/asset/functions/object/alias/1156/tick.mcfunction +++ b/Asset/data/asset/functions/object/alias/1156/tick.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/tick/tick.m # 元のTick処理を呼び出す - function asset:object/1156.refraction_prism/tick/ \ No newline at end of file + function asset:object/1156.refraction_prism/tick/ diff --git a/Asset/data/asset/tags/functions/artifact/attack.json b/Asset/data/asset/tags/functions/artifact/attack.json index cc4f84a8b8..68b8ee54f9 100644 --- a/Asset/data/asset/tags/functions/artifact/attack.json +++ b/Asset/data/asset/tags/functions/artifact/attack.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1391.blue_refraction_prism/trigger/1.trigger", "asset:artifact/1534.drop_in_the_bucket/trigger/1.trigger", "asset:artifact/1327.lunatic_torch/trigger/1.trigger", "asset:artifact/1308.magnifier_of_detective_girl/trigger/1.trigger", @@ -13,4 +14,4 @@ "asset:artifact/0664.soul_fire_armor/attack/1.trigger", "asset:artifact/0724.oblivious_snow/attack/1.trigger" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index fdb7a26c47..573b742d5f 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/1391.blue_refraction_prism/give/1.trigger", "asset:artifact/1562.tsukimi_dango/give/1.trigger", "asset:artifact/1430.shield_of_fate/give/1.trigger", "asset:artifact/1453.frost_flake_bow/give/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 2bba1f3f33..b4e34863d3 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/1391.blue_refraction_prism/register", "asset:artifact/1562.tsukimi_dango/register", "asset:artifact/1453.frost_flake_bow/register", "asset:artifact/1430.shield_of_fate/register",