From 6036e960cbe689bce92b0d61183a796365261f7e Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 14 Jun 2026 13:29:40 +0200 Subject: [PATCH 01/32] =?UTF-8?q?Artifact=E3=81=A8Object=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 +++++++++++++++++++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 14 ++++ .../trigger/3.main.mcfunction | 16 +++++ .../1160.electric_catfish/_index.d.mcfunction | 8 +++ .../1160.electric_catfish/init/.mcfunction | 17 +++++ .../1160.electric_catfish/load.mcfunction | 9 +++ .../1160.electric_catfish/register.mcfunction | 20 ++++++ .../1160.electric_catfish/summon/.mcfunction | 8 +++ .../summon/debug.mcfunction | 10 +++ .../1160.electric_catfish/tick/.mcfunction | 19 ++++++ .../tick/attack.mcfunction | 31 +++++++++ .../tick/kill.mcfunction | 11 +++ .../object/alias/1160/init.mcfunction | 8 +++ .../object/alias/1160/register.mcfunction | 8 +++ .../object/alias/1160/summon.mcfunction | 8 +++ .../object/alias/1160/tick.mcfunction | 8 +++ .../artifact/click.carrot_on_a_stick.json | 3 +- .../asset/tags/functions/artifact/give.json | 3 +- .../asset/tags/functions/object/load.json | 1 + 21 files changed, 283 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/object/1160.electric_catfish/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1160.electric_catfish/load.mcfunction create mode 100644 Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1160.electric_catfish/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1160.electric_catfish/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction create mode 100644 Asset/data/asset/functions/object/1160.electric_catfish/tick/kill.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1160/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1160/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1160/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1160/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/1.trigger.mcfunction new file mode 100644 index 00000000000..9704dd76ddc --- /dev/null +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1464.call_electric_catfish/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1464} run function asset:artifact/1464.call_electric_catfish/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction new file mode 100644 index 00000000000..94ad23c78be --- /dev/null +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1464.call_electric_catfish/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1464.call_electric_catfish/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1464 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (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 100 +# 攻撃に関する情報 -攻撃タイプ (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 "every" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 80 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# MP回復量 (int) + # data modify storage asset:artifact MPHealWhenHit set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# 種別クールダウン ({Type: string, Duration: int}) (オプション) + data modify storage asset:artifact TypeCooldown.Type set value "summon" + data modify storage asset:artifact TypeCooldown.Duration set value 600 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..f61580689b3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1464.call_electric_catfish/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:1464} run function asset:artifact/1464.call_electric_catfish/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..654970e4867 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction @@ -0,0 +1,14 @@ +#> asset:artifact/1464.call_electric_catfish/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1464.call_electric_catfish/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/mainhand + +# 追加チェック:地面に立っていないならCanUsed剝奪 + execute unless data entity @s[tag=CanUsed] {OnGround:1b} run tag @s remove CanUsed + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1464.call_electric_catfish/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/3.main.mcfunction new file mode 100644 index 00000000000..ece243bddd2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/3.main.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/1464.call_electric_catfish/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1464.call_electric_catfish/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/mainhand + +# ダメージ設定 + data modify storage api: Argument.FieldOverride.Damage set value 100.0f + +# 本体召喚 + data modify storage api: Argument.ID set value 1160 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + function api:object/summon diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/_index.d.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/_index.d.mcfunction new file mode 100644 index 00000000000..4539d860745 --- /dev/null +++ b/Asset/data/asset/functions/object/1160.electric_catfish/_index.d.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1160.electric_catfish/_index.d +# @private + +#> tag +# @within function asset:object/1160.electric_catfish/** + #declare tag 1160.Inactive + #declare tag 1160.SteppedOn + #declare objective 1160.Cooldown diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction new file mode 100644 index 00000000000..9bd4adc73e2 --- /dev/null +++ b/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction @@ -0,0 +1,17 @@ +#> asset:object/1160.electric_catfish/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1160/init + +# ブロックの中心にtp(召喚時にtpするとinitされない) + execute align xz run tp @s ~0.5 ~ ~0.5 + +# item_displayを設定(召喚時のtransformationは反映されない) + data modify entity @s transformation.scale set value [1.0f, 0.2f, 1.0f] + data modify entity @s transformation.translation set value [0.0f, 0.1f, 0.0f] + +# 演出 + particle poof ~ ~0.5 ~ 0.1 0.1 0.1 0.05 5 + + playsound entity.player.hurt neutral @a ~ ~ ~ 1 0.5 diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/load.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/load.mcfunction new file mode 100644 index 00000000000..f8634b76527 --- /dev/null +++ b/Asset/data/asset/functions/object/1160.electric_catfish/load.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1160.electric_catfish/load +# +# Objectに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:object/load + +#> 定義類はここに +# @within function asset:object/1160.electric_catfish/** + scoreboard objectives add 1160.Cooldown dummy diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction new file mode 100644 index 00000000000..959acfa9b55 --- /dev/null +++ b/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1160.electric_catfish/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1160/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 1160 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/summon/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/summon/.mcfunction new file mode 100644 index 00000000000..f7019512d44 --- /dev/null +++ b/Asset/data/asset/functions/object/1160.electric_catfish/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1160.electric_catfish/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1160/summon + +# 元となるEntityを召喚する + summon item_display ~ ~ ~ {Tags:["ObjectInit", "Friend"], item:{id:"minecraft:dark_oak_planks", Count:1b}} diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/summon/debug.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/summon/debug.mcfunction new file mode 100644 index 00000000000..2193b659ae1 --- /dev/null +++ b/Asset/data/asset/functions/object/1160.electric_catfish/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1160.electric_catfish/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1160 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction new file mode 100644 index 00000000000..73e4b5d866b --- /dev/null +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction @@ -0,0 +1,19 @@ +#> asset:object/1160.electric_catfish/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1160/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# クールダウン + execute if score @s 1160.Cooldown matches 1.. run scoreboard players remove @s 1160.Cooldown 1 + execute if score @s 1160.Cooldown matches 0 run tag @s remove 1160.Inactive + +# 踏まれたどうかをチェック + execute unless entity @s[tag=1160.Inactive] positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,dx=0,sort=nearest,limit=1] positioned ~ ~-0.8 ~ if entity @s[dx=0] run tag @s add 1160.SteppedOn + execute if entity @e[tag=1160.SteppedOn,distance=..2] at @s run function asset:object/1160.electric_catfish/tick/attack + +# 消滅処理 + execute if score @s General.Object.Tick matches 1200.. run function asset:object/1160.electric_catfish/tick/kill diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction new file mode 100644 index 00000000000..a967a47f438 --- /dev/null +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -0,0 +1,31 @@ +#> asset:object/1160.electric_catfish/tick/attack +# +# Objectのtick時の処理 +# +# @within asset:object/1160.electric_catfish/tick/** + +# ダメージ設定 + 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" + +# SteppedOnタグがついたEntityが対象 + execute as @e[tag=1160.SteppedOn,distance=..2,limit=1] run function api:damage/ + +# 周囲のMobにもダメージ + execute store result storage api: Argument.Damage float 0.5 run data get storage asset:context this.Damage + execute positioned ~-3.5 ~ ~-3.5 as @e[type=#lib:living_without_player,tag=!1160.SteppedOn,dx=7,dz=7] positioned ~ ~-0.2 ~ if entity @s[dx=7,dz=7] run function api:damage/ + +# リセット + tag @e[tag=1160.SteppedOn,distance=..2,limit=1] remove 1160.SteppedOn + +# 0.5秒のクールダウン + scoreboard players set @s 1160.Cooldown 10 + tag @s add 1160.Inactive + +# 演出 + particle dust 1 1 0 2 ~ ~ ~ 1.5 0.1 1.5 0 100 + + playsound entity.player.hurt neutral @a ~ ~ ~ 2 0.5 + playsound entity.allay.hurt neutral @a ~ ~ ~ 2 2.0 + playsound enchant.thorns.hit neutral @a ~ ~ ~ 2 1.0 diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/kill.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/kill.mcfunction new file mode 100644 index 00000000000..402624143ee --- /dev/null +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/kill.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1160.electric_catfish/tick/kill +# +# Object削除の処理 +# +# @within function asset:object/1160.electric_catfish/tick/ + +# 演出 + particle poof ~ ~0.5 ~ 0.1 0.1 0.1 0.05 5 + +# 消す + kill @s diff --git a/Asset/data/asset/functions/object/alias/1160/init.mcfunction b/Asset/data/asset/functions/object/alias/1160/init.mcfunction new file mode 100644 index 00000000000..3f38c93b29a --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1160/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1160/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1160.electric_catfish/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1160/register.mcfunction b/Asset/data/asset/functions/object/alias/1160/register.mcfunction new file mode 100644 index 00000000000..d0b9f30ca57 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1160/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1160/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1160.electric_catfish/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1160/summon.mcfunction b/Asset/data/asset/functions/object/alias/1160/summon.mcfunction new file mode 100644 index 00000000000..6d0bd6c7135 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1160/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1160/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1160.electric_catfish/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1160/tick.mcfunction b/Asset/data/asset/functions/object/alias/1160/tick.mcfunction new file mode 100644 index 00000000000..fe042147217 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1160/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1160/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1160.electric_catfish/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json index 40202c95573..f2247ecf167 100644 --- a/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json +++ b/Asset/data/asset/tags/functions/artifact/click.carrot_on_a_stick.json @@ -1,5 +1,6 @@ { "values": [ + "asset:artifact/1464.call_electric_catfish/trigger/1.trigger", "asset:artifact/1306.will_o_wisp/trigger/1.trigger", "asset:artifact/1144.cradle_of_azure_moon/trigger/1.trigger", "asset:artifact/0005.musket_matchlock/trigger/1.trigger", @@ -176,4 +177,4 @@ "asset:artifact/2001.staff_of_the_willless/trigger/1.trigger", "asset:artifact/0019.scripture/trigger/1.trigger" ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 16715fe3c74..52f6ac1a7b5 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/1464.call_electric_catfish/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/object/load.json b/Asset/data/asset/tags/functions/object/load.json index 370cd7f01be..3d8f2a2f731 100644 --- a/Asset/data/asset/tags/functions/object/load.json +++ b/Asset/data/asset/tags/functions/object/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:object/1160.electric_catfish/load", "asset:object/1061.azure_jelly/load", "asset:object/2251.wall_laser_clock/load", "asset:object/2212.eclael_upper_shot/load", From 9a24a1bbe20d63d01ca7d9a4da3192ccbf912262 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 14 Jun 2026 13:41:55 +0200 Subject: [PATCH 02/32] =?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=81=AE=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1464.call_electric_catfish/give/2.give.mcfunction | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction index 94ad23c78be..38a6350af8d 100644 --- a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction @@ -13,9 +13,9 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text": "コール:デンキナマズ"}' + data modify storage asset:artifact Name set value '{"text": "コール:デンキナマズ", "color": "yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value [] + data modify storage asset:artifact Lore set value ['{"text": "踏まれると周囲にダメージを与える、ナマズを召喚する。"}', '{"text": "「べちっ」「...」", "color": "gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 @@ -27,7 +27,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onClick" # 神器の発動条件 (TextComponentString) (オプション) - # data modify storage asset:artifact Condition set value + data modify storage asset:artifact Condition set value '{"text": "地面に立っているとき"}' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.Damage set value 100 # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) From 114f0e6b7d84d34abcc2f1db82b6c38c28f6cff2 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 20 Jun 2026 11:29:36 +0200 Subject: [PATCH 03/32] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E7=B5=90=E6=9E=9C?= =?UTF-8?q?=E3=81=AB=E7=99=BB=E9=8C=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1464.call_electric_catfish/register.mcfunction | 7 +++++++ Asset/data/asset/tags/functions/artifact/register.json | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/artifact/1464.call_electric_catfish/register.mcfunction diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/register.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/register.mcfunction new file mode 100644 index 00000000000..7b499633fe4 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1464.call_electric_catfish/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[3] append value [1464] \ 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 7e92660e5a2..77c902aec56 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/1464.call_electric_catfish/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 From 2f183a63cf6fc2a58b7f34aa5d5b60927530220a Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 20 Jun 2026 15:28:39 +0200 Subject: [PATCH 04/32] =?UTF-8?q?=E5=AF=BE=E8=B1=A1=E3=81=8C=E5=8B=95?= =?UTF-8?q?=E3=81=84=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E3=81=A8=E6=94=BB?= =?UTF-8?q?=E6=92=83=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1160.electric_catfish/tick/.mcfunction | 2 +- .../tick/check.mcfunction | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction index 73e4b5d866b..d75aa370ffe 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction @@ -12,7 +12,7 @@ execute if score @s 1160.Cooldown matches 0 run tag @s remove 1160.Inactive # 踏まれたどうかをチェック - execute unless entity @s[tag=1160.Inactive] positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,dx=0,sort=nearest,limit=1] positioned ~ ~-0.8 ~ if entity @s[dx=0] run tag @s add 1160.SteppedOn + execute unless entity @s[tag=1160.Inactive] positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,dx=0,sort=nearest,limit=1] positioned ~ ~-0.8 ~ if entity @s[dx=0] run function asset:object/1160.electric_catfish/tick/check execute if entity @e[tag=1160.SteppedOn,distance=..2] at @s run function asset:object/1160.electric_catfish/tick/attack # 消滅処理 diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction new file mode 100644 index 00000000000..dd9568a316e --- /dev/null +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction @@ -0,0 +1,25 @@ +#> asset:object/1160.electric_catfish/tick/check +# +# +# +# @within asset:object/1160.electric_catfish/tick/** + +#> private +# @private + #declare score_holder $MotionX + #declare score_holder $MotionZ + +# 動いているなら踏んだ判定 + execute store result score $MotionX Temporary run data get entity @s Motion[0] 100 + execute store result score $MotionZ Temporary run data get entity @s Motion[2] 100 + + execute if score $MotionX Temporary matches ..-1 store result score $MotionX Temporary run data get entity @s Motion[0] -100 + execute if score $MotionZ Temporary matches ..-1 store result score $MotionZ Temporary run data get entity @s Motion[2] -100 + + scoreboard players operation $MotionX Temporary += $MotionZ Temporary + + execute if score $MotionX Temporary matches 1.. run tag @s add 1160.SteppedOn + +# リセット + scoreboard players reset $MotionX + scoreboard players reset $MotionZ From d0fea90ada28fd49b67cb236925deeebebbdda32 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 20 Jun 2026 15:52:15 +0200 Subject: [PATCH 05/32] =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=81=AE=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E3=81=8C=E5=87=BA=E7=8F=BE=E4=BD=8D=E7=BD=AE=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=81=86=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1160.electric_catfish/init/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction index 9bd4adc73e2..efd578c9930 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction @@ -12,6 +12,6 @@ data modify entity @s transformation.translation set value [0.0f, 0.1f, 0.0f] # 演出 - particle poof ~ ~0.5 ~ 0.1 0.1 0.1 0.05 5 + execute align xz run particle poof ~0.5 ~0.5 ~0.5 0.1 0.1 0.1 0.05 5 playsound entity.player.hurt neutral @a ~ ~ ~ 1 0.5 From 4e30e88f9d8611942539941c2c4d664ee0fa7928 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 23 Jun 2026 08:26:24 +0200 Subject: [PATCH 06/32] =?UTF-8?q?Object=E3=81=AE=E8=A6=8B=E3=81=9F?= =?UTF-8?q?=E7=9B=AE=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1160.electric_catfish/init/.mcfunction | 4 ---- .../functions/object/1160.electric_catfish/summon/.mcfunction | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction index efd578c9930..4d4fedb5145 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction @@ -7,10 +7,6 @@ # ブロックの中心にtp(召喚時にtpするとinitされない) execute align xz run tp @s ~0.5 ~ ~0.5 -# item_displayを設定(召喚時のtransformationは反映されない) - data modify entity @s transformation.scale set value [1.0f, 0.2f, 1.0f] - data modify entity @s transformation.translation set value [0.0f, 0.1f, 0.0f] - # 演出 execute align xz run particle poof ~0.5 ~0.5 ~0.5 0.1 0.1 0.1 0.05 5 diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/summon/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/summon/.mcfunction index f7019512d44..def67823eac 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1160/summon # 元となるEntityを召喚する - summon item_display ~ ~ ~ {Tags:["ObjectInit", "Friend"], item:{id:"minecraft:dark_oak_planks", Count:1b}} + summon item_display ~ ~ ~ {Tags:["ObjectInit", "Friend"], item:{id:"minecraft:stick", Count:1b, tag:{CustomModelData:20628}}} From f36314cc4b20d8d3fafeb06f373831972399030c Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 2 Aug 2026 11:33:55 +0200 Subject: [PATCH 07/32] =?UTF-8?q?=E6=94=BB=E6=92=83=E6=83=85=E5=A0=B1?= =?UTF-8?q?=E3=82=92=E7=A5=9E=E5=99=A8=E4=BE=9D=E5=AD=98=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 2 ++ .../object/1160.electric_catfish/register.mcfunction | 10 ++++++---- .../1160.electric_catfish/tick/attack.mcfunction | 5 +++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/3.main.mcfunction index ece243bddd2..84ee3877a0a 100644 --- a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/3.main.mcfunction @@ -9,6 +9,8 @@ # ダメージ設定 data modify storage api: Argument.FieldOverride.Damage set value 100.0f + data modify storage api: Argument.FieldOverride.AttackType set value "Physical" + data modify storage api: Argument.FieldOverride.ElementType set value "Thunder" # 本体召喚 data modify storage api: Argument.ID set value 1160 diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction index 959acfa9b55..edb5c7263a3 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction @@ -5,16 +5,18 @@ # @within function asset:object/alias/1160/register # 継承(オプション) - # data modify storage asset:object Extends append value + # data modify storage asset:object Extends append value # function asset:object/extends # 他のObjectに継承されることを許可するか (boolean) (オプション) - # data modify storage asset:object ExtendsSafe set value + # 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 + # data modify storage asset:object IsTicking set value # ID (int) data modify storage asset:object ID set value 1160 # フィールド(オプション) - # data modify storage asset:object Field.myValue set value \ No newline at end of file + data modify storage asset:object Field.Damage set value 0 + data modify storage asset:object Field.AttackType set value "" + data modify storage asset:object Field.ElementType set value "" diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction index a967a47f438..864bdfae5ed 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -6,8 +6,8 @@ # ダメージ設定 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.AttackType set from storage asset:context this.AttackType + data modify storage api: Argument.ElementType set from storage asset:context this.ElementType # SteppedOnタグがついたEntityが対象 execute as @e[tag=1160.SteppedOn,distance=..2,limit=1] run function api:damage/ @@ -17,6 +17,7 @@ execute positioned ~-3.5 ~ ~-3.5 as @e[type=#lib:living_without_player,tag=!1160.SteppedOn,dx=7,dz=7] positioned ~ ~-0.2 ~ if entity @s[dx=7,dz=7] run function api:damage/ # リセット + function api:damage/reset tag @e[tag=1160.SteppedOn,distance=..2,limit=1] remove 1160.SteppedOn # 0.5秒のクールダウン From 9cccc66e997aef03b137859d4b50307671e67d5c Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 2 Aug 2026 11:49:50 +0200 Subject: [PATCH 08/32] =?UTF-8?q?=E8=B6=B3=E5=85=83=E3=81=AE=E3=83=96?= =?UTF-8?q?=E3=83=AD=E3=83=83=E3=82=AF=E3=81=8C=E5=A3=8A=E3=82=8C=E3=82=8B?= =?UTF-8?q?=E3=81=A8=E6=B6=88=E3=81=88=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 --- .../functions/object/1160.electric_catfish/tick/.mcfunction | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction index d75aa370ffe..5e6209dd950 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction @@ -15,5 +15,8 @@ execute unless entity @s[tag=1160.Inactive] positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,dx=0,sort=nearest,limit=1] positioned ~ ~-0.8 ~ if entity @s[dx=0] run function asset:object/1160.electric_catfish/tick/check execute if entity @e[tag=1160.SteppedOn,distance=..2] at @s run function asset:object/1160.electric_catfish/tick/attack +# 足元にブロックがないなら消す + execute if block ~ ~-0.1 ~ #lib:no_collision/ run scoreboard players set @s General.Object.Tick 1200 + # 消滅処理 execute if score @s General.Object.Tick matches 1200.. run function asset:object/1160.electric_catfish/tick/kill From 85cfff31d41ce538648c6dff4d4bec51c07994f6 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 1 Sep 2026 17:47:00 +0200 Subject: [PATCH 09/32] =?UTF-8?q?Lore=E3=82=92=E3=82=88=E3=82=8A=E6=AD=A3?= =?UTF-8?q?=E7=A2=BA=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1464.call_electric_catfish/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction index 38a6350af8d..a6d66b46b92 100644 --- a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "コール:デンキナマズ", "color": "yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text": "踏まれると周囲にダメージを与える、ナマズを召喚する。"}', '{"text": "「べちっ」「...」", "color": "gray"}'] + data modify storage asset:artifact Lore set value ['{"text": "踏まれると周囲にダメージを", "extra": [{"text": "50", "color": "yellow"}, {"text": "与える、ナマズを召喚する。", "color": "white"}]}', '{"text": "「べちっ」「...」", "color": "gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 @@ -29,7 +29,7 @@ # 神器の発動条件 (TextComponentString) (オプション) data modify storage asset:artifact Condition set value '{"text": "地面に立っているとき"}' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value 100 + data modify storage asset:artifact AttackInfo.Damage set value [100] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) From d96fd283ceff96a3fccf249ecaf966cc87fae9cb Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 1 Sep 2026 17:56:30 +0200 Subject: [PATCH 10/32] =?UTF-8?q?=E3=82=BB=E3=83=AC=E3=82=AF=E3=82=BF?= =?UTF-8?q?=E3=83=BC=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/object/1160.electric_catfish/tick/.mcfunction | 2 +- .../object/1160.electric_catfish/tick/attack.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction index 5e6209dd950..a7b27ae3dac 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction @@ -13,7 +13,7 @@ # 踏まれたどうかをチェック execute unless entity @s[tag=1160.Inactive] positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,dx=0,sort=nearest,limit=1] positioned ~ ~-0.8 ~ if entity @s[dx=0] run function asset:object/1160.electric_catfish/tick/check - execute if entity @e[tag=1160.SteppedOn,distance=..2] at @s run function asset:object/1160.electric_catfish/tick/attack + execute positioned ~-0.5 ~ ~-0.5 if entity @e[type=#lib:living_without_player,tag=1160.SteppedOn,dx=0] at @s run function asset:object/1160.electric_catfish/tick/attack # 足元にブロックがないなら消す execute if block ~ ~-0.1 ~ #lib:no_collision/ run scoreboard players set @s General.Object.Tick 1200 diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction index 864bdfae5ed..838c82249c0 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -18,7 +18,7 @@ # リセット function api:damage/reset - tag @e[tag=1160.SteppedOn,distance=..2,limit=1] remove 1160.SteppedOn + execute positioned ~-0.5 ~ ~-0.5 run tag @e[type=#lib:living_without_player,tag=1160.SteppedOn,dx=0,limit=1] remove 1160.SteppedOn # 0.5秒のクールダウン scoreboard players set @s 1160.Cooldown 10 From 055fc41a5df979852c50b6e07786655a09d44954 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Tue, 1 Sep 2026 18:04:08 +0200 Subject: [PATCH 11/32] =?UTF-8?q?nbt=E5=8F=96=E5=BE=97=E3=82=92api?= =?UTF-8?q?=E3=81=A7=E7=BD=AE=E3=81=8D=E6=8F=9B=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/2.check_condition.mcfunction | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction index 654970e4867..316d4639058 100644 --- a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction @@ -8,7 +8,8 @@ function asset:artifact/common/check_condition/mainhand # 追加チェック:地面に立っていないならCanUsed剝奪 - execute unless data entity @s[tag=CanUsed] {OnGround:1b} run tag @s remove CanUsed + function api:data_get/on_ground + execute unless data storage api: {OnGround:1b} run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1464.call_electric_catfish/trigger/3.main From 6829b7d3891fbed9c87f2ec342a6cd93e2f25639 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Fri, 4 Sep 2026 16:23:10 +0200 Subject: [PATCH 12/32] =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E5=8F=96?= =?UTF-8?q?=E5=BE=97=E5=87=A6=E7=90=86=E3=82=92=E8=BB=BD=E9=87=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1160.electric_catfish/register.mcfunction | 1 + .../1160.electric_catfish/tick/check.mcfunction | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction index edb5c7263a3..d9b2234e253 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction @@ -20,3 +20,4 @@ data modify storage asset:object Field.Damage set value 0 data modify storage asset:object Field.AttackType set value "" data modify storage asset:object Field.ElementType set value "" + data modify storage asset:object Field.Motion set value [] diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction index dd9568a316e..41b468c1c74 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction @@ -9,17 +9,21 @@ #declare score_holder $MotionX #declare score_holder $MotionZ +# thisにMotion保存 + data modify storage asset:context this.Motion set from entity @s Motion + # 動いているなら踏んだ判定 - execute store result score $MotionX Temporary run data get entity @s Motion[0] 100 - execute store result score $MotionZ Temporary run data get entity @s Motion[2] 100 + execute store result score $MotionX Temporary run data get storage asset:context this.Motion[0] 100 + execute store result score $MotionZ Temporary run data get storage asset:context this.Motion[2] 100 - execute if score $MotionX Temporary matches ..-1 store result score $MotionX Temporary run data get entity @s Motion[0] -100 - execute if score $MotionZ Temporary matches ..-1 store result score $MotionZ Temporary run data get entity @s Motion[2] -100 + execute if score $MotionX Temporary matches ..-1 store result score $MotionX Temporary run data get storage asset:context this.Motion[0] -100 + execute if score $MotionZ Temporary matches ..-1 store result score $MotionZ Temporary run data get storage asset:context this.Motion[2] -100 scoreboard players operation $MotionX Temporary += $MotionZ Temporary execute if score $MotionX Temporary matches 1.. run tag @s add 1160.SteppedOn # リセット + data remove storage asset:context this.Motion scoreboard players reset $MotionX scoreboard players reset $MotionZ From a01e4ae5c8a0cd634c94b8fe0d94bff033d1275b Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Wed, 16 Sep 2026 20:43:41 +0200 Subject: [PATCH 13/32] =?UTF-8?q?=E7=AF=84=E5=9B=B2=E6=94=BB=E6=92=83?= =?UTF-8?q?=E3=81=ABmodifier=E3=81=8C=E9=81=A9=E7=94=A8=E3=81=95=E3=82=8C?= =?UTF-8?q?=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 --- .../object/1160.electric_catfish/tick/attack.mcfunction | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction index 838c82249c0..b415ebddf9f 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -4,10 +4,16 @@ # # @within asset:object/1160.electric_catfish/tick/** +#> 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 from storage asset:context this.AttackType data modify storage api: Argument.ElementType set from storage asset:context this.ElementType + 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 # SteppedOnタグがついたEntityが対象 execute as @e[tag=1160.SteppedOn,distance=..2,limit=1] run function api:damage/ @@ -19,6 +25,7 @@ # リセット function api:damage/reset execute positioned ~-0.5 ~ ~-0.5 run tag @e[type=#lib:living_without_player,tag=1160.SteppedOn,dx=0,limit=1] remove 1160.SteppedOn + scoreboard players reset $UserID Temporary # 0.5秒のクールダウン scoreboard players set @s 1160.Cooldown 10 From 57cae4a8024210c141ec0f9a99d91b517b6f55be Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Thu, 8 Oct 2026 18:45:14 +0200 Subject: [PATCH 14/32] =?UTF-8?q?type=E6=8C=87=E5=AE=9A=E5=BF=98=E3=82=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1160.electric_catfish/tick/attack.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction index b415ebddf9f..3b07775cdf9 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -16,7 +16,7 @@ execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier # SteppedOnタグがついたEntityが対象 - execute as @e[tag=1160.SteppedOn,distance=..2,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=1160.SteppedOn,distance=..2,limit=1] run function api:damage/ # 周囲のMobにもダメージ execute store result storage api: Argument.Damage float 0.5 run data get storage asset:context this.Damage From 7bbf2e0aa94839a2644f3c05a57f0af07f0f1722 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Thu, 8 Oct 2026 18:46:53 +0200 Subject: [PATCH 15/32] =?UTF-8?q?Lore=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1464.call_electric_catfish/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction index a6d66b46b92..5234fc34b3c 100644 --- a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "コール:デンキナマズ", "color": "yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text": "踏まれると周囲にダメージを", "extra": [{"text": "50", "color": "yellow"}, {"text": "与える、ナマズを召喚する。", "color": "white"}]}', '{"text": "「べちっ」「...」", "color": "gray"}'] + data modify storage asset:artifact Lore set value ['{"text": "踏まれると周囲にダメージを与えるナマズを召喚する。"}' , '{"text": "「べちっ」「...」", "color": "gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 @@ -29,7 +29,7 @@ # 神器の発動条件 (TextComponentString) (オプション) data modify storage asset:artifact Condition set value '{"text": "地面に立っているとき"}' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value [100] + data modify storage asset:artifact AttackInfo.Damage set value [50, 100] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) From 1961f636a3d70801a63eef20b63773e0fc4ac8bf Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Thu, 8 Oct 2026 18:52:29 +0200 Subject: [PATCH 16/32] =?UTF-8?q?=E7=AF=84=E5=9B=B2=E6=94=BB=E6=92=83?= =?UTF-8?q?=E3=81=AE=E5=88=A4=E5=AE=9A=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1160.electric_catfish/tick/attack.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction index 3b07775cdf9..5c234fc64f2 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -20,7 +20,7 @@ # 周囲のMobにもダメージ execute store result storage api: Argument.Damage float 0.5 run data get storage asset:context this.Damage - execute positioned ~-3.5 ~ ~-3.5 as @e[type=#lib:living_without_player,tag=!1160.SteppedOn,dx=7,dz=7] positioned ~ ~-0.2 ~ if entity @s[dx=7,dz=7] run function api:damage/ + execute positioned ~-3.5 ~ ~-3.5 as @e[type=#lib:living_without_player,tag=!1160.SteppedOn,dx=6,dz=6] positioned ~ ~-0.2 ~ if entity @s[dx=6,dz=6] run function api:damage/ # リセット function api:damage/reset From e48dde5a664388b9e7aaa1c540a5495ba217a77f Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Thu, 8 Oct 2026 18:53:21 +0200 Subject: [PATCH 17/32] =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=82=92double=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1160.electric_catfish/tick/attack.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction index 5c234fc64f2..0da2e0a9c21 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -19,7 +19,7 @@ execute as @e[type=#lib:living_without_player,tag=1160.SteppedOn,distance=..2,limit=1] run function api:damage/ # 周囲のMobにもダメージ - execute store result storage api: Argument.Damage float 0.5 run data get storage asset:context this.Damage + execute store result storage api: Argument.Damage double 0.5 run data get storage asset:context this.Damage execute positioned ~-3.5 ~ ~-3.5 as @e[type=#lib:living_without_player,tag=!1160.SteppedOn,dx=6,dz=6] positioned ~ ~-0.2 ~ if entity @s[dx=6,dz=6] run function api:damage/ # リセット From 41fd7ce5b2868bd46211c9ba7f79e110c4d574ca Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Thu, 8 Oct 2026 18:57:30 +0200 Subject: [PATCH 18/32] =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=82=92=E3=82=B7=E3=83=B3=E3=82=B0=E3=83=AB?= =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E3=82=BB=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1160.electric_catfish/tick/attack.mcfunction | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction index 0da2e0a9c21..2d4b6a06b9f 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -8,6 +8,9 @@ # @private #declare score_holder $UserID +# シングルダメージセッション開始 + function api:damage/single_damage_session/open + # ダメージ設定 data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set from storage asset:context this.AttackType @@ -37,3 +40,6 @@ playsound entity.player.hurt neutral @a ~ ~ ~ 2 0.5 playsound entity.allay.hurt neutral @a ~ ~ ~ 2 2.0 playsound enchant.thorns.hit neutral @a ~ ~ ~ 2 1.0 + +# シングルダメージセッション終了 + function api:damage/single_damage_session/close From f207e0d597dcb02a3eb4bf2cc4e56836b2d82d7b Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Thu, 8 Oct 2026 20:45:39 +0200 Subject: [PATCH 19/32] =?UTF-8?q?=E6=8E=A5=E8=A7=A6=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E3=82=92=E3=82=88=E3=82=8A=E7=B2=BE=E5=AF=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1160.electric_catfish/_index.d.mcfunction | 1 + .../functions/object/1160.electric_catfish/tick/.mcfunction | 4 ++-- .../object/1160.electric_catfish/tick/attack.mcfunction | 6 ++++-- .../object/1160.electric_catfish/tick/check.mcfunction | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/_index.d.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/_index.d.mcfunction index 4539d860745..d31873f03b9 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/_index.d.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/_index.d.mcfunction @@ -5,4 +5,5 @@ # @within function asset:object/1160.electric_catfish/** #declare tag 1160.Inactive #declare tag 1160.SteppedOn + #declare tag 1160.Candidate #declare objective 1160.Cooldown diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction index a7b27ae3dac..308fe268cc4 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction @@ -12,8 +12,8 @@ execute if score @s 1160.Cooldown matches 0 run tag @s remove 1160.Inactive # 踏まれたどうかをチェック - execute unless entity @s[tag=1160.Inactive] positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,dx=0,sort=nearest,limit=1] positioned ~ ~-0.8 ~ if entity @s[dx=0] run function asset:object/1160.electric_catfish/tick/check - execute positioned ~-0.5 ~ ~-0.5 if entity @e[type=#lib:living_without_player,tag=1160.SteppedOn,dx=0] at @s run function asset:object/1160.electric_catfish/tick/attack + execute unless entity @s[tag=1160.Inactive] positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,dx=0] positioned ~ ~-0.8 ~ if entity @s[dx=0] run function asset:object/1160.electric_catfish/tick/check + execute positioned ~-0.5 ~ ~-0.5 if entity @e[type=#lib:living_without_player,tag=1160.Candidate,dx=0] at @s run function asset:object/1160.electric_catfish/tick/attack # 足元にブロックがないなら消す execute if block ~ ~-0.1 ~ #lib:no_collision/ run scoreboard players set @s General.Object.Tick 1200 diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction index 2d4b6a06b9f..525b9692722 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -18,8 +18,9 @@ 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 -# SteppedOnタグがついたEntityが対象 - execute as @e[type=#lib:living_without_player,tag=1160.SteppedOn,distance=..2,limit=1] run function api:damage/ +# CandidateタグがついたランダムなEntityが対象 + tag @e[type=#lib:living_without_player,tag=1160.Candidate,sort=random,limit=1] add 1160.SteppedOn + execute as @e[type=#lib:living_without_player,tag=1160.SteppedOn,distance=..2,sort=random,limit=1] run function api:damage/ # 周囲のMobにもダメージ execute store result storage api: Argument.Damage double 0.5 run data get storage asset:context this.Damage @@ -28,6 +29,7 @@ # リセット function api:damage/reset execute positioned ~-0.5 ~ ~-0.5 run tag @e[type=#lib:living_without_player,tag=1160.SteppedOn,dx=0,limit=1] remove 1160.SteppedOn + execute positioned ~-0.5 ~ ~-0.5 run tag @e[type=#lib:living_without_player,tag=1160.Candidate,dx=0] remove 1160.Candidate scoreboard players reset $UserID Temporary # 0.5秒のクールダウン diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction index 41b468c1c74..7979fd92bc4 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction @@ -21,7 +21,7 @@ scoreboard players operation $MotionX Temporary += $MotionZ Temporary - execute if score $MotionX Temporary matches 1.. run tag @s add 1160.SteppedOn + execute if score $MotionX Temporary matches 1.. run tag @s add 1160.Candidate # リセット data remove storage asset:context this.Motion From e05d672f48aebfba6614f825038410cdc71e6bfb Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 26 Oct 2026 17:27:39 +0100 Subject: [PATCH 20/32] =?UTF-8?q?=E7=AF=84=E5=9B=B2=E6=94=BB=E6=92=83?= =?UTF-8?q?=E3=81=AEmodifier=E5=BF=98=E3=82=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 --- .../object/1160.electric_catfish/tick/attack.mcfunction | 1 + 1 file changed, 1 insertion(+) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction index 525b9692722..187a7f67fec 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -24,6 +24,7 @@ # 周囲のMobにもダメージ execute store result storage api: Argument.Damage double 0.5 run data get storage asset:context this.Damage + execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier execute positioned ~-3.5 ~ ~-3.5 as @e[type=#lib:living_without_player,tag=!1160.SteppedOn,dx=6,dz=6] positioned ~ ~-0.2 ~ if entity @s[dx=6,dz=6] run function api:damage/ # リセット From 2f867fdd995c3925d541786e1b73a2770d67c66d Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 26 Oct 2026 18:08:29 +0100 Subject: [PATCH 21/32] =?UTF-8?q?=E5=BD=93=E3=81=9F=E3=82=8A=E5=88=A4?= =?UTF-8?q?=E5=AE=9A=E3=81=AE=E5=8F=96=E5=BE=97=E5=BD=A2=E5=BC=8F=E3=82=92?= =?UTF-8?q?=E7=B5=B1=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1160.electric_catfish/tick/attack.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction index 187a7f67fec..d9199728397 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -20,7 +20,7 @@ # CandidateタグがついたランダムなEntityが対象 tag @e[type=#lib:living_without_player,tag=1160.Candidate,sort=random,limit=1] add 1160.SteppedOn - execute as @e[type=#lib:living_without_player,tag=1160.SteppedOn,distance=..2,sort=random,limit=1] run function api:damage/ + execute positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,tag=1160.SteppedOn,dx=0,sort=random,limit=1] run function api:damage/ # 周囲のMobにもダメージ execute store result storage api: Argument.Damage double 0.5 run data get storage asset:context this.Damage From d849e05e4840b57a1ef86a6e90f1f94245cfd149 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 26 Oct 2026 18:47:24 +0100 Subject: [PATCH 22/32] =?UTF-8?q?=E5=8F=AC=E5=96=9A=EF=BC=8F=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E5=8F=AF=E8=83=BD=E3=81=AA=E5=88=A4=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1464.call_electric_catfish/give/2.give.mcfunction | 2 +- .../trigger/2.check_condition.mcfunction | 5 ++--- .../functions/object/1160.electric_catfish/tick/.mcfunction | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction index 5234fc34b3c..25ecb8e394a 100644 --- a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction @@ -27,7 +27,7 @@ # 神器のトリガー (string) Wikiを参照 data modify storage asset:artifact Trigger set value "onClick" # 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text": "地面に立っているとき"}' + data modify storage asset:artifact Condition set value '{"text": "足元にブロックがあるとき"}' # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.Damage set value [50, 100] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction index 316d4639058..2a6b889135b 100644 --- a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction @@ -7,9 +7,8 @@ # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く function asset:artifact/common/check_condition/mainhand -# 追加チェック:地面に立っていないならCanUsed剝奪 - function api:data_get/on_ground - execute unless data storage api: {OnGround:1b} run tag @s remove CanUsed +# 追加チェック:足元にブロックがないならCanUsed剝奪 + execute align y if block ~ ~-1 ~ #lib:no_collision/ run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1464.call_electric_catfish/trigger/3.main diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction index 308fe268cc4..43d3c3f853e 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction @@ -16,7 +16,7 @@ execute positioned ~-0.5 ~ ~-0.5 if entity @e[type=#lib:living_without_player,tag=1160.Candidate,dx=0] at @s run function asset:object/1160.electric_catfish/tick/attack # 足元にブロックがないなら消す - execute if block ~ ~-0.1 ~ #lib:no_collision/ run scoreboard players set @s General.Object.Tick 1200 + execute align y if block ~ ~-1 ~ #lib:no_collision/ run scoreboard players set @s General.Object.Tick 1200 # 消滅処理 execute if score @s General.Object.Tick matches 1200.. run function asset:object/1160.electric_catfish/tick/kill From 1fd081d45b484c10310295921a733c52ece331da Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 26 Oct 2026 18:51:35 +0100 Subject: [PATCH 23/32] =?UTF-8?q?Lore=E3=82=92=E3=82=88=E3=82=8A=E6=98=8E?= =?UTF-8?q?=E7=A2=BA=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1464.call_electric_catfish/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction index 25ecb8e394a..d7e6b922bcc 100644 --- a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text": "コール:デンキナマズ", "color": "yellow"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text": "踏まれると周囲にダメージを与えるナマズを召喚する。"}' , '{"text": "「べちっ」「...」", "color": "gray"}'] + data modify storage asset:artifact Lore set value ['{"text": "敵に踏まれると周囲にダメージを与えるナマズを召喚する。"}' , '{"text": "「べちっ」「...」", "color": "gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 From 4354ccea19b5c9777fd5c3bc42f03548edfb0c59 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Mon, 26 Oct 2026 19:33:36 +0100 Subject: [PATCH 24/32] =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=AE=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88?= =?UTF-8?q?=E6=BC=8F=E3=82=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 --- .../object/1160.electric_catfish/tick/attack.mcfunction | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction index d9199728397..3c280b4ffda 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -21,11 +21,15 @@ # CandidateタグがついたランダムなEntityが対象 tag @e[type=#lib:living_without_player,tag=1160.Candidate,sort=random,limit=1] add 1160.SteppedOn execute positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,tag=1160.SteppedOn,dx=0,sort=random,limit=1] run function api:damage/ + function api:damage/reset # 周囲のMobにもダメージ execute store result storage api: Argument.Damage double 0.5 run data get storage asset:context this.Damage + data modify storage api: Argument.AttackType set from storage asset:context this.AttackType + data modify storage api: Argument.ElementType set from storage asset:context this.ElementType execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier execute positioned ~-3.5 ~ ~-3.5 as @e[type=#lib:living_without_player,tag=!1160.SteppedOn,dx=6,dz=6] positioned ~ ~-0.2 ~ if entity @s[dx=6,dz=6] run function api:damage/ + function api:damage/reset # リセット function api:damage/reset From c17364f959f23f10a6dba10c85418830cfe6c5ce Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Wed, 28 Oct 2026 17:03:12 +0100 Subject: [PATCH 25/32] =?UTF-8?q?=E5=90=84=E7=A8=AE=E3=83=91=E3=83=A9?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=BF=E3=83=BC=E3=82=92=E7=A5=9E=E5=99=A8?= =?UTF-8?q?=E3=81=8B=E3=82=89=E8=A8=AD=E5=AE=9A=E3=81=A7=E3=81=8D=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 24 ++++++++++++++----- .../1160.electric_catfish/init/.mcfunction | 8 ++++++- .../1160.electric_catfish/register.mcfunction | 10 +++++++- .../1160.electric_catfish/tick/.mcfunction | 10 ++++---- .../tick/attack.mcfunction | 6 ++--- 5 files changed, 42 insertions(+), 16 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/3.main.mcfunction index 84ee3877a0a..2cbf575c9ea 100644 --- a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/3.main.mcfunction @@ -7,12 +7,24 @@ # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う function asset:artifact/common/use/mainhand -# ダメージ設定 - data modify storage api: Argument.FieldOverride.Damage set value 100.0f - data modify storage api: Argument.FieldOverride.AttackType set value "Physical" - data modify storage api: Argument.FieldOverride.ElementType set value "Thunder" - -# 本体召喚 +# Object1160召喚 data modify storage api: Argument.ID set value 1160 + # 攻撃情報 + data modify storage api: Argument.FieldOverride.Damage set value 100.0d + data modify storage api: Argument.FieldOverride.AttackType set value "Physical" + data modify storage api: Argument.FieldOverride.ElementType set value "Thunder" + + # 攻撃範囲: Objectを中心とした、一辺AttackRangeの正方形を攻撃する + data modify storage api: Argument.FieldOverride.AttackRange set value 7.0d + + # 範囲攻撃の判定クールダウン + data modify storage api: Argument.FieldOverride.AttackCooldown set value 10 + + # 範囲攻撃のダメージ倍率 + data modify storage api: Argument.FieldOverride.DamageMultiplier set value 0.5 + + # 存在時間 + data modify storage api: Argument.FieldOverride.Tick set value 1200 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID function api:object/summon diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction index 4d4fedb5145..a11c148e65e 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction @@ -7,7 +7,13 @@ # ブロックの中心にtp(召喚時にtpするとinitされない) execute align xz run tp @s ~0.5 ~ ~0.5 +# 存在する時間を設定 + execute store result score @s General.Object.Tick run data get storage asset:context this.Ticks + +# 攻撃範囲のFieldを設定 + execute store result storage asset:context this.AttackRadius double -0.5 run data get storage asset:context this.AttackRange + execute store result storage asset:context this.AttackHitbox int 0.9999999999 run data get storage asset:context this.AttackRange + # 演出 execute align xz run particle poof ~0.5 ~0.5 ~0.5 0.1 0.1 0.1 0.05 5 - playsound entity.player.hurt neutral @a ~ ~ ~ 1 0.5 diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction index d9b2234e253..1a4c3976601 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/register.mcfunction @@ -17,7 +17,15 @@ # ID (int) data modify storage asset:object ID set value 1160 # フィールド(オプション) - data modify storage asset:object Field.Damage set value 0 + data modify storage asset:object Field.Damage set value -1 data modify storage asset:object Field.AttackType set value "" data modify storage asset:object Field.ElementType set value "" + + data modify storage asset:object Field.AttackRange set value -1 + data modify storage asset:object Field.AttackRadius set value -1 + data modify storage asset:object Field.AttackHitbox set value -1 + data modify storage asset:object Field.DamageMultiplier set value -1 + data modify storage asset:object Field.AttackCooldown set value -1 + data modify storage asset:object Field.Tick set value -1 + data modify storage asset:object Field.UserID set value -1 data modify storage asset:object Field.Motion set value [] diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction index 43d3c3f853e..8c294dad224 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction @@ -4,8 +4,8 @@ # # @within asset:object/alias/1160/tick -# Tick加算 - scoreboard players add @s General.Object.Tick 1 +# Tick減算 + scoreboard players remove @s General.Object.Tick 1 # クールダウン execute if score @s 1160.Cooldown matches 1.. run scoreboard players remove @s 1160.Cooldown 1 @@ -13,10 +13,10 @@ # 踏まれたどうかをチェック execute unless entity @s[tag=1160.Inactive] positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,dx=0] positioned ~ ~-0.8 ~ if entity @s[dx=0] run function asset:object/1160.electric_catfish/tick/check - execute positioned ~-0.5 ~ ~-0.5 if entity @e[type=#lib:living_without_player,tag=1160.Candidate,dx=0] at @s run function asset:object/1160.electric_catfish/tick/attack + execute positioned ~-0.5 ~ ~-0.5 if entity @e[type=#lib:living_without_player,tag=1160.Candidate,dx=0] at @s run function asset:object/1160.electric_catfish/tick/attack with storage asset:context this # 足元にブロックがないなら消す - execute align y if block ~ ~-1 ~ #lib:no_collision/ run scoreboard players set @s General.Object.Tick 1200 + execute align y if block ~ ~-1 ~ #lib:no_collision/ run scoreboard players set @s General.Object.Tick 0 # 消滅処理 - execute if score @s General.Object.Tick matches 1200.. run function asset:object/1160.electric_catfish/tick/kill + execute if score @s General.Object.Tick matches ..0 run function asset:object/1160.electric_catfish/tick/kill diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction index 3c280b4ffda..e307e824ff5 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction @@ -24,11 +24,11 @@ function api:damage/reset # 周囲のMobにもダメージ - execute store result storage api: Argument.Damage double 0.5 run data get storage asset:context this.Damage + $execute store result storage api: Argument.Damage double $(DamageMultiplier) run data get storage asset:context this.Damage data modify storage api: Argument.AttackType set from storage asset:context this.AttackType data modify storage api: Argument.ElementType set from storage asset:context this.ElementType execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-3.5 ~ ~-3.5 as @e[type=#lib:living_without_player,tag=!1160.SteppedOn,dx=6,dz=6] positioned ~ ~-0.2 ~ if entity @s[dx=6,dz=6] run function api:damage/ + $execute positioned ~$(AttackRadius) ~ ~$(AttackRadius) as @e[type=#lib:living_without_player,tag=!1160.SteppedOn,dx=$(AttackHitbox),dz=$(AttackHitbox)] positioned ~ ~-0.2 ~ if entity @s[dx=$(AttackHitbox),dz=$(AttackHitbox)] run function api:damage/ function api:damage/reset # リセット @@ -38,7 +38,7 @@ scoreboard players reset $UserID Temporary # 0.5秒のクールダウン - scoreboard players set @s 1160.Cooldown 10 + execute store result score @s 1160.Cooldown run data get storage asset:context this.AttackCooldown tag @s add 1160.Inactive # 演出 From 3a95e0fe25d2d08dbe530db4611cb6f8c7125063 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Wed, 28 Oct 2026 17:41:20 +0100 Subject: [PATCH 26/32] =?UTF-8?q?Field=E5=90=8D=E3=81=8C=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?= =?UTF-8?q?=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/object/1160.electric_catfish/init/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction index a11c148e65e..804c8857aca 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/init/.mcfunction @@ -8,7 +8,7 @@ execute align xz run tp @s ~0.5 ~ ~0.5 # 存在する時間を設定 - execute store result score @s General.Object.Tick run data get storage asset:context this.Ticks + execute store result score @s General.Object.Tick run data get storage asset:context this.Tick # 攻撃範囲のFieldを設定 execute store result storage asset:context this.AttackRadius double -0.5 run data get storage asset:context this.AttackRange From 179a21d560d9cf22cd4d00965a0785b2bf837804 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Wed, 28 Oct 2026 17:42:18 +0100 Subject: [PATCH 27/32] =?UTF-8?q?function=E3=82=92=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1160.electric_catfish/tick/.mcfunction | 2 +- .../tick/{attack.mcfunction => attack.m.mcfunction} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename Asset/data/asset/functions/object/1160.electric_catfish/tick/{attack.mcfunction => attack.m.mcfunction} (98%) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction index 8c294dad224..bb5ecc9ebf0 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction @@ -13,7 +13,7 @@ # 踏まれたどうかをチェック execute unless entity @s[tag=1160.Inactive] positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,dx=0] positioned ~ ~-0.8 ~ if entity @s[dx=0] run function asset:object/1160.electric_catfish/tick/check - execute positioned ~-0.5 ~ ~-0.5 if entity @e[type=#lib:living_without_player,tag=1160.Candidate,dx=0] at @s run function asset:object/1160.electric_catfish/tick/attack with storage asset:context this + execute positioned ~-0.5 ~ ~-0.5 if entity @e[type=#lib:living_without_player,tag=1160.Candidate,dx=0] at @s run function asset:object/1160.electric_catfish/tick/attack.m with storage asset:context this # 足元にブロックがないなら消す execute align y if block ~ ~-1 ~ #lib:no_collision/ run scoreboard players set @s General.Object.Tick 0 diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction similarity index 98% rename from Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction rename to Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction index e307e824ff5..467f08bfc52 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1160.electric_catfish/tick/attack +#> asset:object/1160.electric_catfish/tick/attack.m # # Objectのtick時の処理 # From daab82caebe1fdb5d75412bf70b4d3feedf1939e Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 31 Oct 2026 11:15:47 +0100 Subject: [PATCH 28/32] =?UTF-8?q?=E5=A4=89=E6=95=B0=E9=A1=9E=E3=81=AB?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=A6=8F=E5=89=87=E3=82=92=E9=81=A9=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1160.electric_catfish/_index.d.mcfunction | 8 +++---- .../1160.electric_catfish/load.mcfunction | 2 +- .../1160.electric_catfish/tick/.mcfunction | 8 +++---- .../tick/attack.m.mcfunction | 22 +++++++++---------- .../tick/check.mcfunction | 20 ++++++++--------- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/_index.d.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/_index.d.mcfunction index d31873f03b9..17c7d0ac497 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/_index.d.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/_index.d.mcfunction @@ -3,7 +3,7 @@ #> tag # @within function asset:object/1160.electric_catfish/** - #declare tag 1160.Inactive - #declare tag 1160.SteppedOn - #declare tag 1160.Candidate - #declare objective 1160.Cooldown + #declare tag O1160.Inactive + #declare tag O1160.SteppedOn + #declare tag O1160.Candidate + #declare objective O1160.Cooldown diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/load.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/load.mcfunction index f8634b76527..8775a61265a 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/load.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/load.mcfunction @@ -6,4 +6,4 @@ #> 定義類はここに # @within function asset:object/1160.electric_catfish/** - scoreboard objectives add 1160.Cooldown dummy + scoreboard objectives add O1160.Cooldown dummy diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction index bb5ecc9ebf0..f1796a0bd9c 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/.mcfunction @@ -8,12 +8,12 @@ scoreboard players remove @s General.Object.Tick 1 # クールダウン - execute if score @s 1160.Cooldown matches 1.. run scoreboard players remove @s 1160.Cooldown 1 - execute if score @s 1160.Cooldown matches 0 run tag @s remove 1160.Inactive + execute if score @s O1160.Cooldown matches 1.. run scoreboard players remove @s O1160.Cooldown 1 + execute if score @s O1160.Cooldown matches 0 run tag @s remove O1160.Inactive # 踏まれたどうかをチェック - execute unless entity @s[tag=1160.Inactive] positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,dx=0] positioned ~ ~-0.8 ~ if entity @s[dx=0] run function asset:object/1160.electric_catfish/tick/check - execute positioned ~-0.5 ~ ~-0.5 if entity @e[type=#lib:living_without_player,tag=1160.Candidate,dx=0] at @s run function asset:object/1160.electric_catfish/tick/attack.m with storage asset:context this + execute unless entity @s[tag=O1160.Inactive] positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,dx=0] positioned ~ ~-0.8 ~ if entity @s[dx=0] run function asset:object/1160.electric_catfish/tick/check + execute positioned ~-0.5 ~ ~-0.5 if entity @e[type=#lib:living_without_player,tag=O1160.Candidate,dx=0] at @s run function asset:object/1160.electric_catfish/tick/attack.m with storage asset:context this # 足元にブロックがないなら消す execute align y if block ~ ~-1 ~ #lib:no_collision/ run scoreboard players set @s General.Object.Tick 0 diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction index 467f08bfc52..7ada45b36d9 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction @@ -6,7 +6,7 @@ #> Private # @private - #declare score_holder $UserID + #declare score_holder $O1160.UserID # シングルダメージセッション開始 function api:damage/single_damage_session/open @@ -15,31 +15,31 @@ data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set from storage asset:context this.AttackType data modify storage api: Argument.ElementType set from storage asset:context this.ElementType - execute store result score $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 store result score $O1160.UserID Temporary run data get storage asset:context this.UserID + execute as @a if score @s UserID = $O1160.UserID Temporary run function api:damage/modifier # CandidateタグがついたランダムなEntityが対象 - tag @e[type=#lib:living_without_player,tag=1160.Candidate,sort=random,limit=1] add 1160.SteppedOn - execute positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,tag=1160.SteppedOn,dx=0,sort=random,limit=1] run function api:damage/ + tag @e[type=#lib:living_without_player,tag=O1160.Candidate,sort=random,limit=1] add O1160.SteppedOn + execute positioned ~-0.5 ~ ~-0.5 as @e[type=#lib:living_without_player,tag=O1160.SteppedOn,dx=0,sort=random,limit=1] run function api:damage/ function api:damage/reset # 周囲のMobにもダメージ $execute store result storage api: Argument.Damage double $(DamageMultiplier) run data get storage asset:context this.Damage data modify storage api: Argument.AttackType set from storage asset:context this.AttackType data modify storage api: Argument.ElementType set from storage asset:context this.ElementType - execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier + execute as @a if score @s UserID = $O1160.UserID Temporary run function api:damage/modifier $execute positioned ~$(AttackRadius) ~ ~$(AttackRadius) as @e[type=#lib:living_without_player,tag=!1160.SteppedOn,dx=$(AttackHitbox),dz=$(AttackHitbox)] positioned ~ ~-0.2 ~ if entity @s[dx=$(AttackHitbox),dz=$(AttackHitbox)] run function api:damage/ function api:damage/reset # リセット function api:damage/reset - execute positioned ~-0.5 ~ ~-0.5 run tag @e[type=#lib:living_without_player,tag=1160.SteppedOn,dx=0,limit=1] remove 1160.SteppedOn - execute positioned ~-0.5 ~ ~-0.5 run tag @e[type=#lib:living_without_player,tag=1160.Candidate,dx=0] remove 1160.Candidate - scoreboard players reset $UserID Temporary + execute positioned ~-0.5 ~ ~-0.5 run tag @e[type=#lib:living_without_player,tag=O1160.SteppedOn,dx=0,limit=1] remove O1160.SteppedOn + execute positioned ~-0.5 ~ ~-0.5 run tag @e[type=#lib:living_without_player,tag=O1160.Candidate,dx=0] remove O1160.Candidate + scoreboard players reset $O1160.UserID Temporary # 0.5秒のクールダウン - execute store result score @s 1160.Cooldown run data get storage asset:context this.AttackCooldown - tag @s add 1160.Inactive + execute store result score @s O1160.Cooldown run data get storage asset:context this.AttackCooldown + tag @s add O1160.Inactive # 演出 particle dust 1 1 0 2 ~ ~ ~ 1.5 0.1 1.5 0 100 diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction index 7979fd92bc4..2a4547d7bef 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/check.mcfunction @@ -6,24 +6,24 @@ #> private # @private - #declare score_holder $MotionX - #declare score_holder $MotionZ + #declare score_holder $O1160.MotionX + #declare score_holder $O1160.MotionZ # thisにMotion保存 data modify storage asset:context this.Motion set from entity @s Motion # 動いているなら踏んだ判定 - execute store result score $MotionX Temporary run data get storage asset:context this.Motion[0] 100 - execute store result score $MotionZ Temporary run data get storage asset:context this.Motion[2] 100 + execute store result score $O1160.MotionX Temporary run data get storage asset:context this.Motion[0] 100 + execute store result score $O1160.MotionZ Temporary run data get storage asset:context this.Motion[2] 100 - execute if score $MotionX Temporary matches ..-1 store result score $MotionX Temporary run data get storage asset:context this.Motion[0] -100 - execute if score $MotionZ Temporary matches ..-1 store result score $MotionZ Temporary run data get storage asset:context this.Motion[2] -100 + execute if score $O1160.MotionX Temporary matches ..-1 store result score $O1160.MotionX Temporary run data get storage asset:context this.Motion[0] -100 + execute if score $O1160.MotionZ Temporary matches ..-1 store result score $O1160.MotionZ Temporary run data get storage asset:context this.Motion[2] -100 - scoreboard players operation $MotionX Temporary += $MotionZ Temporary + scoreboard players operation $O1160.MotionX Temporary += $O1160.MotionZ Temporary - execute if score $MotionX Temporary matches 1.. run tag @s add 1160.Candidate + execute if score $O1160.MotionX Temporary matches 1.. run tag @s add O1160.Candidate # リセット data remove storage asset:context this.Motion - scoreboard players reset $MotionX - scoreboard players reset $MotionZ + scoreboard players reset $O1160.MotionX + scoreboard players reset $O1160.MotionZ From 11528bb16cf8c071b4ce44976e8c2fc8ad4c68cc Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 31 Oct 2026 13:55:58 +0100 Subject: [PATCH 29/32] =?UTF-8?q?=E3=82=B9=E3=82=B3=E3=82=A2=E3=83=AA?= =?UTF-8?q?=E3=82=BB=E3=83=83=E3=83=88=E6=99=82=E3=81=AEobjective=E6=8C=87?= =?UTF-8?q?=E5=AE=9A=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1160.electric_catfish/tick/attack.m.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction index 7ada45b36d9..157b4a112a9 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction @@ -35,7 +35,7 @@ function api:damage/reset execute positioned ~-0.5 ~ ~-0.5 run tag @e[type=#lib:living_without_player,tag=O1160.SteppedOn,dx=0,limit=1] remove O1160.SteppedOn execute positioned ~-0.5 ~ ~-0.5 run tag @e[type=#lib:living_without_player,tag=O1160.Candidate,dx=0] remove O1160.Candidate - scoreboard players reset $O1160.UserID Temporary + scoreboard players reset $O1160.UserID # 0.5秒のクールダウン execute store result score @s O1160.Cooldown run data get storage asset:context this.AttackCooldown From 31ccb667ba16010b70c1730f3475010a91e97c1f Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sat, 31 Oct 2026 14:18:25 +0100 Subject: [PATCH 30/32] =?UTF-8?q?=E3=82=BF=E3=82=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 --- .../object/1160.electric_catfish/tick/attack.m.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction index 157b4a112a9..4e52ea42cad 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/tick/attack.m.mcfunction @@ -28,7 +28,7 @@ data modify storage api: Argument.AttackType set from storage asset:context this.AttackType data modify storage api: Argument.ElementType set from storage asset:context this.ElementType execute as @a if score @s UserID = $O1160.UserID Temporary run function api:damage/modifier - $execute positioned ~$(AttackRadius) ~ ~$(AttackRadius) as @e[type=#lib:living_without_player,tag=!1160.SteppedOn,dx=$(AttackHitbox),dz=$(AttackHitbox)] positioned ~ ~-0.2 ~ if entity @s[dx=$(AttackHitbox),dz=$(AttackHitbox)] run function api:damage/ + $execute positioned ~$(AttackRadius) ~ ~$(AttackRadius) as @e[type=#lib:living_without_player,tag=!O1160.SteppedOn,dx=$(AttackHitbox),dz=$(AttackHitbox)] positioned ~ ~-0.2 ~ if entity @s[dx=$(AttackHitbox),dz=$(AttackHitbox)] run function api:damage/ function api:damage/reset # リセット From 54ec972add1d564cbbc23fc7ef7e12f754b49588 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 8 Nov 2026 16:17:08 +0100 Subject: [PATCH 31/32] =?UTF-8?q?Object=E3=81=AE=E8=A6=8B=E3=81=9F?= =?UTF-8?q?=E7=9B=AE=E3=82=92=E8=80=83=E6=85=AE=E3=81=97=E3=81=9F=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1160.electric_catfish/summon/.mcfunction | 21 ++++++++++++++++++- .../1160.electric_catfish/summon/m.mcfunction | 7 +++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/object/1160.electric_catfish/summon/m.mcfunction diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/summon/.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/summon/.mcfunction index def67823eac..d0cbcd4a69e 100644 --- a/Asset/data/asset/functions/object/1160.electric_catfish/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1160.electric_catfish/summon/.mcfunction @@ -4,5 +4,24 @@ # # @within asset:object/alias/1160/summon +#> private +# @private + #declare score_holder $O1160.Rotation + #declare score_holder $90 + +# プレイヤーが向いている方向を90°間隔に補正 + execute rotated as @s as 0-0-0-0-0 in overworld positioned as @s run tp @s ~ ~ ~ ~ ~ + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + data modify storage asset:temp Args.Rotation[1] set value 0.0f + + execute store result score $O1160.Rotation Temporary run data get storage asset:temp Args.Rotation[0] + scoreboard players add $O1160.Rotation Temporary 45 + scoreboard players operation $O1160.Rotation Temporary /= $90 Const + execute store result storage asset:temp Args.Rotation[0] float 1 run scoreboard players operation $O1160.Rotation Temporary *= $90 Const + # 元となるEntityを召喚する - summon item_display ~ ~ ~ {Tags:["ObjectInit", "Friend"], item:{id:"minecraft:stick", Count:1b, tag:{CustomModelData:20628}}} + function asset:object/1160.electric_catfish/summon/m with storage asset:temp Args + +# リセット + scoreboard players reset $O1160.Rotation + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1160.electric_catfish/summon/m.mcfunction b/Asset/data/asset/functions/object/1160.electric_catfish/summon/m.mcfunction new file mode 100644 index 00000000000..3923ad93f61 --- /dev/null +++ b/Asset/data/asset/functions/object/1160.electric_catfish/summon/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1160.electric_catfish/summon/m +# +# +# +# @within function asset:object/1160.electric_catfish/summon/ + + $summon item_display ~ ~ ~ {Rotation: $(Rotation), Tags:["ObjectInit", "Friend"], item:{id:"minecraft:stick", Count:1b, tag:{CustomModelData:20628}},transformation:{scale:[1.0f,1.0f,1.0f], translation:[0.0f,0.5f,0.0f], left_rotation:{axis:[1.0f,1.0f,1.0f], angle:0.0f}, right_rotation:{axis:[1.0f,1.0f,1.0f], angle:0.0f}}} From 9bf5b352167a2ca758a7bafb8d59e7183f1db3c7 Mon Sep 17 00:00:00 2001 From: RandomFridge Date: Sun, 8 Nov 2026 16:20:50 +0100 Subject: [PATCH 32/32] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E3=81=ABOnGround=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/2.check_condition.mcfunction | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction index 2a6b889135b..5e2d8c72625 100644 --- a/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1464.call_electric_catfish/trigger/2.check_condition.mcfunction @@ -8,6 +8,8 @@ function asset:artifact/common/check_condition/mainhand # 追加チェック:足元にブロックがないならCanUsed剝奪 + function api:data_get/on_ground + execute if data storage api: {OnGround:0b} run tag @s remove CanUsed execute align y if block ~ ~-1 ~ #lib:no_collision/ run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する