From f0b71f40d0b64e1058829b821d224516152583f4 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 20 Jun 2026 11:26:24 +0200 Subject: [PATCH 01/23] =?UTF-8?q?Artifact=E3=81=A8Effect=E3=81=AE=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E6=A9=9F=E8=83=BD=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/1.trigger.mcfunction | 7 ++ .../give/2.give.mcfunction | 68 +++++++++++++++++++ .../1465.versatile_plasma/register.mcfunction | 7 ++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 19 ++++++ .../trigger/3.main.mcfunction | 16 +++++ .../trigger/charge.mcfunction | 24 +++++++ .../effect/374.charge_plasma/_/end.mcfunction | 7 ++ .../374.charge_plasma/_/re-given.mcfunction | 7 ++ .../374.charge_plasma/_/register.mcfunction | 7 ++ .../effect/374.charge_plasma/end/.mcfunction | 10 +++ .../374.charge_plasma/re-given/.mcfunction | 22 ++++++ .../374.charge_plasma/register.mcfunction | 39 +++++++++++ .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- .../tags/functions/artifact/using_item.json | 1 + .../data/asset/tags/functions/effect/end.json | 3 +- .../asset/tags/functions/effect/re-given.json | 3 +- .../asset/tags/functions/effect/register.json | 3 +- 19 files changed, 252 insertions(+), 5 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1465.versatile_plasma/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1465.versatile_plasma/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/charge.mcfunction create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/_/end.mcfunction create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/_/re-given.mcfunction create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/_/register.mcfunction create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/re-given/.mcfunction create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/register.mcfunction diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/1.trigger.mcfunction new file mode 100644 index 0000000000..cc46a1a9a5 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1465.versatile_plasma/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1465} run function asset:artifact/1465.versatile_plasma/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction new file mode 100644 index 0000000000..42d15d12b0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1465.versatile_plasma/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1465.versatile_plasma/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1465 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:ender_eye" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text": "ヴァースティル・プラズマ"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value [] +# 消費アイテム ({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 [30, 300] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [Thunder] +# 攻撃に関する情報 -防御無視 (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 1 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# MP回復量 (int) + data modify storage asset:artifact MPHealWhenHit set value 10 +# 神器のクールダウン (int) (オプション) + data modify storage asset:artifact LocalCooldown set value 100 +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + data modify storage asset:artifact TypeCooldown.Type set value "longRange" + data modify storage asset:artifact TypeCooldown.Duration set value 50 +# グローバルクールダウン (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 ["Urban", "Wi-ki"] +# カスタム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/1465.versatile_plasma/register.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/register.mcfunction new file mode 100644 index 0000000000..e26bb3ec03 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1465.versatile_plasma/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[3] append value [1465] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/1.trigger.mcfunction new file mode 100644 index 0000000000..4744c2c87e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1465.versatile_plasma/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:1465} run function asset:artifact/1465.versatile_plasma/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/2.check_condition.mcfunction new file mode 100644 index 0000000000..e0f92c8d0f --- /dev/null +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/2.check_condition.mcfunction @@ -0,0 +1,19 @@ +#> asset:artifact/1465.versatile_plasma/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1465.versatile_plasma/trigger/1.trigger + +# チャージ段階のEffect取得 + data modify storage api: Argument.ID set value 374 + function api:entity/mob/effect/get/from_id +# チャージが完了しているならキャンセル + execute if data storage api: Return.Effect{Stack:3} run return 0 +# チャージ中ならば強制的にチャージ続行 + execute if data storage api: Return.Effect run return run function asset:artifact/1465.versatile_plasma/trigger/charge + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1465.versatile_plasma/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/3.main.mcfunction new file mode 100644 index 0000000000..fc2b7c0c34 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/3.main.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/1465.versatile_plasma/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1465.versatile_plasma/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ここから先は神器側の効果の処理を書く + say test: 1465.versatile_plasma + +# チャージ用Effectを付与 + data modify storage api: Argument.ID set value 374 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/charge.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/charge.mcfunction new file mode 100644 index 0000000000..745f24362e --- /dev/null +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/charge.mcfunction @@ -0,0 +1,24 @@ +#> asset:artifact/1465.versatile_plasma/trigger/charge +# +# +# +# @within function asset:artifact/1465.versatile_plasma/trigger/2.check_condition + +#> Private +# @private + #declare score_holder $MP + +# MPが足りないならキャンセル + function api:mp/get_current + execute store result score $MP Temporary run data get storage api: Return.CurrentMP 10 + execute unless score $MP Temporary matches 1.. run return fail + +# チャージ用Effectを付与 + data modify storage api: Argument.ID set value 374 + function api:entity/mob/effect/give + function api:entity/mob/effect/reset + +# MP消費 + data modify storage api: Argument.Fluctuation set value -1 + data modify storage api: Argument.DisableLog set value 1b + function api:mp/fluctuation diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/_/end.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/_/end.mcfunction new file mode 100644 index 0000000000..c00f95c415 --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/_/end.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/374.charge_plasma/_/end +# +# Effectの効果の終了時に実行されるfunction +# +# @within tag/function asset:effect/end + +execute if data storage asset:context {id:374} run function asset:effect/374.charge_plasma/end/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/_/re-given.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/_/re-given.mcfunction new file mode 100644 index 0000000000..5f7c753fdc --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/_/re-given.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/374.charge_plasma/_/re-given +# +# Effectが上書きされた時に実行されるfunction +# +# @within tag/function asset:effect/re-given + +execute if data storage asset:context {id:374} run function asset:effect/374.charge_plasma/re-given/ \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/_/register.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/_/register.mcfunction new file mode 100644 index 0000000000..7175e6c65d --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/_/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:effect/374.charge_plasma/_/register +# +# +# +# @within tag/function asset:effect/register + +execute if data storage asset:context {id:374} run function asset:effect/374.charge_plasma/register \ No newline at end of file diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction new file mode 100644 index 0000000000..38f621ef6b --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction @@ -0,0 +1,10 @@ +#> asset:effect/374.charge_plasma/end/ +# +# Effectの効果が切れた時の処理 +# +# @within function asset:effect/374.charge_plasma/_/end + +# スタック数に応じてそれぞれの攻撃用Objectを召喚 + execute if data storage asset:context {Stack:1} run say MP heal attack + execute if data storage asset:context {Stack:2} run say broad attack + execute if data storage asset:context {Stack:3} run say laser attack diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/re-given/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/.mcfunction new file mode 100644 index 0000000000..f59d367e8d --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/.mcfunction @@ -0,0 +1,22 @@ +#> asset:effect/374.charge_plasma/re-given/ +# +# Effectが上書きされた時の処理 +# +# @within function asset:effect/374.charge_plasma/_/re-given + +#> Private +# @private + #declare score_holder $Charge + +# チャージ時間を取得 + execute store result score $Charge Temporary run data get storage asset:context PreviousField.Charge + +# Field.Chargeを+1 + execute store result storage asset:context this.Charge int 1 run scoreboard players add $Charge Temporary 1 + +# 時間に応じてバフをスタック + execute if score $Charge Temporary matches 25 run data modify storage asset:context Stack set value 2 + execute if score $Charge Temporary matches 50 run data modify storage asset:context Stack set value 3 + +# リセット + scoreboard players reset $Charge Temporary diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/register.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/register.mcfunction new file mode 100644 index 0000000000..ae3706006e --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/register.mcfunction @@ -0,0 +1,39 @@ +#> asset:effect/374.charge_plasma/register +# +# Effectのデータを指定 +# +# @within function asset:effect/374.charge_plasma/_/register + +# ExtendsSafe (boolean) (default = false) + # data modify storage asset:effect ExtendsSafe set value true +# ID (int) + data modify storage asset:effect ID set value 374 +# 名前 (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 1 +# スタック (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 1 +# 最大スタック (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/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 16715fe3c7..2c71544d3b 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/1465.versatile_plasma/give/1.trigger", "asset:artifact/1252.fox_candle/give/1.trigger", "asset:artifact/1343.coffee_milk_pack/give/1.trigger", "asset:artifact/1342.fruit_milk_pack/give/1.trigger", @@ -530,4 +531,4 @@ "asset:artifact/0735.collision_plate/give/1.trigger", "asset:artifact/0745.blade_of_whirlwind/give/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 7e92660e5a..61e72dbe22 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/1465.versatile_plasma/register", "asset:artifact/1252.fox_candle/register", "asset:artifact/1343.coffee_milk_pack/register", "asset:artifact/1342.fruit_milk_pack/register", @@ -308,4 +309,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/using_item.json b/Asset/data/asset/tags/functions/artifact/using_item.json index 499dc901af..7af85ba9f9 100644 --- a/Asset/data/asset/tags/functions/artifact/using_item.json +++ b/Asset/data/asset/tags/functions/artifact/using_item.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1465.versatile_plasma/trigger/1.trigger", "asset:artifact/1220.sacred_hardener/trigger/1.trigger", "asset:artifact/1269.apocalypse/using_item/1.trigger", "asset:artifact/1228.fatalerror/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/effect/end.json b/Asset/data/asset/tags/functions/effect/end.json index 48b7d4613e..68e9ab8894 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/374.charge_plasma/_/end", "asset:effect/0360.calamity_bind/_/end", "asset:effect/0345.topaz_protection/_/end", "asset:effect/0342.prayer_amidst_blight/_/end", @@ -105,4 +106,4 @@ "asset:effect/0007.defense_base_debuff/_/end", "asset:effect/0258.spirit_melody/_/end" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/re-given.json b/Asset/data/asset/tags/functions/effect/re-given.json index d3650bf09a..381d5ee8da 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/374.charge_plasma/_/re-given", "asset:effect/0352.kitsunebi/_/re-given", "asset:effect/0345.topaz_protection/_/re-given", "asset:effect/0029.poison/_/re-given", @@ -60,4 +61,4 @@ "asset:effect/0007.defense_base_debuff/_/re-given", "asset:effect/0258.spirit_melody/_/re-given" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/effect/register.json b/Asset/data/asset/tags/functions/effect/register.json index 2a88625f93..1edc87b976 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/374.charge_plasma/_/register", "asset:effect/0352.kitsunebi/_/register", "asset:effect/0351.nectar_regeneration/_/register", "asset:effect/0117.slowness/_/register", @@ -175,4 +176,4 @@ "asset:effect/0007.defense_base_debuff/_/register", "asset:effect/0258.spirit_melody/_/register" ] -} +} \ No newline at end of file From 95bf7fab2952ba56f9e17ac147f3b75b7e11cf86 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Thu, 2 Jul 2026 17:41:08 +0200 Subject: [PATCH 02/23] =?UTF-8?q?=E6=94=BB=E6=92=831=20=E3=82=B9=E3=83=91?= =?UTF-8?q?=E3=83=BC=E3=82=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 3 -- .../effect/374.charge_plasma/end/.mcfunction | 2 +- .../end/attack/1/.mcfunction | 25 ++++++++++++++++ .../end/attack/1/m.mcfunction | 10 +++++++ .../end/attack/1/rec.mcfunction | 19 ++++++++++++ .../object/1168.plasma_spark/init/.mcfunction | 8 +++++ .../1168.plasma_spark/register.mcfunction | 21 +++++++++++++ .../1168.plasma_spark/summon/.mcfunction | 8 +++++ .../1168.plasma_spark/summon/debug.mcfunction | 10 +++++++ .../object/1168.plasma_spark/tick/.mcfunction | 11 +++++++ .../1168.plasma_spark/tick/explode.mcfunction | 30 +++++++++++++++++++ .../object/alias/1168/init.mcfunction | 8 +++++ .../object/alias/1168/register.mcfunction | 8 +++++ .../object/alias/1168/summon.mcfunction | 8 +++++ .../object/alias/1168/tick.mcfunction | 8 +++++ 15 files changed, 175 insertions(+), 4 deletions(-) create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/.mcfunction create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/m.mcfunction create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/rec.mcfunction create mode 100644 Asset/data/asset/functions/object/1168.plasma_spark/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1168.plasma_spark/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1168.plasma_spark/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1168.plasma_spark/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1168.plasma_spark/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1168/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1168/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1168/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1168/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/3.main.mcfunction index fc2b7c0c34..77e03d69ba 100644 --- a/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/3.main.mcfunction @@ -7,9 +7,6 @@ # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う function asset:artifact/common/use/mainhand -# ここから先は神器側の効果の処理を書く - say test: 1465.versatile_plasma - # チャージ用Effectを付与 data modify storage api: Argument.ID set value 374 function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction index 38f621ef6b..2bfca7a4b5 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction @@ -5,6 +5,6 @@ # @within function asset:effect/374.charge_plasma/_/end # スタック数に応じてそれぞれの攻撃用Objectを召喚 - execute if data storage asset:context {Stack:1} run say MP heal attack + execute if data storage asset:context {Stack:1} run function asset:effect/374.charge_plasma/end/attack/1/ execute if data storage asset:context {Stack:2} run say broad attack execute if data storage asset:context {Stack:3} run say laser attack diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/.mcfunction new file mode 100644 index 0000000000..50e1a41eac --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/.mcfunction @@ -0,0 +1,25 @@ +#> asset:effect/374.charge_plasma/end/attack/1 +# +# 攻撃（ため1段階）:スパーク +# +# @within function asset:effect/374.charge_plasma/end/** + +#> Private +# @within function asset:effect/374.charge_plasma/end/attack/** + #declare score_holder $rec + +# 24回実行 + scoreboard players set $rec Temporary 24 + +# 向いている方向に確定で一個だす + data modify storage api: Argument.ID set value 1168 + data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage api: PersistentArgument.AdditionalMPHeal + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + execute anchored eyes positioned ^ ^ ^2.5 run function api:object/summon + +# 本体 + execute anchored eyes run function asset:effect/374.charge_plasma/end/attack/1/rec + +# リセット + scoreboard players reset $rec + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/m.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/m.mcfunction new file mode 100644 index 0000000000..f9fd2a0adc --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/m.mcfunction @@ -0,0 +1,10 @@ +#> asset:effect/374.charge_plasma/end/attack/1/m +# +# Object 1168を召喚 +# +# @within function asset:effect/374.charge_plasma/end/attack/1/rec + + data modify storage api: Argument.ID set value 1168 + data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage api: PersistentArgument.AdditionalMPHeal + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + $execute positioned ^$(OffsetX) ^$(OffsetY) ^$(OffsetZ) run function api:object/summon diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/rec.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/rec.mcfunction new file mode 100644 index 0000000000..7ed87e69d3 --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/rec.mcfunction @@ -0,0 +1,19 @@ +#> asset:effect/374.charge_plasma/end/attack/1/rec +# +# 再帰処理 +# +# @within function asset:effect/374.charge_plasma/end/attack/1/** + +# rec減算 + scoreboard players remove $rec Temporary 1 + +# ランダムなoffsetを設定 + execute store result storage asset:temp Args.OffsetX float 0.1 run random value -20..20 + execute store result storage asset:temp Args.OffsetY float 0.1 run random value -5..5 + execute store result storage asset:temp Args.OffsetZ float 0.1 run random value 5..35 + +# マクロでObject召喚 + function asset:effect/374.charge_plasma/end/attack/1/m with storage asset:temp Args + +# 再帰 + execute if score $rec Temporary matches 1.. run function asset:effect/374.charge_plasma/end/attack/1/rec diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/init/.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/init/.mcfunction new file mode 100644 index 0000000000..5c8d60eebe --- /dev/null +++ b/Asset/data/asset/functions/object/1168.plasma_spark/init/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1168.plasma_spark/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1168/init + +# Tickをランダムに設定 + execute store result score @s General.Object.Tick run random value 2..7 diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/register.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/register.mcfunction new file mode 100644 index 0000000000..7712930b53 --- /dev/null +++ b/Asset/data/asset/functions/object/1168.plasma_spark/register.mcfunction @@ -0,0 +1,21 @@ +#> asset:object/1168.plasma_spark/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1168/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # 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 1168 +# フィールド(オプション) + data modify storage asset:object Field.AdditionalMPHeal set value 10 + data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/summon/.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/summon/.mcfunction new file mode 100644 index 0000000000..2cab2b2c31 --- /dev/null +++ b/Asset/data/asset/functions/object/1168.plasma_spark/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1168.plasma_spark/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1168/summon + +# 元となるEntityを召喚する + summon text_display ~ ~ ~ {Tags:["ObjectInit"]} diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/summon/debug.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/summon/debug.mcfunction new file mode 100644 index 0000000000..9423b8a200 --- /dev/null +++ b/Asset/data/asset/functions/object/1168.plasma_spark/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1168.plasma_spark/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1168 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/tick/.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/tick/.mcfunction new file mode 100644 index 0000000000..7f6341f01c --- /dev/null +++ b/Asset/data/asset/functions/object/1168.plasma_spark/tick/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1168.plasma_spark/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1168/tick + +# Tick減算 + scoreboard players remove @s General.Object.Tick 1 + +# 炸裂処理 + execute if score @s General.Object.Tick matches ..0 run function asset:object/1168.plasma_spark/tick/explode diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction new file mode 100644 index 0000000000..fe0e727362 --- /dev/null +++ b/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction @@ -0,0 +1,30 @@ +#> asset:object/1168.plasma_spark/tick/explore +# +# 攻撃処理 +# +# @within function asset:object/1168.plasma_spark/tick/** + +#> Private +# @private + #declare score_holder $UserID + +# 攻撃判定 + data modify storage api: Argument.Damage set value 30.0f + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "Thunder" + data modify storage api: Argument.AdditionalMPHeal set value 10f + data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal + 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 api:damage/modifier + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~-0.9 ~-0.9 ~-0.9 if entity @s[dx=0] run function api:damage/ + function api:damage/reset + +# 演出 + particle end_rod ~ ~ ~ 0 0 0 0 1 + playsound entity.firework_rocket.twinkle player @a ~ ~ ~ 1 2 + +# リセット + scoreboard players reset $UserID + +# 消す + kill @s diff --git a/Asset/data/asset/functions/object/alias/1168/init.mcfunction b/Asset/data/asset/functions/object/alias/1168/init.mcfunction new file mode 100644 index 0000000000..a0a41b7315 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1168/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1168/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1168.plasma_spark/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1168/register.mcfunction b/Asset/data/asset/functions/object/alias/1168/register.mcfunction new file mode 100644 index 0000000000..81771735e3 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1168/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1168/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1168.plasma_spark/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1168/summon.mcfunction b/Asset/data/asset/functions/object/alias/1168/summon.mcfunction new file mode 100644 index 0000000000..461e2deec8 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1168/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1168/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1168.plasma_spark/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1168/tick.mcfunction b/Asset/data/asset/functions/object/alias/1168/tick.mcfunction new file mode 100644 index 0000000000..b7822787b3 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1168/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1168/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1168.plasma_spark/tick/ \ No newline at end of file From a2bbbd265464c541441f7c82ed6243827fad7469 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Thu, 2 Jul 2026 17:42:30 +0200 Subject: [PATCH 03/23] =?UTF-8?q?Object=E3=81=AEEntity=E3=82=92=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/object/1168.plasma_spark/summon/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/summon/.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/summon/.mcfunction index 2cab2b2c31..2f2d174a7d 100644 --- a/Asset/data/asset/functions/object/1168.plasma_spark/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1168.plasma_spark/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1168/summon # 元となるEntityを召喚する - summon text_display ~ ~ ~ {Tags:["ObjectInit"]} + summon marker ~ ~ ~ {Tags:["ObjectInit"]} From 97db26a1f671450949e73f8a563a58f977b7c1a0 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Thu, 2 Jul 2026 22:06:59 +0200 Subject: [PATCH 04/23] =?UTF-8?q?=E6=94=BB=E6=92=832=20=E3=83=93=E3=83=BC?= =?UTF-8?q?=E3=83=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/374.charge_plasma/end/.mcfunction | 2 +- .../374.charge_plasma/end/attack/2.mcfunction | 18 +++++++++++++++ .../1169.plasma_beam/register.mcfunction | 22 +++++++++++++++++++ .../1169.plasma_beam/summon/.mcfunction | 11 ++++++++++ .../1169.plasma_beam/summon/debug.mcfunction | 10 +++++++++ .../1169.plasma_beam/summon/m.mcfunction | 7 ++++++ .../object/alias/1169/register.mcfunction | 8 +++++++ .../object/alias/1169/summon.mcfunction | 8 +++++++ 8 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction create mode 100644 Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1169.plasma_beam/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1169.plasma_beam/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1169.plasma_beam/summon/m.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1169/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1169/summon.mcfunction diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction index 2bfca7a4b5..1bee2dcf07 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction @@ -6,5 +6,5 @@ # スタック数に応じてそれぞれの攻撃用Objectを召喚 execute if data storage asset:context {Stack:1} run function asset:effect/374.charge_plasma/end/attack/1/ - execute if data storage asset:context {Stack:2} run say broad attack + execute if data storage asset:context {Stack:2} anchored eyes positioned ^ ^ ^ run function asset:effect/374.charge_plasma/end/attack/2 execute if data storage asset:context {Stack:3} run say laser attack diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction new file mode 100644 index 0000000000..1519d7b6e6 --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction @@ -0,0 +1,18 @@ +#> asset:effect/374.charge_plasma/end/attack/2 +# +# プラズマ攻撃2: 拡散レーザー +# +# @within function asset:effect/374.charge_plasma/end/** + +# 3発撃つ + data modify storage api: Argument.ID set value 1169 + execute rotated ~-60 ~ run function api:object/summon + + data modify storage api: Argument.ID set value 1169 + execute rotated ~ ~ run function api:object/summon + + data modify storage api: Argument.ID set value 1169 + execute rotated ~60 ~ run function api:object/summon + +# 演出 + playsound block.respawn_anchor.deplete player @a ~ ~ ~ 1.0 2.0 diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction new file mode 100644 index 0000000000..8969df2775 --- /dev/null +++ b/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction @@ -0,0 +1,22 @@ +#> asset:object/1169.plasma_beam/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1169/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 1169 +# フィールド(オプション) + data modify storage asset:object Field.Speed set value 2 + data modify storage asset:object Field.Range set value 20 + data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/summon/.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/summon/.mcfunction new file mode 100644 index 0000000000..959010ef5d --- /dev/null +++ b/Asset/data/asset/functions/object/1169.plasma_beam/summon/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1169.plasma_beam/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1169/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/1169.plasma_beam/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/summon/debug.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/summon/debug.mcfunction new file mode 100644 index 0000000000..80568122ea --- /dev/null +++ b/Asset/data/asset/functions/object/1169.plasma_beam/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1169.plasma_beam/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1169 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/summon/m.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/summon/m.mcfunction new file mode 100644 index 0000000000..5364d165be --- /dev/null +++ b/Asset/data/asset/functions/object/1169.plasma_beam/summon/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1169.plasma_beam/summon/m +# +# @input args: +# Rotation : float @ 2 +# @within function asset:object/1169.plasma_beam/summon/ + + $summon item_display ~ ~ ~ {Rotation: $(Rotation),Tags:["ObjectInit"],item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20630}},brightness:{block:15,sky:15},teleport_duration:1} diff --git a/Asset/data/asset/functions/object/alias/1169/register.mcfunction b/Asset/data/asset/functions/object/alias/1169/register.mcfunction new file mode 100644 index 0000000000..e8cc16b447 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1169/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1169/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1169.plasma_beam/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1169/summon.mcfunction b/Asset/data/asset/functions/object/alias/1169/summon.mcfunction new file mode 100644 index 0000000000..798eaeb33d --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1169/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1169/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1169.plasma_beam/summon/ \ No newline at end of file From fae7c8ef3b4126e5543667c4b78729bda3cd4953 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 15:42:48 +0200 Subject: [PATCH 05/23] =?UTF-8?q?=E6=94=BB=E6=92=832=20=E3=83=93=E3=83=BC?= =?UTF-8?q?=E3=83=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/374.charge_plasma/end/.mcfunction | 2 +- .../374.charge_plasma/end/attack/2.mcfunction | 18 ++++++++++++++ .../detect_hit_entity/.mcfunction | 8 +++++++ .../1169.plasma_beam/hit_entity/.mcfunction | 14 +++++++++++ .../hit_entity/damage.mcfunction | 21 ++++++++++++++++ .../1169.plasma_beam/register.mcfunction | 24 +++++++++++++++++++ .../1169.plasma_beam/summon/.mcfunction | 11 +++++++++ .../1169.plasma_beam/summon/debug.mcfunction | 10 ++++++++ .../1169.plasma_beam/summon/m.mcfunction | 7 ++++++ .../alias/1169/detect_hit_entity.mcfunction | 8 +++++++ .../object/alias/1169/hit_entity.mcfunction | 8 +++++++ .../object/alias/1169/register.mcfunction | 8 +++++++ .../object/alias/1169/summon.mcfunction | 8 +++++++ 13 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction create mode 100644 Asset/data/asset/functions/object/1169.plasma_beam/detect_hit_entity/.mcfunction create mode 100644 Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/.mcfunction create mode 100644 Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/damage.mcfunction create mode 100644 Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1169.plasma_beam/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1169.plasma_beam/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1169.plasma_beam/summon/m.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1169/detect_hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1169/hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1169/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1169/summon.mcfunction diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction index 2bfca7a4b5..1bee2dcf07 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction @@ -6,5 +6,5 @@ # スタック数に応じてそれぞれの攻撃用Objectを召喚 execute if data storage asset:context {Stack:1} run function asset:effect/374.charge_plasma/end/attack/1/ - execute if data storage asset:context {Stack:2} run say broad attack + execute if data storage asset:context {Stack:2} anchored eyes positioned ^ ^ ^ run function asset:effect/374.charge_plasma/end/attack/2 execute if data storage asset:context {Stack:3} run say laser attack diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction new file mode 100644 index 0000000000..1519d7b6e6 --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction @@ -0,0 +1,18 @@ +#> asset:effect/374.charge_plasma/end/attack/2 +# +# プラズマ攻撃2: 拡散レーザー +# +# @within function asset:effect/374.charge_plasma/end/** + +# 3発撃つ + data modify storage api: Argument.ID set value 1169 + execute rotated ~-60 ~ run function api:object/summon + + data modify storage api: Argument.ID set value 1169 + execute rotated ~ ~ run function api:object/summon + + data modify storage api: Argument.ID set value 1169 + execute rotated ~60 ~ run function api:object/summon + +# 演出 + playsound block.respawn_anchor.deplete player @a ~ ~ ~ 1.0 2.0 diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/detect_hit_entity/.mcfunction new file mode 100644 index 0000000000..fc84aa8330 --- /dev/null +++ b/Asset/data/asset/functions/object/1169.plasma_beam/detect_hit_entity/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1169.plasma_beam/detect_hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/1169/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/1169.plasma_beam/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/.mcfunction new file mode 100644 index 0000000000..a3bed5f49f --- /dev/null +++ b/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/1169.plasma_beam/hit_entity/ +# +# ヒット処理 +# +# @within asset:object/alias/1169/hit_entity + +# ダメージ + 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/1169.plasma_beam/hit_entity/damage + +# リセット + scoreboard players reset $UserID + +# 消す + function asset:object/call.m {method:kill} diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/damage.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/damage.mcfunction new file mode 100644 index 0000000000..53e8603935 --- /dev/null +++ b/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/damage.mcfunction @@ -0,0 +1,21 @@ +#> asset:object/1169.plasma_beam/hit_entity/damage +# +# ダメージ処理 +# +# @within function asset:object/1169.plasma_beam/hit_entity/ + +#> Private +# @private + #declare score_holder $UserID + + 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 "Thunder" + data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal + 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 api:damage/modifier + function api:damage/ + function api:damage/reset + +# リセット + scoreboard players reset $UserID diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction new file mode 100644 index 0000000000..d36d06b3e7 --- /dev/null +++ b/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction @@ -0,0 +1,24 @@ +#> asset:object/1169.plasma_beam/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1169/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 1169 +# フィールド(オプション) + data modify storage asset:object Field.Damage set value 150 + data modify storage asset:object Field.AdditionalMPHeal set value 10 + data modify storage asset:object Field.Speed set value 2 + data modify storage asset:object Field.Range set value 20 + data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/summon/.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/summon/.mcfunction new file mode 100644 index 0000000000..959010ef5d --- /dev/null +++ b/Asset/data/asset/functions/object/1169.plasma_beam/summon/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1169.plasma_beam/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1169/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/1169.plasma_beam/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/summon/debug.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/summon/debug.mcfunction new file mode 100644 index 0000000000..80568122ea --- /dev/null +++ b/Asset/data/asset/functions/object/1169.plasma_beam/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1169.plasma_beam/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1169 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/summon/m.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/summon/m.mcfunction new file mode 100644 index 0000000000..5364d165be --- /dev/null +++ b/Asset/data/asset/functions/object/1169.plasma_beam/summon/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1169.plasma_beam/summon/m +# +# @input args: +# Rotation : float @ 2 +# @within function asset:object/1169.plasma_beam/summon/ + + $summon item_display ~ ~ ~ {Rotation: $(Rotation),Tags:["ObjectInit"],item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20630}},brightness:{block:15,sky:15},teleport_duration:1} diff --git a/Asset/data/asset/functions/object/alias/1169/detect_hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1169/detect_hit_entity.mcfunction new file mode 100644 index 0000000000..aaf4cb2a3d --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1169/detect_hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1169/detect_hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1169.plasma_beam/detect_hit_entity/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1169/hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/1169/hit_entity.mcfunction new file mode 100644 index 0000000000..301f4e7e96 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1169/hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1169/hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/1169.plasma_beam/hit_entity/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1169/register.mcfunction b/Asset/data/asset/functions/object/alias/1169/register.mcfunction new file mode 100644 index 0000000000..e8cc16b447 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1169/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1169/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1169.plasma_beam/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1169/summon.mcfunction b/Asset/data/asset/functions/object/alias/1169/summon.mcfunction new file mode 100644 index 0000000000..798eaeb33d --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1169/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1169/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1169.plasma_beam/summon/ \ No newline at end of file From f7fb80a5026507534cf2042abcfa63e68f1805d5 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 15:46:14 +0200 Subject: [PATCH 06/23] =?UTF-8?q?=E8=A8=98=E8=BF=B0=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1168.plasma_spark/tick/explode.mcfunction | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction index fe0e727362..c63ec60793 100644 --- a/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction +++ b/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1168.plasma_spark/tick/explore +#> asset:object/1168.plasma_spark/tick/explode # # 攻撃処理 # @@ -12,7 +12,6 @@ data modify storage api: Argument.Damage set value 30.0f data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Thunder" - data modify storage api: Argument.AdditionalMPHeal set value 10f data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal 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 api:damage/modifier From cf306686a896d52df19b61c013b9d16aff35b21d Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 15:59:08 +0200 Subject: [PATCH 07/23] =?UTF-8?q?=E6=94=BB=E6=92=832=E3=81=AB=E3=83=8E?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=83=90=E3=83=83=E3=82=AF=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1169.plasma_beam/hit_entity/.mcfunction | 3 --- .../object/1169.plasma_beam/hit_entity/damage.mcfunction | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/.mcfunction index a3bed5f49f..c83fd0f37a 100644 --- a/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/.mcfunction @@ -7,8 +7,5 @@ # ダメージ 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/1169.plasma_beam/hit_entity/damage -# リセット - scoreboard players reset $UserID - # 消す function asset:object/call.m {method:kill} diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/damage.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/damage.mcfunction index 53e8603935..69b3aeccab 100644 --- a/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/damage.mcfunction +++ b/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/damage.mcfunction @@ -17,5 +17,9 @@ function api:damage/ function api:damage/reset +# ノックバック + data modify storage lib: Argument.VectorMagnitude set value 0.75d + function lib:motion/looking + # リセット scoreboard players reset $UserID From cac824c7e73397049b766afd53fca6dd3fb5ac9e Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 16:52:52 +0200 Subject: [PATCH 08/23] =?UTF-8?q?=E6=94=BB=E6=92=833=20=E8=B2=AB=E9=80=9A?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/374.charge_plasma/end/.mcfunction | 4 ++-- .../374.charge_plasma/end/attack/3/.mcfunction | 17 +++++++++++++++++ .../end/attack/3/damage.mcfunction | 18 ++++++++++++++++++ .../end/attack/3/rec.mcfunction | 17 +++++++++++++++++ 4 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/.mcfunction create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/damage.mcfunction create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/rec.mcfunction diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction index 1bee2dcf07..25f819732d 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction @@ -4,7 +4,7 @@ # # @within function asset:effect/374.charge_plasma/_/end -# スタック数に応じてそれぞれの攻撃用Objectを召喚 +# スタック数に応じてそれぞれの攻撃処理を実行 execute if data storage asset:context {Stack:1} run function asset:effect/374.charge_plasma/end/attack/1/ execute if data storage asset:context {Stack:2} anchored eyes positioned ^ ^ ^ run function asset:effect/374.charge_plasma/end/attack/2 - execute if data storage asset:context {Stack:3} run say laser attack + execute if data storage asset:context {Stack:3} run function asset:effect/374.charge_plasma/end/attack/3/ diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/.mcfunction new file mode 100644 index 0000000000..22958745fc --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/.mcfunction @@ -0,0 +1,17 @@ +#> asset:effect/374.charge_plasma/end/attack/3/ +# +# 攻撃3: 貫通レーザー +# +# @within function asset:effect/374.charge_plasma/end/** + +#> Private +# @within function asset:effect/374.charge_plasma/end/attack/3/** + #declare tag Hit + #declare tag HitTarget + +# 再帰処理 + execute anchored eyes run function asset:effect/374.charge_plasma/end/attack/3/rec + tag @s remove Hit + tag @e[tag=HitTarget,distance=..20] remove HitTarget + +# 演出 diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/damage.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/damage.mcfunction new file mode 100644 index 0000000000..14facc5838 --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/damage.mcfunction @@ -0,0 +1,18 @@ +#> asset:effect/374.charge_plasma/end/attack/3/damage +# +# +# +# @within function asset:effect/374.charge_plasma/end/attack/3/rec + + +# ヒット済みタグ + execute positioned ~-0.5 ~-0.5 ~-0.5 run tag @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] add HitTarget + +# ダメージ + data modify storage api: Argument.Damage set value 300 + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "Thunder" + data modify storage api: Argument.AdditionalMPHeal set value 10 + function api:damage/modifier + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] run function api:damage/ + function api:damage/reset diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/rec.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/rec.mcfunction new file mode 100644 index 0000000000..4b89469ec6 --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/rec.mcfunction @@ -0,0 +1,17 @@ +#> asset:effect/374.charge_plasma/end/attack/3/rec +# +# +# +# @within function asset:effect/374.charge_plasma/end/attack/3/** + +# 着弾検知 + execute unless block ^ ^ ^0.5 #lib:no_collision/ run tag @s add Hit + +# 命中 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!HitTarget,tag=!Uninterferable,dx=0,limit=1] run function asset:effect/374.charge_plasma/end/attack/3/damage + +# 演出 + particle dust 0.3 1.0 0.0 1.0 ~ ~ ~ 0.0 0.0 0.0 1 3 + +# 再起 + execute positioned ^ ^ ^0.5 if entity @s[tag=!Hit,distance=..20] run function asset:effect/374.charge_plasma/end/attack/3/rec From bde71d599763d7862d07de750e8bca9e23c64e67 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 17:16:12 +0200 Subject: [PATCH 09/23] =?UTF-8?q?=E3=83=8E=E3=83=83=E3=82=AF=E3=83=90?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1169.plasma_beam/hit_entity/damage.mcfunction | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/damage.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/damage.mcfunction index 69b3aeccab..d6ed284706 100644 --- a/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/damage.mcfunction +++ b/Asset/data/asset/functions/object/1169.plasma_beam/hit_entity/damage.mcfunction @@ -18,8 +18,9 @@ function api:damage/reset # ノックバック - data modify storage lib: Argument.VectorMagnitude set value 0.75d - function lib:motion/looking + data modify storage lib: Argument.KnockbackResist set value true + data modify storage lib: Argument.VectorMagnitude set value 3.5d + execute rotated ~ -30 run function lib:motion/looking # リセット scoreboard players reset $UserID From d815bdfbbb48a95d0fbaefd4a0bb618a573833f6 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 17:18:34 +0200 Subject: [PATCH 10/23] =?UTF-8?q?=E9=9F=B3=E9=87=8F=E8=AA=BF=E7=AF=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1168.plasma_spark/tick/explode.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction index c63ec60793..5a4bce8ba5 100644 --- a/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction +++ b/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction @@ -20,7 +20,7 @@ # 演出 particle end_rod ~ ~ ~ 0 0 0 0 1 - playsound entity.firework_rocket.twinkle player @a ~ ~ ~ 1 2 + playsound entity.firework_rocket.twinkle player @a ~ ~ ~ 0.25 2 # リセット scoreboard players reset $UserID From 3f826d1938db9df21af0db99c03c5be04c58a560 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 17:34:07 +0200 Subject: [PATCH 11/23] =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E7=94=A8=E3=83=90=E3=83=95=E3=81=AE=E3=82=B9=E3=82=BF=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=81=8C=E5=A4=89=E5=8B=95=E3=81=97=E3=81=9F=E3=81=A8?= =?UTF-8?q?=E3=81=8D=E3=81=AE=E3=81=BF=E3=81=ABMP=E3=82=92=E6=B6=88?= =?UTF-8?q?=E8=B2=BB=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1465.versatile_plasma/give/2.give.mcfunction | 4 ++-- .../trigger/2.check_condition.mcfunction | 2 -- .../trigger/charge.mcfunction | 14 -------------- .../effect/374.charge_plasma/re-given/.mcfunction | 12 +++++++++--- .../374.charge_plasma/re-given/charge/2.mcfunction | 13 +++++++++++++ .../374.charge_plasma/re-given/charge/3.mcfunction | 13 +++++++++++++ 6 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/2.mcfunction create mode 100644 Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/3.mcfunction diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction index 42d15d12b0..85397a7a8c 100644 --- a/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction @@ -41,9 +41,9 @@ # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackRange set value "???" # MP消費量 (int) - data modify storage asset:artifact MPCost set value 1 + # data modify storage asset:artifact MPCost set value 0 # MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value + data modify storage asset:artifact MPRequire set value 0 # MP回復量 (int) data modify storage asset:artifact MPHealWhenHit set value 10 # 神器のクールダウン (int) (オプション) diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/2.check_condition.mcfunction index e0f92c8d0f..9de6cd60d9 100644 --- a/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/2.check_condition.mcfunction @@ -7,8 +7,6 @@ # チャージ段階のEffect取得 data modify storage api: Argument.ID set value 374 function api:entity/mob/effect/get/from_id -# チャージが完了しているならキャンセル - execute if data storage api: Return.Effect{Stack:3} run return 0 # チャージ中ならば強制的にチャージ続行 execute if data storage api: Return.Effect run return run function asset:artifact/1465.versatile_plasma/trigger/charge diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/charge.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/charge.mcfunction index 745f24362e..a6779a9d71 100644 --- a/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/charge.mcfunction +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/charge.mcfunction @@ -4,21 +4,7 @@ # # @within function asset:artifact/1465.versatile_plasma/trigger/2.check_condition -#> Private -# @private - #declare score_holder $MP - -# MPが足りないならキャンセル - function api:mp/get_current - execute store result score $MP Temporary run data get storage api: Return.CurrentMP 10 - execute unless score $MP Temporary matches 1.. run return fail - # チャージ用Effectを付与 data modify storage api: Argument.ID set value 374 function api:entity/mob/effect/give function api:entity/mob/effect/reset - -# MP消費 - data modify storage api: Argument.Fluctuation set value -1 - data modify storage api: Argument.DisableLog set value 1b - function api:mp/fluctuation diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/re-given/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/.mcfunction index f59d367e8d..2eb79076f9 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/re-given/.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/.mcfunction @@ -7,16 +7,22 @@ #> Private # @private #declare score_holder $Charge + #declare score_holder $MP # チャージ時間を取得 execute store result score $Charge Temporary run data get storage asset:context PreviousField.Charge +# MPを取得 + function api:mp/get_current + execute store result score $MP Temporary run data get storage api: Return.CurrentMP 10 + # Field.Chargeを+1 execute store result storage asset:context this.Charge int 1 run scoreboard players add $Charge Temporary 1 # 時間に応じてバフをスタック - execute if score $Charge Temporary matches 25 run data modify storage asset:context Stack set value 2 - execute if score $Charge Temporary matches 50 run data modify storage asset:context Stack set value 3 + execute if data storage asset:context {Stack:1} if score $Charge Temporary matches 25.. if score $MP Temporary matches 25.. run function asset:effect/374.charge_plasma/re-given/charge/2 + execute if data storage asset:context {Stack:2} if score $Charge Temporary matches 50.. if score $MP Temporary matches 35.. run function asset:effect/374.charge_plasma/re-given/charge/3 # リセット - scoreboard players reset $Charge Temporary + scoreboard players reset $Charge + scoreboard players reset $MP diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/2.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/2.mcfunction new file mode 100644 index 0000000000..5089199b09 --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/2.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/374.charge_plasma/re-given/charge/2 +# +# +# +# @within function asset:effect/374.charge_plasma/re-given/ + +# スタック数を増やす + data modify storage asset:context Stack set value 2 + +# MP消費 + data modify storage api: Argument.Fluctuation set value -25 + data modify storage api: Argument.DisableLog set value 1b + function api:mp/fluctuation diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/3.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/3.mcfunction new file mode 100644 index 0000000000..273ef6a398 --- /dev/null +++ b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/3.mcfunction @@ -0,0 +1,13 @@ +#> asset:effect/374.charge_plasma/re-given/charge/3 +# +# +# +# @within function asset:effect/374.charge_plasma/re-given/ + +# スタック数を増やす + data modify storage asset:context Stack set value 3 + +# MP消費 + data modify storage api: Argument.Fluctuation set value -35 + data modify storage api: Argument.DisableLog set value 1b + function api:mp/fluctuation From 3f62b6ec22dfc8e6cd469c231a61f9cdac8f7f71 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 17:37:25 +0200 Subject: [PATCH 12/23] =?UTF-8?q?=E6=94=BB=E6=92=83=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E3=82=92=E5=BC=B7=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1168.plasma_spark/tick/explode.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction index 5a4bce8ba5..487aa8cf7b 100644 --- a/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction +++ b/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction @@ -15,7 +15,7 @@ data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal 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 api:damage/modifier - execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~-0.9 ~-0.9 ~-0.9 if entity @s[dx=0] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~-0.75 ~-0.75 ~-0.75 if entity @s[dx=0] run function api:damage/ function api:damage/reset # 演出 From d6cafe273785b94e956a0623f995ee3290c5a249 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 17:44:07 +0200 Subject: [PATCH 13/23] =?UTF-8?q?=E6=94=BB=E6=92=832=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E7=AF=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/374.charge_plasma/end/attack/2.mcfunction | 4 ++-- .../functions/object/1169.plasma_beam/register.mcfunction | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction index 1519d7b6e6..e5245b284f 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction @@ -6,13 +6,13 @@ # 3発撃つ data modify storage api: Argument.ID set value 1169 - execute rotated ~-60 ~ run function api:object/summon + execute rotated ~-30 ~ run function api:object/summon data modify storage api: Argument.ID set value 1169 execute rotated ~ ~ run function api:object/summon data modify storage api: Argument.ID set value 1169 - execute rotated ~60 ~ run function api:object/summon + execute rotated ~30 ~ run function api:object/summon # 演出 playsound block.respawn_anchor.deplete player @a ~ ~ ~ 1.0 2.0 diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction index d36d06b3e7..5498345c33 100644 --- a/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction +++ b/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction @@ -20,5 +20,5 @@ data modify storage asset:object Field.Damage set value 150 data modify storage asset:object Field.AdditionalMPHeal set value 10 data modify storage asset:object Field.Speed set value 2 - data modify storage asset:object Field.Range set value 20 + data modify storage asset:object Field.Range set value 50 data modify storage asset:object Field.UserID set value -1 From 1d2702834534bab580d28901e0db261bd06a4aed Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 17:53:32 +0200 Subject: [PATCH 14/23] =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E9=87=8F=E3=82=92Field=E3=81=A7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1168.plasma_spark/register.mcfunction | 1 + .../functions/object/1168.plasma_spark/tick/explode.mcfunction | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/register.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/register.mcfunction index 7712930b53..573d9e806d 100644 --- a/Asset/data/asset/functions/object/1168.plasma_spark/register.mcfunction +++ b/Asset/data/asset/functions/object/1168.plasma_spark/register.mcfunction @@ -17,5 +17,6 @@ # ID (int) data modify storage asset:object ID set value 1168 # フィールド(オプション) + data modify storage asset:object Field.Damage set value 30 data modify storage asset:object Field.AdditionalMPHeal set value 10 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction index 487aa8cf7b..6218cad260 100644 --- a/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction +++ b/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction @@ -9,7 +9,7 @@ #declare score_holder $UserID # 攻撃判定 - data modify storage api: Argument.Damage set value 30.0f + 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 "Thunder" data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal From fe461cfa92897172c0f23b59d1ffa23bf87652e4 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 18:00:25 +0200 Subject: [PATCH 15/23] =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E6=99=82=E3=81=AEMP=E6=B6=88=E8=B2=BB=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/effect/374.charge_plasma/re-given/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/re-given/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/.mcfunction index 2eb79076f9..05e9241d07 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/re-given/.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/.mcfunction @@ -14,7 +14,7 @@ # MPを取得 function api:mp/get_current - execute store result score $MP Temporary run data get storage api: Return.CurrentMP 10 + execute store result score $MP Temporary run data get storage api: Return.CurrentMP # Field.Chargeを+1 execute store result storage asset:context this.Charge int 1 run scoreboard players add $Charge Temporary 1 From 2a629dd12da8d8e7c5b0afd116b88d6a1f6e2220 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 18:12:43 +0200 Subject: [PATCH 16/23] =?UTF-8?q?=E3=83=84=E3=83=BC=E3=83=AB=E3=83=81?= =?UTF-8?q?=E3=83=83=E3=83=97=E3=82=92=E6=95=B4=E5=82=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1465.versatile_plasma/give/2.give.mcfunction | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction index 85397a7a8c..a75c9b7c07 100644 --- a/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction @@ -13,9 +13,9 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:ender_eye" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text": "ヴァースティル・プラズマ"}' + data modify storage asset:artifact Name set value '{"text": "ヴァースティル・プラズマ", "color": "#D4FFBA"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value [] + data modify storage asset:artifact Lore set value ['{"text": "チャージ段階に応じて異なる方法で攻撃する。"}', '{"text": "チャージを2層重ねると25、3層重ねると追加で35のMPを消費する。"}'] # 消費アイテム ({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 @@ -41,9 +41,9 @@ # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackRange set value "???" # MP消費量 (int) - # data modify storage asset:artifact MPCost set value 0 + # data modify storage asset:artifact MPCost set value # MP必要量 (int) (オプション) - data modify storage asset:artifact MPRequire set value 0 + # data modify storage asset:artifact MPRequire set value # MP回復量 (int) data modify storage asset:artifact MPHealWhenHit set value 10 # 神器のクールダウン (int) (オプション) From b781eeeb5b2e671c7d1f00a63288cc65dc50a0de Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 3 Jul 2026 18:46:58 +0200 Subject: [PATCH 17/23] =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1465.versatile_plasma/trigger/3.main.mcfunction | 3 +++ .../effect/374.charge_plasma/end/attack/2.mcfunction | 2 +- .../effect/374.charge_plasma/end/attack/3/.mcfunction | 2 ++ .../effect/374.charge_plasma/end/attack/3/rec.mcfunction | 4 +++- .../effect/374.charge_plasma/re-given/charge/2.mcfunction | 6 ++++++ .../effect/374.charge_plasma/re-given/charge/3.mcfunction | 7 +++++++ .../object/1168.plasma_spark/tick/explode.mcfunction | 1 + 7 files changed, 23 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/3.main.mcfunction index 77e03d69ba..fde8e3c5ad 100644 --- a/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/trigger/3.main.mcfunction @@ -11,3 +11,6 @@ data modify storage api: Argument.ID set value 374 function api:entity/mob/effect/give function api:entity/mob/effect/reset + +# 演出 + playsound block.iron_door.open player @a ~ ~ ~ 2 0.5 diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction index e5245b284f..c310469468 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction @@ -15,4 +15,4 @@ execute rotated ~30 ~ run function api:object/summon # 演出 - playsound block.respawn_anchor.deplete player @a ~ ~ ~ 1.0 2.0 + playsound block.respawn_anchor.deplete player @a ~ ~ ~ 2 2 diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/.mcfunction index 22958745fc..f7052c4ba3 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/.mcfunction @@ -15,3 +15,5 @@ tag @e[tag=HitTarget,distance=..20] remove HitTarget # 演出 + playsound block.vault.open_shutter master @a ~ ~ ~ 2 2 + playsound block.vault.break master @a ~ ~ ~ 1 1 diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/rec.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/rec.mcfunction index 4b89469ec6..ed6421d92d 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/rec.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/rec.mcfunction @@ -11,7 +11,9 @@ execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!HitTarget,tag=!Uninterferable,dx=0,limit=1] run function asset:effect/374.charge_plasma/end/attack/3/damage # 演出 - particle dust 0.3 1.0 0.0 1.0 ~ ~ ~ 0.0 0.0 0.0 1 3 + particle dust 0.8 1.0 0.5 1.0 ~ ~ ~ 0.0 0.0 0.0 1 1 + particle dust 0.5 1.0 0.5 1.5 ~ ~ ~ 0.0 0.0 0.0 1 1 + particle dust 0.8 0.8 0.3 0.5 ~ ~ ~ 0.0 0.0 0.0 1 1 # 再起 execute positioned ^ ^ ^0.5 if entity @s[tag=!Hit,distance=..20] run function asset:effect/374.charge_plasma/end/attack/3/rec diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/2.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/2.mcfunction index 5089199b09..ee8527f714 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/2.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/2.mcfunction @@ -11,3 +11,9 @@ data modify storage api: Argument.Fluctuation set value -25 data modify storage api: Argument.DisableLog set value 1b function api:mp/fluctuation + +# 演出 + playsound block.piston.extend player @a ~ ~ ~ 2 2 + particle dust 0.8 1.0 0.5 2.0 ~ ~ ~ 0.5 1.0 0.5 1 8 + particle dust 0.5 1.0 0.5 2.5 ~ ~ ~ 0.5 1.0 0.5 1 8 + particle dust 0.8 0.8 0.3 1.5 ~ ~ ~ 0.5 1.0 0.5 1 8 diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/3.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/3.mcfunction index 273ef6a398..3e0946a5ce 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/3.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/re-given/charge/3.mcfunction @@ -11,3 +11,10 @@ data modify storage api: Argument.Fluctuation set value -35 data modify storage api: Argument.DisableLog set value 1b function api:mp/fluctuation + +# 演出 + playsound block.piston.extend player @a ~ ~ ~ 2 2 + playsound block.trial_spawner.detect_player player @a ~ ~ ~ 2 0.5 + particle dust 0.8 1.0 0.5 2.0 ~ ~ ~ 0.5 1.0 0.5 1 8 + particle dust 0.5 1.0 0.5 2.5 ~ ~ ~ 0.5 1.0 0.5 1 8 + particle dust 0.8 0.8 0.3 1.5 ~ ~ ~ 0.5 1.0 0.5 1 8 diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction index 6218cad260..be5ad48d2f 100644 --- a/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction +++ b/Asset/data/asset/functions/object/1168.plasma_spark/tick/explode.mcfunction @@ -21,6 +21,7 @@ # 演出 particle end_rod ~ ~ ~ 0 0 0 0 1 playsound entity.firework_rocket.twinkle player @a ~ ~ ~ 0.25 2 + playsound block.copper_bulb.turn_on player @a ~ ~ ~ 2 2 # リセット scoreboard players reset $UserID From 80994c3197cb1bb172fb915bc4e0525a0f3d86a5 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 4 Jul 2026 12:56:32 +0200 Subject: [PATCH 18/23] =?UTF-8?q?playsound=E3=81=A7=E5=86=8D=E7=94=9F?= =?UTF-8?q?=E3=81=99=E3=82=8B=E9=9F=B3=E3=82=92ogg=E5=90=8D=E5=89=8D?= =?UTF-8?q?=E7=A9=BA=E9=96=93=E3=81=AE=E3=82=82=E3=81=AE=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/374.charge_plasma/end/attack/3/.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/.mcfunction index f7052c4ba3..d4b2658dab 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/.mcfunction @@ -15,5 +15,5 @@ tag @e[tag=HitTarget,distance=..20] remove HitTarget # 演出 - playsound block.vault.open_shutter master @a ~ ~ ~ 2 2 - playsound block.vault.break master @a ~ ~ ~ 1 1 + playsound ogg:block.vault.open_shutter master @a ~ ~ ~ 2 2 + playsound ogg:block.vault.break master @a ~ ~ ~ 1 1 From 01fe0d402c4c274569a967337a5f5a22eff5b302 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 4 Jul 2026 13:02:01 +0200 Subject: [PATCH 19/23] =?UTF-8?q?=E6=94=BB=E6=92=831=E3=81=AE=E7=99=BA?= =?UTF-8?q?=E5=B0=84=E6=95=B0=E3=82=92=E5=A2=97=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/374.charge_plasma/end/attack/1/.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/.mcfunction index 50e1a41eac..8c301a5357 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/1/.mcfunction @@ -8,8 +8,8 @@ # @within function asset:effect/374.charge_plasma/end/attack/** #declare score_holder $rec -# 24回実行 - scoreboard players set $rec Temporary 24 +# 36回実行 + scoreboard players set $rec Temporary 36 # 向いている方向に確定で一個だす data modify storage api: Argument.ID set value 1168 From b0bc9db2b854f7afe5901d8912836745e5e22fa7 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 4 Jul 2026 13:07:55 +0200 Subject: [PATCH 20/23] =?UTF-8?q?MP=E5=9B=9E=E5=BE=A9=E9=87=8F=E3=82=92?= =?UTF-8?q?=E5=8D=8A=E5=88=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1465.versatile_plasma/give/2.give.mcfunction | 2 +- .../effect/374.charge_plasma/end/attack/3/damage.mcfunction | 2 +- .../functions/object/1168.plasma_spark/register.mcfunction | 2 +- .../asset/functions/object/1169.plasma_beam/register.mcfunction | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction index a75c9b7c07..21dde854db 100644 --- a/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1465.versatile_plasma/give/2.give.mcfunction @@ -45,7 +45,7 @@ # MP必要量 (int) (オプション) # data modify storage asset:artifact MPRequire set value # MP回復量 (int) - data modify storage asset:artifact MPHealWhenHit set value 10 + data modify storage asset:artifact MPHealWhenHit set value 5 # 神器のクールダウン (int) (オプション) data modify storage asset:artifact LocalCooldown set value 100 # 種別クールダウン ({Type: string, Duration: int}) (オプション) diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/damage.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/damage.mcfunction index 14facc5838..9bbe96c21f 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/damage.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/3/damage.mcfunction @@ -12,7 +12,7 @@ data modify storage api: Argument.Damage set value 300 data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Thunder" - data modify storage api: Argument.AdditionalMPHeal set value 10 + data modify storage api: Argument.AdditionalMPHeal set value 5 function api:damage/modifier execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/object/1168.plasma_spark/register.mcfunction b/Asset/data/asset/functions/object/1168.plasma_spark/register.mcfunction index 573d9e806d..06914ef81c 100644 --- a/Asset/data/asset/functions/object/1168.plasma_spark/register.mcfunction +++ b/Asset/data/asset/functions/object/1168.plasma_spark/register.mcfunction @@ -18,5 +18,5 @@ data modify storage asset:object ID set value 1168 # フィールド(オプション) data modify storage asset:object Field.Damage set value 30 - data modify storage asset:object Field.AdditionalMPHeal set value 10 + data modify storage asset:object Field.AdditionalMPHeal set value 5 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction b/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction index 5498345c33..a3c84e8fbd 100644 --- a/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction +++ b/Asset/data/asset/functions/object/1169.plasma_beam/register.mcfunction @@ -18,7 +18,7 @@ data modify storage asset:object ID set value 1169 # フィールド(オプション) data modify storage asset:object Field.Damage set value 150 - data modify storage asset:object Field.AdditionalMPHeal set value 10 + data modify storage asset:object Field.AdditionalMPHeal set value 5 data modify storage asset:object Field.Speed set value 2 data modify storage asset:object Field.Range set value 50 data modify storage asset:object Field.UserID set value -1 From a186c0364cf23865a5493d3a846a5c596141eca1 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 4 Jul 2026 13:26:34 +0200 Subject: [PATCH 21/23] =?UTF-8?q?=E6=94=BB=E6=92=832=E3=81=AE=E8=A6=96?= =?UTF-8?q?=E8=AA=8D=E6=80=A7=E3=82=92=E6=94=B9=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/effect/374.charge_plasma/end/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction index 25f819732d..c748cbb2e8 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/.mcfunction @@ -6,5 +6,5 @@ # スタック数に応じてそれぞれの攻撃処理を実行 execute if data storage asset:context {Stack:1} run function asset:effect/374.charge_plasma/end/attack/1/ - execute if data storage asset:context {Stack:2} anchored eyes positioned ^ ^ ^ run function asset:effect/374.charge_plasma/end/attack/2 + execute if data storage asset:context {Stack:2} anchored eyes positioned ^ ^-0.25 ^ run function asset:effect/374.charge_plasma/end/attack/2 execute if data storage asset:context {Stack:3} run function asset:effect/374.charge_plasma/end/attack/3/ From 92f4a96840eb7bada674d386304ee6de986e30c1 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 4 Jul 2026 18:22:48 +0200 Subject: [PATCH 22/23] =?UTF-8?q?UserID=E3=81=8C=E6=AD=A3=E3=81=97?= =?UTF-8?q?=E3=81=8F=E7=B4=90=E3=81=A5=E3=81=84=E3=81=A6=E3=81=84=E3=81=AA?= =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../effect/374.charge_plasma/end/attack/2.mcfunction | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction index c310469468..8d18055546 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/end/attack/2.mcfunction @@ -6,12 +6,18 @@ # 3発撃つ data modify storage api: Argument.ID set value 1169 + data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage api: PersistentArgument.AdditionalMPHeal + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute rotated ~-30 ~ run function api:object/summon data modify storage api: Argument.ID set value 1169 + data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage api: PersistentArgument.AdditionalMPHeal + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute rotated ~ ~ run function api:object/summon data modify storage api: Argument.ID set value 1169 + data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage api: PersistentArgument.AdditionalMPHeal + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute rotated ~30 ~ run function api:object/summon # 演出 From ea8404068f799b93f39152498c061dd9decda2b9 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 4 Jul 2026 18:27:45 +0200 Subject: [PATCH 23/23] =?UTF-8?q?Effect=E3=81=AE=E8=AA=AC=E6=98=8E?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/effect/374.charge_plasma/register.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/effect/374.charge_plasma/register.mcfunction b/Asset/data/asset/functions/effect/374.charge_plasma/register.mcfunction index ae3706006e..6e61a3ca90 100644 --- a/Asset/data/asset/functions/effect/374.charge_plasma/register.mcfunction +++ b/Asset/data/asset/functions/effect/374.charge_plasma/register.mcfunction @@ -9,9 +9,9 @@ # ID (int) data modify storage asset:effect ID set value 374 # 名前 (TextComponentString) - data modify storage asset:effect Name set value '{"text": "チャージ・プラズマ"}' + data modify storage asset:effect Name set value '{"text": "チャージ・プラズマ", "color": "#D4FFBA"}' # 説明文 (TextComponentString[]) - data modify storage asset:effect Description set value [] + data modify storage asset:effect Description set value ['{"text": "チャージ終了時、チャージ段階に応じて異なる攻撃を放つ"}'] # 効果時間 (int) (default = API || error) data modify storage asset:effect Duration set value 1 # スタック (int) (default = API || 1)