From e647da85f171bb4c8bcc803fd7fd78acb815aa4c Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Wed, 7 Oct 2026 09:05:56 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E5=BF=85=E8=A6=81=E3=81=AA=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E7=94=9F=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 | 71 +++++++++++++++++++ .../register.mcfunction | 8 +++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../trigger/3.main.mcfunction | 11 +++ .../_index.d.mcfunction | 6 ++ .../1195.right_glove_creeper/init/.mcfunction | 8 +++ .../1195.right_glove_creeper/kill/.mcfunction | 6 ++ .../1195.right_glove_creeper/load.mcfunction | 9 +++ .../register.mcfunction | 24 +++++++ .../summon/.mcfunction | 11 +++ .../summon/m.mcfunction | 7 ++ .../1195.right_glove_creeper/tick/.mcfunction | 22 ++++++ .../object/alias/1195/init.mcfunction | 8 +++ .../object/alias/1195/register.mcfunction | 8 +++ .../object/alias/1195/summon.mcfunction | 8 +++ .../object/alias/1195/tick.mcfunction | 8 +++ .../artifact/click.carrot_on_a_stick.json | 1 + .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- .../asset/tags/functions/object/load.json | 3 +- 22 files changed, 249 insertions(+), 3 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1634.call_glove_creepers/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/kill/.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/load.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/summon/m.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1195/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1195/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1195/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1195/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/1.trigger.mcfunction new file mode 100644 index 00000000000..85c0259ba51 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1634.call_glove_creepers/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1634} run function asset:artifact/1634.call_glove_creepers/give/2.give diff --git a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/2.give.mcfunction new file mode 100644 index 00000000000..b00d36d6f40 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/2.give.mcfunction @@ -0,0 +1,71 @@ +#> asset:artifact/1634.call_glove_creepers/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1634.call_glove_creepers/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1634 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"コール:グローブ・クリーパーズ","color":"#6CEB35"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"グローブの形をしたクリーパーを両隣に召喚する"}','{"text":"画面を左右に動かしたとき、同じ向きにパンチを行い爆発する"}','{"text":"爆発はプレイヤーも含めて辺りのものを大きく吹っ飛ばす"}','{"text":"こいつらはなんでこんな形になっちゃったんだ?","color":"dark_gray"}'] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' + # data modify storage asset:artifact ConsumeItem.Count set value 1 + # data modify storage asset:artifact ConsumeItem.Extra set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "auto" +# 神器のトリガー (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 [150,200] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value 'every' +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackRange set value 3 +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 120 +# 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 400 +# 第二種別クールダウン ({Type: string, Duration: int}) (オプション) + data modify storage asset:artifact SecondaryTypeCooldown.Type set value "shortRange" + data modify storage asset:artifact SecondaryTypeCooldown.Duration set value 180 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 破壊時の音を鳴らさないかどうか (boolean) (オプション) + # data modify storage asset:artifact DisableBreakSound set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} + +# 神器の入手用function + function asset:artifact/common/give diff --git a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/register.mcfunction b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/register.mcfunction new file mode 100644 index 00000000000..43eae8d53db --- /dev/null +++ b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1634.call_glove_creepers/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[3] append value [1634] +data modify storage asset:artifact RarityRegistryWithColor.Red[3] append value [1634] diff --git a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..5c54491178c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1634.call_glove_creepers/trigger/1.trigger +# +# 指定したイベントタイミングで実行されるfunction +# +# @within tag/function asset:artifact/** + +# storage asset:idのautoに装備している神器のIDが入っているので比較し、~/2.check_condition.mcfunctionを実行する + execute if data storage asset:context id{auto:1634} run function asset:artifact/1634.call_glove_creepers/trigger/2.check_condition diff --git a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..bc0c23c9d8c --- /dev/null +++ b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1634.call_glove_creepers/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1634.call_glove_creepers/trigger/1.trigger + +# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く + function asset:artifact/common/check_condition/auto +# 他にアイテム等確認する場合はここに書く + +# CanUsedタグをチェックして3.main.mcfunctionを実行する + execute if entity @s[tag=CanUsed] run function asset:artifact/1634.call_glove_creepers/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction new file mode 100644 index 00000000000..60dc8b525e0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction @@ -0,0 +1,11 @@ +#> asset:artifact/1634.call_glove_creepers/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1634.call_glove_creepers/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/auto + +# ここから先は神器側の効果の処理を書く + say test: 1634.call_glove_creepers diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/_index.d.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/_index.d.mcfunction new file mode 100644 index 00000000000..a62535bd33a --- /dev/null +++ b/Asset/data/asset/functions/object/1195.right_glove_creeper/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:object/1195.right_glove_creeper/_index.d +# @private + +#> tag +# @within function asset:object/1195.right_glove_creeper/** + #declare tag 1195.Owner diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/init/.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/init/.mcfunction new file mode 100644 index 00000000000..5d25c1eee7c --- /dev/null +++ b/Asset/data/asset/functions/object/1195.right_glove_creeper/init/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1195.right_glove_creeper/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1195/init + +#縦の向きはいらないので0にする + tp @s ~ ~ ~ ~ 0 diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/kill/.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/kill/.mcfunction new file mode 100644 index 00000000000..aa4764aba8f --- /dev/null +++ b/Asset/data/asset/functions/object/1195.right_glove_creeper/kill/.mcfunction @@ -0,0 +1,6 @@ +#> asset:object/1195.right_glove_creeper/kill/ +# +# 消滅処理 +# +# @within function asset:object/1195.right_glove_creeper/tick/ +kill @s diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/load.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/load.mcfunction new file mode 100644 index 00000000000..9edf07d2960 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.right_glove_creeper/load.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1195.right_glove_creeper/load +# +# Objectに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:object/load + +#> 定義類はここに +# @within function asset:object/1195.right_glove_creeper/** + scoreboard objectives add \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/register.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/register.mcfunction new file mode 100644 index 00000000000..650287602bf --- /dev/null +++ b/Asset/data/asset/functions/object/1195.right_glove_creeper/register.mcfunction @@ -0,0 +1,24 @@ +#> asset:object/1195.right_glove_creeper/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1195/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 1195 +# フィールド(オプション) + data modify storage asset:object Field.Damage set value {Min:1,Max:5} + data modify storage asset:object Field.UserID set value -1 + data modify storage asset:object Field.Tick set value 340 +# 攻撃中かどうか(boolean) + data modify storage asset:object Field.IsAttackMode set value false diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/summon/.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/summon/.mcfunction new file mode 100644 index 00000000000..ef839199e5f --- /dev/null +++ b/Asset/data/asset/functions/object/1195.right_glove_creeper/summon/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1195.right_glove_creeper/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1195/summon + +# 元となるEntityを召喚する + execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ 0 + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + function asset:object/1195.right_glove_creeper/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/summon/m.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/summon/m.mcfunction new file mode 100644 index 00000000000..d45ef4ec3e9 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.right_glove_creeper/summon/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1195.right_glove_creeper/summon/m +# +# +# +# @within function asset:object/1195.right_glove_creeper/summon/ + + $summon item_display ~ ~ ~ {Tags:["ObjectInit","Friend"],Rotation:$(Rotation),teleport_duration:1,item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20664}}} diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction new file mode 100644 index 00000000000..7f461525280 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction @@ -0,0 +1,22 @@ +#> asset:object/1195.right_glove_creeper/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1195/tick + +#> Private +# @private + #declare score_holder $UserID + +# OwnerにTag付与 + execute store result score $UserID Temporary run data get storage asset:context this.UserID + execute as @a if score @s UserID = $UserID Temporary run tag @s add 1195.Owner + scoreboard players reset $UserID Temporary + + +# リセット + tag @p[tag=1195.Owner] remove 1195.Owner + +# 消滅処理 + execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick + execute if data storage asset:context this{Tick:0} run function asset:object/1195.right_glove_creeper/kill/ diff --git a/Asset/data/asset/functions/object/alias/1195/init.mcfunction b/Asset/data/asset/functions/object/alias/1195/init.mcfunction new file mode 100644 index 00000000000..11d46c100ed --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1195/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1195/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1195.right_glove_creeper/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1195/register.mcfunction b/Asset/data/asset/functions/object/alias/1195/register.mcfunction new file mode 100644 index 00000000000..9bbd6a577ef --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1195/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1195/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1195.right_glove_creeper/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1195/summon.mcfunction b/Asset/data/asset/functions/object/alias/1195/summon.mcfunction new file mode 100644 index 00000000000..c754f895fc6 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1195/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1195/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1195.right_glove_creeper/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1195/tick.mcfunction b/Asset/data/asset/functions/object/alias/1195/tick.mcfunction new file mode 100644 index 00000000000..4171cf3aeff --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1195/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1195/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1195.right_glove_creeper/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 8b0fecd8b5f..db996b389d2 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/1634.call_glove_creepers/trigger/1.trigger", "asset:artifact/1332.bebebeam/trigger/1.trigger", "asset:artifact/1306.will_o_wisp/trigger/1.trigger", "asset:artifact/1144.cradle_of_azure_moon/trigger/1.trigger", diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index 36bdb74b2d3..bbfc13a91c5 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/1634.call_glove_creepers/give/1.trigger", "asset:artifact/1474.ninja_kunai/give/1.trigger", "asset:artifact/1473.ninja_sandals/give/1.trigger", "asset:artifact/1472.ninja_pants/give/1.trigger", @@ -545,4 +546,4 @@ "asset:artifact/0735.collision_plate/give/1.trigger", "asset:artifact/0745.blade_of_whirlwind/give/1.trigger" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/artifact/register.json b/Asset/data/asset/tags/functions/artifact/register.json index 6bffb2d8600..5cf21bc0296 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/1634.call_glove_creepers/register", "asset:artifact/1474.ninja_kunai/register", "asset:artifact/1470.ninja_hood/register", "asset:artifact/1562.tsukimi_dango/register", @@ -320,4 +321,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} \ No newline at end of file +} diff --git a/Asset/data/asset/tags/functions/object/load.json b/Asset/data/asset/tags/functions/object/load.json index 370cd7f01be..44e3fa970a8 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/1195.right_glove_creeper/load", "asset:object/1061.azure_jelly/load", "asset:object/2251.wall_laser_clock/load", "asset:object/2212.eclael_upper_shot/load", @@ -58,4 +59,4 @@ "asset:object/1059.book_of_hero/load", "asset:object/2031.giant_pumpkin/load" ] -} +} \ No newline at end of file From 9b904e65e86aa8687853efc285cd431fdaf141fa Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Wed, 7 Oct 2026 14:44:24 +0900 Subject: [PATCH 2/7] =?UTF-8?q?=E9=80=94=E4=B8=AD=E7=B5=8C=E9=81=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1195.right_glove_creeper/tick/.mcfunction | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction index 7f461525280..12db82e514c 100644 --- a/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction @@ -13,6 +13,10 @@ execute as @a if score @s UserID = $UserID Temporary run tag @s add 1195.Owner scoreboard players reset $UserID Temporary +#攻撃状態でない場合の処理 + +#攻撃状態の処理 + # リセット tag @p[tag=1195.Owner] remove 1195.Owner From 44c2d7843965229b3df21f71737e72c6a2529762 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Thu, 8 Oct 2026 21:45:41 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=E6=94=BB=E6=92=83CD=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1195.right_glove_creeper/register.mcfunction | 4 ++-- .../object/1195.right_glove_creeper/tick/.mcfunction | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/register.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/register.mcfunction index 650287602bf..ba9359ab08f 100644 --- a/Asset/data/asset/functions/object/1195.right_glove_creeper/register.mcfunction +++ b/Asset/data/asset/functions/object/1195.right_glove_creeper/register.mcfunction @@ -20,5 +20,5 @@ data modify storage asset:object Field.Damage set value {Min:1,Max:5} data modify storage asset:object Field.UserID set value -1 data modify storage asset:object Field.Tick set value 340 -# 攻撃中かどうか(boolean) - data modify storage asset:object Field.IsAttackMode set value false +# 攻撃中のカウンタ + data modify storage asset:object Field.AttackTick set value 0 diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction index 12db82e514c..9bac1a5ac47 100644 --- a/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction @@ -13,7 +13,7 @@ execute as @a if score @s UserID = $UserID Temporary run tag @s add 1195.Owner scoreboard players reset $UserID Temporary -#攻撃状態でない場合の処理 +#攻撃状態のカウンタが0場合(攻撃待機状態)の処理 #攻撃状態の処理 From a7c16e4a5e69763cad78abb7e2e3c1a5c535d27e Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Mon, 16 Nov 2026 19:10:21 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=E2=9C=A8=20[Artifact=201634]=20=E3=82=B3?= =?UTF-8?q?=E3=83=BC=E3=83=AB:=E3=82=B0=E3=83=AD=E3=83=BC=E3=83=96?= =?UTF-8?q?=E3=83=BB=E3=82=AF=E3=83=AA=E3=83=BC=E3=83=91=E3=83=BC=E3=82=BA?= =?UTF-8?q?=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/2.give.mcfunction | 4 +- .../trigger/3.main.mcfunction | 25 +++++- .../_index.d.mcfunction | 12 +++ .../1195.creeper_glove_right/init/.mcfunction | 18 ++++ .../1195.creeper_glove_right/kill/.mcfunction | 16 ++++ .../register.mcfunction | 43 ++++++++++ .../summon/.mcfunction | 6 +- .../summon/m.mcfunction | 7 ++ .../1195.creeper_glove_right/tick/.mcfunction | 21 +++++ .../tick/arc/.mcfunction | 84 +++++++++++++++++++ .../tick/arc/tp.m.mcfunction | 7 ++ .../tick/explode/.mcfunction | 24 ++++++ .../tick/explode/damage.mcfunction | 16 ++++ .../tick/explode/knockback_enemy.mcfunction | 10 +++ .../tick/explode/push_player.mcfunction | 34 ++++++++ .../tick/explode/vfx.mcfunction | 11 +++ .../tick/main.mcfunction | 27 ++++++ .../tick/owner.mcfunction | 18 ++++ .../tick/swing/back.mcfunction | 38 +++++++++ .../tick/swing/cooldown.mcfunction | 29 +++++++ .../tick/swing/detect.mcfunction | 35 ++++++++ .../tick/swing/hold.mcfunction | 24 ++++++ .../tick/swing/idle.mcfunction | 13 +++ .../tick/swing/out.mcfunction | 43 ++++++++++ .../tick/swing/predict.mcfunction | 18 ++++ .../tick/swing/start.mcfunction | 16 ++++ .../_index.d.mcfunction | 6 -- .../1195.right_glove_creeper/init/.mcfunction | 8 -- .../1195.right_glove_creeper/kill/.mcfunction | 6 -- .../1195.right_glove_creeper/load.mcfunction | 9 -- .../register.mcfunction | 24 ------ .../summon/m.mcfunction | 7 -- .../1195.right_glove_creeper/tick/.mcfunction | 26 ------ .../register.mcfunction | 21 +++++ .../summon/.mcfunction | 11 +++ .../summon/m.mcfunction | 7 ++ .../object/alias/1195/init.mcfunction | 2 +- .../object/alias/1195/register.mcfunction | 2 +- .../object/alias/1195/summon.mcfunction | 2 +- .../object/alias/1195/tick.mcfunction | 2 +- .../object/alias/1196/register.mcfunction | 8 ++ .../object/alias/1196/summon.mcfunction | 8 ++ .../asset/tags/functions/object/load.json | 3 +- 43 files changed, 652 insertions(+), 99 deletions(-) create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/kill/.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/register.mcfunction rename Asset/data/asset/functions/object/{1195.right_glove_creeper => 1195.creeper_glove_right}/summon/.mcfunction (72%) create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/summon/m.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/arc/.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/arc/tp.m.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/damage.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/knockback_enemy.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/push_player.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/vfx.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/main.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/owner.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/back.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/cooldown.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/detect.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/hold.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/idle.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/out.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/predict.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/start.mcfunction delete mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/init/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/kill/.mcfunction delete mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/load.mcfunction delete mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/register.mcfunction delete mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/summon/m.mcfunction delete mode 100644 Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1196.creeper_glove_left/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1196.creeper_glove_left/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1196.creeper_glove_left/summon/m.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1196/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1196/summon.mcfunction diff --git a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/2.give.mcfunction index b00d36d6f40..dfba74c5485 100644 --- a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"コール:グローブ・クリーパーズ","color":"#6CEB35"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"グローブの形をしたクリーパーを両隣に召喚する"}','{"text":"画面を左右に動かしたとき、同じ向きにパンチを行い爆発する"}','{"text":"爆発はプレイヤーも含めて辺りのものを大きく吹っ飛ばす"}','{"text":"こいつらはなんでこんな形になっちゃったんだ?","color":"dark_gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"グローブの形をしたクリーパーを両隣に召喚する"}','{"text":"画面を左右に動かしたとき、同じ向きにパンチを行い爆発する"}','{"text":"爆発はプレイヤーも含めて辺りのものを大きく吹っ飛ばす"}','{"text":"ロケットパンチにあこがれたクリーパーたちの末路","color":"dark_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 # 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value [150,200] + data modify storage asset:artifact AttackInfo.Damage set value [150] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Physical] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) diff --git a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction index 60dc8b525e0..1bb5ad9f8d9 100644 --- a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction @@ -7,5 +7,26 @@ # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う function asset:artifact/common/use/auto -# ここから先は神器側の効果の処理を書く - say test: 1634.call_glove_creepers +# グローブに渡す値 + execute store result storage asset:temp 1634.FieldOverride.UserID int 1 run scoreboard players get @s UserID + data modify storage asset:temp 1634.FieldOverride.Damage set value 150d + data modify storage asset:temp 1634.FieldOverride.SwingCooldown set value 5 + data modify storage asset:temp 1634.FieldOverride.LifeTime set value 360 + data modify storage asset:temp 1634.FieldOverride.EnemyKnockback set value 1.0d + data modify storage asset:temp 1634.FieldOverride.PlayerKnockback set value 1.5d + +# 右のグローブを召喚する + data modify storage api: Argument.ID set value 1195 + data modify storage api: Argument.FieldOverride set from storage asset:temp 1634.FieldOverride + execute anchored eyes positioned ^ ^ ^ rotated ~ 0 positioned ^-1.0 ^-0.3 ^0.2 rotated as @s run function api:object/summon + +# 左のグローブを召喚する + data modify storage api: Argument.ID set value 1196 + data modify storage api: Argument.FieldOverride set from storage asset:temp 1634.FieldOverride + execute anchored eyes positioned ^ ^ ^ rotated ~ 0 positioned ^1.0 ^-0.3 ^0.2 rotated as @s run function api:object/summon + +# 演出 + playsound entity.creeper.primed player @a[distance=..16] ~ ~ ~ 0.7 1.2 + +# リセット + data remove storage asset:temp 1634 diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/_index.d.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/_index.d.mcfunction new file mode 100644 index 00000000000..6b115b50712 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/_index.d.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/1195.creeper_glove_right/_index.d +# @private + +#> tag +# @within function asset:object/1195.creeper_glove_right/** + #declare tag 1195.Owner + +#> score_holder +# @within function asset:object/1195.creeper_glove_right/** + #declare score_holder $1195.SwingStart + #declare score_holder $1195.ArcT + #declare score_holder $1195.Expired diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/init/.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/init/.mcfunction new file mode 100644 index 00000000000..ed0cb0e1340 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/init/.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1195.creeper_glove_right/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1195/init + +#> Private +# @private + #declare score_holder $UserID + +#vfx + particle explosion ~ ~1 ~ 1.5 1 1.5 0 15 force + playsound entity.generic.explode player @a ~ ~ ~ 1 1 + +# 所有者の今のyaw(度×100)を振り検出の基準にする + execute store result score $UserID Temporary run data get storage asset:context this.UserID + execute as @a[distance=..16] if score @s UserID = $UserID Temporary store result storage asset:context this.PrevYaw int 1 run data get entity @s Rotation[0] 100 + scoreboard players reset $UserID Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/kill/.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/kill/.mcfunction new file mode 100644 index 00000000000..a6a773585a6 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/kill/.mcfunction @@ -0,0 +1,16 @@ +#> asset:object/1195.creeper_glove_right/kill/ +# +# 消滅処理 +# +# @within function +# asset:object/1195.creeper_glove_right/tick/ +# asset:object/1195.creeper_glove_right/tick/main + +#vfx + particle explosion ~ ~1 ~ 1.5 1 1.5 0 15 force + particle large_smoke ~ ~ ~ 0.3 0.3 0.3 0.05 10 normal @a + playsound entity.creeper.hurt player @a ~ ~ ~ 1 0.8 + playsound minecraft:entity.creeper.death player @a ~ ~ ~ 1.0 1 0.0 + +#消滅 + kill @s diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/register.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/register.mcfunction new file mode 100644 index 00000000000..62734f51a86 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/register.mcfunction @@ -0,0 +1,43 @@ +#> asset:object/1195.creeper_glove_right/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1195/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のObjectに継承されることを許可するか (boolean) (オプション) + data modify storage asset:object ExtendsSafe set value true +# 継承されることを前提とした、抽象的な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 1195 +# フィールド(オプション) + data modify storage asset:object Field.UserID set value -1 + data modify storage asset:object Field.Damage set value 1d + data modify storage asset:object Field.SwingCooldown set value 1 + data modify storage asset:object Field.LifeTime set value 1 + data modify storage asset:object Field.EnemyKnockback set value 1.0d + data modify storage asset:object Field.PlayerKnockback set value 1.0d + # 左右 (右: 1, 左: -1) と所有者の目からの位置 (m) + data modify storage asset:object Field.Side set value 1 + data modify storage asset:object Field.OffsetSide set value 1.0d + data modify storage asset:object Field.OffsetUp set value -0.3d + data modify storage asset:object Field.OffsetForward set value 0.2d + data modify storage asset:object Field.Reach set value 3.0d + # 振り (閾値は度/tick、時間はtick) + data modify storage asset:object Field.SwingThreshold set value 5.0d + data modify storage asset:object Field.SwingDuration set value 4 + data modify storage asset:object Field.ReturnDuration set value 10 + data modify storage asset:object Field.FinishYaw set value 70.0d + data modify storage asset:object Field.HitHoldDuration set value 15 + # 状態 + data modify storage asset:object Field.State set value "idle" + data modify storage asset:object Field.Step set value 0 + data modify storage asset:object Field.PrevYaw set value 0 + data modify storage asset:object Field.IgnoreBury set value false + data modify storage asset:object Field.ExplodeProgress set value 0 diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/summon/.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/summon/.mcfunction similarity index 72% rename from Asset/data/asset/functions/object/1195.right_glove_creeper/summon/.mcfunction rename to Asset/data/asset/functions/object/1195.creeper_glove_right/summon/.mcfunction index ef839199e5f..81fecf603e0 100644 --- a/Asset/data/asset/functions/object/1195.right_glove_creeper/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/summon/.mcfunction @@ -1,11 +1,11 @@ -#> asset:object/1195.right_glove_creeper/summon/ +#> asset:object/1195.creeper_glove_right/summon/ # # Object召喚処理の呼び出し時に実行されるfunction # # @within asset:object/alias/1195/summon # 元となるEntityを召喚する - execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ 0 + execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ ~ data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation - function asset:object/1195.right_glove_creeper/summon/m with storage asset:temp Args + function asset:object/1195.creeper_glove_right/summon/m with storage asset:temp Args data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/summon/m.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/summon/m.mcfunction new file mode 100644 index 00000000000..568ea1d9023 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/summon/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1195.creeper_glove_right/summon/m +# +# +# +# @within function asset:object/1195.creeper_glove_right/summon/ + + $summon item_display ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"],item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20664}},teleport_duration:1} diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/.mcfunction new file mode 100644 index 00000000000..5922d87d142 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/.mcfunction @@ -0,0 +1,21 @@ +#> asset:object/1195.creeper_glove_right/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1195/tick + +# 経過時間を数える + scoreboard players add @s General.Object.Tick 1 + +# 所有者がいなければ消滅する + execute unless function asset:object/1195.creeper_glove_right/tick/owner run return run function asset:object/1195.creeper_glove_right/kill/ + +# 状態ごとの処理 + function asset:object/1195.creeper_glove_right/tick/main + +# リセット + tag @a[tag=1195.Owner,distance=..16] remove 1195.Owner + data remove storage asset:temp 1195 + scoreboard players reset $1195.SwingStart Temporary + scoreboard players reset $1195.ArcT Temporary + scoreboard players reset $1195.Expired Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/arc/.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/arc/.mcfunction new file mode 100644 index 00000000000..5673f0a82f5 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/arc/.mcfunction @@ -0,0 +1,84 @@ +#> asset:object/1195.creeper_glove_right/tick/arc/ +# +# 進行度の割合$1195.ArcT (0..1000) から円弧上の位置と向きを求めて移動する +# +# @within function +# asset:object/1195.creeper_glove_right/tick/swing/idle +# asset:object/1195.creeper_glove_right/tick/swing/out +# asset:object/1195.creeper_glove_right/tick/swing/back +# asset:object/1195.creeper_glove_right/tick/swing/cooldown + +#> Private +# @private + #declare score_holder $T + #declare score_holder $U + #declare score_holder $Side + #declare score_holder $OwnerYaw + #declare score_holder $OwnerPitch + #declare score_holder $Value + #declare score_holder $Calc + +# t, u (×1000) と所有者の向き (度×1000) + scoreboard players operation $T Temporary = $1195.ArcT Temporary + scoreboard players set $U Temporary 1000 + scoreboard players operation $U Temporary -= $T Temporary + execute store result score $Side Temporary run data get storage asset:context this.Side + execute store result score $OwnerYaw Temporary run data get entity @p[tag=1195.Owner,distance=..64] Rotation[0] 1000 + execute store result score $OwnerPitch Temporary run data get entity @p[tag=1195.Owner,distance=..64] Rotation[1] 1000 + +# 角度 Theta + scoreboard players set $Value Temporary 90 + scoreboard players operation $Value Temporary *= $U Temporary + scoreboard players operation $Value Temporary *= $Side Temporary + execute store result storage asset:temp 1195.Arc.Theta double 0.001 run scoreboard players get $Value Temporary +# 見た目のyaw = 所有者のyaw − Side × FinishYaw × t (待機で所有者と同じ向き、到達時に内側へFinishYaw度) + execute store result score $Value Temporary run data get storage asset:context this.FinishYaw 1000 + scoreboard players operation $Value Temporary *= $T Temporary + scoreboard players operation $Value Temporary /= $1000 Const + scoreboard players operation $Value Temporary *= $Side Temporary + scoreboard players operation $Calc Temporary = $OwnerYaw Temporary + scoreboard players operation $Calc Temporary -= $Value Temporary + execute store result storage asset:temp 1195.Arc.Yaw double 0.001 run scoreboard players get $Calc Temporary + +# 半径 r + execute store result score $Value Temporary run data get storage asset:context this.Reach 1000 + execute store result score $Calc Temporary run data get storage asset:context this.OffsetSide 1000 + scoreboard players operation $Value Temporary -= $Calc Temporary + scoreboard players operation $Value Temporary *= $T Temporary + scoreboard players operation $Value Temporary /= $1000 Const + scoreboard players operation $Value Temporary += $Calc Temporary + execute store result storage asset:temp 1195.Arc.R double 0.001 run scoreboard players get $Value Temporary +# 前のずれ f + execute store result score $Value Temporary run data get storage asset:context this.OffsetForward 1000 + scoreboard players operation $Value Temporary *= $U Temporary + scoreboard players operation $Value Temporary /= $1000 Const + execute store result storage asset:temp 1195.Arc.F double 0.001 run scoreboard players get $Value Temporary +# 高さ h + execute store result score $Value Temporary run data get storage asset:context this.OffsetUp 1000 + scoreboard players operation $Value Temporary *= $U Temporary + scoreboard players operation $Value Temporary /= $1000 Const + execute store result storage asset:temp 1195.Arc.H double 0.001 run scoreboard players get $Value Temporary + +# 円弧のpitch + scoreboard players operation $Value Temporary = $OwnerPitch Temporary + scoreboard players operation $Value Temporary *= $T Temporary + scoreboard players operation $Value Temporary /= $1000 Const + execute store result storage asset:temp 1195.Arc.Pitch double 0.001 run scoreboard players get $Value Temporary +# 見た目のpitch + execute store result storage asset:temp 1195.Arc.VisPitch double 0.001 run scoreboard players get $OwnerPitch Temporary + +# 先読み補正がなければ0にする + execute unless data storage asset:temp 1195.Arc.DX run data modify storage asset:temp 1195.Arc merge value {DX:0d,DY:0d,DZ:0d} + +# 移動する + function asset:object/1195.creeper_glove_right/tick/arc/tp.m with storage asset:temp 1195.Arc + +# リセット + data remove storage asset:temp 1195.Arc + scoreboard players reset $T Temporary + scoreboard players reset $U Temporary + scoreboard players reset $Side Temporary + scoreboard players reset $OwnerYaw Temporary + scoreboard players reset $OwnerPitch Temporary + scoreboard players reset $Value Temporary + scoreboard players reset $Calc Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/arc/tp.m.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/arc/tp.m.mcfunction new file mode 100644 index 00000000000..670fcaff7eb --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/arc/tp.m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1195.creeper_glove_right/tick/arc/tp.m +# +# 所有者の目を基準に、水平の向きで高さと前のずれを取り、円弧の角度とpitchへ回してから半径だけ進んだ位置へ移動する +# +# @within function asset:object/1195.creeper_glove_right/tick/arc/ + +$execute as @p[tag=1195.Owner,distance=..64] at @s anchored eyes positioned ^ ^ ^ rotated ~ 0 positioned ^ ^$(H) ^$(F) rotated ~$(Theta) $(Pitch) positioned ^ ^ ^$(R) positioned ~$(DX) ~$(DY) ~$(DZ) run tp @e[type=item_display,tag=this,distance=..20,limit=1] ~ ~ ~ $(Yaw) $(VisPitch) diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/.mcfunction new file mode 100644 index 00000000000..2f4c192ed94 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/.mcfunction @@ -0,0 +1,24 @@ +#> asset:object/1195.creeper_glove_right/tick/explode/ +# +# 爆発処理 +# +# @within function asset:object/1195.creeper_glove_right/tick/swing/out + +# 演出 + function asset:object/1195.creeper_glove_right/tick/explode/vfx + +# 敵へのダメージ + function asset:object/1195.creeper_glove_right/tick/explode/damage + +# 敵のノックバック 倒れた敵と追加当たり判定は除く + execute rotated as @p[tag=1195.Owner,distance=..64] rotated ~ -15 positioned ~ ~-0.9 ~ as @e[type=#lib:living_without_player,tag=Enemy,tag=!ExtendedCollision,tag=!Uninterferable,tag=!Death,distance=..2] run function asset:object/1195.creeper_glove_right/tick/explode/knockback_enemy + +# プレイヤーの吹き飛ばし + execute positioned ~ ~-0.9 ~ as @a[gamemode=!spectator,tag=!Death,distance=..4] run function asset:object/1195.creeper_glove_right/tick/explode/push_player + +# 硬直へ移る + data modify storage asset:context this.State set value "hit_hold" + data modify storage asset:context this.Step set value 0 + +# 存在時間が切れていれば、爆発の直後に消滅する + execute if score $1195.Expired Temporary matches 1 run kill @s diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/damage.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/damage.mcfunction new file mode 100644 index 00000000000..df603476cf4 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/damage.mcfunction @@ -0,0 +1,16 @@ +#> asset:object/1195.creeper_glove_right/tick/explode/damage +# +# ダメージ処理 +# +# @within function asset:object/1195.creeper_glove_right/tick/explode/ + +# ダメージ + 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 "None" + execute as @p[tag=1195.Owner,distance=..64] run function api:damage/modifier + # 追加当たり判定には1回だけ当たるようにして与える + function api:damage/single_damage_session/open + execute positioned ~ ~-0.9 ~ as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,tag=!Death,distance=..2] run function api:damage/ + function api:damage/single_damage_session/close + function api:damage/reset diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/knockback_enemy.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/knockback_enemy.mcfunction new file mode 100644 index 00000000000..7194fa13b3a --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/knockback_enemy.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1195.creeper_glove_right/tick/explode/knockback_enemy +# +# 実行向きへ敵を飛ばす +# +# @within function asset:object/1195.creeper_glove_right/tick/explode/ + +# lib:motion/lookingは呼ぶたびに引数を消すので、対象ごとに設定する + data modify storage lib: Argument.VectorMagnitude set from storage asset:context this.EnemyKnockback + data modify storage lib: Argument.KnockbackResist set value 1b + function lib:motion/looking diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/push_player.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/push_player.mcfunction new file mode 100644 index 00000000000..745eb5beb75 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/push_player.mcfunction @@ -0,0 +1,34 @@ +#> asset:object/1195.creeper_glove_right/tick/explode/push_player +# +# 爆発から遠ざかる向きへプレイヤーを吹き飛ばす +# +# @within function asset:object/1195.creeper_glove_right/tick/explode/ + +#> Private +# @private + #declare score_holder $Distance + #declare score_holder $Power + #declare score_holder $Rest + +# 距離 d (×1000) + function lib:distance/as_to_at + execute store result score $Distance Temporary run data get storage lib: Return.Distance 1000 + data remove storage lib: Return.Distance + +# 強さ (×1000) + execute store result score $Power Temporary run data get storage asset:context this.PlayerKnockback 1000 + scoreboard players set $Rest Temporary 4000 + scoreboard players operation $Rest Temporary -= $Distance Temporary + scoreboard players operation $Power Temporary *= $Rest Temporary + scoreboard players operation $Power Temporary /= $4000 Const + execute if score $Power Temporary matches 1.. store result storage lib: Argument.VectorMagnitude double 0.001 run scoreboard players get $Power Temporary + +# 爆発から遠ざかる水平の向きから20°上へ飛ばす + execute if score $Power Temporary matches 1.. if score $Distance Temporary matches 100.. facing entity @s feet rotated ~ -20 run function lib:motion/looking +# 近すぎて向きが決まらないときは所有者の前方から20°上へ飛ばす + execute if score $Power Temporary matches 1.. if score $Distance Temporary matches ..99 rotated as @p[tag=1195.Owner,distance=..64] rotated ~ -20 run function lib:motion/looking + +# リセット + scoreboard players reset $Distance Temporary + scoreboard players reset $Power Temporary + scoreboard players reset $Rest Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/vfx.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/vfx.mcfunction new file mode 100644 index 00000000000..55e3dd48576 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/vfx.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1195.creeper_glove_right/tick/explode/vfx +# +# +# +# @within function asset:object/1195.creeper_glove_right/tick/explode/ + + particle explosion ~ ~ ~ 0 0 0 0 1 normal @a + particle dust 0.35 0.8 0.3 1.5 ~ ~ ~ 0.6 0.6 0.6 0 30 normal @a + particle large_smoke ~ ~ ~ 0.3 0.3 0.3 0.05 10 normal @a + playsound entity.generic.explode player @a ~ ~ ~ 0.5 1.3 + playsound entity.creeper.hurt player @a ~ ~ ~ 0.6 0.8 diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/main.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/main.mcfunction new file mode 100644 index 00000000000..33b6b1fcd56 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/main.mcfunction @@ -0,0 +1,27 @@ +#> asset:object/1195.creeper_glove_right/tick/main +# +# 行動のメイン処理 +# +# @within function asset:object/1195.creeper_glove_right/tick/ + +#> Private +# @private + #declare score_holder $LifeTime + +# 存在時間が切れたか + execute store result score $LifeTime Temporary run data get storage asset:context this.LifeTime + execute store success score $1195.Expired Temporary if score @s General.Object.Tick >= $LifeTime Temporary + scoreboard players reset $LifeTime Temporary +# 攻撃中でなければ即消滅する 攻撃中は爆発の直後に消える + execute if score $1195.Expired Temporary matches 1 unless data storage asset:context this{State:"swing_out"} run return run function asset:object/1195.creeper_glove_right/kill/ + +# 視点を振ったかを検出する + function asset:object/1195.creeper_glove_right/tick/swing/detect + +# 処理前の状態で振り分ける + data modify storage asset:temp 1195.State set from storage asset:context this.State + execute if data storage asset:temp 1195{State:"idle"} run function asset:object/1195.creeper_glove_right/tick/swing/idle + execute if data storage asset:temp 1195{State:"swing_out"} run function asset:object/1195.creeper_glove_right/tick/swing/out + execute if data storage asset:temp 1195{State:"hit_hold"} run function asset:object/1195.creeper_glove_right/tick/swing/hold + execute if data storage asset:temp 1195{State:"swing_back"} run function asset:object/1195.creeper_glove_right/tick/swing/back + execute if data storage asset:temp 1195{State:"cooldown"} run function asset:object/1195.creeper_glove_right/tick/swing/cooldown diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/owner.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/owner.mcfunction new file mode 100644 index 00000000000..666332d1270 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/owner.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1195.creeper_glove_right/tick/owner +# +# 所有者に1195.Ownerを付け、所有者が16m以内にいない・死亡中・スペクテイターなら失敗を返す +# +# @within function asset:object/1195.creeper_glove_right/tick/ + +#> Private +# @private + #declare score_holder $UserID + +# 所有者を探す + execute store result score $UserID Temporary run data get storage asset:context this.UserID + execute as @a[gamemode=!spectator,tag=!Death,distance=..64] if score @s UserID = $UserID Temporary run tag @s add 1195.Owner + scoreboard players reset $UserID Temporary + +# 見つかったかを返す + execute if entity @p[tag=1195.Owner,distance=..64] run return 1 + return fail diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/back.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/back.mcfunction new file mode 100644 index 00000000000..d11c8f1dfe5 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/back.mcfunction @@ -0,0 +1,38 @@ +#> asset:object/1195.creeper_glove_right/tick/swing/back +# +# 爆発した時点の進行度から、ReturnDuration tickかけて円弧を逆に戻る +# +# @within function asset:object/1195.creeper_glove_right/tick/main + +#> Private +# @private + #declare score_holder $Step + #declare score_holder $Duration + #declare score_holder $Rest + +# 経過を数える + execute store result score $Step Temporary run data get storage asset:context this.Step + scoreboard players add $Step Temporary 1 + execute store result storage asset:context this.Step int 1 run scoreboard players get $Step Temporary + +# 進行度の割合 = 爆発時の割合 × (D − Step) / D (DはReturnDuration、0以下でも1tickとして扱う) + execute store result score $Duration Temporary run data get storage asset:context this.ReturnDuration + scoreboard players operation $Duration Temporary > $1 Const + scoreboard players operation $Step Temporary < $Duration Temporary + scoreboard players operation $Rest Temporary = $Duration Temporary + scoreboard players operation $Rest Temporary -= $Step Temporary + execute store result score $1195.ArcT Temporary run data get storage asset:context this.ExplodeProgress + scoreboard players operation $1195.ArcT Temporary *= $Rest Temporary + scoreboard players operation $1195.ArcT Temporary /= $Duration Temporary + +# 円弧の位置へ動く + function asset:object/1195.creeper_glove_right/tick/arc/ + +# 戻り終えたら再使用待ちへ移る + execute if score $Step Temporary >= $Duration Temporary run data modify storage asset:context this.State set value "cooldown" + execute if score $Step Temporary >= $Duration Temporary run data modify storage asset:context this.Step set value 0 + +# リセット + scoreboard players reset $Step Temporary + scoreboard players reset $Duration Temporary + scoreboard players reset $Rest Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/cooldown.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/cooldown.mcfunction new file mode 100644 index 00000000000..726506251f0 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/cooldown.mcfunction @@ -0,0 +1,29 @@ +#> asset:object/1195.creeper_glove_right/tick/swing/cooldown +# +# 待機位置で再使用まで待つ +# +# @within function asset:object/1195.creeper_glove_right/tick/main + +#> Private +# @private + #declare score_holder $Step + #declare score_holder $Duration + +# 経過を数える + execute store result score $Step Temporary run data get storage asset:context this.Step + scoreboard players add $Step Temporary 1 + execute store result storage asset:context this.Step int 1 run scoreboard players get $Step Temporary + +# 待機位置へ動く + function asset:object/1195.creeper_glove_right/tick/swing/predict + scoreboard players set $1195.ArcT Temporary 0 + function asset:object/1195.creeper_glove_right/tick/arc/ + +# 待ち終えたら待機へ戻る + execute store result score $Duration Temporary run data get storage asset:context this.SwingCooldown + execute if score $Step Temporary >= $Duration Temporary run data modify storage asset:context this.State set value "idle" + execute if score $Step Temporary >= $Duration Temporary run data modify storage asset:context this.Step set value 0 + +# リセット + scoreboard players reset $Step Temporary + scoreboard players reset $Duration Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/detect.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/detect.mcfunction new file mode 100644 index 00000000000..b99cfd8b1e8 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/detect.mcfunction @@ -0,0 +1,35 @@ +#> asset:object/1195.creeper_glove_right/tick/swing/detect +# +# グローブの向きに振ったかを判定する +# +# @within function asset:object/1195.creeper_glove_right/tick/main + +#> Private +# @private + #declare score_holder $Yaw + #declare score_holder $YawDiff + #declare score_holder $Side + #declare score_holder $Threshold + +# 前のtickのyawとの差 (度×100) を取る 左へ振ると正になる + execute store result score $Yaw Temporary run data get entity @p[tag=1195.Owner,distance=..64] Rotation[0] 100 + execute store result score $YawDiff Temporary run data get storage asset:context this.PrevYaw + scoreboard players operation $YawDiff Temporary -= $Yaw Temporary +# ±180度に正規化する + execute if score $YawDiff Temporary matches 18001.. run scoreboard players remove $YawDiff Temporary 36000 + execute if score $YawDiff Temporary matches ..-18001 run scoreboard players add $YawDiff Temporary 36000 + +# 右のグローブは左へ、左のグローブは右へ振ったときに反応する + execute store result score $Side Temporary run data get storage asset:context this.Side + scoreboard players operation $YawDiff Temporary *= $Side Temporary + execute store result score $Threshold Temporary run data get storage asset:context this.SwingThreshold 100 + execute store success score $1195.SwingStart Temporary if score $YawDiff Temporary >= $Threshold Temporary + +# 次のtickの基準にする + execute store result storage asset:context this.PrevYaw int 1 run scoreboard players get $Yaw Temporary + +# リセット + scoreboard players reset $Yaw Temporary + scoreboard players reset $YawDiff Temporary + scoreboard players reset $Side Temporary + scoreboard players reset $Threshold Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/hold.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/hold.mcfunction new file mode 100644 index 00000000000..bb5c6bdd83c --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/hold.mcfunction @@ -0,0 +1,24 @@ +#> asset:object/1195.creeper_glove_right/tick/swing/hold +# +# 爆発した位置で硬直する +# +# @within function asset:object/1195.creeper_glove_right/tick/main + +#> Private +# @private + #declare score_holder $Step + #declare score_holder $Duration + +# 経過を数える + execute store result score $Step Temporary run data get storage asset:context this.Step + scoreboard players add $Step Temporary 1 + execute store result storage asset:context this.Step int 1 run scoreboard players get $Step Temporary + +# 硬直が終わったら戻りへ移る + execute store result score $Duration Temporary run data get storage asset:context this.HitHoldDuration + execute if score $Step Temporary >= $Duration Temporary run data modify storage asset:context this.State set value "swing_back" + execute if score $Step Temporary >= $Duration Temporary run data modify storage asset:context this.Step set value 0 + +# リセット + scoreboard players reset $Step Temporary + scoreboard players reset $Duration Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/idle.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/idle.mcfunction new file mode 100644 index 00000000000..71f7ca5eee3 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/idle.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1195.creeper_glove_right/tick/swing/idle +# +# 待機処理 +# +# @within function asset:object/1195.creeper_glove_right/tick/main + +# 振ったら攻撃を始める + execute if score $1195.SwingStart Temporary matches 1 run function asset:object/1195.creeper_glove_right/tick/swing/start + +# 待機位置へ動く + function asset:object/1195.creeper_glove_right/tick/swing/predict + scoreboard players set $1195.ArcT Temporary 0 + function asset:object/1195.creeper_glove_right/tick/arc/ diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/out.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/out.mcfunction new file mode 100644 index 00000000000..37b757c9d36 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/out.mcfunction @@ -0,0 +1,43 @@ +#> asset:object/1195.creeper_glove_right/tick/swing/out +# +# 円弧を進み、到達したかブロックに埋まったら爆発する +# +# @within function asset:object/1195.creeper_glove_right/tick/main + +#> Private +# @private + #declare score_holder $Step + #declare score_holder $Duration + #declare score_holder $Explode + +# 進行度を1つ進める + execute store result score $Step Temporary run data get storage asset:context this.Step + scoreboard players add $Step Temporary 1 + execute store result storage asset:context this.Step int 1 run scoreboard players get $Step Temporary + +# 進行度の割合 (×1000) を求める SwingDurationが0以下でも1tickとして扱う + execute store result score $Duration Temporary run data get storage asset:context this.SwingDuration + scoreboard players operation $Duration Temporary > $1 Const + scoreboard players operation $Step Temporary < $Duration Temporary + scoreboard players operation $1195.ArcT Temporary = $Step Temporary + scoreboard players operation $1195.ArcT Temporary *= $1000 Const + scoreboard players operation $1195.ArcT Temporary /= $Duration Temporary + +# 円弧の位置へ動く + function asset:object/1195.creeper_glove_right/tick/arc/ + +# 移動後に埋まっていなければ、埋まり判定を有効にする + execute at @s if block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context this.IgnoreBury set value false + +# 到達したか、埋まったか、敵に当たったら爆発する + scoreboard players set $Explode Temporary 0 + execute if score $Step Temporary >= $Duration Temporary run scoreboard players set $Explode Temporary 1 + execute at @s unless block ~ ~ ~ #lib:no_collision/ if data storage asset:context this{IgnoreBury:false} run scoreboard players set $Explode Temporary 1 + execute at @s positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,tag=!Death,dx=0] run scoreboard players set $Explode Temporary 1 + execute if score $Explode Temporary matches 1 store result storage asset:context this.ExplodeProgress int 1 run scoreboard players get $1195.ArcT Temporary + execute if score $Explode Temporary matches 1 at @s run function asset:object/1195.creeper_glove_right/tick/explode/ + +# リセット + scoreboard players reset $Step Temporary + scoreboard players reset $Duration Temporary + scoreboard players reset $Explode Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/predict.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/predict.mcfunction new file mode 100644 index 00000000000..6880a816154 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/predict.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1195.creeper_glove_right/tick/swing/predict +# +# 所有者の1tickの移動量を見た目の先読み補正として円弧の位置に足す +# +# @within function +# asset:object/1195.creeper_glove_right/tick/swing/idle +# asset:object/1195.creeper_glove_right/tick/swing/cooldown + +# 所有者の移動量を取得する + execute as @p[tag=1195.Owner,distance=..64] run function api:player_vector/get + +# 0.001刻みにして渡す + execute store result storage asset:temp 1195.Arc.DX double 0.001 run data get storage api: Return.Vector[0] 1000 + execute store result storage asset:temp 1195.Arc.DY double 0.001 run data get storage api: Return.Vector[1] 1000 + execute store result storage asset:temp 1195.Arc.DZ double 0.001 run data get storage api: Return.Vector[2] 1000 + +# リセット + data remove storage api: Return.Vector diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/start.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/start.mcfunction new file mode 100644 index 00000000000..310b2c4251c --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/swing/start.mcfunction @@ -0,0 +1,16 @@ +#> asset:object/1195.creeper_glove_right/tick/swing/start +# +# 攻撃を始める処理 +# +# @within function asset:object/1195.creeper_glove_right/tick/swing/idle + +# 状態を攻撃にする + data modify storage asset:context this.State set value "swing_out" + data modify storage asset:context this.Step set value 0 + +# 攻撃開始時に埋まっていれば、抜けるまで埋まり判定を無視する + data modify storage asset:context this.IgnoreBury set value false + execute unless block ~ ~ ~ #lib:no_collision/ run data modify storage asset:context this.IgnoreBury set value true + +#vfx + playsound minecraft:entity.creeper.primed player @a ~ ~ ~ 1.0 1 0.0 diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/_index.d.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/_index.d.mcfunction deleted file mode 100644 index a62535bd33a..00000000000 --- a/Asset/data/asset/functions/object/1195.right_glove_creeper/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:object/1195.right_glove_creeper/_index.d -# @private - -#> tag -# @within function asset:object/1195.right_glove_creeper/** - #declare tag 1195.Owner diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/init/.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/init/.mcfunction deleted file mode 100644 index 5d25c1eee7c..00000000000 --- a/Asset/data/asset/functions/object/1195.right_glove_creeper/init/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/1195.right_glove_creeper/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/1195/init - -#縦の向きはいらないので0にする - tp @s ~ ~ ~ ~ 0 diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/kill/.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/kill/.mcfunction deleted file mode 100644 index aa4764aba8f..00000000000 --- a/Asset/data/asset/functions/object/1195.right_glove_creeper/kill/.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:object/1195.right_glove_creeper/kill/ -# -# 消滅処理 -# -# @within function asset:object/1195.right_glove_creeper/tick/ -kill @s diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/load.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/load.mcfunction deleted file mode 100644 index 9edf07d2960..00000000000 --- a/Asset/data/asset/functions/object/1195.right_glove_creeper/load.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:object/1195.right_glove_creeper/load -# -# Objectに利用するスコアボード等の初期化処理 -# -# @within tag/function asset:object/load - -#> 定義類はここに -# @within function asset:object/1195.right_glove_creeper/** - scoreboard objectives add \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/register.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/register.mcfunction deleted file mode 100644 index ba9359ab08f..00000000000 --- a/Asset/data/asset/functions/object/1195.right_glove_creeper/register.mcfunction +++ /dev/null @@ -1,24 +0,0 @@ -#> asset:object/1195.right_glove_creeper/register -# -# Objectのデータを指定 -# -# @within function asset:object/alias/1195/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 1195 -# フィールド(オプション) - data modify storage asset:object Field.Damage set value {Min:1,Max:5} - data modify storage asset:object Field.UserID set value -1 - data modify storage asset:object Field.Tick set value 340 -# 攻撃中のカウンタ - data modify storage asset:object Field.AttackTick set value 0 diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/summon/m.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/summon/m.mcfunction deleted file mode 100644 index d45ef4ec3e9..00000000000 --- a/Asset/data/asset/functions/object/1195.right_glove_creeper/summon/m.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:object/1195.right_glove_creeper/summon/m -# -# -# -# @within function asset:object/1195.right_glove_creeper/summon/ - - $summon item_display ~ ~ ~ {Tags:["ObjectInit","Friend"],Rotation:$(Rotation),teleport_duration:1,item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20664}}} diff --git a/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction b/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction deleted file mode 100644 index 9bac1a5ac47..00000000000 --- a/Asset/data/asset/functions/object/1195.right_glove_creeper/tick/.mcfunction +++ /dev/null @@ -1,26 +0,0 @@ -#> asset:object/1195.right_glove_creeper/tick/ -# -# Objectのtick時の処理 -# -# @within asset:object/alias/1195/tick - -#> Private -# @private - #declare score_holder $UserID - -# OwnerにTag付与 - execute store result score $UserID Temporary run data get storage asset:context this.UserID - execute as @a if score @s UserID = $UserID Temporary run tag @s add 1195.Owner - scoreboard players reset $UserID Temporary - -#攻撃状態のカウンタが0場合(攻撃待機状態)の処理 - -#攻撃状態の処理 - - -# リセット - tag @p[tag=1195.Owner] remove 1195.Owner - -# 消滅処理 - execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick - execute if data storage asset:context this{Tick:0} run function asset:object/1195.right_glove_creeper/kill/ diff --git a/Asset/data/asset/functions/object/1196.creeper_glove_left/register.mcfunction b/Asset/data/asset/functions/object/1196.creeper_glove_left/register.mcfunction new file mode 100644 index 00000000000..a6caff93b5b --- /dev/null +++ b/Asset/data/asset/functions/object/1196.creeper_glove_left/register.mcfunction @@ -0,0 +1,21 @@ +#> asset:object/1196.creeper_glove_left/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1196/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1195 + 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 1196 +# フィールド(オプション) + # 左右を反転する + data modify storage asset:object Field.Side set value -1 diff --git a/Asset/data/asset/functions/object/1196.creeper_glove_left/summon/.mcfunction b/Asset/data/asset/functions/object/1196.creeper_glove_left/summon/.mcfunction new file mode 100644 index 00000000000..ce1cc3bf9dc --- /dev/null +++ b/Asset/data/asset/functions/object/1196.creeper_glove_left/summon/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1196.creeper_glove_left/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1196/summon + +# 元となるEntityを召喚する + execute as 0-0-0-0-0 in minecraft:overworld positioned as @s run tp @s ~ ~ ~ ~ ~ + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + function asset:object/1196.creeper_glove_left/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1196.creeper_glove_left/summon/m.mcfunction b/Asset/data/asset/functions/object/1196.creeper_glove_left/summon/m.mcfunction new file mode 100644 index 00000000000..fb87055bd18 --- /dev/null +++ b/Asset/data/asset/functions/object/1196.creeper_glove_left/summon/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1196.creeper_glove_left/summon/m +# +# +# +# @within function asset:object/1196.creeper_glove_left/summon/ + +$summon item_display ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"],item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20665}},teleport_duration:1} diff --git a/Asset/data/asset/functions/object/alias/1195/init.mcfunction b/Asset/data/asset/functions/object/alias/1195/init.mcfunction index 11d46c100ed..cb29219aa2e 100644 --- a/Asset/data/asset/functions/object/alias/1195/init.mcfunction +++ b/Asset/data/asset/functions/object/alias/1195/init.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/init/init.m # 元のInit処理を呼び出す - function asset:object/1195.right_glove_creeper/init/ \ No newline at end of file + function asset:object/1195.creeper_glove_right/init/ diff --git a/Asset/data/asset/functions/object/alias/1195/register.mcfunction b/Asset/data/asset/functions/object/alias/1195/register.mcfunction index 9bbd6a577ef..3d04768f37f 100644 --- a/Asset/data/asset/functions/object/alias/1195/register.mcfunction +++ b/Asset/data/asset/functions/object/alias/1195/register.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/summon/register.m # 元の登録処理を呼び出す - function asset:object/1195.right_glove_creeper/register \ No newline at end of file + function asset:object/1195.creeper_glove_right/register diff --git a/Asset/data/asset/functions/object/alias/1195/summon.mcfunction b/Asset/data/asset/functions/object/alias/1195/summon.mcfunction index c754f895fc6..82a68f44398 100644 --- a/Asset/data/asset/functions/object/alias/1195/summon.mcfunction +++ b/Asset/data/asset/functions/object/alias/1195/summon.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/summon/summon.m # 元の召喚処理を呼び出す - function asset:object/1195.right_glove_creeper/summon/ \ No newline at end of file + function asset:object/1195.creeper_glove_right/summon/ diff --git a/Asset/data/asset/functions/object/alias/1195/tick.mcfunction b/Asset/data/asset/functions/object/alias/1195/tick.mcfunction index 4171cf3aeff..58c4563e853 100644 --- a/Asset/data/asset/functions/object/alias/1195/tick.mcfunction +++ b/Asset/data/asset/functions/object/alias/1195/tick.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/tick/tick.m # 元のTick処理を呼び出す - function asset:object/1195.right_glove_creeper/tick/ \ No newline at end of file + function asset:object/1195.creeper_glove_right/tick/ diff --git a/Asset/data/asset/functions/object/alias/1196/register.mcfunction b/Asset/data/asset/functions/object/alias/1196/register.mcfunction new file mode 100644 index 00000000000..529f43b6501 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1196/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1196/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1196.creeper_glove_left/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1196/summon.mcfunction b/Asset/data/asset/functions/object/alias/1196/summon.mcfunction new file mode 100644 index 00000000000..79c8af700af --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1196/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1196/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1196.creeper_glove_left/summon/ \ 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 44e3fa970a8..370cd7f01be 100644 --- a/Asset/data/asset/tags/functions/object/load.json +++ b/Asset/data/asset/tags/functions/object/load.json @@ -1,6 +1,5 @@ { "values": [ - "asset:object/1195.right_glove_creeper/load", "asset:object/1061.azure_jelly/load", "asset:object/2251.wall_laser_clock/load", "asset:object/2212.eclael_upper_shot/load", @@ -59,4 +58,4 @@ "asset:object/1059.book_of_hero/load", "asset:object/2031.giant_pumpkin/load" ] -} \ No newline at end of file +} From b466bdbde2ebe8a006d87b776101530c9a5afca7 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Mon, 16 Nov 2026 19:37:16 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=E8=B7=9D=E9=9B=A2=E3=81=8C=E9=9B=A2?= =?UTF-8?q?=E3=82=8C=E3=81=99=E3=81=8E=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB?= =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=8F=E7=A7=BB=E5=8B=95=E3=82=84=E3=82=BF?= =?UTF-8?q?=E3=82=B0=E3=81=AE=E8=A7=A3=E9=99=A4=E3=81=8C=E3=81=A7=E3=81=8D?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=E5=95=8F?= =?UTF-8?q?=E9=A1=8C=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1195.creeper_glove_right/init/.mcfunction | 2 +- .../functions/object/1195.creeper_glove_right/tick/.mcfunction | 2 +- .../object/1195.creeper_glove_right/tick/arc/tp.m.mcfunction | 2 +- .../object/1195.creeper_glove_right/tick/owner.mcfunction | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/init/.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/init/.mcfunction index ed0cb0e1340..350ff5c0eee 100644 --- a/Asset/data/asset/functions/object/1195.creeper_glove_right/init/.mcfunction +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/init/.mcfunction @@ -14,5 +14,5 @@ # 所有者の今のyaw(度×100)を振り検出の基準にする execute store result score $UserID Temporary run data get storage asset:context this.UserID - execute as @a[distance=..16] if score @s UserID = $UserID Temporary store result storage asset:context this.PrevYaw int 1 run data get entity @s Rotation[0] 100 + execute as @a[distance=..64] if score @s UserID = $UserID Temporary store result storage asset:context this.PrevYaw int 1 run data get entity @s Rotation[0] 100 scoreboard players reset $UserID Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/.mcfunction index 5922d87d142..c2eec35ce4e 100644 --- a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/.mcfunction @@ -14,7 +14,7 @@ function asset:object/1195.creeper_glove_right/tick/main # リセット - tag @a[tag=1195.Owner,distance=..16] remove 1195.Owner + tag @a[tag=1195.Owner,distance=..64] remove 1195.Owner data remove storage asset:temp 1195 scoreboard players reset $1195.SwingStart Temporary scoreboard players reset $1195.ArcT Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/arc/tp.m.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/arc/tp.m.mcfunction index 670fcaff7eb..d16d5415fa0 100644 --- a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/arc/tp.m.mcfunction +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/arc/tp.m.mcfunction @@ -4,4 +4,4 @@ # # @within function asset:object/1195.creeper_glove_right/tick/arc/ -$execute as @p[tag=1195.Owner,distance=..64] at @s anchored eyes positioned ^ ^ ^ rotated ~ 0 positioned ^ ^$(H) ^$(F) rotated ~$(Theta) $(Pitch) positioned ^ ^ ^$(R) positioned ~$(DX) ~$(DY) ~$(DZ) run tp @e[type=item_display,tag=this,distance=..20,limit=1] ~ ~ ~ $(Yaw) $(VisPitch) +$execute as @p[tag=1195.Owner,distance=..64] at @s anchored eyes positioned ^ ^ ^ rotated ~ 0 positioned ^ ^$(H) ^$(F) rotated ~$(Theta) $(Pitch) positioned ^ ^ ^$(R) positioned ~$(DX) ~$(DY) ~$(DZ) run tp @e[type=item_display,tag=this,distance=..64,limit=1] ~ ~ ~ $(Yaw) $(VisPitch) diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/owner.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/owner.mcfunction index 666332d1270..b0994c23e81 100644 --- a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/owner.mcfunction +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/owner.mcfunction @@ -1,6 +1,6 @@ #> asset:object/1195.creeper_glove_right/tick/owner # -# 所有者に1195.Ownerを付け、所有者が16m以内にいない・死亡中・スペクテイターなら失敗を返す +# 所有者に1195.Ownerを付け、所有者が64m以内にいない・死亡中・スペクテイターなら失敗を返す # # @within function asset:object/1195.creeper_glove_right/tick/ From 9f6375401cc774187288271dde587d9c9a47ce12 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Tue, 17 Nov 2026 10:55:47 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E3=83=96=E3=83=BC=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=83=A2=E3=83=BC=E3=83=89=E3=81=AE=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 2 +- .../trigger/3.main.mcfunction | 7 ++-- .../1195.creeper_glove_right/kill/.mcfunction | 1 + .../register.mcfunction | 10 ++++-- .../tick/blink.mcfunction | 18 ++++++++++ .../tick/empower.mcfunction | 17 ++++++++++ .../tick/explode/.mcfunction | 3 -- .../tick/explode/push_player.mcfunction | 34 ------------------- .../tick/explode/vfx.mcfunction | 2 +- .../tick/main.mcfunction | 8 +++++ 10 files changed, 59 insertions(+), 43 deletions(-) create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/blink.mcfunction create mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/empower.mcfunction delete mode 100644 Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/push_player.mcfunction diff --git a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/2.give.mcfunction index dfba74c5485..8bb9a9727fb 100644 --- a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '{"text":"コール:グローブ・クリーパーズ","color":"#6CEB35"}' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"グローブの形をしたクリーパーを両隣に召喚する"}','{"text":"画面を左右に動かしたとき、同じ向きにパンチを行い爆発する"}','{"text":"爆発はプレイヤーも含めて辺りのものを大きく吹っ飛ばす"}','{"text":"ロケットパンチにあこがれたクリーパーたちの末路","color":"dark_gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"グローブの形をしたクリーパーを両隣に召喚する"}','{"text":"画面を左右に動かしたとき、同じ向きにパンチを行い爆発する"}','{"text":"召喚して12秒経つとパンチを発動しやすくなり"}','{"text":"パンチのスピードが大きく上昇する"}','{"text":"ロケットパンチにあこがれたクリーパーたちの末路","color":"dark_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 diff --git a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction index 1bb5ad9f8d9..dc98eec0b42 100644 --- a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction @@ -13,7 +13,10 @@ data modify storage asset:temp 1634.FieldOverride.SwingCooldown set value 5 data modify storage asset:temp 1634.FieldOverride.LifeTime set value 360 data modify storage asset:temp 1634.FieldOverride.EnemyKnockback set value 1.0d - data modify storage asset:temp 1634.FieldOverride.PlayerKnockback set value 1.5d + data modify storage asset:temp 1634.FieldOverride.EmpowerTime set value 240 + data modify storage asset:temp 1634.FieldOverride.EmpoweredSwingCooldown set value 1 + data modify storage asset:temp 1634.FieldOverride.EmpoweredReturnDuration set value 2 + data modify storage asset:temp 1634.FieldOverride.EmpoweredHitHoldDuration set value 2 # 右のグローブを召喚する data modify storage api: Argument.ID set value 1195 @@ -26,7 +29,7 @@ execute anchored eyes positioned ^ ^ ^ rotated ~ 0 positioned ^1.0 ^-0.3 ^0.2 rotated as @s run function api:object/summon # 演出 - playsound entity.creeper.primed player @a[distance=..16] ~ ~ ~ 0.7 1.2 + playsound entity.creeper.primed player @a ~ ~ ~ 0.7 1.2 # リセット data remove storage asset:temp 1634 diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/kill/.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/kill/.mcfunction index a6a773585a6..323eabe4858 100644 --- a/Asset/data/asset/functions/object/1195.creeper_glove_right/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/kill/.mcfunction @@ -11,6 +11,7 @@ particle large_smoke ~ ~ ~ 0.3 0.3 0.3 0.05 10 normal @a playsound entity.creeper.hurt player @a ~ ~ ~ 1 0.8 playsound minecraft:entity.creeper.death player @a ~ ~ ~ 1.0 1 0.0 + playsound entity.generic.explode player @a ~ ~ ~ 1 0.9 #消滅 kill @s diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/register.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/register.mcfunction index 62734f51a86..44a122bbac5 100644 --- a/Asset/data/asset/functions/object/1195.creeper_glove_right/register.mcfunction +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/register.mcfunction @@ -22,7 +22,6 @@ data modify storage asset:object Field.SwingCooldown set value 1 data modify storage asset:object Field.LifeTime set value 1 data modify storage asset:object Field.EnemyKnockback set value 1.0d - data modify storage asset:object Field.PlayerKnockback set value 1.0d # 左右 (右: 1, 左: -1) と所有者の目からの位置 (m) data modify storage asset:object Field.Side set value 1 data modify storage asset:object Field.OffsetSide set value 1.0d @@ -31,13 +30,20 @@ data modify storage asset:object Field.Reach set value 3.0d # 振り (閾値は度/tick、時間はtick) data modify storage asset:object Field.SwingThreshold set value 5.0d - data modify storage asset:object Field.SwingDuration set value 4 + data modify storage asset:object Field.SwingDuration set value 3 data modify storage asset:object Field.ReturnDuration set value 10 data modify storage asset:object Field.FinishYaw set value 70.0d data modify storage asset:object Field.HitHoldDuration set value 15 + # 強化 (召喚からEmpowerTime tick後に、振りの各時間を強化後の値へ変える) + data modify storage asset:object Field.EmpowerTime set value 10 + data modify storage asset:object Field.EmpoweredSwingCooldown set value 1 + data modify storage asset:object Field.EmpoweredReturnDuration set value 1 + data modify storage asset:object Field.EmpoweredHitHoldDuration set value 1 + data modify storage asset:object Field.EmpoweredSwingThreshold set value 1.0d # 状態 data modify storage asset:object Field.State set value "idle" data modify storage asset:object Field.Step set value 0 data modify storage asset:object Field.PrevYaw set value 0 data modify storage asset:object Field.IgnoreBury set value false data modify storage asset:object Field.ExplodeProgress set value 0 + data modify storage asset:object Field.Empowered set value false diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/blink.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/blink.mcfunction new file mode 100644 index 00000000000..4822dc28469 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/blink.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1195.creeper_glove_right/tick/blink +# +# 4tickごとに明るさを15と0で切り替えてチカチカさせる +# +# @within function asset:object/1195.creeper_glove_right/tick/main + +#> Private +# @private + #declare score_holder $Phase + +# 8tick周期の位置 (0..3: 明るい, 4..7: 暗い) 切り替わるtickだけ書き換える + scoreboard players operation $Phase Temporary = @s General.Object.Tick + scoreboard players operation $Phase Temporary %= $8 Const + execute if score $Phase Temporary matches 0 run data modify entity @s brightness set value {block:15,sky:15} + execute if score $Phase Temporary matches 4 run data modify entity @s brightness set value {block:0,sky:0} + +# リセット + scoreboard players reset $Phase Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/empower.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/empower.mcfunction new file mode 100644 index 00000000000..c1d2796eeb5 --- /dev/null +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/empower.mcfunction @@ -0,0 +1,17 @@ +#> asset:object/1195.creeper_glove_right/tick/empower +# +# 強化する 振りの各時間を強化後の値へ変える +# +# @within function asset:object/1195.creeper_glove_right/tick/main + +# 強化済みにする + data modify storage asset:context this.Empowered set value true + +# 振りの各時間を強化後の値へ変える + data modify storage asset:context this.SwingCooldown set from storage asset:context this.EmpoweredSwingCooldown + data modify storage asset:context this.ReturnDuration set from storage asset:context this.EmpoweredReturnDuration + data modify storage asset:context this.HitHoldDuration set from storage asset:context this.EmpoweredHitHoldDuration + data modify storage asset:context this.SwingThreshold set from storage asset:context this.EmpoweredSwingThreshold + +# 演出 + playsound entity.creeper.primed player @a ~ ~ ~ 0.8 0.8 diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/.mcfunction index 2f4c192ed94..8a990535934 100644 --- a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/.mcfunction +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/.mcfunction @@ -13,9 +13,6 @@ # 敵のノックバック 倒れた敵と追加当たり判定は除く execute rotated as @p[tag=1195.Owner,distance=..64] rotated ~ -15 positioned ~ ~-0.9 ~ as @e[type=#lib:living_without_player,tag=Enemy,tag=!ExtendedCollision,tag=!Uninterferable,tag=!Death,distance=..2] run function asset:object/1195.creeper_glove_right/tick/explode/knockback_enemy -# プレイヤーの吹き飛ばし - execute positioned ~ ~-0.9 ~ as @a[gamemode=!spectator,tag=!Death,distance=..4] run function asset:object/1195.creeper_glove_right/tick/explode/push_player - # 硬直へ移る data modify storage asset:context this.State set value "hit_hold" data modify storage asset:context this.Step set value 0 diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/push_player.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/push_player.mcfunction deleted file mode 100644 index 745eb5beb75..00000000000 --- a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/push_player.mcfunction +++ /dev/null @@ -1,34 +0,0 @@ -#> asset:object/1195.creeper_glove_right/tick/explode/push_player -# -# 爆発から遠ざかる向きへプレイヤーを吹き飛ばす -# -# @within function asset:object/1195.creeper_glove_right/tick/explode/ - -#> Private -# @private - #declare score_holder $Distance - #declare score_holder $Power - #declare score_holder $Rest - -# 距離 d (×1000) - function lib:distance/as_to_at - execute store result score $Distance Temporary run data get storage lib: Return.Distance 1000 - data remove storage lib: Return.Distance - -# 強さ (×1000) - execute store result score $Power Temporary run data get storage asset:context this.PlayerKnockback 1000 - scoreboard players set $Rest Temporary 4000 - scoreboard players operation $Rest Temporary -= $Distance Temporary - scoreboard players operation $Power Temporary *= $Rest Temporary - scoreboard players operation $Power Temporary /= $4000 Const - execute if score $Power Temporary matches 1.. store result storage lib: Argument.VectorMagnitude double 0.001 run scoreboard players get $Power Temporary - -# 爆発から遠ざかる水平の向きから20°上へ飛ばす - execute if score $Power Temporary matches 1.. if score $Distance Temporary matches 100.. facing entity @s feet rotated ~ -20 run function lib:motion/looking -# 近すぎて向きが決まらないときは所有者の前方から20°上へ飛ばす - execute if score $Power Temporary matches 1.. if score $Distance Temporary matches ..99 rotated as @p[tag=1195.Owner,distance=..64] rotated ~ -20 run function lib:motion/looking - -# リセット - scoreboard players reset $Distance Temporary - scoreboard players reset $Power Temporary - scoreboard players reset $Rest Temporary diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/vfx.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/vfx.mcfunction index 55e3dd48576..8f0c0edd284 100644 --- a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/vfx.mcfunction +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/explode/vfx.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1195.creeper_glove_right/tick/explode/ particle explosion ~ ~ ~ 0 0 0 0 1 normal @a - particle dust 0.35 0.8 0.3 1.5 ~ ~ ~ 0.6 0.6 0.6 0 30 normal @a + particle dust 0.35 0.8 0.3 1.5 ~ ~ ~ 0.6 0.6 0.6 0 10 normal @a particle large_smoke ~ ~ ~ 0.3 0.3 0.3 0.05 10 normal @a playsound entity.generic.explode player @a ~ ~ ~ 0.5 1.3 playsound entity.creeper.hurt player @a ~ ~ ~ 0.6 0.8 diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/main.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/main.mcfunction index 33b6b1fcd56..9566cbce330 100644 --- a/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/main.mcfunction +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/tick/main.mcfunction @@ -7,6 +7,7 @@ #> Private # @private #declare score_holder $LifeTime + #declare score_holder $EmpowerTime # 存在時間が切れたか execute store result score $LifeTime Temporary run data get storage asset:context this.LifeTime @@ -15,6 +16,13 @@ # 攻撃中でなければ即消滅する 攻撃中は爆発の直後に消える execute if score $1195.Expired Temporary matches 1 unless data storage asset:context this{State:"swing_out"} run return run function asset:object/1195.creeper_glove_right/kill/ +# 召喚からEmpowerTime tick経ったら強化する + execute store result score $EmpowerTime Temporary run data get storage asset:context this.EmpowerTime + execute if data storage asset:context this{Empowered:false} if score @s General.Object.Tick >= $EmpowerTime Temporary run function asset:object/1195.creeper_glove_right/tick/empower + scoreboard players reset $EmpowerTime Temporary +# 強化中はチカチカさせる + execute if data storage asset:context this{Empowered:true} run function asset:object/1195.creeper_glove_right/tick/blink + # 視点を振ったかを検出する function asset:object/1195.creeper_glove_right/tick/swing/detect From 1a2553a054681e6ca33559b5f28b9e130c675989 Mon Sep 17 00:00:00 2001 From: k22992068-crypto <286215529+k22992068-crypto@users.noreply.github.com> Date: Tue, 17 Nov 2026 11:26:48 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E3=82=92=E5=B0=91?= =?UTF-8?q?=E3=81=97=E7=94=BB=E9=9D=A2=E3=81=AE=E5=A4=96=E5=81=B4=E3=81=AB?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1634.call_glove_creepers/trigger/3.main.mcfunction | 4 ++-- .../object/1195.creeper_glove_right/register.mcfunction | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction index dc98eec0b42..fc33625ca95 100644 --- a/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1634.call_glove_creepers/trigger/3.main.mcfunction @@ -21,12 +21,12 @@ # 右のグローブを召喚する data modify storage api: Argument.ID set value 1195 data modify storage api: Argument.FieldOverride set from storage asset:temp 1634.FieldOverride - execute anchored eyes positioned ^ ^ ^ rotated ~ 0 positioned ^-1.0 ^-0.3 ^0.2 rotated as @s run function api:object/summon + execute anchored eyes positioned ^ ^ ^ rotated ~ 0 positioned ^-1.0 ^-0.3 ^-0.1 rotated as @s run function api:object/summon # 左のグローブを召喚する data modify storage api: Argument.ID set value 1196 data modify storage api: Argument.FieldOverride set from storage asset:temp 1634.FieldOverride - execute anchored eyes positioned ^ ^ ^ rotated ~ 0 positioned ^1.0 ^-0.3 ^0.2 rotated as @s run function api:object/summon + execute anchored eyes positioned ^ ^ ^ rotated ~ 0 positioned ^1.0 ^-0.3 ^-0.1 rotated as @s run function api:object/summon # 演出 playsound entity.creeper.primed player @a ~ ~ ~ 0.7 1.2 diff --git a/Asset/data/asset/functions/object/1195.creeper_glove_right/register.mcfunction b/Asset/data/asset/functions/object/1195.creeper_glove_right/register.mcfunction index 44a122bbac5..15c7533b517 100644 --- a/Asset/data/asset/functions/object/1195.creeper_glove_right/register.mcfunction +++ b/Asset/data/asset/functions/object/1195.creeper_glove_right/register.mcfunction @@ -26,7 +26,7 @@ data modify storage asset:object Field.Side set value 1 data modify storage asset:object Field.OffsetSide set value 1.0d data modify storage asset:object Field.OffsetUp set value -0.3d - data modify storage asset:object Field.OffsetForward set value 0.2d + data modify storage asset:object Field.OffsetForward set value -0.1d data modify storage asset:object Field.Reach set value 3.0d # 振り (閾値は度/tick、時間はtick) data modify storage asset:object Field.SwingThreshold set value 5.0d