From d828029a7049fcbc1f05eca86eba916e4b20617d Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 1 Oct 2025 17:41:13 +0900 Subject: [PATCH 01/66] =?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 --- .../give/1.trigger.mcfunction | 7 ++ .../give/2.give.mcfunction | 68 +++++++++++++++++++ .../register.mcfunction | 7 ++ .../trigger/1.trigger.mcfunction | 8 +++ .../trigger/2.check_condition.mcfunction | 12 ++++ .../trigger/3.main.mcfunction | 12 ++++ .../1061.azure_jelly/_index.d.mcfunction | 6 ++ .../object/1061.azure_jelly/init/.mcfunction | 5 ++ .../1061.azure_jelly/register.mcfunction | 20 ++++++ .../1061.azure_jelly/summon/.mcfunction | 7 ++ .../object/1061.azure_jelly/tick/.mcfunction | 56 +++++++++++++++ .../1061.azure_jelly/tick/kill.mcfunction | 9 +++ .../1061.azure_jelly/tick/rotate.mcfunction | 7 ++ .../object/alias/1061/init.mcfunction | 8 +++ .../object/alias/1061/register.mcfunction | 8 +++ .../object/alias/1061/summon.mcfunction | 8 +++ .../object/alias/1061/tick.mcfunction | 8 +++ .../artifact/click.carrot_on_a_stick.json | 6 +- .../asset/tags/functions/artifact/give.json | 3 +- .../tags/functions/artifact/register.json | 3 +- 20 files changed, 262 insertions(+), 6 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/register.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/1.trigger.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/2.check_condition.mcfunction create mode 100644 Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/kill.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/rotate.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1061/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1061/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1061/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1061/tick.mcfunction diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/1.trigger.mcfunction new file mode 100644 index 00000000000..bd7d0418098 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/1.trigger.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1144.cradle_of_azure_moon/give/1.trigger +# +# 神器の取得処理の呼び出し時に実行されるfunction +# +# @within tag/function asset:artifact/give + +execute if data storage asset:context {id:1144} run function asset:artifact/1144.cradle_of_azure_moon/give/2.give \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction new file mode 100644 index 00000000000..97e5c07ade0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction @@ -0,0 +1,68 @@ +#> asset:artifact/1144.cradle_of_azure_moon/give/2.give +# +# 神器の作成部 ここでID等を定義する +# +# @user +# @within function asset:artifact/1144.cradle_of_azure_moon/give/1.trigger + +# 神器の説明や消費MPなどをここで設定する。 +# 最後にasset:artifact/common/giveを実行することで入手可能。 + +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 1144 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"蒼き月の揺籠","color":"blue"}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value [] +# 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) + # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' + # data modify storage asset:artifact ConsumeItem.Count set value 1 + # data modify storage asset:artifact ConsumeItem.Extra set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "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 [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [Water] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "every" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackRange set value 3 +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 100 +# 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 + # data modify storage asset:artifact TypeCooldown.Duration set value +# グローバルクールダウン (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", "Wi-ki", "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/1144.cradle_of_azure_moon/register.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/register.mcfunction new file mode 100644 index 00000000000..b4d93a038cc --- /dev/null +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/register.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/1144.cradle_of_azure_moon/register +# +# 神器プールへの登録処理 +# +# @within tag/function asset:artifact/register + +data modify storage asset:artifact RarityRegistry[4] append value [1144] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/1.trigger.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/1.trigger.mcfunction new file mode 100644 index 00000000000..1fdbc5f395d --- /dev/null +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/1.trigger.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/1144.cradle_of_azure_moon/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:1144} run function asset:artifact/1144.cradle_of_azure_moon/trigger/2.check_condition \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/2.check_condition.mcfunction new file mode 100644 index 00000000000..d8ab55f3a79 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/2.check_condition.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1144.cradle_of_azure_moon/trigger/2.check_condition +# +# 神器の発動条件をチェックします +# +# @within function asset:artifact/1144.cradle_of_azure_moon/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/1144.cradle_of_azure_moon/trigger/3.main \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction new file mode 100644 index 00000000000..a38171324e6 --- /dev/null +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/1144.cradle_of_azure_moon/trigger/3.main +# +# 神器のメイン処理部 +# +# @within function asset:artifact/1144.cradle_of_azure_moon/trigger/2.check_condition + +# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う + function asset:artifact/common/use/auto + +# ここから先は神器側の効果の処理を書く + +# Object召喚 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction new file mode 100644 index 00000000000..f7477bce04e --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:object/1061.azure_jelly/_index.d +# @private + +#> tag +# @within function asset:object/1061.azure_jelly/** + #declare tag 1061.Owner diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/init/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/init/.mcfunction new file mode 100644 index 00000000000..7e5f0b87823 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/init/.mcfunction @@ -0,0 +1,5 @@ +#> asset:object/1061.azure_jelly/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/1061/init diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction new file mode 100644 index 00000000000..17ea48a2b1d --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1061.azure_jelly/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1061/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 1061 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction new file mode 100644 index 00000000000..2e2508b333b --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1061.azure_jelly/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1061/summon + +summon armor_stand ~ ~ ~ {Tags:["ObjectInit"],Marker:1b,Invisible:1b,Passengers:[{id:"minecraft:item_display",Tags:["ProcessCommonTag","AutoKillWhenDieVehicle"],teleport_duration:1,item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20578}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[1f,1f,1f],translation:[0f,0f,0f]}}]} diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction new file mode 100644 index 00000000000..b8182a3e031 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -0,0 +1,56 @@ +#> asset:object/1061.azure_jelly/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1061/tick + +#> Private +# @private + #declare score_holder $OwnerID + #declare score_holder $Interval + +# OwnerにTag付与 + execute store result score $OwnerID Temporary run data get storage asset:context this.UserID + execute as @a if score @s UserID = @p UserID run tag @p add 1061.Owner + +# インターバル + #scoreboard players operation $Interval Temporary = @s General.Object.Tick + #scoreboard players operation $Interval Temporary %= $43 Const + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 周囲にOwnerがいなければOwnerの方を向く + #execute if score $Interval Temporary matches 0 unless entity @p[tag=1061.Owner,distance=..5] facing entity @p[tag=1061.Owner] eyes run function asset:object/1061.azure_jelly/tick/forward_spread + +# 周囲にOwnerがいればランダムな方向を向く + #execute if score $Interval Temporary matches 0 if entity @p[tag=1061.Owner,distance=..5] run function asset:object/1061.azure_jelly/tick/random_rotate + +# 演出 + #execute if score $Interval Temporary matches 0 at @s rotated ~ 0 run function asset:object/1061.azure_jelly/tick/vfx + +# 移動 + execute if score $Interval Temporary matches 0 at @s run tp @s ^ ^ ^ ~ -10 + #execute if score $Interval Temporary matches 0..30 at @s run tp @s ^ ^ ^0.3 ~ ~2 + execute if score $Interval Temporary matches 0..5 at @s run tp @s ^ ^ ^0.2 ~ ~-1 + execute if score $Interval Temporary matches 6..8 at @s run tp @s ^ ^ ^0.3 ~ ~-2 + execute if score $Interval Temporary matches 9..10 at @s run tp @s ^ ^ ^0.4 ~ ~-3 + execute if score $Interval Temporary matches 11..12 at @s run tp @s ^ ^ ^0.3 ~ ~-3 + execute if score $Interval Temporary matches 13..17 at @s run tp @s ^ ^ ^0.2 ~ ~2 + execute if score $Interval Temporary matches 18..21 at @s run tp @s ^ ^ ^0.2 ~ ~3 + execute if score $Interval Temporary matches 22..32 at @s run tp @s ^ ^ ^0.25 ~ ~4 + execute if score $Interval Temporary matches 33..35 at @s run tp @s ^ ^ ^0.3 ~ ~6 + execute if score $Interval Temporary matches 36..39 at @s run tp @s ^ ^ ^0.2 ~ ~6 + execute if score $Interval Temporary matches 40..42 at @s run tp @s ^ ^ ^0.1 ~ ~6 + +# 地面に接触したら上を向く + #execute at @s unless block ~ ~-0.6 ~ #lib:no_collision run function asset:object/1061.azure_jelly/tick/vfx + #execute at @s unless block ~ ~-0.6 ~ #lib:no_collision run tp @s ~ ~ ~ ~ -30 + +# リセット + scoreboard players reset $OwnerID Temporary + scoreboard players reset $Interval Temporary + tag @p[tag=1061.Owner] remove 1061.Owner + +# 消滅処理 + execute if entity @s[scores={General.Object.Tick=600..}] run function asset:object/1061.azure_jelly/tick/kill diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/kill.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/kill.mcfunction new file mode 100644 index 00000000000..74ad84f3275 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/kill.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1061.azure_jelly/tick/kill +# +# +# +# @within function asset:object/1061.azure_jelly/tick/ + +# 消滅 + execute on passengers run kill @s + kill @s diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/rotate.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/rotate.mcfunction new file mode 100644 index 00000000000..466e1c754f3 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/rotate.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1061.azure_jelly/tick/rotate +# +# +# +# @within function asset:object/1061.azure_jelly/tick/ + +# diff --git a/Asset/data/asset/functions/object/alias/1061/init.mcfunction b/Asset/data/asset/functions/object/alias/1061/init.mcfunction new file mode 100644 index 00000000000..ccea1651c17 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1061/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1061/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/1061.azure_jelly/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1061/register.mcfunction b/Asset/data/asset/functions/object/alias/1061/register.mcfunction new file mode 100644 index 00000000000..2e0eb2f934d --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1061/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1061/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1061.azure_jelly/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1061/summon.mcfunction b/Asset/data/asset/functions/object/alias/1061/summon.mcfunction new file mode 100644 index 00000000000..2e34a9ec92b --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1061/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1061/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1061.azure_jelly/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1061/tick.mcfunction b/Asset/data/asset/functions/object/alias/1061/tick.mcfunction new file mode 100644 index 00000000000..55098310478 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1061/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1061/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1061.azure_jelly/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 5864dbd3668..f2ea17bddf0 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/1144.cradle_of_azure_moon/trigger/1.trigger", "asset:artifact/0005.musket_matchlock/trigger/1.trigger", "asset:artifact/0017.harmful_books/trigger/1.trigger", "asset:artifact/0075.whirlpool_wand/trigger/1.trigger", @@ -90,7 +91,6 @@ "asset:artifact/1265.thunder_ray/trigger/1.trigger", "asset:artifact/1270.raging_passion_pickaxe/trigger/1.trigger", "asset:artifact/1272.big_water_launcher/trigger/1.trigger", - "asset:artifact/0001.book_of_all-seeing/trigger/1.trigger", "asset:artifact/0002.blessing/trigger/1.trigger", "asset:artifact/0007.nitrogen_fixater/trigger/1.trigger", @@ -175,8 +175,6 @@ "asset:artifact/1284.quiver/trigger/1.trigger", "asset:artifact/1285.torch_bag/trigger/1.trigger", "asset:artifact/2001.staff_of_the_willless/trigger/1.trigger", - "asset:artifact/0019.scripture/trigger/1.trigger" - ] -} +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/give.json b/Asset/data/asset/tags/functions/artifact/give.json index f3eb0088574..5326c549e59 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/1144.cradle_of_azure_moon/give/1.trigger", "asset:artifact/1140.over_pulse_booster/give/1.trigger", "asset:artifact/1139.over_pulse_legframe/give/1.trigger", "asset:artifact/1138.over_pulse_bodyarmor/give/1.trigger", @@ -517,4 +518,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 deba1661508..49abd0dff51 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/1144.cradle_of_azure_moon/register", "asset:artifact/1137.over_pulse_headgear/register", "asset:artifact/1228.fatalerror/register", "asset:artifact/1273.maidchan_plush/register", @@ -295,4 +296,4 @@ "asset:artifact/1027.fire_of_rebirth/register", "asset:artifact/1111.rod_o_redeem/register" ] -} +} \ No newline at end of file From 9f7c33e6ef303863a0af267506a79f4fa473b47e Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 4 Oct 2025 00:59:54 +0900 Subject: [PATCH 02/66] =?UTF-8?q?=E5=A4=A7=E4=BD=93=E3=81=AE=E6=8C=99?= =?UTF-8?q?=E5=8B=95=E3=81=AF=E3=81=A7=E3=81=8D=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 3 + .../1061.azure_jelly/_index.d.mcfunction | 1 + .../object/1061.azure_jelly/init/.mcfunction | 2 + .../object/1061.azure_jelly/load.mcfunction | 9 ++ .../predicate/near_enemy.mcfunction | 11 +++ .../predicate/near_player.mcfunction | 11 +++ .../1061.azure_jelly/register.mcfunction | 10 ++- .../1061.azure_jelly/summon/.mcfunction | 2 +- .../object/1061.azure_jelly/tick/.mcfunction | 57 ++++++------ .../1061.azure_jelly/tick/angle/.mcfunction | 14 +++ .../tick/angle/init.mcfunction | 19 ++++ .../tick/angle/switch_up_down.mcfunction | 10 +++ .../1061.azure_jelly/tick/attack/.mcfunction | 16 ++++ .../tick/attack/vfx/circle.mcfunction | 86 +++++++++++++++++++ .../1061.azure_jelly/tick/kill.mcfunction | 12 +++ .../1061.azure_jelly/tick/move/.mcfunction | 19 ++++ .../tick/move/check.m.mcfunction | 9 ++ .../1061.azure_jelly/tick/rotate.mcfunction | 7 -- .../1061.azure_jelly/tick/sound.mcfunction | 14 +++ .../1061.azure_jelly/tick/turn/.mcfunction | 29 +++++++ .../tick/turn/far_player_no_enemy.mcfunction | 38 ++++++++ .../tick/turn/near_player_no_enemy.mcfunction | 13 +++ .../asset/tags/functions/object/load.json | 1 + 23 files changed, 349 insertions(+), 44 deletions(-) create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/load.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_player.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/switch_up_down.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check.m.mcfunction delete mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/rotate.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/sound.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/far_player_no_enemy.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/near_player_no_enemy.mcfunction diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction index a38171324e6..e701f7ee19c 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction @@ -10,3 +10,6 @@ # ここから先は神器側の効果の処理を書く # Object召喚 + data modify storage api: Argument.ID set value 1061 + execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID + function api:object/summon diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction index f7477bce04e..8bfaa4bb714 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction @@ -4,3 +4,4 @@ #> tag # @within function asset:object/1061.azure_jelly/** #declare tag 1061.Owner + #declare score_holder $Interval diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/init/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/init/.mcfunction index 7e5f0b87823..48e1cfed085 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/init/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/init/.mcfunction @@ -3,3 +3,5 @@ # Objectのinit時の処理 # # @within asset:object/alias/1061/init + + scoreboard players set @s General.Object.Tick -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/load.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/load.mcfunction new file mode 100644 index 00000000000..5e87b0332fc --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/load.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1061.azure_jelly/load +# +# Objectに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:object/load + +#> 定義類はここに +# @within function asset:object/1061.azure_jelly/** + scoreboard objectives add 1061.Pitch dummy diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction new file mode 100644 index 00000000000..4863df400fe --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1061.azure_jelly/predicate/near_enemy +# +# +# +# @within function asset:object/1061.azure_jelly/tick/turn/ + +# 敵が近くにいなければfail + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..16,limit=1] run return fail + +# 成功 + return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_player.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_player.mcfunction new file mode 100644 index 00000000000..6e81540ce06 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_player.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1061.azure_jelly/predicate/near_player +# +# +# +# @within function asset:object/1061.azure_jelly/tick/turn/ + +# プレイヤーが近くにいないならfail + execute positioned ~-6 ~ ~-6 unless entity @p[tag=1061.Owner,dx=11,dy=1,dz=11] run return fail + +# 成功 + return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction index 17ea48a2b1d..4d1bd3b2999 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -5,16 +5,18 @@ # @within function asset:object/alias/1061/register # 継承(オプション) - # data modify storage asset:object Extends append value + # data modify storage asset:object Extends append value # function asset:object/extends # 他のObjectに継承されることを許可するか (boolean) (オプション) - # data modify storage asset:object ExtendsSafe set value + # data modify storage asset:object ExtendsSafe set value # 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) data modify storage asset:object IsAbstract set value false # Tickするかどうか(boolean) (オプション) - # data modify storage asset:object IsTicking set value + # data modify storage asset:object IsTicking set value # ID (int) data modify storage asset:object ID set value 1061 # フィールド(オプション) - # data modify storage asset:object Field.myValue set value \ No newline at end of file + data modify storage asset:object Field.IsUpper set value false + data modify storage asset:object Field.Damage set value 1 + data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction index 2e2508b333b..223abe12471 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction @@ -4,4 +4,4 @@ # # @within asset:object/alias/1061/summon -summon armor_stand ~ ~ ~ {Tags:["ObjectInit"],Marker:1b,Invisible:1b,Passengers:[{id:"minecraft:item_display",Tags:["ProcessCommonTag","AutoKillWhenDieVehicle"],teleport_duration:1,item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20578}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[1f,1f,1f],translation:[0f,0f,0f]}}]} +summon armor_stand ~ ~ ~ {Tags:["ObjectInit","Friend"],Marker:1b,Invisible:1b,Passengers:[{id:"minecraft:item_display",Rotation:[90f,0f],Tags:["ProcessCommonTag","AutoKillWhenDieVehicle"],teleport_duration:1,brightness:{sky:10,block:10},item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20578}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[1f,1f,1f],translation:[0f,0f,0f]}}]} diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index b8182a3e031..d74d9c08350 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -6,51 +6,44 @@ #> Private # @private - #declare score_holder $OwnerID - #declare score_holder $Interval + #declare score_holder $UserID # OwnerにTag付与 - execute store result score $OwnerID Temporary run data get storage asset:context this.UserID - execute as @a if score @s UserID = @p UserID run tag @p add 1061.Owner - -# インターバル - #scoreboard players operation $Interval Temporary = @s General.Object.Tick - #scoreboard players operation $Interval Temporary %= $43 Const + 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 1061.Owner # Tick加算 scoreboard players add @s General.Object.Tick 1 -# 周囲にOwnerがいなければOwnerの方を向く - #execute if score $Interval Temporary matches 0 unless entity @p[tag=1061.Owner,distance=..5] facing entity @p[tag=1061.Owner] eyes run function asset:object/1061.azure_jelly/tick/forward_spread +# インターバル + scoreboard players operation $Interval Temporary = @s General.Object.Tick + scoreboard players operation $Interval Temporary %= $48 Const + +# 常時演出 + particle dust 0.267 0.729 0.945 0.9 ~ ~ ~ 0.4 0.6 0.4 0 1 normal @a -# 周囲にOwnerがいればランダムな方向を向く - #execute if score $Interval Temporary matches 0 if entity @p[tag=1061.Owner,distance=..5] run function asset:object/1061.azure_jelly/tick/random_rotate +# 攻撃 + execute if score $Interval Temporary matches 0 run function asset:object/1061.azure_jelly/tick/attack/ -# 演出 - #execute if score $Interval Temporary matches 0 at @s rotated ~ 0 run function asset:object/1061.azure_jelly/tick/vfx +# playsound + execute if score $Interval Temporary matches 0..3 run function asset:object/1061.azure_jelly/tick/sound + +# 移動方向設定 + execute if score $Interval Temporary matches 0 run function asset:object/1061.azure_jelly/tick/turn/ + +# 角度 + execute if score $Interval Temporary matches 0 at @s run function asset:object/1061.azure_jelly/tick/angle/init + execute at @s run function asset:object/1061.azure_jelly/tick/angle/ # 移動 - execute if score $Interval Temporary matches 0 at @s run tp @s ^ ^ ^ ~ -10 - #execute if score $Interval Temporary matches 0..30 at @s run tp @s ^ ^ ^0.3 ~ ~2 - execute if score $Interval Temporary matches 0..5 at @s run tp @s ^ ^ ^0.2 ~ ~-1 - execute if score $Interval Temporary matches 6..8 at @s run tp @s ^ ^ ^0.3 ~ ~-2 - execute if score $Interval Temporary matches 9..10 at @s run tp @s ^ ^ ^0.4 ~ ~-3 - execute if score $Interval Temporary matches 11..12 at @s run tp @s ^ ^ ^0.3 ~ ~-3 - execute if score $Interval Temporary matches 13..17 at @s run tp @s ^ ^ ^0.2 ~ ~2 - execute if score $Interval Temporary matches 18..21 at @s run tp @s ^ ^ ^0.2 ~ ~3 - execute if score $Interval Temporary matches 22..32 at @s run tp @s ^ ^ ^0.25 ~ ~4 - execute if score $Interval Temporary matches 33..35 at @s run tp @s ^ ^ ^0.3 ~ ~6 - execute if score $Interval Temporary matches 36..39 at @s run tp @s ^ ^ ^0.2 ~ ~6 - execute if score $Interval Temporary matches 40..42 at @s run tp @s ^ ^ ^0.1 ~ ~6 - -# 地面に接触したら上を向く - #execute at @s unless block ~ ~-0.6 ~ #lib:no_collision run function asset:object/1061.azure_jelly/tick/vfx - #execute at @s unless block ~ ~-0.6 ~ #lib:no_collision run tp @s ~ ~ ~ ~ -30 + execute at @s run function asset:object/1061.azure_jelly/tick/move/ + + #execute at @s run particle flame ^ ^ ^1 0 0 0 0 1 # リセット - scoreboard players reset $OwnerID Temporary + scoreboard players reset $UserID Temporary scoreboard players reset $Interval Temporary tag @p[tag=1061.Owner] remove 1061.Owner # 消滅処理 - execute if entity @s[scores={General.Object.Tick=600..}] run function asset:object/1061.azure_jelly/tick/kill + execute if entity @s[scores={General.Object.Tick=480..}] run function asset:object/1061.azure_jelly/tick/kill diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction new file mode 100644 index 00000000000..a3ca069d036 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/1061.azure_jelly/tick/angle/ +# +# +# +# @within function asset:object/1061.azure_jelly/tick/ + +# trueなら+200 + execute if data storage asset:context this{IsUpper:true} run scoreboard players add @s 1061.Pitch 200 + +# falseなら-100 + execute if data storage asset:context this{IsUpper:false} run scoreboard players remove @s 1061.Pitch 100 + +# -9000..9000ならRotation[1]へ代入 + execute if score @s 1061.Pitch matches -9000..9000 store result entity @s Rotation[1] float 0.01 run scoreboard players get @s 1061.Pitch diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction new file mode 100644 index 00000000000..20813ef9547 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction @@ -0,0 +1,19 @@ +#> asset:object/1061.azure_jelly/tick/angle/init +# +# +# +# @within function asset:object/1061.azure_jelly/tick/ + +# 現在のRotation[1](e2)を取得 + execute store result score @s 1061.Pitch run data get entity @s Rotation[1] 100 + +# 上下どちらの移動をするかトグルで切り替える + function asset:object/1061.azure_jelly/tick/angle/switch_up_down + +# trueなら-6000して保存しておく + execute if data storage asset:context this{IsUpper:true} run scoreboard players remove @s 1061.Pitch 6000 + +# falseなら+3000 + execute if data storage asset:context this{IsUpper:false} run scoreboard players add @s 1061.Pitch 3000 + +#tellraw @a {"storage":"asset:context","nbt":"this.IsUpper"} diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/switch_up_down.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/switch_up_down.mcfunction new file mode 100644 index 00000000000..af6365e9c75 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/switch_up_down.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1061.azure_jelly/tick/angle/switch_up_down +# +# トグルで上下どちらかにいるかを切り替える +# +# @within function asset:object/1061.azure_jelly/tick/angle/init + +# トグルでtrue/falseを切り替え + execute if data storage asset:context this{IsUpper:true} run return run data modify storage asset:context this.IsUpper set value false + + execute unless data storage asset:context this{IsUpper:true} run data modify storage asset:context this.IsUpper set value true diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction new file mode 100644 index 00000000000..261cd00343c --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction @@ -0,0 +1,16 @@ +#> asset:object/1061.azure_jelly/tick/attack/ +# +# +# +# @within function asset:object/1061.azure_jelly/tick/ + +# 演出 + execute rotated ~ 0 run function asset:object/1061.azure_jelly/tick/attack/vfx/circle + +# ダメージ + data modify storage api: Argument.Damage set from storage asset:context this.Damage + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "Water" + execute as @p[tag=1061.Owner] run function api:damage/modifier + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..4] run function api:damage/ + function api:damage/reset diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle.mcfunction new file mode 100644 index 00000000000..1fd7d88f795 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle.mcfunction @@ -0,0 +1,86 @@ +#> asset:object/1061.azure_jelly/tick/attack/vfx/circle +# +# +# +# @within function asset:object/1061.azure_jelly/tick/attack/ + +particle scrape ~ ~ ~ ^0 ^ ^-1000000 0.00003 0 +particle scrape ~ ~ ~ ^78459.09573 ^ ^-996917.33373 0.00003 0 +particle scrape ~ ~ ~ ^156434.46504 ^ ^-987688.3406 0.00003 0 +particle scrape ~ ~ ~ ^233445.36386 ^ ^-972369.9204 0.00003 0 +particle scrape ~ ~ ~ ^309016.99437 ^ ^-951056.5163 0.00003 0 +particle scrape ~ ~ ~ ^382683.43237 ^ ^-923879.53251 0.00003 0 +particle scrape ~ ~ ~ ^453990.49974 ^ ^-891006.52419 0.00003 0 +particle scrape ~ ~ ~ ^522498.56472 ^ ^-852640.16435 0.00003 0 +particle scrape ~ ~ ~ ^587785.25229 ^ ^-809016.99437 0.00003 0 +particle scrape ~ ~ ~ ^649448.04833 ^ ^-760405.9656 0.00003 0 +particle scrape ~ ~ ~ ^707106.78119 ^ ^-707106.78119 0.00003 0 +particle scrape ~ ~ ~ ^760405.9656 ^ ^-649448.04833 0.00003 0 +particle scrape ~ ~ ~ ^809016.99437 ^ ^-587785.25229 0.00003 0 +particle scrape ~ ~ ~ ^852640.16435 ^ ^-522498.56472 0.00003 0 +particle scrape ~ ~ ~ ^891006.52419 ^ ^-453990.49974 0.00003 0 +particle scrape ~ ~ ~ ^923879.53251 ^ ^-382683.43237 0.00003 0 +particle scrape ~ ~ ~ ^951056.5163 ^ ^-309016.99437 0.00003 0 +particle scrape ~ ~ ~ ^972369.9204 ^ ^-233445.36386 0.00003 0 +particle scrape ~ ~ ~ ^987688.3406 ^ ^-156434.46504 0.00003 0 +particle scrape ~ ~ ~ ^996917.33373 ^ ^-78459.09573 0.00003 0 +particle scrape ~ ~ ~ ^1000000 ^ ^0 0.00003 0 +particle scrape ~ ~ ~ ^996917.33373 ^ ^78459.09573 0.00003 0 +particle scrape ~ ~ ~ ^987688.3406 ^ ^156434.46504 0.00003 0 +particle scrape ~ ~ ~ ^972369.9204 ^ ^233445.36386 0.00003 0 +particle scrape ~ ~ ~ ^951056.5163 ^ ^309016.99437 0.00003 0 +particle scrape ~ ~ ~ ^923879.53251 ^ ^382683.43237 0.00003 0 +particle scrape ~ ~ ~ ^891006.52419 ^ ^453990.49974 0.00003 0 +particle scrape ~ ~ ~ ^852640.16435 ^ ^522498.56472 0.00003 0 +particle scrape ~ ~ ~ ^809016.99437 ^ ^587785.25229 0.00003 0 +particle scrape ~ ~ ~ ^760405.9656 ^ ^649448.04833 0.00003 0 +particle scrape ~ ~ ~ ^707106.78119 ^ ^707106.78119 0.00003 0 +particle scrape ~ ~ ~ ^649448.04833 ^ ^760405.9656 0.00003 0 +particle scrape ~ ~ ~ ^587785.25229 ^ ^809016.99437 0.00003 0 +particle scrape ~ ~ ~ ^522498.56472 ^ ^852640.16435 0.00003 0 +particle scrape ~ ~ ~ ^453990.49974 ^ ^891006.52419 0.00003 0 +particle scrape ~ ~ ~ ^382683.43237 ^ ^923879.53251 0.00003 0 +particle scrape ~ ~ ~ ^309016.99437 ^ ^951056.5163 0.00003 0 +particle scrape ~ ~ ~ ^233445.36386 ^ ^972369.9204 0.00003 0 +particle scrape ~ ~ ~ ^156434.46504 ^ ^987688.3406 0.00003 0 +particle scrape ~ ~ ~ ^78459.09573 ^ ^996917.33373 0.00003 0 +particle scrape ~ ~ ~ ^0 ^ ^1000000 0.00003 0 +particle scrape ~ ~ ~ ^-78459.09573 ^ ^996917.33373 0.00003 0 +particle scrape ~ ~ ~ ^-156434.46504 ^ ^987688.3406 0.00003 0 +particle scrape ~ ~ ~ ^-233445.36386 ^ ^972369.9204 0.00003 0 +particle scrape ~ ~ ~ ^-309016.99437 ^ ^951056.5163 0.00003 0 +particle scrape ~ ~ ~ ^-382683.43237 ^ ^923879.53251 0.00003 0 +particle scrape ~ ~ ~ ^-453990.49974 ^ ^891006.52419 0.00003 0 +particle scrape ~ ~ ~ ^-522498.56472 ^ ^852640.16435 0.00003 0 +particle scrape ~ ~ ~ ^-587785.25229 ^ ^809016.99437 0.00003 0 +particle scrape ~ ~ ~ ^-649448.04833 ^ ^760405.9656 0.00003 0 +particle scrape ~ ~ ~ ^-707106.78119 ^ ^707106.78119 0.00003 0 +particle scrape ~ ~ ~ ^-760405.9656 ^ ^649448.04833 0.00003 0 +particle scrape ~ ~ ~ ^-809016.99437 ^ ^587785.25229 0.00003 0 +particle scrape ~ ~ ~ ^-852640.16435 ^ ^522498.56472 0.00003 0 +particle scrape ~ ~ ~ ^-891006.52419 ^ ^453990.49974 0.00003 0 +particle scrape ~ ~ ~ ^-923879.53251 ^ ^382683.43237 0.00003 0 +particle scrape ~ ~ ~ ^-951056.5163 ^ ^309016.99437 0.00003 0 +particle scrape ~ ~ ~ ^-972369.9204 ^ ^233445.36386 0.00003 0 +particle scrape ~ ~ ~ ^-987688.3406 ^ ^156434.46504 0.00003 0 +particle scrape ~ ~ ~ ^-996917.33373 ^ ^78459.09573 0.00003 0 +particle scrape ~ ~ ~ ^-1000000 ^ ^0 0.00003 0 +particle scrape ~ ~ ~ ^-996917.33373 ^ ^-78459.09573 0.00003 0 +particle scrape ~ ~ ~ ^-987688.3406 ^ ^-156434.46504 0.00003 0 +particle scrape ~ ~ ~ ^-972369.9204 ^ ^-233445.36386 0.00003 0 +particle scrape ~ ~ ~ ^-951056.5163 ^ ^-309016.99437 0.00003 0 +particle scrape ~ ~ ~ ^-923879.53251 ^ ^-382683.43237 0.00003 0 +particle scrape ~ ~ ~ ^-891006.52419 ^ ^-453990.49974 0.00003 0 +particle scrape ~ ~ ~ ^-852640.16435 ^ ^-522498.56472 0.00003 0 +particle scrape ~ ~ ~ ^-809016.99437 ^ ^-587785.25229 0.00003 0 +particle scrape ~ ~ ~ ^-760405.9656 ^ ^-649448.04833 0.00003 0 +particle scrape ~ ~ ~ ^-707106.78119 ^ ^-707106.78119 0.00003 0 +particle scrape ~ ~ ~ ^-649448.04833 ^ ^-760405.9656 0.00003 0 +particle scrape ~ ~ ~ ^-587785.25229 ^ ^-809016.99437 0.00003 0 +particle scrape ~ ~ ~ ^-522498.56472 ^ ^-852640.16435 0.00003 0 +particle scrape ~ ~ ~ ^-453990.49974 ^ ^-891006.52419 0.00003 0 +particle scrape ~ ~ ~ ^-382683.43237 ^ ^-923879.53251 0.00003 0 +particle scrape ~ ~ ~ ^-309016.99437 ^ ^-951056.5163 0.00003 0 +particle scrape ~ ~ ~ ^-233445.36386 ^ ^-972369.9204 0.00003 0 +particle scrape ~ ~ ~ ^-156434.46504 ^ ^-987688.3406 0.00003 0 +particle scrape ~ ~ ~ ^-78459.09573 ^ ^-996917.33373 0.00003 0 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/kill.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/kill.mcfunction index 74ad84f3275..d8d5e37601d 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/kill.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/kill.mcfunction @@ -4,6 +4,18 @@ # # @within function asset:object/1061.azure_jelly/tick/ +# 演出 + particle scrape ~ ~1 ~ 0 0 0 6 50 normal @a + particle dust 0.267 0.729 0.945 0.9 ~ ~1 ~ 0.5 0.6 0.4 0 50 normal @a + + playsound ogg:ambient.nether.crimson_forest.shine1 player @a[distance=..12] ~ ~ ~ 0.05 1.3 + playsound entity.dolphin.jump player @a ~ ~ ~ 0.25 0.8 + playsound entity.dolphin.jump player @a ~ ~ ~ 0.25 0.85 + playsound entity.dolphin.jump player @a ~ ~ ~ 0.25 0.9 + + playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 1 2 + playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 1 1.6 + # 消滅 execute on passengers run kill @s kill @s diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction new file mode 100644 index 00000000000..25457545de9 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction @@ -0,0 +1,19 @@ +#> asset:object/1061.azure_jelly/tick/move/ +# +# +# +# @within function asset:object/1061.azure_jelly/tick/ + + execute if score $Interval Temporary matches 00..05 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.08} + execute if score $Interval Temporary matches 06..10 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.10} + execute if score $Interval Temporary matches 11..15 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.15} + execute if score $Interval Temporary matches 16..20 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.20} + execute if score $Interval Temporary matches 21..24 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.25} + execute if score $Interval Temporary matches 25..26 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.30} + + execute if score $Interval Temporary matches 27..28 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.30} + execute if score $Interval Temporary matches 29..32 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.25} + execute if score $Interval Temporary matches 33..37 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.20} + execute if score $Interval Temporary matches 38..42 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.15} + execute if score $Interval Temporary matches 43..47 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.10} + #execute if score $Interval Temporary matches 48..49 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.08} diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check.m.mcfunction new file mode 100644 index 00000000000..140237b5de2 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check.m.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1061.azure_jelly/tick/move/check.m +# +# +# +# @within function asset:object/1061.azure_jelly/tick/move/ + +# 前方が問題なかったら移動する + #$execute positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision if block ~ ~1 ~ #lib:no_collision at @s run tp @s ^ ^ ^$(Step) + $tp @s ^ ^ ^$(Step) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/rotate.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/rotate.mcfunction deleted file mode 100644 index 466e1c754f3..00000000000 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/rotate.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:object/1061.azure_jelly/tick/rotate -# -# -# -# @within function asset:object/1061.azure_jelly/tick/ - -# diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/sound.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/sound.mcfunction new file mode 100644 index 00000000000..b710297a820 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/sound.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/1061.azure_jelly/tick/sound +# +# +# +# @within function asset:object/1061.azure_jelly/tick/ + + execute if score $Interval Temporary matches 0 run playsound ogg:ambient.nether.crimson_forest.shine1 player @a[distance=..12] ~ ~ ~ 0.05 1.3 + execute if score $Interval Temporary matches 0 run playsound entity.dolphin.jump player @a ~ ~ ~ 0.20 0.8 + execute if score $Interval Temporary matches 1 run playsound entity.dolphin.jump player @a ~ ~ ~ 0.25 0.85 + execute if score $Interval Temporary matches 2 run playsound entity.dolphin.jump player @a ~ ~ ~ 0.30 0.9 + + execute if score $Interval Temporary matches 0 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 2 + execute if score $Interval Temporary matches 0 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 1.2 + execute if score $Interval Temporary matches 0 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 0.6 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction new file mode 100644 index 00000000000..0a87eeb8b55 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction @@ -0,0 +1,29 @@ +#> asset:object/1061.azure_jelly/tick/turn/ +# +# +# +# @within function asset:object/1061.azure_jelly/tick/ + +# 敵がいなければ +# - 使用者の近くならテキトーに移動する +# - 使用者が遠ければそっちへ移動する + +# 敵がいれば +# - プレイヤーから一定距離以内なら最寄りの敵の方へ移動する +# - プレイヤーから離れすぎたらプレイヤーの方へ戻る + +# 敵がいないなら + # Ownerが近くならテキトーな方向へ + execute unless function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/turn/near_player_no_enemy + + # Ownerが遠いならOwnerの方へ + #execute unless function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/rotate/far_player_no_enemy + execute unless function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player facing entity @p[tag=1061.Owner] feet run tp @s ~ ~ ~ ~ ~ + + +# 敵がいるなら + # Ownerが近くなら敵の方へ + execute if function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/turn/far_player_no_enemy + + # Ownerが遠いならOwnerの方へ + execute if function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player facing entity @p[tag=1061.Owner] feet run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/far_player_no_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/far_player_no_enemy.mcfunction new file mode 100644 index 00000000000..114f797c434 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/far_player_no_enemy.mcfunction @@ -0,0 +1,38 @@ +#> asset:object/1061.azure_jelly/tick/turn/far_player_no_enemy +# +# +# +# @within function asset:object/1061.azure_jelly/tick/turn/ + +#> Private +# @private + #declare score_holder $1061.MyY + #declare score_holder $1061.OwnerY + +# Rotation用のstorageを用意しておく + # data modify storage asset:temp 1061.Rotation set value [0f,0f] + +# Rotation[0]はテキトーな数値を入れる + # execute store result storage asset:temp 1061.Rotation[0] float 0.01 run random value 0..35999 + +#say a + +# 自身とプレイヤーのy座標を取得する + execute store result score $1061.MyY Temporary run data get entity @s Pos[1] 100 + execute as @p[tag=1061.Owner] run function api:data_get/pos + execute store result score $1061.OwnerY Temporary run data get storage api: Pos[1] 100 + +# 自身とプレイヤーのy座標の差を求める + scoreboard players operation $1061.MyY Temporary -= $1061.OwnerY Temporary + +# 差が-50..100ならRotation[1]は0とする + execute if score $1061.MyY Temporary matches -50..100 run tp @s ~ ~ ~ ~ 0 + +# 差が101以上ならOwnerの方を向く + execute if score $1061.MyY Temporary matches 101.. facing entity @p[tag=1061.Owner] feet run tp @s ~ ~ ~ ~ ~30 + +# -50未満は考慮しない + +# リセット + scoreboard players reset $1061.MyY Temporary + scoreboard players reset $1061.OwnerY Temporary diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/near_player_no_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/near_player_no_enemy.mcfunction new file mode 100644 index 00000000000..c3bcfa84b60 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/near_player_no_enemy.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1061.azure_jelly/tick/turn/near_player_no_enemy +# +# +# +# @within function asset:object/1061.azure_jelly/tick/turn/ + +# Rotation:[*,0f]にする + data modify storage asset:temp 1061.Rotation set value [0f,0f] + execute store result storage asset:temp 1061.Rotation[0] float 0.01 run random value 0..35999 + data modify entity @s Rotation set from storage asset:temp 1061.Rotation + +# リセット + data remove storage asset:temp 1061 diff --git a/Asset/data/asset/tags/functions/object/load.json b/Asset/data/asset/tags/functions/object/load.json index 7046352e616..e2c220e15ff 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/1061.azure_jelly/load", "asset:object/2251.wall_laser_clock/load", "asset:object/2212.eclael_upper_shot/load", "asset:object/2187.heiloang_ff_main/load", From 171fe0f7583f88b3d0dffef3695acf3ca7c127f7 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 4 Oct 2025 16:25:59 +0900 Subject: [PATCH 03/66] =?UTF-8?q?=E5=A3=81=E8=B2=AB=E9=80=9A=E5=AF=BE?= =?UTF-8?q?=E7=AD=96=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1061.azure_jelly/_index.d.mcfunction | 1 + .../1061.azure_jelly/register.mcfunction | 1 + .../object/1061.azure_jelly/tick/.mcfunction | 3 +- .../1061.azure_jelly/tick/move/.mcfunction | 26 +++++----- .../tick/move/check.m.mcfunction | 9 ---- .../tick/move/check_collision.m.mcfunction | 15 ++++++ .../tick/move/collision/calc_pos.m.mcfunction | 51 +++++++++++++++++++ .../tick/move/collision/move.mcfunction | 14 +++++ .../1061.azure_jelly/tick/turn/.mcfunction | 2 +- .../tick/turn/far_player_no_enemy.mcfunction | 38 -------------- 10 files changed, 99 insertions(+), 61 deletions(-) delete mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check.m.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/move.mcfunction delete mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/far_player_no_enemy.mcfunction diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction index 8bfaa4bb714..b28af52141f 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction @@ -5,3 +5,4 @@ # @within function asset:object/1061.azure_jelly/** #declare tag 1061.Owner #declare score_holder $Interval + #declare score_holder diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction index 4d1bd3b2999..a9785a0eca3 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -17,6 +17,7 @@ # ID (int) data modify storage asset:object ID set value 1061 # フィールド(オプション) + data modify storage asset:object Field.Speed set value 0.1 data modify storage asset:object Field.IsUpper set value false data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index d74d9c08350..5c035ca4250 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -17,10 +17,11 @@ # インターバル scoreboard players operation $Interval Temporary = @s General.Object.Tick - scoreboard players operation $Interval Temporary %= $48 Const + scoreboard players operation $Interval Temporary %= $50 Const # 常時演出 particle dust 0.267 0.729 0.945 0.9 ~ ~ ~ 0.4 0.6 0.4 0 1 normal @a + execute if predicate lib:random_pass_per/40 run particle scrape ~ ~ ~ 0.4 0.6 0.4 0 1 normal @a # 攻撃 execute if score $Interval Temporary matches 0 run function asset:object/1061.azure_jelly/tick/attack/ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction index 25457545de9..ba2103a12ca 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction @@ -4,16 +4,18 @@ # # @within function asset:object/1061.azure_jelly/tick/ - execute if score $Interval Temporary matches 00..05 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.08} - execute if score $Interval Temporary matches 06..10 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.10} - execute if score $Interval Temporary matches 11..15 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.15} - execute if score $Interval Temporary matches 16..20 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.20} - execute if score $Interval Temporary matches 21..24 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.25} - execute if score $Interval Temporary matches 25..26 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.30} + execute if score $Interval Temporary matches 00..03 run data modify storage asset:context this.Speed set value 0.08 + execute if score $Interval Temporary matches 04..08 run data modify storage asset:context this.Speed set value 0.10 + execute if score $Interval Temporary matches 09..13 run data modify storage asset:context this.Speed set value 0.15 + execute if score $Interval Temporary matches 14..18 run data modify storage asset:context this.Speed set value 0.20 + execute if score $Interval Temporary matches 19..22 run data modify storage asset:context this.Speed set value 0.25 + execute if score $Interval Temporary matches 23..24 run data modify storage asset:context this.Speed set value 0.30 - execute if score $Interval Temporary matches 27..28 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.30} - execute if score $Interval Temporary matches 29..32 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.25} - execute if score $Interval Temporary matches 33..37 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.20} - execute if score $Interval Temporary matches 38..42 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.15} - execute if score $Interval Temporary matches 43..47 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.10} - #execute if score $Interval Temporary matches 48..49 run function asset:object/1061.azure_jelly/tick/move/check.m {Step:0.08} + execute if score $Interval Temporary matches 25..26 run data modify storage asset:context this.Speed set value 0.30 + execute if score $Interval Temporary matches 27..30 run data modify storage asset:context this.Speed set value 0.25 + execute if score $Interval Temporary matches 31..35 run data modify storage asset:context this.Speed set value 0.20 + execute if score $Interval Temporary matches 36..40 run data modify storage asset:context this.Speed set value 0.15 + execute if score $Interval Temporary matches 41..45 run data modify storage asset:context this.Speed set value 0.10 + execute if score $Interval Temporary matches 46..49 run data modify storage asset:context this.Speed set value 0.08 + + function asset:object/1061.azure_jelly/tick/move/check_collision.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check.m.mcfunction deleted file mode 100644 index 140237b5de2..00000000000 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check.m.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:object/1061.azure_jelly/tick/move/check.m -# -# -# -# @within function asset:object/1061.azure_jelly/tick/move/ - -# 前方が問題なかったら移動する - #$execute positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision if block ~ ~1 ~ #lib:no_collision at @s run tp @s ^ ^ ^$(Step) - $tp @s ^ ^ ^$(Step) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction new file mode 100644 index 00000000000..c86b6d84078 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/1061.azure_jelly/tick/move/check_collision.m +# +# +# +# @within function asset:object/1061.azure_jelly/tick/move/ + +# 前方が問題ないか判定 + $execute positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision if block ~ ~1 ~ #lib:no_collision run data modify storage asset:temp 1061.Success set value true + +# 前方が問題ないならそのままtp、そうでないなら移動先と現在位置を比較して色々する + $execute if data storage asset:temp 1061{Success:true} run tp @s ^ ^ ^$(Speed) + $execute unless data storage asset:temp 1061{Success:true} run function asset:object/1061.azure_jelly/tick/move/collision/calc_pos.m {Speed:$(Speed)} + +# リセット + data remove storage asset:temp 1061 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction new file mode 100644 index 00000000000..8bf77e77454 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction @@ -0,0 +1,51 @@ +#> asset:object/1061.azure_jelly/tick/move/collision/calc_pos.m +# +# +# +# @within function asset:object/1061.azure_jelly/tick/move/check_collision.m + +#> Private +# @private + #declare tag TempMarker + #declare score_holder $1061.MyX + #declare score_holder $1061.MyY + #declare score_holder $1061.MyZ + #declare score_holder $1061.TargetX + #declare score_holder $1061.TargetY + #declare score_holder $1061.TargetZ + +# 自身の座標をstorageへ + data modify storage asset:temp 1061.MyPos set from entity @s Pos + +# 移動先にMarkerを召喚し、その座標をstorageへ + $summon marker ^ ^ ^$(Speed) {Tags:["TempMarker"]} + execute as @e[type=marker,tag=TempMarker,distance=..3] run data modify storage asset:temp 1061.TargetPos set from entity @s Pos + +# 自身の座標と移動先のx,y,zをそれぞれ取得 + execute store result score $1061.MyX Temporary run data get storage asset:temp 1061.MyPos[0] 100 + execute store result score $1061.MyY Temporary run data get storage asset:temp 1061.MyPos[1] 100 + execute store result score $1061.MyZ Temporary run data get storage asset:temp 1061.MyPos[2] 100 + + execute store result score $1061.TargetX Temporary run data get storage asset:temp 1061.TargetPos[0] 100 + execute store result score $1061.TargetY Temporary run data get storage asset:temp 1061.TargetPos[1] 100 + execute store result score $1061.TargetZ Temporary run data get storage asset:temp 1061.TargetPos[2] 100 + +# 差を比較し、storageへ突っ込む + execute store result storage asset:temp 1061.X float 0.01 run scoreboard players operation $1061.TargetX Temporary -= $1061.MyX Temporary + execute store result storage asset:temp 1061.Y float 0.01 run scoreboard players operation $1061.TargetY Temporary -= $1061.MyY Temporary + execute store result storage asset:temp 1061.Z float 0.01 run scoreboard players operation $1061.TargetZ Temporary -= $1061.MyZ Temporary + +# Speedをstorageに入れておく + # $data modify storage asset:temp 1061.Speed $(Speed) + +# マクロでstorageに突っ込んだxyzでそれぞれ現座標に+したとき、そこが埋まってるなら0とする、埋まってないならそのまま移動 + function asset:object/1061.azure_jelly/tick/move/collision/move with storage asset:temp 1061 + +# リセット + kill @e[type=marker,tag=TempMarker,distance=..3] + scoreboard players reset $1061.MyX Temporary + scoreboard players reset $1061.MyY Temporary + scoreboard players reset $1061.MyZ Temporary + scoreboard players reset $1061.TargetX Temporary + scoreboard players reset $1061.TargetY Temporary + scoreboard players reset $1061.TargetZ Temporary diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/move.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/move.mcfunction new file mode 100644 index 00000000000..62efb03d38d --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/move.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/1061.azure_jelly/tick/move/collision/move +# +# +# +# @within function asset:object/1061.azure_jelly/tick/move/collision/calc_pos.m + +# X軸判定 + $execute if block ~$(X) ~ ~ #lib:no_collision run tp @s ~$(X) ~ ~ + +# Y軸判定 + $execute at @s if block ~ ~$(Y) ~ #lib:no_collision run tp @s ~ ~$(Y) ~ + +# Z軸判定 + $execute at @s if block ~ ~ ~$(Z) #lib:no_collision run tp @s ~ ~ ~$(Z) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction index 0a87eeb8b55..74183cb31dc 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction @@ -23,7 +23,7 @@ # 敵がいるなら # Ownerが近くなら敵の方へ - execute if function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/turn/far_player_no_enemy + #execute if function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/turn/far_player_no_enemy # Ownerが遠いならOwnerの方へ execute if function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player facing entity @p[tag=1061.Owner] feet run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/far_player_no_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/far_player_no_enemy.mcfunction deleted file mode 100644 index 114f797c434..00000000000 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/far_player_no_enemy.mcfunction +++ /dev/null @@ -1,38 +0,0 @@ -#> asset:object/1061.azure_jelly/tick/turn/far_player_no_enemy -# -# -# -# @within function asset:object/1061.azure_jelly/tick/turn/ - -#> Private -# @private - #declare score_holder $1061.MyY - #declare score_holder $1061.OwnerY - -# Rotation用のstorageを用意しておく - # data modify storage asset:temp 1061.Rotation set value [0f,0f] - -# Rotation[0]はテキトーな数値を入れる - # execute store result storage asset:temp 1061.Rotation[0] float 0.01 run random value 0..35999 - -#say a - -# 自身とプレイヤーのy座標を取得する - execute store result score $1061.MyY Temporary run data get entity @s Pos[1] 100 - execute as @p[tag=1061.Owner] run function api:data_get/pos - execute store result score $1061.OwnerY Temporary run data get storage api: Pos[1] 100 - -# 自身とプレイヤーのy座標の差を求める - scoreboard players operation $1061.MyY Temporary -= $1061.OwnerY Temporary - -# 差が-50..100ならRotation[1]は0とする - execute if score $1061.MyY Temporary matches -50..100 run tp @s ~ ~ ~ ~ 0 - -# 差が101以上ならOwnerの方を向く - execute if score $1061.MyY Temporary matches 101.. facing entity @p[tag=1061.Owner] feet run tp @s ~ ~ ~ ~ ~30 - -# -50未満は考慮しない - -# リセット - scoreboard players reset $1061.MyY Temporary - scoreboard players reset $1061.OwnerY Temporary From 388148b643f5b187a40671c5db9402dbed3f12c8 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 4 Oct 2025 16:29:07 +0900 Subject: [PATCH 04/66] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=95?= =?UTF-8?q?=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1061.azure_jelly/register.mcfunction | 1 - .../1061.azure_jelly/tick/move/.mcfunction | 26 +++++++++---------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction index a9785a0eca3..4d1bd3b2999 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -17,7 +17,6 @@ # ID (int) data modify storage asset:object ID set value 1061 # フィールド(オプション) - data modify storage asset:object Field.Speed set value 0.1 data modify storage asset:object Field.IsUpper set value false data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction index ba2103a12ca..54340cc3aa8 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction @@ -4,18 +4,16 @@ # # @within function asset:object/1061.azure_jelly/tick/ - execute if score $Interval Temporary matches 00..03 run data modify storage asset:context this.Speed set value 0.08 - execute if score $Interval Temporary matches 04..08 run data modify storage asset:context this.Speed set value 0.10 - execute if score $Interval Temporary matches 09..13 run data modify storage asset:context this.Speed set value 0.15 - execute if score $Interval Temporary matches 14..18 run data modify storage asset:context this.Speed set value 0.20 - execute if score $Interval Temporary matches 19..22 run data modify storage asset:context this.Speed set value 0.25 - execute if score $Interval Temporary matches 23..24 run data modify storage asset:context this.Speed set value 0.30 + execute if score $Interval Temporary matches 00..03 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.08} + execute if score $Interval Temporary matches 04..08 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.10} + execute if score $Interval Temporary matches 09..13 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.15} + execute if score $Interval Temporary matches 14..18 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.20} + execute if score $Interval Temporary matches 19..22 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.25} + execute if score $Interval Temporary matches 23..24 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.30} - execute if score $Interval Temporary matches 25..26 run data modify storage asset:context this.Speed set value 0.30 - execute if score $Interval Temporary matches 27..30 run data modify storage asset:context this.Speed set value 0.25 - execute if score $Interval Temporary matches 31..35 run data modify storage asset:context this.Speed set value 0.20 - execute if score $Interval Temporary matches 36..40 run data modify storage asset:context this.Speed set value 0.15 - execute if score $Interval Temporary matches 41..45 run data modify storage asset:context this.Speed set value 0.10 - execute if score $Interval Temporary matches 46..49 run data modify storage asset:context this.Speed set value 0.08 - - function asset:object/1061.azure_jelly/tick/move/check_collision.m with storage asset:context this + execute if score $Interval Temporary matches 25..26 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.30} + execute if score $Interval Temporary matches 27..30 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.25} + execute if score $Interval Temporary matches 31..35 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.20} + execute if score $Interval Temporary matches 36..40 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.15} + execute if score $Interval Temporary matches 41..45 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.10} + execute if score $Interval Temporary matches 46..49 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.08} From 686437a65032f0311f6a3494a0260240cd712dac Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 4 Oct 2025 18:39:32 +0900 Subject: [PATCH 05/66] =?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 --- .../predicate/far_player.mcfunction | 11 +++++++++++ .../object/1061.azure_jelly/summon/.mcfunction | 2 +- .../object/1061.azure_jelly/tick/.mcfunction | 5 ++++- .../1061.azure_jelly/tick/angle/.mcfunction | 2 +- .../1061.azure_jelly/tick/angle/init.mcfunction | 2 +- .../1061.azure_jelly/tick/attack/.mcfunction | 2 +- .../tick/move/check_collision.m.mcfunction | 2 +- .../1061.azure_jelly/tick/turn/.mcfunction | 16 ++++++++-------- .../tick/turn/chase_enemy.mcfunction | 8 ++++++++ 9 files changed, 36 insertions(+), 14 deletions(-) create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction new file mode 100644 index 00000000000..c000e9e0c16 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1061.azure_jelly/predicate/far_player +# +# +# +# @within function asset:object/1061.azure_jelly/tick/turn/ + +# プレイヤーが近くにいたらfail + execute if entity @p[tag=1061.Owner,distance=..32] run return fail + +# 成功 + return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction index 223abe12471..71e616034d8 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction @@ -4,4 +4,4 @@ # # @within asset:object/alias/1061/summon -summon armor_stand ~ ~ ~ {Tags:["ObjectInit","Friend"],Marker:1b,Invisible:1b,Passengers:[{id:"minecraft:item_display",Rotation:[90f,0f],Tags:["ProcessCommonTag","AutoKillWhenDieVehicle"],teleport_duration:1,brightness:{sky:10,block:10},item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20578}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[1f,1f,1f],translation:[0f,0f,0f]}}]} +summon armor_stand ~ ~ ~ {Tags:["ObjectInit","Friend"],Marker:1b,Invisible:1b,Passengers:[{id:"minecraft:item_display",Rotation:[90f,0f],Tags:["ProcessCommonTag","AutoKillWhenDieVehicle"],teleport_duration:1,brightness:{sky:10,block:10},item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20578}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[1f,1f,1f],translation:[0f,-0.5f,0f]}}]} diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index 5c035ca4250..ed41fed9acf 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -32,6 +32,9 @@ # 移動方向設定 execute if score $Interval Temporary matches 0 run function asset:object/1061.azure_jelly/tick/turn/ +# 追跡 + execute at @s run function asset:object/1061.azure_jelly/tick/chase/ + # 角度 execute if score $Interval Temporary matches 0 at @s run function asset:object/1061.azure_jelly/tick/angle/init execute at @s run function asset:object/1061.azure_jelly/tick/angle/ @@ -39,7 +42,7 @@ # 移動 execute at @s run function asset:object/1061.azure_jelly/tick/move/ - #execute at @s run particle flame ^ ^ ^1 0 0 0 0 1 + execute at @s run particle flame ^ ^ ^ 0 0 0 0 1 # リセット scoreboard players reset $UserID Temporary diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction index a3ca069d036..78f0c6bfd5f 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction @@ -8,7 +8,7 @@ execute if data storage asset:context this{IsUpper:true} run scoreboard players add @s 1061.Pitch 200 # falseなら-100 - execute if data storage asset:context this{IsUpper:false} run scoreboard players remove @s 1061.Pitch 100 + execute if data storage asset:context this{IsUpper:false} run scoreboard players remove @s 1061.Pitch 50 # -9000..9000ならRotation[1]へ代入 execute if score @s 1061.Pitch matches -9000..9000 store result entity @s Rotation[1] float 0.01 run scoreboard players get @s 1061.Pitch diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction index 20813ef9547..69f4d9070c9 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction @@ -14,6 +14,6 @@ execute if data storage asset:context this{IsUpper:true} run scoreboard players remove @s 1061.Pitch 6000 # falseなら+3000 - execute if data storage asset:context this{IsUpper:false} run scoreboard players add @s 1061.Pitch 3000 + execute if data storage asset:context this{IsUpper:false} run scoreboard players add @s 1061.Pitch 1500 #tellraw @a {"storage":"asset:context","nbt":"this.IsUpper"} diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction index 261cd00343c..53dd3f188a3 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction @@ -12,5 +12,5 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Water" execute as @p[tag=1061.Owner] run function api:damage/modifier - execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..4] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..5] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction index c86b6d84078..228acbb7f5d 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/move/ # 前方が問題ないか判定 - $execute positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision if block ~ ~1 ~ #lib:no_collision run data modify storage asset:temp 1061.Success set value true + $execute positioned ^ ^ ^$(Speed) if block ~ ~-1.5 ~ #lib:no_collision if block ~ ~-0.5 ~ #lib:no_collision run data modify storage asset:temp 1061.Success set value true # 前方が問題ないならそのままtp、そうでないなら移動先と現在位置を比較して色々する $execute if data storage asset:temp 1061{Success:true} run tp @s ^ ^ ^$(Speed) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction index 74183cb31dc..1d78c7795d8 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction @@ -9,21 +9,21 @@ # - 使用者が遠ければそっちへ移動する # 敵がいれば -# - プレイヤーから一定距離以内なら最寄りの敵の方へ移動する -# - プレイヤーから離れすぎたらプレイヤーの方へ戻る +# - プレイヤーから「離れていないなら」最寄りの敵の方へ移動する +# - プレイヤーから「離れているなら」プレイヤーの方へ戻る + +# プレイヤー # 敵がいないなら # Ownerが近くならテキトーな方向へ execute unless function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/turn/near_player_no_enemy # Ownerが遠いならOwnerの方へ - #execute unless function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/rotate/far_player_no_enemy - execute unless function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player facing entity @p[tag=1061.Owner] feet run tp @s ~ ~ ~ ~ ~ + execute unless function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player facing entity @p[tag=1061.Owner] eyes run tp @s ~ ~ ~ ~ ~ # 敵がいるなら - # Ownerが近くなら敵の方へ - #execute if function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/turn/far_player_no_enemy - + # Ownerが遠くなければ敵の方へ + execute if function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/far_player run function asset:object/1061.azure_jelly/tick/turn/chase_enemy # Ownerが遠いならOwnerの方へ - execute if function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player facing entity @p[tag=1061.Owner] feet run tp @s ~ ~ ~ ~ ~ + execute if function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/far_player facing entity @p[tag=1061.Owner] eyes run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction new file mode 100644 index 00000000000..cdc5975f0e0 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1061.azure_jelly/tick/turn/chase_enemy +# +# +# +# @within function asset:object/1061.azure_jelly/tick/turn/ + +# 最寄りの敵の方を見る + tp @s ~ ~ ~ facing entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..16,sort=nearest,limit=1] eyes From 189308b9977cbfe153f887c964f9a7e3eaff6ad6 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 4 Oct 2025 19:38:20 +0900 Subject: [PATCH 06/66] =?UTF-8?q?#lib:no=5Fcollision/=E3=81=AB=E7=BD=AE?= =?UTF-8?q?=E3=81=8D=E6=8F=9B=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1061.azure_jelly/tick/move/check_collision.m.mcfunction | 2 +- .../1061.azure_jelly/tick/move/collision/move.mcfunction | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction index 228acbb7f5d..e28e8da9e1f 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/move/ # 前方が問題ないか判定 - $execute positioned ^ ^ ^$(Speed) if block ~ ~-1.5 ~ #lib:no_collision if block ~ ~-0.5 ~ #lib:no_collision run data modify storage asset:temp 1061.Success set value true + $execute positioned ^ ^ ^$(Speed) if block ~ ~-1.5 ~ #lib:no_collision/ if block ~ ~-0.5 ~ #lib:no_collision/ run data modify storage asset:temp 1061.Success set value true # 前方が問題ないならそのままtp、そうでないなら移動先と現在位置を比較して色々する $execute if data storage asset:temp 1061{Success:true} run tp @s ^ ^ ^$(Speed) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/move.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/move.mcfunction index 62efb03d38d..04c0ca6646e 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/move.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/move.mcfunction @@ -5,10 +5,10 @@ # @within function asset:object/1061.azure_jelly/tick/move/collision/calc_pos.m # X軸判定 - $execute if block ~$(X) ~ ~ #lib:no_collision run tp @s ~$(X) ~ ~ + $execute if block ~$(X) ~ ~ #lib:no_collision/ run tp @s ~$(X) ~ ~ # Y軸判定 - $execute at @s if block ~ ~$(Y) ~ #lib:no_collision run tp @s ~ ~$(Y) ~ + $execute at @s if block ~ ~$(Y) ~ #lib:no_collision/ run tp @s ~ ~$(Y) ~ # Z軸判定 - $execute at @s if block ~ ~ ~$(Z) #lib:no_collision run tp @s ~ ~ ~$(Z) + $execute at @s if block ~ ~ ~$(Z) #lib:no_collision/ run tp @s ~ ~ ~$(Z) From 179f2bb33448aa49bf18edacb23226d7ca64b15c Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 4 Oct 2025 19:59:12 +0900 Subject: [PATCH 07/66] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0?= =?UTF-8?q?=E7=94=A8=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=82=92=E3=82=B3?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=A2=E3=82=A6=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/object/1061.azure_jelly/tick/.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index ed41fed9acf..b19cd4d4552 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -33,7 +33,7 @@ execute if score $Interval Temporary matches 0 run function asset:object/1061.azure_jelly/tick/turn/ # 追跡 - execute at @s run function asset:object/1061.azure_jelly/tick/chase/ + #execute at @s run function asset:object/1061.azure_jelly/tick/chase/ # 角度 execute if score $Interval Temporary matches 0 at @s run function asset:object/1061.azure_jelly/tick/angle/init @@ -42,7 +42,7 @@ # 移動 execute at @s run function asset:object/1061.azure_jelly/tick/move/ - execute at @s run particle flame ^ ^ ^ 0 0 0 0 1 + #execute at @s run particle flame ^ ^ ^ 0 0 0 0 1 # リセット scoreboard players reset $UserID Temporary From d0eac88cf7097efc85a656d29ec24e45fccab15e Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 5 Oct 2025 14:13:18 +0900 Subject: [PATCH 08/66] =?UTF-8?q?=E5=8F=AC=E5=96=9A=E6=99=82=E6=BC=94?= =?UTF-8?q?=E5=87=BA=E3=81=AE=E3=81=AF=E3=81=98=E3=82=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/init/.mcfunction | 1 + .../1061.azure_jelly/predicate/collision.mcfunction | 13 +++++++++++++ .../object/1061.azure_jelly/register.mcfunction | 1 + .../object/1061.azure_jelly/tick/.mcfunction | 13 +++++++++---- .../tick/move/check_collision.m.mcfunction | 2 +- .../tick/move/collision/calc_pos.m.mcfunction | 2 +- 6 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/init/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/init/.mcfunction index 48e1cfed085..5655504d908 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/init/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/init/.mcfunction @@ -4,4 +4,5 @@ # # @within asset:object/alias/1061/init +# 初期化 scoreboard players set @s General.Object.Tick -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction new file mode 100644 index 00000000000..d7db491513a --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1061.azure_jelly/predicate/collision +# +# +# +# @within function asset:object/1061.azure_jelly/tick/move/check_collision.m + +# 判定 + execute unless block ~ ~ ~ #lib:no_collision/ run return fail + execute unless block ~ ~0.5 ~ #lib:no_collision/ run return fail + execute unless block ~ ~1.0 ~ #lib:no_collision/ run return fail + +# 成功 + return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction index 4d1bd3b2999..e7d46401990 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -17,6 +17,7 @@ # ID (int) data modify storage asset:object ID set value 1061 # フィールド(オプション) + data modify storage asset:object Field.First set value true data modify storage asset:object Field.IsUpper set value false data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index b19cd4d4552..1408f938b98 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -8,6 +8,15 @@ # @private #declare score_holder $UserID +# 常時演出 + particle dust 0.267 0.729 0.945 0.9 ~ ~ ~ 0.4 0.6 0.4 0 1 normal @a + execute if predicate lib:random_pass_per/40 run particle scrape ~ ~ ~ 0.4 0.6 0.4 0 1 normal @a + +# 召喚演出 + +# 召喚演出中はreturn + execute if data storage asset:context this{IsFirst:true} run return fail + # 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 1061.Owner @@ -19,10 +28,6 @@ scoreboard players operation $Interval Temporary = @s General.Object.Tick scoreboard players operation $Interval Temporary %= $50 Const -# 常時演出 - particle dust 0.267 0.729 0.945 0.9 ~ ~ ~ 0.4 0.6 0.4 0 1 normal @a - execute if predicate lib:random_pass_per/40 run particle scrape ~ ~ ~ 0.4 0.6 0.4 0 1 normal @a - # 攻撃 execute if score $Interval Temporary matches 0 run function asset:object/1061.azure_jelly/tick/attack/ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction index e28e8da9e1f..cbd0ae8d5b7 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/move/ # 前方が問題ないか判定 - $execute positioned ^ ^ ^$(Speed) if block ~ ~-1.5 ~ #lib:no_collision/ if block ~ ~-0.5 ~ #lib:no_collision/ run data modify storage asset:temp 1061.Success set value true + $execute positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/collision run data modify storage asset:temp 1061.Success set value true # 前方が問題ないならそのままtp、そうでないなら移動先と現在位置を比較して色々する $execute if data storage asset:temp 1061{Success:true} run tp @s ^ ^ ^$(Speed) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction index 8bf77e77454..97f223218eb 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction @@ -38,7 +38,7 @@ # Speedをstorageに入れておく # $data modify storage asset:temp 1061.Speed $(Speed) -# マクロでstorageに突っ込んだxyzでそれぞれ現座標に+したとき、そこが埋まってるなら0とする、埋まってないならそのまま移動 +# マクロでstorageに突っ込んだxyzでそれぞれ現座標に+したとき、埋まってないならそのまま移動 function asset:object/1061.azure_jelly/tick/move/collision/move with storage asset:temp 1061 # リセット From 5d3405d10428834d51a98023a9c28f7b9e6dbb52 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 5 Oct 2025 17:18:02 +0900 Subject: [PATCH 09/66] =?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 --- .../tick/angle/init.mcfunction | 2 -- .../1061.azure_jelly/tick/attack/.mcfunction | 2 +- .../tick/move/check_collision.m.mcfunction | 8 +++-- .../tick/move/collision/calc_pos.m.mcfunction | 36 +++++++++++-------- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction index 69f4d9070c9..3e9e18bc261 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction @@ -15,5 +15,3 @@ # falseなら+3000 execute if data storage asset:context this{IsUpper:false} run scoreboard players add @s 1061.Pitch 1500 - -#tellraw @a {"storage":"asset:context","nbt":"this.IsUpper"} diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction index 53dd3f188a3..b8b4a0f9a2d 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction @@ -12,5 +12,5 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Water" execute as @p[tag=1061.Owner] run function api:damage/modifier - execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction index cbd0ae8d5b7..91d0cf2a4c5 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction @@ -7,9 +7,13 @@ # 前方が問題ないか判定 $execute positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/collision run data modify storage asset:temp 1061.Success set value true -# 前方が問題ないならそのままtp、そうでないなら移動先と現在位置を比較して色々する +# 前方が問題ないならそのままtp $execute if data storage asset:temp 1061{Success:true} run tp @s ^ ^ ^$(Speed) - $execute unless data storage asset:temp 1061{Success:true} run function asset:object/1061.azure_jelly/tick/move/collision/calc_pos.m {Speed:$(Speed)} + +# そうでないならSpeedの半分を引数として色々する + $execute unless data storage asset:temp 1061{Success:true} run data modify storage asset:temp 1061.Speed set value $(Speed) + execute unless data storage asset:temp 1061{Success:true} store result storage asset:temp 1061.Speed float 0.005 run data get storage asset:temp 1061.Speed 100 + execute unless data storage asset:temp 1061{Success:true} run function asset:object/1061.azure_jelly/tick/move/collision/calc_pos.m with storage asset:temp 1061 # リセット data remove storage asset:temp 1061 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction index 97f223218eb..99b7586b03b 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction @@ -18,28 +18,34 @@ data modify storage asset:temp 1061.MyPos set from entity @s Pos # 移動先にMarkerを召喚し、その座標をstorageへ - $summon marker ^ ^ ^$(Speed) {Tags:["TempMarker"]} - execute as @e[type=marker,tag=TempMarker,distance=..3] run data modify storage asset:temp 1061.TargetPos set from entity @s Pos + #$summon marker ^ ^ ^$(Speed) {Tags:["TempMarker"]} + #execute as @e[type=marker,tag=TempMarker,distance=..3] run data modify storage asset:temp 1061.TargetPos set from entity @s Pos + +# y + $execute positioned ^ ^ ^$(Speed) rotated ~180 ~ positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ + +# x + $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned 0.0 ~ ~ positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ + +# z + $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned ~ ~ 0.0 positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision at @s run tp @s ~ ~ ~ # 自身の座標と移動先のx,y,zをそれぞれ取得 - execute store result score $1061.MyX Temporary run data get storage asset:temp 1061.MyPos[0] 100 - execute store result score $1061.MyY Temporary run data get storage asset:temp 1061.MyPos[1] 100 - execute store result score $1061.MyZ Temporary run data get storage asset:temp 1061.MyPos[2] 100 + # execute store result score $1061.MyX Temporary run data get storage asset:temp 1061.MyPos[0] 100 + # execute store result score $1061.MyY Temporary run data get storage asset:temp 1061.MyPos[1] 100 + # execute store result score $1061.MyZ Temporary run data get storage asset:temp 1061.MyPos[2] 100 - execute store result score $1061.TargetX Temporary run data get storage asset:temp 1061.TargetPos[0] 100 - execute store result score $1061.TargetY Temporary run data get storage asset:temp 1061.TargetPos[1] 100 - execute store result score $1061.TargetZ Temporary run data get storage asset:temp 1061.TargetPos[2] 100 + # execute store result score $1061.TargetX Temporary run data get storage asset:temp 1061.TargetPos[0] 100 + # execute store result score $1061.TargetY Temporary run data get storage asset:temp 1061.TargetPos[1] 100 + # execute store result score $1061.TargetZ Temporary run data get storage asset:temp 1061.TargetPos[2] 100 # 差を比較し、storageへ突っ込む - execute store result storage asset:temp 1061.X float 0.01 run scoreboard players operation $1061.TargetX Temporary -= $1061.MyX Temporary - execute store result storage asset:temp 1061.Y float 0.01 run scoreboard players operation $1061.TargetY Temporary -= $1061.MyY Temporary - execute store result storage asset:temp 1061.Z float 0.01 run scoreboard players operation $1061.TargetZ Temporary -= $1061.MyZ Temporary - -# Speedをstorageに入れておく - # $data modify storage asset:temp 1061.Speed $(Speed) + # execute store result storage asset:temp 1061.X float 0.01 run scoreboard players operation $1061.TargetX Temporary -= $1061.MyX Temporary + # execute store result storage asset:temp 1061.Y float 0.01 run scoreboard players operation $1061.TargetY Temporary -= $1061.MyY Temporary + # execute store result storage asset:temp 1061.Z float 0.01 run scoreboard players operation $1061.TargetZ Temporary -= $1061.MyZ Temporary # マクロでstorageに突っ込んだxyzでそれぞれ現座標に+したとき、埋まってないならそのまま移動 - function asset:object/1061.azure_jelly/tick/move/collision/move with storage asset:temp 1061 + #function asset:object/1061.azure_jelly/tick/move/collision/move with storage asset:temp 1061 # リセット kill @e[type=marker,tag=TempMarker,distance=..3] From 7037c7762f0118592204399e1b41ac4bd9e6f64d Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 5 Oct 2025 17:39:44 +0900 Subject: [PATCH 10/66] =?UTF-8?q?=E5=90=84=E3=83=99=E3=82=AF=E3=83=88?= =?UTF-8?q?=E3=83=AB=E3=81=A7=E5=88=A4=E5=AE=9A=E3=81=99=E3=82=8B=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=82=92=E8=BB=BD=E9=87=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/move/check_collision.m.mcfunction | 2 +- .../tick/move/collision/calc_pos.m.mcfunction | 57 ------------------- .../tick/move/collision/move.mcfunction | 14 ----- .../tick/move/with_collision.mcfunction | 14 +++++ 4 files changed, 15 insertions(+), 72 deletions(-) delete mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction delete mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/move.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction index 91d0cf2a4c5..badef3ec528 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction @@ -13,7 +13,7 @@ # そうでないならSpeedの半分を引数として色々する $execute unless data storage asset:temp 1061{Success:true} run data modify storage asset:temp 1061.Speed set value $(Speed) execute unless data storage asset:temp 1061{Success:true} store result storage asset:temp 1061.Speed float 0.005 run data get storage asset:temp 1061.Speed 100 - execute unless data storage asset:temp 1061{Success:true} run function asset:object/1061.azure_jelly/tick/move/collision/calc_pos.m with storage asset:temp 1061 + execute unless data storage asset:temp 1061{Success:true} run function asset:object/1061.azure_jelly/tick/move/with_collision with storage asset:temp 1061 # リセット data remove storage asset:temp 1061 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction deleted file mode 100644 index 99b7586b03b..00000000000 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/calc_pos.m.mcfunction +++ /dev/null @@ -1,57 +0,0 @@ -#> asset:object/1061.azure_jelly/tick/move/collision/calc_pos.m -# -# -# -# @within function asset:object/1061.azure_jelly/tick/move/check_collision.m - -#> Private -# @private - #declare tag TempMarker - #declare score_holder $1061.MyX - #declare score_holder $1061.MyY - #declare score_holder $1061.MyZ - #declare score_holder $1061.TargetX - #declare score_holder $1061.TargetY - #declare score_holder $1061.TargetZ - -# 自身の座標をstorageへ - data modify storage asset:temp 1061.MyPos set from entity @s Pos - -# 移動先にMarkerを召喚し、その座標をstorageへ - #$summon marker ^ ^ ^$(Speed) {Tags:["TempMarker"]} - #execute as @e[type=marker,tag=TempMarker,distance=..3] run data modify storage asset:temp 1061.TargetPos set from entity @s Pos - -# y - $execute positioned ^ ^ ^$(Speed) rotated ~180 ~ positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ ~ ~ - -# x - $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned 0.0 ~ ~ positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ - -# z - $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned ~ ~ 0.0 positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision at @s run tp @s ~ ~ ~ - -# 自身の座標と移動先のx,y,zをそれぞれ取得 - # execute store result score $1061.MyX Temporary run data get storage asset:temp 1061.MyPos[0] 100 - # execute store result score $1061.MyY Temporary run data get storage asset:temp 1061.MyPos[1] 100 - # execute store result score $1061.MyZ Temporary run data get storage asset:temp 1061.MyPos[2] 100 - - # execute store result score $1061.TargetX Temporary run data get storage asset:temp 1061.TargetPos[0] 100 - # execute store result score $1061.TargetY Temporary run data get storage asset:temp 1061.TargetPos[1] 100 - # execute store result score $1061.TargetZ Temporary run data get storage asset:temp 1061.TargetPos[2] 100 - -# 差を比較し、storageへ突っ込む - # execute store result storage asset:temp 1061.X float 0.01 run scoreboard players operation $1061.TargetX Temporary -= $1061.MyX Temporary - # execute store result storage asset:temp 1061.Y float 0.01 run scoreboard players operation $1061.TargetY Temporary -= $1061.MyY Temporary - # execute store result storage asset:temp 1061.Z float 0.01 run scoreboard players operation $1061.TargetZ Temporary -= $1061.MyZ Temporary - -# マクロでstorageに突っ込んだxyzでそれぞれ現座標に+したとき、埋まってないならそのまま移動 - #function asset:object/1061.azure_jelly/tick/move/collision/move with storage asset:temp 1061 - -# リセット - kill @e[type=marker,tag=TempMarker,distance=..3] - scoreboard players reset $1061.MyX Temporary - scoreboard players reset $1061.MyY Temporary - scoreboard players reset $1061.MyZ Temporary - scoreboard players reset $1061.TargetX Temporary - scoreboard players reset $1061.TargetY Temporary - scoreboard players reset $1061.TargetZ Temporary diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/move.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/move.mcfunction deleted file mode 100644 index 04c0ca6646e..00000000000 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/collision/move.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:object/1061.azure_jelly/tick/move/collision/move -# -# -# -# @within function asset:object/1061.azure_jelly/tick/move/collision/calc_pos.m - -# X軸判定 - $execute if block ~$(X) ~ ~ #lib:no_collision/ run tp @s ~$(X) ~ ~ - -# Y軸判定 - $execute at @s if block ~ ~$(Y) ~ #lib:no_collision/ run tp @s ~ ~$(Y) ~ - -# Z軸判定 - $execute at @s if block ~ ~ ~$(Z) #lib:no_collision/ run tp @s ~ ~ ~$(Z) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction new file mode 100644 index 00000000000..f6acd3becd8 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/1061.azure_jelly/tick/move/with_collision +# +# +# +# @within function asset:object/1061.azure_jelly/tick/move/check_collision.m + +# x + $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned 0.0 ~ ~ positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ + +# y + $execute positioned ^ ^ ^$(Speed) rotated ~180 ~ positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ + +# z + $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned ~ ~ 0.0 positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ From ae65790ef5dbf7aef846291d1834d1dd457711ad Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 6 Oct 2025 00:01:56 +0900 Subject: [PATCH 11/66] =?UTF-8?q?=E8=AB=B8=E3=80=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 2 +- .../predicate/collision.mcfunction | 4 +++ .../predicate/near_enemy.mcfunction | 4 +-- .../predicate/near_player.mcfunction | 2 +- .../1061.azure_jelly/register.mcfunction | 4 +-- .../1061.azure_jelly/summon/.mcfunction | 6 +++- .../1061.azure_jelly/summon/m.mcfunction | 7 ++++ .../object/1061.azure_jelly/tick/.mcfunction | 9 ++--- .../tick/move/check_collision.m.mcfunction | 7 ++-- .../tick/summon_effect/.mcfunction | 33 +++++++++++++++++++ .../tick/summon_effect/end.mcfunction | 9 +++++ .../tick/summon_effect/vfx.mcfunction | 15 +++++++++ .../1061.azure_jelly/tick/turn/.mcfunction | 1 - .../tick/turn/chase_enemy.mcfunction | 13 ++++++-- 14 files changed, 100 insertions(+), 16 deletions(-) create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/summon/m.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/end.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/vfx.mcfunction diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction index e701f7ee19c..e76a41679f0 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction @@ -12,4 +12,4 @@ # Object召喚 data modify storage api: Argument.ID set value 1061 execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID - function api:object/summon + execute anchored eyes rotated ~ 0 positioned ^ ^-1 ^1.5 run function api:object/summon diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction index d7db491513a..a9238c2967e 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction @@ -8,6 +8,10 @@ execute unless block ~ ~ ~ #lib:no_collision/ run return fail execute unless block ~ ~0.5 ~ #lib:no_collision/ run return fail execute unless block ~ ~1.0 ~ #lib:no_collision/ run return fail + execute unless block ~0.25 ~1.0 ~0.25 #lib:no_collision/ run return fail + execute unless block ~0.25 ~1.0 ~-0.25 #lib:no_collision/ run return fail + execute unless block ~-0.25 ~1.0 ~0.25 #lib:no_collision/ run return fail + execute unless block ~-0.25 ~1.0 ~-0.25 #lib:no_collision/ run return fail # 成功 return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction index 4863df400fe..34a38a1a91b 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction @@ -4,8 +4,8 @@ # # @within function asset:object/1061.azure_jelly/tick/turn/ -# 敵が近くにいなければfail - execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..16,limit=1] run return fail +# 敵が近くにいるかを判定 + execute positioned ~-14 ~-14 ~-14 unless entity @e[type=#lib:living_without_player,tag=Enemy,dx=27,dy=27,dz=27,limit=1] run return fail # 成功 return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_player.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_player.mcfunction index 6e81540ce06..2f1c0728e41 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_player.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_player.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/turn/ # プレイヤーが近くにいないならfail - execute positioned ~-6 ~ ~-6 unless entity @p[tag=1061.Owner,dx=11,dy=1,dz=11] run return fail + execute positioned ~-6 ~-1 ~-6 unless entity @p[tag=1061.Owner,dx=11,dy=1,dz=11] run return fail # 成功 return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction index e7d46401990..16bb5113090 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -17,7 +17,7 @@ # ID (int) data modify storage asset:object ID set value 1061 # フィールド(オプション) - data modify storage asset:object Field.First set value true - data modify storage asset:object Field.IsUpper set value false + data modify storage asset:object Field.IsFirst set value true + data modify storage asset:object Field.IsUpper set value true data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction index 71e616034d8..50e1cac88db 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/summon/.mcfunction @@ -4,4 +4,8 @@ # # @within asset:object/alias/1061/summon -summon armor_stand ~ ~ ~ {Tags:["ObjectInit","Friend"],Marker:1b,Invisible:1b,Passengers:[{id:"minecraft:item_display",Rotation:[90f,0f],Tags:["ProcessCommonTag","AutoKillWhenDieVehicle"],teleport_duration:1,brightness:{sky:10,block:10},item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20578}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[1f,1f,1f],translation:[0f,-0.5f,0f]}}]} +# 元となる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/1061.azure_jelly/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/summon/m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/summon/m.mcfunction new file mode 100644 index 00000000000..0dab6ea8843 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/summon/m.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/1061.azure_jelly/summon/m +# +# +# +# @within function asset:object/1061.azure_jelly/summon/ + +$summon armor_stand ~ ~ ~ {Tags:["ObjectInit","Friend"],Rotation:$(Rotation),Marker:1b,Invisible:1b,Passengers:[{id:"minecraft:item_display",Rotation:[90f,0f],Tags:["ProcessCommonTag","AutoKillWhenDieVehicle"],teleport_duration:1,brightness:{sky:10,block:10},item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20578}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[1f,1f,1f],translation:[0f,-0.5f,0f]}}]} diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index 1408f938b98..820d61a1e9d 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -8,11 +8,15 @@ # @private #declare score_holder $UserID +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + # 常時演出 particle dust 0.267 0.729 0.945 0.9 ~ ~ ~ 0.4 0.6 0.4 0 1 normal @a execute if predicate lib:random_pass_per/40 run particle scrape ~ ~ ~ 0.4 0.6 0.4 0 1 normal @a # 召喚演出 + execute if data storage asset:context this{IsFirst:true} run function asset:object/1061.azure_jelly/tick/summon_effect/ # 召喚演出中はreturn execute if data storage asset:context this{IsFirst:true} run return fail @@ -21,9 +25,6 @@ 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 1061.Owner -# Tick加算 - scoreboard players add @s General.Object.Tick 1 - # インターバル scoreboard players operation $Interval Temporary = @s General.Object.Tick scoreboard players operation $Interval Temporary %= $50 Const @@ -55,4 +56,4 @@ tag @p[tag=1061.Owner] remove 1061.Owner # 消滅処理 - execute if entity @s[scores={General.Object.Tick=480..}] run function asset:object/1061.azure_jelly/tick/kill + execute if entity @s[scores={General.Object.Tick=500..}] run function asset:object/1061.azure_jelly/tick/kill diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction index badef3ec528..1d02769a31f 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction @@ -1,8 +1,11 @@ #> asset:object/1061.azure_jelly/tick/move/check_collision.m # +# args: +# Speed : float # -# -# @within function asset:object/1061.azure_jelly/tick/move/ +# @within function +# asset:object/1061.azure_jelly/tick/move/ +# asset:object/1061.azure_jelly/tick/summon_effect/ # 前方が問題ないか判定 $execute positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/collision run data modify storage asset:temp 1061.Success set value true diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/.mcfunction new file mode 100644 index 00000000000..06273fb4108 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/.mcfunction @@ -0,0 +1,33 @@ +#> asset:object/1061.azure_jelly/tick/summon_effect/ +# +# +# +# @within function asset:object/1061.azure_jelly/tick/ + +# メモ +# -80スタートで、0まで行きたいから合計加算角度は80くらいである必要がある + +# 召喚時演出 + execute if score @s General.Object.Tick matches 0 run function asset:object/1061.azure_jelly/tick/summon_effect/vfx + +# 角度初期化 + execute if score @s General.Object.Tick matches 0 run tp @s ~ ~ ~ ~ -80 + +# 角度 + execute if score @s General.Object.Tick matches 00..7 at @s run tp @s ~ ~ ~ ~ ~2 + execute if score @s General.Object.Tick matches 08..12 at @s run tp @s ~ ~ ~ ~ ~3 + execute if score @s General.Object.Tick matches 13..18 at @s run tp @s ~ ~ ~ ~ ~4 + execute if score @s General.Object.Tick matches 19..25 at @s run tp @s ~ ~ ~ ~ ~5 + execute if score @s General.Object.Tick matches 26..31 at @s run tp @s ~ ~ ~ ~ ~4 + execute if score @s General.Object.Tick matches 32..39 at @s run tp @s ~ ~ ~ ~ ~3 + +# 移動 + execute if score @s General.Object.Tick matches 00..05 at @s run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.1} + execute if score @s General.Object.Tick matches 06..12 at @s run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.15} + execute if score @s General.Object.Tick matches 13..22 at @s run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.2} + execute if score @s General.Object.Tick matches 23..30 at @s run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.15} + execute if score @s General.Object.Tick matches 31..35 at @s run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.12} + execute if score @s General.Object.Tick matches 36..39 at @s run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.1} + +# 召喚演出終了 + execute if score @s General.Object.Tick matches 40.. run function asset:object/1061.azure_jelly/tick/summon_effect/end diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/end.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/end.mcfunction new file mode 100644 index 00000000000..3d5014bdb38 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/end.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1061.azure_jelly/tick/summon_effect/end +# +# +# +# @within function asset:object/1061.azure_jelly/tick/summon_effect/ + +# 終了 + data modify storage asset:context this.IsFirst set value false + scoreboard players set @s General.Object.Tick -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/vfx.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/vfx.mcfunction new file mode 100644 index 00000000000..9bd42e764f1 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/vfx.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/1061.azure_jelly/tick/summon_effect/vfx +# +# +# +# @within function asset:object/1061.azure_jelly/tick/summon_effect/ + +# 演出 + particle scrape ~ ~1 ~ 0 0.3 0 4.5 50 normal @a + + playsound ogg:ambient.nether.crimson_forest.shine1 player @a[distance=..12] ~ ~ ~ 0.05 1.3 + playsound entity.dolphin.jump player @a ~ ~ ~ 0.40 0.8 + playsound entity.dolphin.jump player @a ~ ~ ~ 0.40 0.85 + playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 2 + playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 1.2 + playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 0.6 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction index 1d78c7795d8..ef2116ca5a1 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction @@ -21,7 +21,6 @@ # Ownerが遠いならOwnerの方へ execute unless function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player facing entity @p[tag=1061.Owner] eyes run tp @s ~ ~ ~ ~ ~ - # 敵がいるなら # Ownerが遠くなければ敵の方へ execute if function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/far_player run function asset:object/1061.azure_jelly/tick/turn/chase_enemy diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction index cdc5975f0e0..f31abc46c3a 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction @@ -4,5 +4,14 @@ # # @within function asset:object/1061.azure_jelly/tick/turn/ -# 最寄りの敵の方を見る - tp @s ~ ~ ~ facing entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..16,sort=nearest,limit=1] eyes +# 最寄りの敵のy座標が近いかを判定 + execute positioned ~-14 ~-1.5 ~-14 if entity @e[type=#lib:living_without_player,tag=Enemy,dx=27,dy=0.0,dz=27,limit=1] run data modify storage asset:temp 1061.Success set value true + +# 近いならrotated ~ 0で敵の方を向く + execute if data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,distance=..40] feet rotated ~ 0 run tp @s ~ ~ ~ ~ ~ + +# 近くなければそのままfacingする + execute unless data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,distance=..40] feet run tp @s ~ ~ ~ ~ ~ + +# リセット + data remove storage asset:temp 1061 From 18098f736fe0e41053b1336d11062febe6ffade4 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 6 Oct 2025 01:43:30 +0900 Subject: [PATCH 12/66] =?UTF-8?q?=E4=BB=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1061.azure_jelly/tick/attack/.mcfunction | 6 +- .../tick/attack/vfx/circle2.mcfunction | 86 +++++++++++++++++++ .../tick/turn/chase_enemy.mcfunction | 2 +- .../1062.azure_wave/register.mcfunction | 20 +++++ .../object/1062.azure_wave/summon/.mcfunction | 8 ++ .../1062.azure_wave/summon/debug.mcfunction | 10 +++ .../object/1062.azure_wave/tick/.mcfunction | 18 ++++ .../1062.azure_wave/tick/vfx/1.mcfunction | 45 ++++++++++ .../1062.azure_wave/tick/vfx/2.mcfunction | 72 ++++++++++++++++ .../1062.azure_wave/tick/vfx/3.mcfunction | 72 ++++++++++++++++ .../1062.azure_wave/tick/vfx/4.mcfunction | 72 ++++++++++++++++ .../1062.azure_wave/tick/vfx/5.mcfunction | 72 ++++++++++++++++ .../object/alias/1062/register.mcfunction | 8 ++ .../object/alias/1062/summon.mcfunction | 8 ++ .../object/alias/1062/tick.mcfunction | 8 ++ 15 files changed, 505 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle2.mcfunction create mode 100644 Asset/data/asset/functions/object/1062.azure_wave/register.mcfunction create mode 100644 Asset/data/asset/functions/object/1062.azure_wave/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/1062.azure_wave/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/1.mcfunction create mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/2.mcfunction create mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/3.mcfunction create mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/4.mcfunction create mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/5.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1062/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1062/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/1062/tick.mcfunction diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction index b8b4a0f9a2d..7d4e3d7566f 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction @@ -5,7 +5,11 @@ # @within function asset:object/1061.azure_jelly/tick/ # 演出 - execute rotated ~ 0 run function asset:object/1061.azure_jelly/tick/attack/vfx/circle + execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/attack/vfx/circle + execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/attack/vfx/circle2 + + data modify storage api: Argument.ID set value 1062 + execute positioned ~ ~-0.3 ~ run function api:object/summon # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle2.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle2.mcfunction new file mode 100644 index 00000000000..3bd57eeaf8b --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle2.mcfunction @@ -0,0 +1,86 @@ +#> asset:object/1061.azure_jelly/tick/attack/vfx/circle2 +# +# +# +# @within function asset:object/1061.azure_jelly/tick/attack/ + +particle scrape ~ ~ ~ ^0 ^ ^-1000000 0.00002 0 +particle scrape ~ ~ ~ ^78459.09573 ^ ^-996917.33373 0.00002 0 +particle scrape ~ ~ ~ ^156434.46504 ^ ^-987688.3406 0.00002 0 +particle scrape ~ ~ ~ ^233445.36386 ^ ^-972369.9204 0.00002 0 +particle scrape ~ ~ ~ ^309016.99437 ^ ^-951056.5163 0.00002 0 +particle scrape ~ ~ ~ ^382683.43237 ^ ^-923879.53251 0.00002 0 +particle scrape ~ ~ ~ ^453990.49974 ^ ^-891006.52419 0.00002 0 +particle scrape ~ ~ ~ ^522498.56472 ^ ^-852640.16435 0.00002 0 +particle scrape ~ ~ ~ ^587785.25229 ^ ^-809016.99437 0.00002 0 +particle scrape ~ ~ ~ ^649448.04833 ^ ^-760405.9656 0.00002 0 +particle scrape ~ ~ ~ ^707106.78119 ^ ^-707106.78119 0.00002 0 +particle scrape ~ ~ ~ ^760405.9656 ^ ^-649448.04833 0.00002 0 +particle scrape ~ ~ ~ ^809016.99437 ^ ^-587785.25229 0.00002 0 +particle scrape ~ ~ ~ ^852640.16435 ^ ^-522498.56472 0.00002 0 +particle scrape ~ ~ ~ ^891006.52419 ^ ^-453990.49974 0.00002 0 +particle scrape ~ ~ ~ ^923879.53251 ^ ^-382683.43237 0.00002 0 +particle scrape ~ ~ ~ ^951056.5163 ^ ^-309016.99437 0.00002 0 +particle scrape ~ ~ ~ ^972369.9204 ^ ^-233445.36386 0.00002 0 +particle scrape ~ ~ ~ ^987688.3406 ^ ^-156434.46504 0.00002 0 +particle scrape ~ ~ ~ ^996917.33373 ^ ^-78459.09573 0.00002 0 +particle scrape ~ ~ ~ ^1000000 ^ ^0 0.00002 0 +particle scrape ~ ~ ~ ^996917.33373 ^ ^78459.09573 0.00002 0 +particle scrape ~ ~ ~ ^987688.3406 ^ ^156434.46504 0.00002 0 +particle scrape ~ ~ ~ ^972369.9204 ^ ^233445.36386 0.00002 0 +particle scrape ~ ~ ~ ^951056.5163 ^ ^309016.99437 0.00002 0 +particle scrape ~ ~ ~ ^923879.53251 ^ ^382683.43237 0.00002 0 +particle scrape ~ ~ ~ ^891006.52419 ^ ^453990.49974 0.00002 0 +particle scrape ~ ~ ~ ^852640.16435 ^ ^522498.56472 0.00002 0 +particle scrape ~ ~ ~ ^809016.99437 ^ ^587785.25229 0.00002 0 +particle scrape ~ ~ ~ ^760405.9656 ^ ^649448.04833 0.00002 0 +particle scrape ~ ~ ~ ^707106.78119 ^ ^707106.78119 0.00002 0 +particle scrape ~ ~ ~ ^649448.04833 ^ ^760405.9656 0.00002 0 +particle scrape ~ ~ ~ ^587785.25229 ^ ^809016.99437 0.00002 0 +particle scrape ~ ~ ~ ^522498.56472 ^ ^852640.16435 0.00002 0 +particle scrape ~ ~ ~ ^453990.49974 ^ ^891006.52419 0.00002 0 +particle scrape ~ ~ ~ ^382683.43237 ^ ^923879.53251 0.00002 0 +particle scrape ~ ~ ~ ^309016.99437 ^ ^951056.5163 0.00002 0 +particle scrape ~ ~ ~ ^233445.36386 ^ ^972369.9204 0.00002 0 +particle scrape ~ ~ ~ ^156434.46504 ^ ^987688.3406 0.00002 0 +particle scrape ~ ~ ~ ^78459.09573 ^ ^996917.33373 0.00002 0 +particle scrape ~ ~ ~ ^0 ^ ^1000000 0.00002 0 +particle scrape ~ ~ ~ ^-78459.09573 ^ ^996917.33373 0.00002 0 +particle scrape ~ ~ ~ ^-156434.46504 ^ ^987688.3406 0.00002 0 +particle scrape ~ ~ ~ ^-233445.36386 ^ ^972369.9204 0.00002 0 +particle scrape ~ ~ ~ ^-309016.99437 ^ ^951056.5163 0.00002 0 +particle scrape ~ ~ ~ ^-382683.43237 ^ ^923879.53251 0.00002 0 +particle scrape ~ ~ ~ ^-453990.49974 ^ ^891006.52419 0.00002 0 +particle scrape ~ ~ ~ ^-522498.56472 ^ ^852640.16435 0.00002 0 +particle scrape ~ ~ ~ ^-587785.25229 ^ ^809016.99437 0.00002 0 +particle scrape ~ ~ ~ ^-649448.04833 ^ ^760405.9656 0.00002 0 +particle scrape ~ ~ ~ ^-707106.78119 ^ ^707106.78119 0.00002 0 +particle scrape ~ ~ ~ ^-760405.9656 ^ ^649448.04833 0.00002 0 +particle scrape ~ ~ ~ ^-809016.99437 ^ ^587785.25229 0.00002 0 +particle scrape ~ ~ ~ ^-852640.16435 ^ ^522498.56472 0.00002 0 +particle scrape ~ ~ ~ ^-891006.52419 ^ ^453990.49974 0.00002 0 +particle scrape ~ ~ ~ ^-923879.53251 ^ ^382683.43237 0.00002 0 +particle scrape ~ ~ ~ ^-951056.5163 ^ ^309016.99437 0.00002 0 +particle scrape ~ ~ ~ ^-972369.9204 ^ ^233445.36386 0.00002 0 +particle scrape ~ ~ ~ ^-987688.3406 ^ ^156434.46504 0.00002 0 +particle scrape ~ ~ ~ ^-996917.33373 ^ ^78459.09573 0.00002 0 +particle scrape ~ ~ ~ ^-1000000 ^ ^0 0.00002 0 +particle scrape ~ ~ ~ ^-996917.33373 ^ ^-78459.09573 0.00002 0 +particle scrape ~ ~ ~ ^-987688.3406 ^ ^-156434.46504 0.00002 0 +particle scrape ~ ~ ~ ^-972369.9204 ^ ^-233445.36386 0.00002 0 +particle scrape ~ ~ ~ ^-951056.5163 ^ ^-309016.99437 0.00002 0 +particle scrape ~ ~ ~ ^-923879.53251 ^ ^-382683.43237 0.00002 0 +particle scrape ~ ~ ~ ^-891006.52419 ^ ^-453990.49974 0.00002 0 +particle scrape ~ ~ ~ ^-852640.16435 ^ ^-522498.56472 0.00002 0 +particle scrape ~ ~ ~ ^-809016.99437 ^ ^-587785.25229 0.00002 0 +particle scrape ~ ~ ~ ^-760405.9656 ^ ^-649448.04833 0.00002 0 +particle scrape ~ ~ ~ ^-707106.78119 ^ ^-707106.78119 0.00002 0 +particle scrape ~ ~ ~ ^-649448.04833 ^ ^-760405.9656 0.00002 0 +particle scrape ~ ~ ~ ^-587785.25229 ^ ^-809016.99437 0.00002 0 +particle scrape ~ ~ ~ ^-522498.56472 ^ ^-852640.16435 0.00002 0 +particle scrape ~ ~ ~ ^-453990.49974 ^ ^-891006.52419 0.00002 0 +particle scrape ~ ~ ~ ^-382683.43237 ^ ^-923879.53251 0.00002 0 +particle scrape ~ ~ ~ ^-309016.99437 ^ ^-951056.5163 0.00002 0 +particle scrape ~ ~ ~ ^-233445.36386 ^ ^-972369.9204 0.00002 0 +particle scrape ~ ~ ~ ^-156434.46504 ^ ^-987688.3406 0.00002 0 +particle scrape ~ ~ ~ ^-78459.09573 ^ ^-996917.33373 0.00002 0 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction index f31abc46c3a..58e247b0fb5 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/turn/ # 最寄りの敵のy座標が近いかを判定 - execute positioned ~-14 ~-1.5 ~-14 if entity @e[type=#lib:living_without_player,tag=Enemy,dx=27,dy=0.0,dz=27,limit=1] run data modify storage asset:temp 1061.Success set value true + execute positioned ~-14 ~ ~-14 if entity @e[type=#lib:living_without_player,tag=Enemy,dx=27,dy=0.0,dz=27,limit=1] run data modify storage asset:temp 1061.Success set value true # 近いならrotated ~ 0で敵の方を向く execute if data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,distance=..40] feet rotated ~ 0 run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/object/1062.azure_wave/register.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/register.mcfunction new file mode 100644 index 00000000000..61a86d8126d --- /dev/null +++ b/Asset/data/asset/functions/object/1062.azure_wave/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1062.azure_wave/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/1062/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 1062 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1062.azure_wave/summon/.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/summon/.mcfunction new file mode 100644 index 00000000000..af78df8545b --- /dev/null +++ b/Asset/data/asset/functions/object/1062.azure_wave/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/1062.azure_wave/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/1062/summon + +# 元となるEntityを召喚する + summon marker ~ ~ ~ {Tags:["ObjectInit"]} diff --git a/Asset/data/asset/functions/object/1062.azure_wave/summon/debug.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/summon/debug.mcfunction new file mode 100644 index 00000000000..593012c0dc0 --- /dev/null +++ b/Asset/data/asset/functions/object/1062.azure_wave/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/1062.azure_wave/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 1062 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction new file mode 100644 index 00000000000..1c3ea0c2e2f --- /dev/null +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/1062.azure_wave/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/1062/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 演出 + execute if score @s General.Object.Tick matches 1 run function asset:object/1062.azure_wave/tick/vfx/1 + execute if score @s General.Object.Tick matches 2 run function asset:object/1062.azure_wave/tick/vfx/2 + execute if score @s General.Object.Tick matches 3 run function asset:object/1062.azure_wave/tick/vfx/3 + execute if score @s General.Object.Tick matches 4 run function asset:object/1062.azure_wave/tick/vfx/4 + execute if score @s General.Object.Tick matches 5 run function asset:object/1062.azure_wave/tick/vfx/5 + +# 消滅処理 + kill @s[scores={General.Object.Tick=5..}] diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/1.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/1.mcfunction new file mode 100644 index 00000000000..d96eaf8da60 --- /dev/null +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/1.mcfunction @@ -0,0 +1,45 @@ +#> asset:object/1062.azure_wave/tick/vfx/1 +# +# +# +# @within function asset:object/1062.azure_wave/tick/ + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAEYCMA7ABxxwCspAtACwBMADNZ7QBsHNvQ4pmbWr2YcAZgEMAzAE4eg+mAIA7BQFsEyQGGKAAmpawMBRn0BnJOBQB7QtohIuHAijhu4GBzAANwVsQkNwAA8kHgIoGIBfBIIbUjRCe0RqAlsIa3dEWLA4bGw0GFtDah4ijCc8iEMitFsAUVLyytaAR0JQ7CgAZSsfckRFbEqkvHBoeAp0LFwLYjIKLlpqUk36FCklORFxVlElLj2meh45K9JKWgVyHX1DMFMuCysbPUzHFzckNQuN5fI0AohwCEwhEwNFCnFEskwKl0pkeAA6Zg5PIYApFEplCpVGopeoKRoxAgtdqErq9fpDEZwMYTKYJAC6QA_3 +# 円 2 +particle dust 0.490 0.612 1.000 1.2 ^0 ^ ^-0.5 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.25 ^ ^-0.43301 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.43301 ^ ^-0.25 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.5 ^ ^0 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.43301 ^ ^0.25 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.25 ^ ^0.43301 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0 ^ ^0.5 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.25 ^ ^0.43301 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.43301 ^ ^0.25 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.5 ^ ^0 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.43301 ^ ^-0.25 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.25 ^ ^-0.43301 0 0 0 0 1 +# 円 1 +particle dust 0.490 0.612 1.000 1.2 ^0 ^ ^-1 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.25882 ^ ^-0.96593 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.5 ^ ^-0.86603 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.70711 ^ ^-0.70711 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.86603 ^ ^-0.5 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.96593 ^ ^-0.25882 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^1 ^ ^0 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.96593 ^ ^0.25882 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.86603 ^ ^0.5 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.70711 ^ ^0.70711 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.5 ^ ^0.86603 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0.25882 ^ ^0.96593 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^0 ^ ^1 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.25882 ^ ^0.96593 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.5 ^ ^0.86603 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.70711 ^ ^0.70711 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.86603 ^ ^0.5 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.96593 ^ ^0.25882 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-1 ^ ^0 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.96593 ^ ^-0.25882 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.86603 ^ ^-0.5 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.70711 ^ ^-0.70711 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.5 ^ ^-0.86603 0 0 0 0 1 +particle dust 0.490 0.612 1.000 1.2 ^-0.25882 ^ ^-0.96593 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/2.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/2.mcfunction new file mode 100644 index 00000000000..bf51aecf2d0 --- /dev/null +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/2.mcfunction @@ -0,0 +1,72 @@ +#> asset:object/1062.azure_wave/tick/vfx/2 +# +# +# +# @within function asset:object/1062.azure_wave/tick/ + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAEYCMA7ABxxwCspAtACwBMADNZ7QBsHNvQ4pmbWr2YcAZgEMAzAE4eg+mAIA7BQFsEyQGGKAAmpawMBRn0BnJOBQB7QtohJhBFHDdwMDsAA3BWxCQ3AADyQeAihogF94ghtSNEJ7RC4CWwhrd0QYsDhsbDQYW0NqHkKMJ1yIQ0K0WwBRErKKloBHQhDsKABlK29yREVsCsSAXSA_3 +# 円 1 +particle dust 0.486 0.678 1.000 1.2 ^0 ^ ^-2 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^0.19603 ^ ^-1.99037 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^0.39018 ^ ^-1.96157 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^0.58057 ^ ^-1.91388 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^0.76537 ^ ^-1.84776 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^0.94279 ^ ^-1.76384 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.11114 ^ ^-1.66294 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.26879 ^ ^-1.54602 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.41421 ^ ^-1.41421 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.54602 ^ ^-1.26879 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.66294 ^ ^-1.11114 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.76384 ^ ^-0.94279 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.84776 ^ ^-0.76537 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.91388 ^ ^-0.58057 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.96157 ^ ^-0.39018 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.99037 ^ ^-0.19603 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^2 ^ ^0 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.99037 ^ ^0.19603 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.96157 ^ ^0.39018 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.91388 ^ ^0.58057 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.84776 ^ ^0.76537 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.76384 ^ ^0.94279 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.66294 ^ ^1.11114 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.54602 ^ ^1.26879 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.41421 ^ ^1.41421 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.26879 ^ ^1.54602 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^1.11114 ^ ^1.66294 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^0.94279 ^ ^1.76384 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^0.76537 ^ ^1.84776 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^0.58057 ^ ^1.91388 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^0.39018 ^ ^1.96157 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^0.19603 ^ ^1.99037 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^0 ^ ^2 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-0.19603 ^ ^1.99037 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-0.39018 ^ ^1.96157 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-0.58057 ^ ^1.91388 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-0.76537 ^ ^1.84776 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-0.94279 ^ ^1.76384 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.11114 ^ ^1.66294 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.26879 ^ ^1.54602 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.41421 ^ ^1.41421 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.54602 ^ ^1.26879 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.66294 ^ ^1.11114 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.76384 ^ ^0.94279 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.84776 ^ ^0.76537 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.91388 ^ ^0.58057 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.96157 ^ ^0.39018 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.99037 ^ ^0.19603 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-2 ^ ^0 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.99037 ^ ^-0.19603 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.96157 ^ ^-0.39018 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.91388 ^ ^-0.58057 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.84776 ^ ^-0.76537 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.76384 ^ ^-0.94279 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.66294 ^ ^-1.11114 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.54602 ^ ^-1.26879 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.41421 ^ ^-1.41421 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.26879 ^ ^-1.54602 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-1.11114 ^ ^-1.66294 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-0.94279 ^ ^-1.76384 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-0.76537 ^ ^-1.84776 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-0.58057 ^ ^-1.91388 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-0.39018 ^ ^-1.96157 0 0 0 0 1 +particle dust 0.486 0.678 1.000 1.2 ^-0.19603 ^ ^-1.99037 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/3.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/3.mcfunction new file mode 100644 index 00000000000..800ab677c00 --- /dev/null +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/3.mcfunction @@ -0,0 +1,72 @@ +#> asset:object/1062.azure_wave/tick/vfx/3 +# +# +# +# @within function asset:object/1062.azure_wave/tick/ + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAEYCMA7ABxxwCspAtACwBMADNZ7QBsHNvQ4pmbWr2YcAZgEMAzAE4eg+mAIA7BQFsEyQGGKAAmpawMBRn0BnJOBQB7QtohJhBFHDdwMDsAA3BWxCQ3AADyQeAihogF94ghtSNEJ7RCUCWwhrd0QYsDhsbDQYW0NqHkKMJ1yIQ0K0WwBRErKKloBHQhDsKABlK29yREVsCsSAXSA_3 +# 円 1 +particle dust 0.486 0.753 1.000 1.2 ^0 ^ ^-3 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^0.29405 ^ ^-2.98555 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^0.58527 ^ ^-2.94236 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^0.87085 ^ ^-2.87082 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^1.14805 ^ ^-2.77164 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^1.41419 ^ ^-2.64576 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^1.66671 ^ ^-2.49441 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^1.90318 ^ ^-2.31903 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.12132 ^ ^-2.12132 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.31903 ^ ^-1.90318 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.49441 ^ ^-1.66671 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.64576 ^ ^-1.41419 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.77164 ^ ^-1.14805 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.87082 ^ ^-0.87085 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.94236 ^ ^-0.58527 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.98555 ^ ^-0.29405 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^3 ^ ^0 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.98555 ^ ^0.29405 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.94236 ^ ^0.58527 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.87082 ^ ^0.87085 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.77164 ^ ^1.14805 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.64576 ^ ^1.41419 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.49441 ^ ^1.66671 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.31903 ^ ^1.90318 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^2.12132 ^ ^2.12132 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^1.90318 ^ ^2.31903 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^1.66671 ^ ^2.49441 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^1.41419 ^ ^2.64576 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^1.14805 ^ ^2.77164 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^0.87085 ^ ^2.87082 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^0.58527 ^ ^2.94236 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^0.29405 ^ ^2.98555 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^0 ^ ^3 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-0.29405 ^ ^2.98555 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-0.58527 ^ ^2.94236 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-0.87085 ^ ^2.87082 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-1.14805 ^ ^2.77164 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-1.41419 ^ ^2.64576 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-1.66671 ^ ^2.49441 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-1.90318 ^ ^2.31903 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.12132 ^ ^2.12132 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.31903 ^ ^1.90318 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.49441 ^ ^1.66671 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.64576 ^ ^1.41419 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.77164 ^ ^1.14805 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.87082 ^ ^0.87085 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.94236 ^ ^0.58527 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.98555 ^ ^0.29405 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-3 ^ ^0 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.98555 ^ ^-0.29405 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.94236 ^ ^-0.58527 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.87082 ^ ^-0.87085 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.77164 ^ ^-1.14805 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.64576 ^ ^-1.41419 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.49441 ^ ^-1.66671 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.31903 ^ ^-1.90318 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-2.12132 ^ ^-2.12132 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-1.90318 ^ ^-2.31903 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-1.66671 ^ ^-2.49441 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-1.41419 ^ ^-2.64576 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-1.14805 ^ ^-2.77164 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-0.87085 ^ ^-2.87082 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-0.58527 ^ ^-2.94236 0 0 0 0 1 +particle dust 0.486 0.753 1.000 1.2 ^-0.29405 ^ ^-2.98555 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/4.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/4.mcfunction new file mode 100644 index 00000000000..f27ee18ca2c --- /dev/null +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/4.mcfunction @@ -0,0 +1,72 @@ +#> asset:object/1062.azure_wave/tick/vfx/4 +# +# +# +# @within function asset:object/1062.azure_wave/tick/ + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAEYCMA7ABxxwCspAtACwBMADNZ7QBsHNvQ4pmbWr2YcAZgEMAzAE4eg+mAIA7BQFsEyQGGKAAmpawMBRn0BnJOBQB7QtohJhBFHDdwMDsAA3BWxCQ3AADyQeAihogF94ghtSNEJ7RA4CWwhrd0QYsDhsbDQYW0NqHkKMJ1yIQ0K0WwBRErKKloBHQhDsKABlK29yREVsCsSAXSA_3 +# 円 1 +particle dust 0.482 0.824 1.000 1.2 ^0 ^ ^-4 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^0.39207 ^ ^-3.98074 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^0.78036 ^ ^-3.92314 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^1.16114 ^ ^-3.82776 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^1.53073 ^ ^-3.69552 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^1.88559 ^ ^-3.52769 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^2.22228 ^ ^-3.32588 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^2.53757 ^ ^-3.09204 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^2.82843 ^ ^-2.82843 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.09204 ^ ^-2.53757 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.32588 ^ ^-2.22228 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.52769 ^ ^-1.88559 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.69552 ^ ^-1.53073 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.82776 ^ ^-1.16114 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.92314 ^ ^-0.78036 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.98074 ^ ^-0.39207 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^4 ^ ^0 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.98074 ^ ^0.39207 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.92314 ^ ^0.78036 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.82776 ^ ^1.16114 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.69552 ^ ^1.53073 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.52769 ^ ^1.88559 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.32588 ^ ^2.22228 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^3.09204 ^ ^2.53757 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^2.82843 ^ ^2.82843 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^2.53757 ^ ^3.09204 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^2.22228 ^ ^3.32588 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^1.88559 ^ ^3.52769 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^1.53073 ^ ^3.69552 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^1.16114 ^ ^3.82776 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^0.78036 ^ ^3.92314 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^0.39207 ^ ^3.98074 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^0 ^ ^4 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-0.39207 ^ ^3.98074 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-0.78036 ^ ^3.92314 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-1.16114 ^ ^3.82776 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-1.53073 ^ ^3.69552 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-1.88559 ^ ^3.52769 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-2.22228 ^ ^3.32588 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-2.53757 ^ ^3.09204 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-2.82843 ^ ^2.82843 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.09204 ^ ^2.53757 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.32588 ^ ^2.22228 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.52769 ^ ^1.88559 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.69552 ^ ^1.53073 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.82776 ^ ^1.16114 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.92314 ^ ^0.78036 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.98074 ^ ^0.39207 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-4 ^ ^0 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.98074 ^ ^-0.39207 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.92314 ^ ^-0.78036 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.82776 ^ ^-1.16114 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.69552 ^ ^-1.53073 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.52769 ^ ^-1.88559 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.32588 ^ ^-2.22228 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-3.09204 ^ ^-2.53757 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-2.82843 ^ ^-2.82843 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-2.53757 ^ ^-3.09204 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-2.22228 ^ ^-3.32588 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-1.88559 ^ ^-3.52769 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-1.53073 ^ ^-3.69552 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-1.16114 ^ ^-3.82776 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-0.78036 ^ ^-3.92314 0 0 0 0 1 +particle dust 0.482 0.824 1.000 1.2 ^-0.39207 ^ ^-3.98074 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/5.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/5.mcfunction new file mode 100644 index 00000000000..30f3925f568 --- /dev/null +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/5.mcfunction @@ -0,0 +1,72 @@ +#> asset:object/1062.azure_wave/tick/vfx/5 +# +# +# +# @within function asset:object/1062.azure_wave/tick/ + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAEYCMA7ABxxwCspAtACwBMADNZ7QBsHNvQ4pmbWr2YcAZgEMAzAE4eg+mAIA7BQFsEyQGGKAAmpawMBRn0BnJOBQB7QtohJhBFHDdwMDsAA3BWxCQ3AADyQeAihogF94ghtSNEJ7RGYCWwhrd0QYsDhsbDQYW0NqHkKMJ1yIQ0K0WwBRErKKloBHQhDsKABlK29yREVsCsSAXSA_3 +# 円 1 +particle dust 0.482 0.890 1.000 1.2 ^0 ^ ^-5 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^0.49009 ^ ^-4.97592 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^0.97545 ^ ^-4.90393 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^1.45142 ^ ^-4.7847 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^1.91342 ^ ^-4.6194 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^2.35698 ^ ^-4.40961 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^2.77785 ^ ^-4.15735 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^3.17197 ^ ^-3.86505 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^3.53553 ^ ^-3.53553 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^3.86505 ^ ^-3.17197 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^4.15735 ^ ^-2.77785 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^4.40961 ^ ^-2.35698 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^4.6194 ^ ^-1.91342 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^4.7847 ^ ^-1.45142 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^4.90393 ^ ^-0.97545 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^4.97592 ^ ^-0.49009 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^5 ^ ^0 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^4.97592 ^ ^0.49009 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^4.90393 ^ ^0.97545 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^4.7847 ^ ^1.45142 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^4.6194 ^ ^1.91342 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^4.40961 ^ ^2.35698 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^4.15735 ^ ^2.77785 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^3.86505 ^ ^3.17197 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^3.53553 ^ ^3.53553 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^3.17197 ^ ^3.86505 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^2.77785 ^ ^4.15735 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^2.35698 ^ ^4.40961 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^1.91342 ^ ^4.6194 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^1.45142 ^ ^4.7847 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^0.97545 ^ ^4.90393 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^0.49009 ^ ^4.97592 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^0 ^ ^5 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-0.49009 ^ ^4.97592 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-0.97545 ^ ^4.90393 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-1.45142 ^ ^4.7847 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-1.91342 ^ ^4.6194 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-2.35698 ^ ^4.40961 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-2.77785 ^ ^4.15735 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-3.17197 ^ ^3.86505 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-3.53553 ^ ^3.53553 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-3.86505 ^ ^3.17197 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-4.15735 ^ ^2.77785 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-4.40961 ^ ^2.35698 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-4.6194 ^ ^1.91342 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-4.7847 ^ ^1.45142 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-4.90393 ^ ^0.97545 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-4.97592 ^ ^0.49009 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-5 ^ ^0 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-4.97592 ^ ^-0.49009 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-4.90393 ^ ^-0.97545 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-4.7847 ^ ^-1.45142 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-4.6194 ^ ^-1.91342 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-4.40961 ^ ^-2.35698 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-4.15735 ^ ^-2.77785 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-3.86505 ^ ^-3.17197 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-3.53553 ^ ^-3.53553 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-3.17197 ^ ^-3.86505 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-2.77785 ^ ^-4.15735 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-2.35698 ^ ^-4.40961 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-1.91342 ^ ^-4.6194 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-1.45142 ^ ^-4.7847 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-0.97545 ^ ^-4.90393 0 0 0 0 1 +particle dust 0.482 0.890 1.000 1.2 ^-0.49009 ^ ^-4.97592 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/alias/1062/register.mcfunction b/Asset/data/asset/functions/object/alias/1062/register.mcfunction new file mode 100644 index 00000000000..0d437cc48a2 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1062/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1062/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/1062.azure_wave/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1062/summon.mcfunction b/Asset/data/asset/functions/object/alias/1062/summon.mcfunction new file mode 100644 index 00000000000..1c6610fa6ff --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1062/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1062/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/1062.azure_wave/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/1062/tick.mcfunction b/Asset/data/asset/functions/object/alias/1062/tick.mcfunction new file mode 100644 index 00000000000..efc5a4a1c14 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/1062/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/1062/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/1062.azure_wave/tick/ \ No newline at end of file From 93715b897088d9e44d288d8dc6db8d596af6c29a Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 8 Oct 2025 21:07:55 +0900 Subject: [PATCH 13/66] =?UTF-8?q?=E6=BC=94=E5=87=BA=E7=94=A8Object?= =?UTF-8?q?=E3=82=92=E4=B8=80=E6=99=82=E7=9A=84=E3=81=AB=E5=8F=AC=E5=96=9A?= =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1061.azure_jelly/tick/attack/.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction index 7d4e3d7566f..fff6037b393 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction @@ -8,8 +8,8 @@ execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/attack/vfx/circle execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/attack/vfx/circle2 - data modify storage api: Argument.ID set value 1062 - execute positioned ~ ~-0.3 ~ run function api:object/summon + #data modify storage api: Argument.ID set value 1062 + #execute positioned ~ ~-0.3 ~ run function api:object/summon # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage From 3fd37f411e14736bfe6424cbd1713a16d93db8da Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 8 Oct 2025 21:29:50 +0900 Subject: [PATCH 14/66] =?UTF-8?q?=E8=A1=9D=E7=AA=81=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/predicate/collision.mcfunction | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction index a9238c2967e..efd1c12d358 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction @@ -5,9 +5,8 @@ # @within function asset:object/1061.azure_jelly/tick/move/check_collision.m # 判定 - execute unless block ~ ~ ~ #lib:no_collision/ run return fail - execute unless block ~ ~0.5 ~ #lib:no_collision/ run return fail - execute unless block ~ ~1.0 ~ #lib:no_collision/ run return fail + execute unless block ~ ~-1 ~ #lib:no_collision/ run return fail + execute unless block ~ ~0.0 ~ #lib:no_collision/ run return fail execute unless block ~0.25 ~1.0 ~0.25 #lib:no_collision/ run return fail execute unless block ~0.25 ~1.0 ~-0.25 #lib:no_collision/ run return fail execute unless block ~-0.25 ~1.0 ~0.25 #lib:no_collision/ run return fail From 42cabb05b64b83858cde2d3eb4f47ca12e140562 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 10 Oct 2025 00:10:29 +0900 Subject: [PATCH 15/66] =?UTF-8?q?=E8=A1=9D=E7=AA=81=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4=E3=81=AA=E3=81=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/predicate/collision.mcfunction | 3 ++- .../asset/functions/object/1061.azure_jelly/tick/.mcfunction | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction index efd1c12d358..5fb70562ae0 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction @@ -5,7 +5,8 @@ # @within function asset:object/1061.azure_jelly/tick/move/check_collision.m # 判定 - execute unless block ~ ~-1 ~ #lib:no_collision/ run return fail + #execute unless block ~ ~-1.5 ~ #lib:no_collision/ run return fail + execute unless block ~ ~-1.0 ~ #lib:no_collision/ run return fail execute unless block ~ ~0.0 ~ #lib:no_collision/ run return fail execute unless block ~0.25 ~1.0 ~0.25 #lib:no_collision/ run return fail execute unless block ~0.25 ~1.0 ~-0.25 #lib:no_collision/ run return fail diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index 820d61a1e9d..80f1b1c0fa9 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -38,9 +38,6 @@ # 移動方向設定 execute if score $Interval Temporary matches 0 run function asset:object/1061.azure_jelly/tick/turn/ -# 追跡 - #execute at @s run function asset:object/1061.azure_jelly/tick/chase/ - # 角度 execute if score $Interval Temporary matches 0 at @s run function asset:object/1061.azure_jelly/tick/angle/init execute at @s run function asset:object/1061.azure_jelly/tick/angle/ From 62f8afe892ab1395db1ac24a4dc5e1fbb76588f5 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 11 Oct 2025 15:54:46 +0900 Subject: [PATCH 16/66] =?UTF-8?q?=E5=90=8D=E5=89=8D=E3=81=AB=E3=82=B0?= =?UTF-8?q?=E3=83=A9=E3=83=87=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction index 97e5c07ade0..e45e5a89b1c 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction @@ -13,7 +13,7 @@ # 神器のベースアイテム data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" # 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"蒼き月の揺籠","color":"blue"}' + data modify storage asset:artifact Name set value '[{"text":"蒼","color":"#6a9cff"},{"text":"き","color":"#69a1ff"},{"text":"月","color":"#68a7ff"},{"text":"の","color":"#66acff"},{"text":"揺","color":"#65b2ff"},{"text":"り","color":"#64b7ff"},{"text":"籠","color":"#63bdff"}]' # 神器の説明文 (TextComponentString[]) data modify storage asset:artifact Lore set value [] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) From 5f06713fd021ed303a6558e7c7cd2345494c192d Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 12 Oct 2025 01:57:09 +0900 Subject: [PATCH 17/66] =?UTF-8?q?=E5=A4=A7=E4=BD=93=E3=82=AF=E3=83=A9?= =?UTF-8?q?=E3=82=B2=E3=81=AE=E6=8C=99=E5=8B=95=E5=AE=8C=E6=88=90=E3=81=BE?= =?UTF-8?q?=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../give/2.give.mcfunction | 2 +- .../1061.azure_jelly/_index.d.mcfunction | 1 + .../predicate/collision.mcfunction | 16 +++++----- .../predicate/far_player.mcfunction | 2 +- .../predicate/near_enemy.mcfunction | 2 +- .../predicate/near_player.mcfunction | 2 +- .../1061.azure_jelly/register.mcfunction | 2 ++ .../object/1061.azure_jelly/tick/.mcfunction | 6 ++-- .../1061.azure_jelly/tick/angle/.mcfunction | 6 ++-- .../1061.azure_jelly/tick/attack/.mcfunction | 20 ++++-------- .../tick/attack/attack.mcfunction | 32 +++++++++++++++++++ .../1061.azure_jelly/tick/move/.mcfunction | 28 +++++++++------- .../tick/move/check_collision.m.mcfunction | 2 +- .../tick/move/speed_multiplier.m.mcfunction | 30 +++++++++++++++++ .../tick/move/with_collision.mcfunction | 6 ++-- .../1061.azure_jelly/tick/turn/.mcfunction | 10 +++--- .../tick/turn/chase_enemy.mcfunction | 9 ++++-- .../tick/turn/chase_player/.mcfunction | 17 ++++++++++ .../chase_player/forward_spread.m.mcfunction | 21 ++++++++++++ ...my.mcfunction => random_rotate.mcfunction} | 6 +++- .../set_speed_multiplier/enemy.mcfunction | 11 +++++++ .../set_speed_multiplier/player.mcfunction | 11 +++++++ .../{attack => turn}/vfx/circle.mcfunction | 4 +-- .../{attack => turn}/vfx/circle2.mcfunction | 4 +-- 24 files changed, 191 insertions(+), 59 deletions(-) create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/speed_multiplier.m.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m.mcfunction rename Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/{near_player_no_enemy.mcfunction => random_rotate.mcfunction} (55%) create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/player.mcfunction rename Asset/data/asset/functions/object/1061.azure_jelly/tick/{attack => turn}/vfx/circle.mcfunction (97%) rename Asset/data/asset/functions/object/1061.azure_jelly/tick/{attack => turn}/vfx/circle2.mcfunction (97%) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction index e45e5a89b1c..eb97abcb625 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"蒼","color":"#6a9cff"},{"text":"き","color":"#69a1ff"},{"text":"月","color":"#68a7ff"},{"text":"の","color":"#66acff"},{"text":"揺","color":"#65b2ff"},{"text":"り","color":"#64b7ff"},{"text":"籠","color":"#63bdff"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value [] + data modify storage asset:artifact Lore set value ['{"text":"蒼く光を放つ海月を抱いた水の揺り籠","color":"gray"}','{"text":"深海の静寂に、ひとつの夢がゆらめく","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction index b28af52141f..6bf3f4699b9 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction @@ -4,5 +4,6 @@ #> tag # @within function asset:object/1061.azure_jelly/** #declare tag 1061.Owner + #declare tag 1061.Target #declare score_holder $Interval #declare score_holder diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction index 5fb70562ae0..6ad72869d2c 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction @@ -2,16 +2,16 @@ # # # -# @within function asset:object/1061.azure_jelly/tick/move/check_collision.m +# @within function asset:object/1061.azure_jelly/tick/move/** # 判定 - #execute unless block ~ ~-1.5 ~ #lib:no_collision/ run return fail - execute unless block ~ ~-1.0 ~ #lib:no_collision/ run return fail - execute unless block ~ ~0.0 ~ #lib:no_collision/ run return fail - execute unless block ~0.25 ~1.0 ~0.25 #lib:no_collision/ run return fail - execute unless block ~0.25 ~1.0 ~-0.25 #lib:no_collision/ run return fail - execute unless block ~-0.25 ~1.0 ~0.25 #lib:no_collision/ run return fail - execute unless block ~-0.25 ~1.0 ~-0.25 #lib:no_collision/ run return fail + execute unless block ~ ~-0.75 ~ #lib:no_collision/ run return 0 + execute unless block ~ ~-0.5 ~ #lib:no_collision/ run return 0 + execute unless block ~ ~0.0 ~ #lib:no_collision/ run return 0 + execute unless block ~0.25 ~1.0 ~0.25 #lib:no_collision/ run return 0 + execute unless block ~0.25 ~1.0 ~-0.25 #lib:no_collision/ run return 0 + execute unless block ~-0.25 ~1.0 ~0.25 #lib:no_collision/ run return 0 + execute unless block ~-0.25 ~1.0 ~-0.25 #lib:no_collision/ run return 0 # 成功 return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction index c000e9e0c16..5b73645bf82 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/turn/ # プレイヤーが近くにいたらfail - execute if entity @p[tag=1061.Owner,distance=..32] run return fail + execute if entity @p[tag=1061.Owner,distance=..32] run return 0 # 成功 return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction index 34a38a1a91b..7e7bab9cddf 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/turn/ # 敵が近くにいるかを判定 - execute positioned ~-14 ~-14 ~-14 unless entity @e[type=#lib:living_without_player,tag=Enemy,dx=27,dy=27,dz=27,limit=1] run return fail + execute positioned ~-14 ~-14 ~-14 unless entity @e[type=#lib:living_without_player,tag=Enemy,dx=27,dy=27,dz=27,limit=1] run return 0 # 成功 return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_player.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_player.mcfunction index 2f1c0728e41..2065d7a1c8c 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_player.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_player.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/turn/ # プレイヤーが近くにいないならfail - execute positioned ~-6 ~-1 ~-6 unless entity @p[tag=1061.Owner,dx=11,dy=1,dz=11] run return fail + execute positioned ~-6 ~-1 ~-6 unless entity @p[tag=1061.Owner,dx=11,dy=1,dz=11] run return 0 # 成功 return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction index 16bb5113090..b3b9ea1cc82 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -19,5 +19,7 @@ # フィールド(オプション) data modify storage asset:object Field.IsFirst set value true data modify storage asset:object Field.IsUpper set value true + data modify storage asset:object Field.AttackCD set value 50 + data modify storage asset:object Field.SpeedMultiplier set value 1 data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index 80f1b1c0fa9..e7b775ea960 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -29,9 +29,6 @@ scoreboard players operation $Interval Temporary = @s General.Object.Tick scoreboard players operation $Interval Temporary %= $50 Const -# 攻撃 - execute if score $Interval Temporary matches 0 run function asset:object/1061.azure_jelly/tick/attack/ - # playsound execute if score $Interval Temporary matches 0..3 run function asset:object/1061.azure_jelly/tick/sound @@ -45,6 +42,9 @@ # 移動 execute at @s run function asset:object/1061.azure_jelly/tick/move/ +# 攻撃関連の処理 + execute at @s run function asset:object/1061.azure_jelly/tick/attack/ + #execute at @s run particle flame ^ ^ ^ 0 0 0 0 1 # リセット diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction index 78f0c6bfd5f..ccc1e6ed72d 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction @@ -4,10 +4,10 @@ # # @within function asset:object/1061.azure_jelly/tick/ -# trueなら+200 - execute if data storage asset:context this{IsUpper:true} run scoreboard players add @s 1061.Pitch 200 +# trueなら+ + execute if data storage asset:context this{IsUpper:true} run scoreboard players add @s 1061.Pitch 250 -# falseなら-100 +# falseなら- execute if data storage asset:context this{IsUpper:false} run scoreboard players remove @s 1061.Pitch 50 # -9000..9000ならRotation[1]へ代入 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction index fff6037b393..5ebb59f854e 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction @@ -1,20 +1,14 @@ #> asset:object/1061.azure_jelly/tick/attack/ # -# +# 攻撃関連の処理 # # @within function asset:object/1061.azure_jelly/tick/ -# 演出 - execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/attack/vfx/circle - execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/attack/vfx/circle2 +# クールダウンをデクリメント + execute store result storage asset:context this.AttackCD int 0.9999999999 run data get storage asset:context this.AttackCD - #data modify storage api: Argument.ID set value 1062 - #execute positioned ~ ~-0.3 ~ run function api:object/summon +# CDが0でなければreturn + execute unless data storage asset:context this{AttackCD:0} run return fail -# ダメージ - data modify storage api: Argument.Damage set from storage asset:context this.Damage - data modify storage api: Argument.AttackType set value "Magic" - data modify storage api: Argument.ElementType set value "Water" - execute as @p[tag=1061.Owner] run function api:damage/modifier - execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ - function api:damage/reset +# 敵が近くにいたら攻撃 + execute positioned ~-3 ~-3 ~-3 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=5,dy=5,dz=5] at @s run function asset:object/1061.azure_jelly/tick/attack/attack diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction new file mode 100644 index 00000000000..1be4210a819 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction @@ -0,0 +1,32 @@ +#> asset:object/1061.azure_jelly/tick/attack/attack +# +# +# +# @within function asset:object/1061.azure_jelly/tick/attack/ + +# 演出 + #execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/attack/vfx/circle + #execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/attack/vfx/circle2 + + #data modify storage api: Argument.ID set value 1062 + #execute positioned ~ ~-0.3 ~ run function api:object/summon + +# 円柱Libを用いて判定する + data modify storage lib: Argument.BoundingCylinder.Radius set value 4.5d + data modify storage lib: Argument.BoundingCylinder.Height set value 10.0d + data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7]" + execute positioned ~ ~-5 ~ run function lib:bounding_cylinder/ + +# ダメージ + data modify storage api: Argument.Damage set from storage asset:context this.Damage + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "Water" + execute as @p[tag=1061.Owner] run function api:damage/modifier + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=BoundingCylinder,tag=!Uninterferable,distance=..7] run function api:damage/ + function api:damage/reset + +# リセット + tag @e[type=#lib:living_without_player,tag=BoundingCylinder,distance=..7] remove BoundingCylinder + +# AttackCD初期化 + data modify storage asset:context this.AttackCD set value 50 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction index 54340cc3aa8..602f5b087fc 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction @@ -4,16 +4,20 @@ # # @within function asset:object/1061.azure_jelly/tick/ - execute if score $Interval Temporary matches 00..03 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.08} - execute if score $Interval Temporary matches 04..08 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.10} - execute if score $Interval Temporary matches 09..13 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.15} - execute if score $Interval Temporary matches 14..18 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.20} - execute if score $Interval Temporary matches 19..22 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.25} - execute if score $Interval Temporary matches 23..24 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.30} +# そもそも: 完全に埋まってたら少しずつ上に行ってreturn + #execute unless function asset:object/1061.azure_jelly/predicate/collision run return run tp @s ~ ~0.1 ~ - execute if score $Interval Temporary matches 25..26 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.30} - execute if score $Interval Temporary matches 27..30 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.25} - execute if score $Interval Temporary matches 31..35 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.20} - execute if score $Interval Temporary matches 36..40 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.15} - execute if score $Interval Temporary matches 41..45 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.10} - execute if score $Interval Temporary matches 46..49 run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.08} +# 速度付きで前方が安全か判定してから進む + execute if score $Interval Temporary matches 00..03 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.08} + execute if score $Interval Temporary matches 04..08 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.10} + execute if score $Interval Temporary matches 09..13 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.15} + execute if score $Interval Temporary matches 14..18 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.20} + execute if score $Interval Temporary matches 19..22 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.25} + execute if score $Interval Temporary matches 23..24 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.30} + + execute if score $Interval Temporary matches 25..26 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.30} + execute if score $Interval Temporary matches 27..30 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.25} + execute if score $Interval Temporary matches 31..35 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.20} + execute if score $Interval Temporary matches 36..40 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.15} + execute if score $Interval Temporary matches 41..45 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.10} + execute if score $Interval Temporary matches 46..49 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.08} diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction index 1d02769a31f..45b8cd72a29 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction @@ -4,7 +4,7 @@ # Speed : float # # @within function -# asset:object/1061.azure_jelly/tick/move/ +# asset:object/1061.azure_jelly/tick/move/speed_multiplier.m # asset:object/1061.azure_jelly/tick/summon_effect/ # 前方が問題ないか判定 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/speed_multiplier.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/speed_multiplier.m.mcfunction new file mode 100644 index 00000000000..d62946fe773 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/speed_multiplier.m.mcfunction @@ -0,0 +1,30 @@ +#> asset:object/1061.azure_jelly/tick/move/speed_multiplier.m +# +# +# +# @within function asset:object/1061.azure_jelly/tick/move/ + +#> Private +# @private + #declare score_holder $Speed + #declare score_holder $SpeedMultiplier + +#tellraw @a {"storage":"asset:context","nbt":"this.SpeedMultiplier"} + +# SpeedMultiplier:1ならそのまま実行してreturn + $execute if data storage asset:context this{SpeedMultiplier:1} run return run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:$(Speed)} + +# 設定された速度と倍率を取得 + $data modify storage asset:temp 1061.Speed set value $(Speed) + execute store result score $Speed Temporary run data get storage asset:temp 1061.Speed 100 + execute store result score $SpeedMultiplier Temporary run data get storage asset:context this.SpeedMultiplier 100 + + +# 速度をstorageに入れてマクロで実行 + execute store result storage asset:temp 1061.Speed float 0.0001 run scoreboard players operation $Speed Temporary *= $SpeedMultiplier Temporary + function asset:object/1061.azure_jelly/tick/move/check_collision.m with storage asset:temp 1061 + +# リセット + scoreboard players reset $Speed Temporary + scoreboard players reset $SpeedMultiplier Temporary + data remove storage asset:temp 1061 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction index f6acd3becd8..056953a0cc6 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction @@ -5,10 +5,10 @@ # @within function asset:object/1061.azure_jelly/tick/move/check_collision.m # x - $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned 0.0 ~ ~ positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ + $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned 0.0 ~ ~ positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/collision run tp @s ~ ~ ~ # y - $execute positioned ^ ^ ^$(Speed) rotated ~180 ~ positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ + $execute positioned ^ ^ ^$(Speed) rotated ~180 ~ positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/collision run tp @s ~ ~ ~ # z - $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned ~ ~ 0.0 positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if block ~ ~ ~ #lib:no_collision run tp @s ~ ~ ~ + $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned ~ ~ 0.0 positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/collision run tp @s ~ ~ ~ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction index ef2116ca5a1..d16f47dc97c 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction @@ -12,17 +12,19 @@ # - プレイヤーから「離れていないなら」最寄りの敵の方へ移動する # - プレイヤーから「離れているなら」プレイヤーの方へ戻る -# プレイヤー +# 演出 + execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/turn/vfx/circle + execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/turn/vfx/circle2 # 敵がいないなら # Ownerが近くならテキトーな方向へ - execute unless function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/turn/near_player_no_enemy + execute unless function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/turn/random_rotate # Ownerが遠いならOwnerの方へ - execute unless function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player facing entity @p[tag=1061.Owner] eyes run tp @s ~ ~ ~ ~ ~ + execute unless function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/turn/chase_player/ # 敵がいるなら # Ownerが遠くなければ敵の方へ execute if function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/far_player run function asset:object/1061.azure_jelly/tick/turn/chase_enemy # Ownerが遠いならOwnerの方へ - execute if function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/far_player facing entity @p[tag=1061.Owner] eyes run tp @s ~ ~ ~ ~ ~ + execute if function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/far_player run function asset:object/1061.azure_jelly/tick/turn/chase_player/ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction index 58e247b0fb5..ca09a7760b2 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction @@ -5,13 +5,16 @@ # @within function asset:object/1061.azure_jelly/tick/turn/ # 最寄りの敵のy座標が近いかを判定 - execute positioned ~-14 ~ ~-14 if entity @e[type=#lib:living_without_player,tag=Enemy,dx=27,dy=0.0,dz=27,limit=1] run data modify storage asset:temp 1061.Success set value true + execute positioned ~-14 ~ ~-14 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=27,dy=0.0,dz=27,limit=1] run data modify storage asset:temp 1061.Success set value true # 近いならrotated ~ 0で敵の方を向く - execute if data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,distance=..40] feet rotated ~ 0 run tp @s ~ ~ ~ ~ ~ + execute if data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..40] feet rotated ~ 0 run tp @s ~ ~ ~ ~ ~ # 近くなければそのままfacingする - execute unless data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,distance=..40] feet run tp @s ~ ~ ~ ~ ~ + execute unless data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..40] feet run tp @s ~ ~ ~ ~ ~ # リセット data remove storage asset:temp 1061 + +# 敵との距離に応じて速度倍率を設定する + function asset:object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/.mcfunction new file mode 100644 index 00000000000..9d99a85ad98 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/.mcfunction @@ -0,0 +1,17 @@ +#> asset:object/1061.azure_jelly/tick/turn/chase_player/ +# +# +# +# @within function asset:object/1061.azure_jelly/tick/turn/ + +# プレイヤーの方を見る + execute facing entity @p[tag=1061.Owner] eyes run tp @s ~ ~ ~ ~ ~ + +# プレイヤーの距離に応じて前方拡散の拡散率を変える +# 遠いほど拡散を小っちゃくする + execute if entity @p[tag=1061.Owner,distance=..10] unless entity @p[tag=1061.Owner,distance=10..] run function asset:object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m {Spread:3} + execute if entity @p[tag=1061.Owner,distance=..20] unless entity @p[tag=1061.Owner,distance=20..] run function asset:object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m {Spread:2} + execute if entity @p[tag=1061.Owner,distance=20..] run function asset:object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m {Spread:1} + +# プレイヤーとの距離に応じて速度倍率を設定する + function asset:object/1061.azure_jelly/tick/turn/set_speed_multiplier/player diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m.mcfunction new file mode 100644 index 00000000000..f0412b1629e --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m.mcfunction @@ -0,0 +1,21 @@ +#> asset:object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m +# +# +# +# @within function asset:object/1061.azure_jelly/tick/turn/chase_player/ + +#> Private +# @private + #declare tag SpreadMarker + +# 前方拡散 + summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + data modify storage lib: Argument.Distance set value 4 + $data modify storage lib: Argument.Spread set value $(Speed) + execute as @e[type=marker,tag=SpreadMarker,distance=..0.01,limit=1] run function lib:forward_spreader/circle + +# SpreadMarkerを見る + execute facing entity @e[type=marker,tag=SpreadMarker,distance=..10] feet run tp @s ~ ~ ~ ~ ~ + +# リセット + kill @e[type=marker,tag=SpreadMarker,distance=..10] diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/near_player_no_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/random_rotate.mcfunction similarity index 55% rename from Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/near_player_no_enemy.mcfunction rename to Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/random_rotate.mcfunction index c3bcfa84b60..838ad4d6f7c 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/near_player_no_enemy.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/random_rotate.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1061.azure_jelly/tick/turn/near_player_no_enemy +#> asset:object/1061.azure_jelly/tick/turn/random_rotate # # # @@ -11,3 +11,7 @@ # リセット data remove storage asset:temp 1061 + +# プレイヤーとの距離に応じて速度倍率を設定する +# この関数が呼び出されてる時点で近いはずだが、一応共通処理として、ね + function asset:object/1061.azure_jelly/tick/turn/set_speed_multiplier/player diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy.mcfunction new file mode 100644 index 00000000000..df46a9aa47d --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy +# +# +# +# @within function asset:object/1061.azure_jelly/tick/turn/chase_enemy + +# 敵との距離に応じて速度倍率を設定する + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..40] run data modify storage asset:context this.SpeedMultiplier set value 3 + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..20] run data modify storage asset:context this.SpeedMultiplier set value 2 + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] run data modify storage asset:context this.SpeedMultiplier set value 1 + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..3] run data modify storage asset:context this.SpeedMultiplier set value 0.5 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/player.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/player.mcfunction new file mode 100644 index 00000000000..5a08d6b1943 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/player.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/1061.azure_jelly/tick/turn/set_speed_multiplier/player +# +# +# +# @within function +# asset:object/1061.azure_jelly/tick/turn/chase_player/ +# asset:object/1061.azure_jelly/tick/turn/random_rotate + + execute if entity @p[tag=1061.Owner,distance=..40] run data modify storage asset:context this.SpeedMultiplier set value 3 + execute if entity @p[tag=1061.Owner,distance=..20] run data modify storage asset:context this.SpeedMultiplier set value 2 + execute if entity @p[tag=1061.Owner,distance=..10] run data modify storage asset:context this.SpeedMultiplier set value 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/vfx/circle.mcfunction similarity index 97% rename from Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle.mcfunction rename to Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/vfx/circle.mcfunction index 1fd7d88f795..75a4a021cd9 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/vfx/circle.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1061.azure_jelly/tick/attack/vfx/circle +#> asset:object/1061.azure_jelly/tick/turn/vfx/circle # # # -# @within function asset:object/1061.azure_jelly/tick/attack/ +# @within function asset:object/1061.azure_jelly/tick/turn/ particle scrape ~ ~ ~ ^0 ^ ^-1000000 0.00003 0 particle scrape ~ ~ ~ ^78459.09573 ^ ^-996917.33373 0.00003 0 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle2.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/vfx/circle2.mcfunction similarity index 97% rename from Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle2.mcfunction rename to Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/vfx/circle2.mcfunction index 3bd57eeaf8b..9dbfbda0ea4 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/vfx/circle2.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/vfx/circle2.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1061.azure_jelly/tick/attack/vfx/circle2 +#> asset:object/1061.azure_jelly/tick/turn/vfx/circle2 # # # -# @within function asset:object/1061.azure_jelly/tick/attack/ +# @within function asset:object/1061.azure_jelly/tick/turn/ particle scrape ~ ~ ~ ^0 ^ ^-1000000 0.00002 0 particle scrape ~ ~ ~ ^78459.09573 ^ ^-996917.33373 0.00002 0 From 27f5b1d2218fdd7f8814ea473df7364132b2f2a9 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 12 Oct 2025 02:11:19 +0900 Subject: [PATCH 18/66] =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction | 4 ++-- .../1144.cradle_of_azure_moon/trigger/3.main.mcfunction | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction index eb97abcb625..45ae44641f6 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction @@ -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 [0,0] + data modify storage asset:artifact AttackInfo.Damage set value [1000] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Magic] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) @@ -39,7 +39,7 @@ # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.IsRangeAttack set value "every" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackRange set value 3 + data modify storage asset:artifact AttackInfo.AttackRange set value 4.5 # MP消費量 (int) data modify storage asset:artifact MPCost set value 100 # MP必要量 (int) (オプション) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction index e76a41679f0..6c828752eff 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction @@ -11,5 +11,6 @@ # Object召喚 data modify storage api: Argument.ID set value 1061 + data modify storage api: Argument.FieldOverride.Damage set value 1000 execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute anchored eyes rotated ~ 0 positioned ^ ^-1 ^1.5 run function api:object/summon From 70984a22d878d21c0e3e64d4535aab05918c065c Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 12 Oct 2025 02:11:29 +0900 Subject: [PATCH 19/66] =?UTF-8?q?=E5=AE=8C=E5=85=A8=E3=81=AB=E5=9F=8B?= =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=9F=E3=81=A8=E3=81=8D=E5=AF=BE=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1061.azure_jelly/tick/move/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction index 602f5b087fc..34e09a98516 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/ # そもそも: 完全に埋まってたら少しずつ上に行ってreturn - #execute unless function asset:object/1061.azure_jelly/predicate/collision run return run tp @s ~ ~0.1 ~ + execute unless function asset:object/1061.azure_jelly/predicate/collision run return run tp @s ~ ~0.1 ~ # 速度付きで前方が安全か判定してから進む execute if score $Interval Temporary matches 00..03 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.08} From 260dce6146e869e62eae570913cad88c4e9babf2 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 12 Oct 2025 02:12:48 +0900 Subject: [PATCH 20/66] =?UTF-8?q?=E6=96=B9=E5=90=91=E8=BB=A2=E6=8F=9B?= =?UTF-8?q?=E6=99=82=E3=81=ABreturn=20run=E3=81=97=E3=81=A6=E4=BD=99?= =?UTF-8?q?=E8=A8=88=E3=81=AA=E6=A4=9C=E8=A8=BC=E3=82=92=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/tick/turn/.mcfunction | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction index d16f47dc97c..e0e75a13bf7 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction @@ -18,13 +18,13 @@ # 敵がいないなら # Ownerが近くならテキトーな方向へ - execute unless function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/turn/random_rotate + execute unless function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/near_player run return run function asset:object/1061.azure_jelly/tick/turn/random_rotate # Ownerが遠いならOwnerの方へ - execute unless function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player run function asset:object/1061.azure_jelly/tick/turn/chase_player/ + execute unless function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/near_player run return run function asset:object/1061.azure_jelly/tick/turn/chase_player/ # 敵がいるなら # Ownerが遠くなければ敵の方へ - execute if function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/far_player run function asset:object/1061.azure_jelly/tick/turn/chase_enemy + execute if function asset:object/1061.azure_jelly/predicate/near_enemy unless function asset:object/1061.azure_jelly/predicate/far_player run return run function asset:object/1061.azure_jelly/tick/turn/chase_enemy # Ownerが遠いならOwnerの方へ - execute if function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/far_player run function asset:object/1061.azure_jelly/tick/turn/chase_player/ + execute if function asset:object/1061.azure_jelly/predicate/near_enemy if function asset:object/1061.azure_jelly/predicate/far_player run return run function asset:object/1061.azure_jelly/tick/turn/chase_player/ From eba5a40f531e1fb9e9ea7399e67ded7ab711a958 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 12 Oct 2025 04:59:42 +0900 Subject: [PATCH 21/66] =?UTF-8?q?=E3=83=95=E3=83=AC=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction index 45ae44641f6..1179fb448a5 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"蒼","color":"#6a9cff"},{"text":"き","color":"#69a1ff"},{"text":"月","color":"#68a7ff"},{"text":"の","color":"#66acff"},{"text":"揺","color":"#65b2ff"},{"text":"り","color":"#64b7ff"},{"text":"籠","color":"#63bdff"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"蒼く光を放つ海月を抱いた水の揺り籠","color":"gray"}','{"text":"深海の静寂に、ひとつの夢がゆらめく","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"周囲の敵に攻撃するクラゲを召喚する","color":"white"}','{"text":"蒼く光を放つ海月を抱いた水の揺り籠","color":"gray"}','{"text":"静寂に揺らめき、月光の下に漂う","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 @@ -39,7 +39,7 @@ # 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.IsRangeAttack set value "every" # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackRange set value 4.5 + data modify storage asset:artifact AttackInfo.AttackRange set value "4.5" # MP消費量 (int) data modify storage asset:artifact MPCost set value 100 # MP必要量 (int) (オプション) From a25c93c2e5f7c18370daa7454d5533dc3347f44b Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 12 Oct 2025 05:18:39 +0900 Subject: [PATCH 22/66] =?UTF-8?q?DamageAPI=E5=AE=9F=E8=A1=8C=E6=99=82?= =?UTF-8?q?=E3=81=AB=E5=A3=81=E8=B2=AB=E9=80=9A=E3=82=92=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1061.azure_jelly/_index.d.mcfunction | 2 +- .../tick/attack/attack.mcfunction | 3 ++- .../tick/attack/check_block/.mcfunction | 20 +++++++++++++++++++ .../attack/check_block/recursive.mcfunction | 16 +++++++++++++++ 4 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/check_block/.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/check_block/recursive.mcfunction diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction index 6bf3f4699b9..5b63b4f5866 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction @@ -6,4 +6,4 @@ #declare tag 1061.Owner #declare tag 1061.Target #declare score_holder $Interval - #declare score_holder + #declare score_holder $Recursive diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction index 1be4210a819..ba852a7b032 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction @@ -17,12 +17,13 @@ data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7]" execute positioned ~ ~-5 ~ run function lib:bounding_cylinder/ + # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Water" execute as @p[tag=1061.Owner] run function api:damage/modifier - execute as @e[type=#lib:living_without_player,tag=Enemy,tag=BoundingCylinder,tag=!Uninterferable,distance=..7] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=BoundingCylinder,tag=!Uninterferable,distance=..7] if function asset:object/1061.azure_jelly/tick/attack/check_block/ run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/check_block/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/check_block/.mcfunction new file mode 100644 index 00000000000..b3d613e9c92 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/check_block/.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1061.azure_jelly/tick/attack/check_block/ +# +# +# +# @within function asset:object/1061.azure_jelly/tick/attack/attack + +# 自身の方を見て再帰 + execute facing entity @s feet run function asset:object/1061.azure_jelly/tick/attack/check_block/recursive + +# リセット + scoreboard players reset $Recursive Temporary + +# 失敗 + execute unless data storage asset:temp 1061{Success:true} run return fail + +# storageをリセット + data remove storage asset:temp 1061 + +# 成功 + return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/check_block/recursive.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/check_block/recursive.mcfunction new file mode 100644 index 00000000000..1c206b8404d --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/check_block/recursive.mcfunction @@ -0,0 +1,16 @@ +#> asset:object/1061.azure_jelly/tick/attack/check_block/recursive +# +# +# +# @within function +# asset:object/1061.azure_jelly/tick/attack/check_block/ +# asset:object/1061.azure_jelly/tick/attack/check_block/recursive + +# 再帰防止スコアをインクリメント + scoreboard players add $Recursive Temporary 1 + +# 成功 + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @s[dx=0] run data modify storage asset:temp 1061.Success set value true + +# 0.5ブロックずつ再帰 + execute if score $Recursive Temporary matches ..14 positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision/ run function asset:object/1061.azure_jelly/tick/attack/check_block/recursive From 307ff17e5370255130887a610a42228b99b1bd91 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 12 Oct 2025 05:21:32 +0900 Subject: [PATCH 23/66] =?UTF-8?q?=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF?= =?UTF-8?q?=E6=8E=A5=E8=A7=A6=E5=88=A4=E5=AE=9A=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1061.azure_jelly/predicate/collision.mcfunction | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction index 6ad72869d2c..7d1ee2765ac 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction @@ -8,10 +8,10 @@ execute unless block ~ ~-0.75 ~ #lib:no_collision/ run return 0 execute unless block ~ ~-0.5 ~ #lib:no_collision/ run return 0 execute unless block ~ ~0.0 ~ #lib:no_collision/ run return 0 - execute unless block ~0.25 ~1.0 ~0.25 #lib:no_collision/ run return 0 - execute unless block ~0.25 ~1.0 ~-0.25 #lib:no_collision/ run return 0 - execute unless block ~-0.25 ~1.0 ~0.25 #lib:no_collision/ run return 0 - execute unless block ~-0.25 ~1.0 ~-0.25 #lib:no_collision/ run return 0 + execute unless block ~0.35 ~1.0 ~0.35 #lib:no_collision/ run return 0 + execute unless block ~0.35 ~1.0 ~-0.35 #lib:no_collision/ run return 0 + execute unless block ~-0.35 ~1.0 ~0.35 #lib:no_collision/ run return 0 + execute unless block ~-0.35 ~1.0 ~-0.35 #lib:no_collision/ run return 0 # 成功 return 1 From d89059e4c6e897bf2b1a52833924a2f606fe2f30 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 12 Oct 2025 05:26:28 +0900 Subject: [PATCH 24/66] =?UTF-8?q?=E8=BB=BD=E3=81=8F=E3=81=AA=E3=82=8B?= =?UTF-8?q?=E3=81=8B=E3=82=8F=E3=81=8B=E3=82=89=E3=82=93=E3=81=91=E3=81=A9?= =?UTF-8?q?return=E3=82=92=E5=A2=97=E3=82=84=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1061.azure_jelly/tick/move/.mcfunction | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction index 34e09a98516..2f827fc8647 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction @@ -8,16 +8,17 @@ execute unless function asset:object/1061.azure_jelly/predicate/collision run return run tp @s ~ ~0.1 ~ # 速度付きで前方が安全か判定してから進む - execute if score $Interval Temporary matches 00..03 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.08} - execute if score $Interval Temporary matches 04..08 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.10} - execute if score $Interval Temporary matches 09..13 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.15} - execute if score $Interval Temporary matches 14..18 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.20} - execute if score $Interval Temporary matches 19..22 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.25} - execute if score $Interval Temporary matches 23..24 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.30} +# ちょっとでも軽くしたいな～ってことでreturnで実行数がそんなに増えないようにする + execute if score $Interval Temporary matches 00..03 run return run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.08} + execute if score $Interval Temporary matches 04..08 run return run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.10} + execute if score $Interval Temporary matches 09..13 run return run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.15} + execute if score $Interval Temporary matches 14..18 run return run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.20} + execute if score $Interval Temporary matches 19..22 run return run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.25} + execute if score $Interval Temporary matches 23..24 run return run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.30} - execute if score $Interval Temporary matches 25..26 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.30} - execute if score $Interval Temporary matches 27..30 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.25} - execute if score $Interval Temporary matches 31..35 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.20} - execute if score $Interval Temporary matches 36..40 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.15} - execute if score $Interval Temporary matches 41..45 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.10} + execute if score $Interval Temporary matches 25..26 run return run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.30} + execute if score $Interval Temporary matches 27..30 run return run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.25} + execute if score $Interval Temporary matches 31..35 run return run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.20} + execute if score $Interval Temporary matches 36..40 run return run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.15} + execute if score $Interval Temporary matches 41..45 run return run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.10} execute if score $Interval Temporary matches 46..49 run function asset:object/1061.azure_jelly/tick/move/speed_multiplier.m {Speed:0.08} From 4fb8f27f83097b001509273c1f8a8fd18f5a717d Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 12 Oct 2025 05:28:03 +0900 Subject: [PATCH 25/66] =?UTF-8?q?=E5=8F=AC=E5=96=9A=E6=BC=94=E5=87=BA?= =?UTF-8?q?=E4=B8=AD=E3=81=AEtick/=E4=B8=8B=E3=81=A7=E5=AE=9F=E8=A1=8C?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89?= =?UTF-8?q?=E6=95=B0=E3=82=92=E6=B8=9B=E3=82=89=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1061.azure_jelly/tick/.mcfunction | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index e7b775ea960..3d46368a324 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -15,11 +15,8 @@ particle dust 0.267 0.729 0.945 0.9 ~ ~ ~ 0.4 0.6 0.4 0 1 normal @a execute if predicate lib:random_pass_per/40 run particle scrape ~ ~ ~ 0.4 0.6 0.4 0 1 normal @a -# 召喚演出 - execute if data storage asset:context this{IsFirst:true} run function asset:object/1061.azure_jelly/tick/summon_effect/ - -# 召喚演出中はreturn - execute if data storage asset:context this{IsFirst:true} run return fail +# 召喚演出 その間はreturnする + execute if data storage asset:context this{IsFirst:true} run return run function asset:object/1061.azure_jelly/tick/summon_effect/ # OwnerにTag付与 execute store result score $UserID Temporary run data get storage asset:context this.UserID From 141e37fb04d27172e65ff3d3d0d6a3074024e123 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 12 Oct 2025 05:35:03 +0900 Subject: [PATCH 26/66] =?UTF-8?q?=E3=83=95=E3=83=AC=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction index 1179fb448a5..a515c381011 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"蒼","color":"#6a9cff"},{"text":"き","color":"#69a1ff"},{"text":"月","color":"#68a7ff"},{"text":"の","color":"#66acff"},{"text":"揺","color":"#65b2ff"},{"text":"り","color":"#64b7ff"},{"text":"籠","color":"#63bdff"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"周囲の敵に攻撃するクラゲを召喚する","color":"white"}','{"text":"蒼く光を放つ海月を抱いた水の揺り籠","color":"gray"}','{"text":"静寂に揺らめき、月光の下に漂う","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"周囲の敵に攻撃するクラゲを召喚する","color":"white"}','{"text":"蒼い海月を抱いた水の揺り籠","color":"gray"}','{"text":"静寂に揺らめき、月光の下に漂う","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 From c57d44fca3f6d03c291c58d2e94f0aa50e7f66f4 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 12 Oct 2025 05:45:49 +0900 Subject: [PATCH 27/66] =?UTF-8?q?=E3=83=95=E3=83=AC=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction index a515c381011..e6b0e5ed55b 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"蒼","color":"#6a9cff"},{"text":"き","color":"#69a1ff"},{"text":"月","color":"#68a7ff"},{"text":"の","color":"#66acff"},{"text":"揺","color":"#65b2ff"},{"text":"り","color":"#64b7ff"},{"text":"籠","color":"#63bdff"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"周囲の敵に攻撃するクラゲを召喚する","color":"white"}','{"text":"蒼い海月を抱いた水の揺り籠","color":"gray"}','{"text":"静寂に揺らめき、月光の下に漂う","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"周囲の敵に攻撃するクラゲを召喚する","color":"white"}','{"text":"蒼い海月を抱いた水の揺り籠","color":"gray"}','{"text":"月光に揺らめき、静寂に漂う","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 From e50f7ee6901eac35114d11220d915d665d2c5f8a Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 12 Oct 2025 17:36:27 +0900 Subject: [PATCH 28/66] =?UTF-8?q?=E3=83=95=E3=83=AC=E3=83=BC=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction index e6b0e5ed55b..9f43e36e840 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction @@ -15,7 +15,7 @@ # 神器の名前 (TextComponentString) data modify storage asset:artifact Name set value '[{"text":"蒼","color":"#6a9cff"},{"text":"き","color":"#69a1ff"},{"text":"月","color":"#68a7ff"},{"text":"の","color":"#66acff"},{"text":"揺","color":"#65b2ff"},{"text":"り","color":"#64b7ff"},{"text":"籠","color":"#63bdff"}]' # 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"周囲の敵に攻撃するクラゲを召喚する","color":"white"}','{"text":"蒼い海月を抱いた水の揺り籠","color":"gray"}','{"text":"月光に揺らめき、静寂に漂う","color":"gray"}'] + data modify storage asset:artifact Lore set value ['{"text":"周囲の敵に攻撃するクラゲを召喚する","color":"white"}','{"text":"蒼い海月を抱いた水の揺り籠","color":"gray"}','{"text":"月は水面に揺らめき、静寂に漂う","color":"gray"}'] # 消費アイテム ({Item: TextComponent, Count: int, Extra?: TextComponent}) (オプション) # data modify storage asset:artifact ConsumeItem.Item set value '{"translate":"item.minecraft.stick"}' # data modify storage asset:artifact ConsumeItem.Count set value 1 From 85a1782f13ca043cee047355926f85854c024ccc Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 19 Oct 2025 03:57:18 +0900 Subject: [PATCH 29/66] =?UTF-8?q?=E6=94=BB=E6=92=83=E6=BC=94=E5=87=BA?= =?UTF-8?q?=E3=82=92=E4=BD=9C=E6=88=90=E3=80=81=E3=81=A4=E3=81=84=E3=81=A7?= =?UTF-8?q?=E3=81=AB=E6=96=B9=E5=90=91=E3=81=A6=E6=84=9F=E3=81=98=E3=81=AE?= =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E7=B8=AE=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/attack/attack.mcfunction | 8 ++++---- .../1061.azure_jelly/tick/turn/.mcfunction | 4 ++-- .../circle1.mcfunction} | 4 ++-- .../tick/{turn => }/vfx/circle2.mcfunction | 4 ++-- .../object/1062.azure_wave/summon/.mcfunction | 3 +-- .../object/1062.azure_wave/tick/.mcfunction | 17 +++++++++++------ .../tick/transformation.mcfunction | 12 ++++++++++++ 7 files changed, 34 insertions(+), 18 deletions(-) rename Asset/data/asset/functions/object/1061.azure_jelly/tick/{turn/vfx/circle.mcfunction => vfx/circle1.mcfunction} (97%) rename Asset/data/asset/functions/object/1061.azure_jelly/tick/{turn => }/vfx/circle2.mcfunction (97%) create mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/transformation.mcfunction diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction index ba852a7b032..f9059b86076 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction @@ -5,11 +5,11 @@ # @within function asset:object/1061.azure_jelly/tick/attack/ # 演出 - #execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/attack/vfx/circle - #execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/attack/vfx/circle2 + execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/vfx/circle1 + execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/vfx/circle2 - #data modify storage api: Argument.ID set value 1062 - #execute positioned ~ ~-0.3 ~ run function api:object/summon + data modify storage api: Argument.ID set value 1062 + execute positioned ~ ~-0.3 ~ run function api:object/summon # 円柱Libを用いて判定する data modify storage lib: Argument.BoundingCylinder.Radius set value 4.5d diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction index e0e75a13bf7..4bc6b9d3187 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction @@ -13,8 +13,8 @@ # - プレイヤーから「離れているなら」プレイヤーの方へ戻る # 演出 - execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/turn/vfx/circle - execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/turn/vfx/circle2 + #execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/turn/vfx/circle + #execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/turn/vfx/circle2 # 敵がいないなら # Ownerが近くならテキトーな方向へ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/vfx/circle.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/vfx/circle1.mcfunction similarity index 97% rename from Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/vfx/circle.mcfunction rename to Asset/data/asset/functions/object/1061.azure_jelly/tick/vfx/circle1.mcfunction index 75a4a021cd9..ccfa3a77759 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/vfx/circle.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/vfx/circle1.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1061.azure_jelly/tick/turn/vfx/circle +#> asset:object/1061.azure_jelly/tick/vfx/circle1 # # # -# @within function asset:object/1061.azure_jelly/tick/turn/ +# @within function asset:object/1061.azure_jelly/tick/*/** particle scrape ~ ~ ~ ^0 ^ ^-1000000 0.00003 0 particle scrape ~ ~ ~ ^78459.09573 ^ ^-996917.33373 0.00003 0 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/vfx/circle2.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/vfx/circle2.mcfunction similarity index 97% rename from Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/vfx/circle2.mcfunction rename to Asset/data/asset/functions/object/1061.azure_jelly/tick/vfx/circle2.mcfunction index 9dbfbda0ea4..4e069b6417a 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/vfx/circle2.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/vfx/circle2.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1061.azure_jelly/tick/turn/vfx/circle2 +#> asset:object/1061.azure_jelly/tick/vfx/circle2 # # # -# @within function asset:object/1061.azure_jelly/tick/turn/ +# @within function asset:object/1061.azure_jelly/tick/*/** particle scrape ~ ~ ~ ^0 ^ ^-1000000 0.00002 0 particle scrape ~ ~ ~ ^78459.09573 ^ ^-996917.33373 0.00002 0 diff --git a/Asset/data/asset/functions/object/1062.azure_wave/summon/.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/summon/.mcfunction index af78df8545b..9f9ef0fdbe8 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/summon/.mcfunction @@ -4,5 +4,4 @@ # # @within asset:object/alias/1062/summon -# 元となるEntityを召喚する - summon marker ~ ~ ~ {Tags:["ObjectInit"]} + summon item_display ~ ~ ~ {Tags:["ObjectInit"],Rotation:[90f,0f],teleport_duration:1,interpolation_duration:30,brightness:{sky:10,block:10},item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20579}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,2f,0f],translation:[0f,1f,0f]}} diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction index 1c3ea0c2e2f..72d09d108a3 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction @@ -8,11 +8,16 @@ scoreboard players add @s General.Object.Tick 1 # 演出 - execute if score @s General.Object.Tick matches 1 run function asset:object/1062.azure_wave/tick/vfx/1 - execute if score @s General.Object.Tick matches 2 run function asset:object/1062.azure_wave/tick/vfx/2 - execute if score @s General.Object.Tick matches 3 run function asset:object/1062.azure_wave/tick/vfx/3 - execute if score @s General.Object.Tick matches 4 run function asset:object/1062.azure_wave/tick/vfx/4 - execute if score @s General.Object.Tick matches 5 run function asset:object/1062.azure_wave/tick/vfx/5 + #execute if score @s General.Object.Tick matches 1 run function asset:object/1062.azure_wave/tick/vfx/1 + #execute if score @s General.Object.Tick matches 2 run function asset:object/1062.azure_wave/tick/vfx/2 + #execute if score @s General.Object.Tick matches 3 run function asset:object/1062.azure_wave/tick/vfx/3 + #execute if score @s General.Object.Tick matches 4 run function asset:object/1062.azure_wave/tick/vfx/4 + #execute if score @s General.Object.Tick matches 5 run function asset:object/1062.azure_wave/tick/vfx/5 + +#tp @s ~ ~ ~ ~3 ~ + +# 拡大 + execute if score @s General.Object.Tick matches 3 run function asset:object/1062.azure_wave/tick/transformation # 消滅処理 - kill @s[scores={General.Object.Tick=5..}] + kill @s[scores={General.Object.Tick=30..}] diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/transformation.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/transformation.mcfunction new file mode 100644 index 00000000000..815f20bfa57 --- /dev/null +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/transformation.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/1062.azure_wave/tick/transformation +# +# +# +# @within function asset:object/1062.azure_wave/tick/ + +# start_interpolation + data modify entity @s start_interpolation set value 0 + +# 回転 + data modify entity @s transformation.left_rotation set value [0f,0.7071f,0f,0.7071f] + data modify entity @s transformation.scale set value [6f,2f,6f] From 18e72aab3a66b60042ec53c3aaaebc27d8244ac1 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 19 Oct 2025 03:58:22 +0900 Subject: [PATCH 30/66] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1062.azure_wave/tick/vfx/1.mcfunction | 45 ------------ .../1062.azure_wave/tick/vfx/2.mcfunction | 72 ------------------- .../1062.azure_wave/tick/vfx/3.mcfunction | 72 ------------------- .../1062.azure_wave/tick/vfx/4.mcfunction | 72 ------------------- .../1062.azure_wave/tick/vfx/5.mcfunction | 72 ------------------- 5 files changed, 333 deletions(-) delete mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/1.mcfunction delete mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/2.mcfunction delete mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/3.mcfunction delete mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/4.mcfunction delete mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/5.mcfunction diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/1.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/1.mcfunction deleted file mode 100644 index d96eaf8da60..00000000000 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/1.mcfunction +++ /dev/null @@ -1,45 +0,0 @@ -#> asset:object/1062.azure_wave/tick/vfx/1 -# -# -# -# @within function asset:object/1062.azure_wave/tick/ - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAEYCMA7ABxxwCspAtACwBMADNZ7QBsHNvQ4pmbWr2YcAZgEMAzAE4eg+mAIA7BQFsEyQGGKAAmpawMBRn0BnJOBQB7QtohIuHAijhu4GBzAANwVsQkNwAA8kHgIoGIBfBIIbUjRCe0RqAlsIa3dEWLA4bGw0GFtDah4ijCc8iEMitFsAUVLyytaAR0JQ7CgAZSsfckRFbEqkvHBoeAp0LFwLYjIKLlpqUk36FCklORFxVlElLj2meh45K9JKWgVyHX1DMFMuCysbPUzHFzckNQuN5fI0AohwCEwhEwNFCnFEskwKl0pkeAA6Zg5PIYApFEplCpVGopeoKRoxAgtdqErq9fpDEZwMYTKYJAC6QA_3 -# 円 2 -particle dust 0.490 0.612 1.000 1.2 ^0 ^ ^-0.5 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.25 ^ ^-0.43301 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.43301 ^ ^-0.25 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.5 ^ ^0 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.43301 ^ ^0.25 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.25 ^ ^0.43301 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0 ^ ^0.5 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.25 ^ ^0.43301 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.43301 ^ ^0.25 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.5 ^ ^0 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.43301 ^ ^-0.25 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.25 ^ ^-0.43301 0 0 0 0 1 -# 円 1 -particle dust 0.490 0.612 1.000 1.2 ^0 ^ ^-1 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.25882 ^ ^-0.96593 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.5 ^ ^-0.86603 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.70711 ^ ^-0.70711 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.86603 ^ ^-0.5 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.96593 ^ ^-0.25882 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^1 ^ ^0 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.96593 ^ ^0.25882 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.86603 ^ ^0.5 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.70711 ^ ^0.70711 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.5 ^ ^0.86603 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0.25882 ^ ^0.96593 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^0 ^ ^1 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.25882 ^ ^0.96593 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.5 ^ ^0.86603 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.70711 ^ ^0.70711 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.86603 ^ ^0.5 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.96593 ^ ^0.25882 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-1 ^ ^0 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.96593 ^ ^-0.25882 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.86603 ^ ^-0.5 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.70711 ^ ^-0.70711 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.5 ^ ^-0.86603 0 0 0 0 1 -particle dust 0.490 0.612 1.000 1.2 ^-0.25882 ^ ^-0.96593 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/2.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/2.mcfunction deleted file mode 100644 index bf51aecf2d0..00000000000 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/2.mcfunction +++ /dev/null @@ -1,72 +0,0 @@ -#> asset:object/1062.azure_wave/tick/vfx/2 -# -# -# -# @within function asset:object/1062.azure_wave/tick/ - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAEYCMA7ABxxwCspAtACwBMADNZ7QBsHNvQ4pmbWr2YcAZgEMAzAE4eg+mAIA7BQFsEyQGGKAAmpawMBRn0BnJOBQB7QtohJhBFHDdwMDsAA3BWxCQ3AADyQeAihogF94ghtSNEJ7RC4CWwhrd0QYsDhsbDQYW0NqHkKMJ1yIQ0K0WwBRErKKloBHQhDsKABlK29yREVsCsSAXSA_3 -# 円 1 -particle dust 0.486 0.678 1.000 1.2 ^0 ^ ^-2 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^0.19603 ^ ^-1.99037 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^0.39018 ^ ^-1.96157 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^0.58057 ^ ^-1.91388 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^0.76537 ^ ^-1.84776 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^0.94279 ^ ^-1.76384 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.11114 ^ ^-1.66294 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.26879 ^ ^-1.54602 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.41421 ^ ^-1.41421 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.54602 ^ ^-1.26879 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.66294 ^ ^-1.11114 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.76384 ^ ^-0.94279 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.84776 ^ ^-0.76537 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.91388 ^ ^-0.58057 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.96157 ^ ^-0.39018 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.99037 ^ ^-0.19603 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^2 ^ ^0 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.99037 ^ ^0.19603 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.96157 ^ ^0.39018 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.91388 ^ ^0.58057 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.84776 ^ ^0.76537 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.76384 ^ ^0.94279 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.66294 ^ ^1.11114 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.54602 ^ ^1.26879 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.41421 ^ ^1.41421 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.26879 ^ ^1.54602 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^1.11114 ^ ^1.66294 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^0.94279 ^ ^1.76384 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^0.76537 ^ ^1.84776 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^0.58057 ^ ^1.91388 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^0.39018 ^ ^1.96157 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^0.19603 ^ ^1.99037 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^0 ^ ^2 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-0.19603 ^ ^1.99037 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-0.39018 ^ ^1.96157 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-0.58057 ^ ^1.91388 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-0.76537 ^ ^1.84776 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-0.94279 ^ ^1.76384 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.11114 ^ ^1.66294 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.26879 ^ ^1.54602 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.41421 ^ ^1.41421 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.54602 ^ ^1.26879 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.66294 ^ ^1.11114 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.76384 ^ ^0.94279 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.84776 ^ ^0.76537 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.91388 ^ ^0.58057 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.96157 ^ ^0.39018 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.99037 ^ ^0.19603 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-2 ^ ^0 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.99037 ^ ^-0.19603 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.96157 ^ ^-0.39018 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.91388 ^ ^-0.58057 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.84776 ^ ^-0.76537 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.76384 ^ ^-0.94279 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.66294 ^ ^-1.11114 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.54602 ^ ^-1.26879 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.41421 ^ ^-1.41421 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.26879 ^ ^-1.54602 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-1.11114 ^ ^-1.66294 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-0.94279 ^ ^-1.76384 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-0.76537 ^ ^-1.84776 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-0.58057 ^ ^-1.91388 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-0.39018 ^ ^-1.96157 0 0 0 0 1 -particle dust 0.486 0.678 1.000 1.2 ^-0.19603 ^ ^-1.99037 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/3.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/3.mcfunction deleted file mode 100644 index 800ab677c00..00000000000 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/3.mcfunction +++ /dev/null @@ -1,72 +0,0 @@ -#> asset:object/1062.azure_wave/tick/vfx/3 -# -# -# -# @within function asset:object/1062.azure_wave/tick/ - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAEYCMA7ABxxwCspAtACwBMADNZ7QBsHNvQ4pmbWr2YcAZgEMAzAE4eg+mAIA7BQFsEyQGGKAAmpawMBRn0BnJOBQB7QtohJhBFHDdwMDsAA3BWxCQ3AADyQeAihogF94ghtSNEJ7RCUCWwhrd0QYsDhsbDQYW0NqHkKMJ1yIQ0K0WwBRErKKloBHQhDsKABlK29yREVsCsSAXSA_3 -# 円 1 -particle dust 0.486 0.753 1.000 1.2 ^0 ^ ^-3 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^0.29405 ^ ^-2.98555 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^0.58527 ^ ^-2.94236 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^0.87085 ^ ^-2.87082 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^1.14805 ^ ^-2.77164 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^1.41419 ^ ^-2.64576 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^1.66671 ^ ^-2.49441 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^1.90318 ^ ^-2.31903 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.12132 ^ ^-2.12132 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.31903 ^ ^-1.90318 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.49441 ^ ^-1.66671 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.64576 ^ ^-1.41419 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.77164 ^ ^-1.14805 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.87082 ^ ^-0.87085 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.94236 ^ ^-0.58527 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.98555 ^ ^-0.29405 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^3 ^ ^0 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.98555 ^ ^0.29405 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.94236 ^ ^0.58527 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.87082 ^ ^0.87085 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.77164 ^ ^1.14805 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.64576 ^ ^1.41419 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.49441 ^ ^1.66671 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.31903 ^ ^1.90318 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^2.12132 ^ ^2.12132 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^1.90318 ^ ^2.31903 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^1.66671 ^ ^2.49441 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^1.41419 ^ ^2.64576 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^1.14805 ^ ^2.77164 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^0.87085 ^ ^2.87082 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^0.58527 ^ ^2.94236 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^0.29405 ^ ^2.98555 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^0 ^ ^3 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-0.29405 ^ ^2.98555 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-0.58527 ^ ^2.94236 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-0.87085 ^ ^2.87082 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-1.14805 ^ ^2.77164 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-1.41419 ^ ^2.64576 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-1.66671 ^ ^2.49441 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-1.90318 ^ ^2.31903 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.12132 ^ ^2.12132 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.31903 ^ ^1.90318 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.49441 ^ ^1.66671 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.64576 ^ ^1.41419 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.77164 ^ ^1.14805 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.87082 ^ ^0.87085 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.94236 ^ ^0.58527 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.98555 ^ ^0.29405 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-3 ^ ^0 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.98555 ^ ^-0.29405 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.94236 ^ ^-0.58527 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.87082 ^ ^-0.87085 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.77164 ^ ^-1.14805 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.64576 ^ ^-1.41419 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.49441 ^ ^-1.66671 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.31903 ^ ^-1.90318 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-2.12132 ^ ^-2.12132 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-1.90318 ^ ^-2.31903 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-1.66671 ^ ^-2.49441 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-1.41419 ^ ^-2.64576 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-1.14805 ^ ^-2.77164 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-0.87085 ^ ^-2.87082 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-0.58527 ^ ^-2.94236 0 0 0 0 1 -particle dust 0.486 0.753 1.000 1.2 ^-0.29405 ^ ^-2.98555 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/4.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/4.mcfunction deleted file mode 100644 index f27ee18ca2c..00000000000 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/4.mcfunction +++ /dev/null @@ -1,72 +0,0 @@ -#> asset:object/1062.azure_wave/tick/vfx/4 -# -# -# -# @within function asset:object/1062.azure_wave/tick/ - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAEYCMA7ABxxwCspAtACwBMADNZ7QBsHNvQ4pmbWr2YcAZgEMAzAE4eg+mAIA7BQFsEyQGGKAAmpawMBRn0BnJOBQB7QtohJhBFHDdwMDsAA3BWxCQ3AADyQeAihogF94ghtSNEJ7RA4CWwhrd0QYsDhsbDQYW0NqHkKMJ1yIQ0K0WwBRErKKloBHQhDsKABlK29yREVsCsSAXSA_3 -# 円 1 -particle dust 0.482 0.824 1.000 1.2 ^0 ^ ^-4 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^0.39207 ^ ^-3.98074 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^0.78036 ^ ^-3.92314 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^1.16114 ^ ^-3.82776 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^1.53073 ^ ^-3.69552 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^1.88559 ^ ^-3.52769 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^2.22228 ^ ^-3.32588 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^2.53757 ^ ^-3.09204 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^2.82843 ^ ^-2.82843 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.09204 ^ ^-2.53757 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.32588 ^ ^-2.22228 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.52769 ^ ^-1.88559 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.69552 ^ ^-1.53073 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.82776 ^ ^-1.16114 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.92314 ^ ^-0.78036 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.98074 ^ ^-0.39207 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^4 ^ ^0 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.98074 ^ ^0.39207 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.92314 ^ ^0.78036 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.82776 ^ ^1.16114 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.69552 ^ ^1.53073 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.52769 ^ ^1.88559 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.32588 ^ ^2.22228 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^3.09204 ^ ^2.53757 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^2.82843 ^ ^2.82843 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^2.53757 ^ ^3.09204 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^2.22228 ^ ^3.32588 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^1.88559 ^ ^3.52769 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^1.53073 ^ ^3.69552 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^1.16114 ^ ^3.82776 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^0.78036 ^ ^3.92314 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^0.39207 ^ ^3.98074 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^0 ^ ^4 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-0.39207 ^ ^3.98074 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-0.78036 ^ ^3.92314 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-1.16114 ^ ^3.82776 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-1.53073 ^ ^3.69552 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-1.88559 ^ ^3.52769 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-2.22228 ^ ^3.32588 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-2.53757 ^ ^3.09204 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-2.82843 ^ ^2.82843 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.09204 ^ ^2.53757 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.32588 ^ ^2.22228 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.52769 ^ ^1.88559 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.69552 ^ ^1.53073 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.82776 ^ ^1.16114 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.92314 ^ ^0.78036 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.98074 ^ ^0.39207 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-4 ^ ^0 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.98074 ^ ^-0.39207 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.92314 ^ ^-0.78036 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.82776 ^ ^-1.16114 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.69552 ^ ^-1.53073 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.52769 ^ ^-1.88559 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.32588 ^ ^-2.22228 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-3.09204 ^ ^-2.53757 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-2.82843 ^ ^-2.82843 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-2.53757 ^ ^-3.09204 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-2.22228 ^ ^-3.32588 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-1.88559 ^ ^-3.52769 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-1.53073 ^ ^-3.69552 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-1.16114 ^ ^-3.82776 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-0.78036 ^ ^-3.92314 0 0 0 0 1 -particle dust 0.482 0.824 1.000 1.2 ^-0.39207 ^ ^-3.98074 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/5.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/5.mcfunction deleted file mode 100644 index 30f3925f568..00000000000 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/vfx/5.mcfunction +++ /dev/null @@ -1,72 +0,0 @@ -#> asset:object/1062.azure_wave/tick/vfx/5 -# -# -# -# @within function asset:object/1062.azure_wave/tick/ - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAEYCMA7ABxxwCspAtACwBMADNZ7QBsHNvQ4pmbWr2YcAZgEMAzAE4eg+mAIA7BQFsEyQGGKAAmpawMBRn0BnJOBQB7QtohJhBFHDdwMDsAA3BWxCQ3AADyQeAihogF94ghtSNEJ7RGYCWwhrd0QYsDhsbDQYW0NqHkKMJ1yIQ0K0WwBRErKKloBHQhDsKABlK29yREVsCsSAXSA_3 -# 円 1 -particle dust 0.482 0.890 1.000 1.2 ^0 ^ ^-5 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^0.49009 ^ ^-4.97592 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^0.97545 ^ ^-4.90393 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^1.45142 ^ ^-4.7847 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^1.91342 ^ ^-4.6194 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^2.35698 ^ ^-4.40961 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^2.77785 ^ ^-4.15735 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^3.17197 ^ ^-3.86505 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^3.53553 ^ ^-3.53553 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^3.86505 ^ ^-3.17197 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^4.15735 ^ ^-2.77785 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^4.40961 ^ ^-2.35698 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^4.6194 ^ ^-1.91342 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^4.7847 ^ ^-1.45142 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^4.90393 ^ ^-0.97545 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^4.97592 ^ ^-0.49009 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^5 ^ ^0 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^4.97592 ^ ^0.49009 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^4.90393 ^ ^0.97545 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^4.7847 ^ ^1.45142 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^4.6194 ^ ^1.91342 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^4.40961 ^ ^2.35698 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^4.15735 ^ ^2.77785 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^3.86505 ^ ^3.17197 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^3.53553 ^ ^3.53553 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^3.17197 ^ ^3.86505 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^2.77785 ^ ^4.15735 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^2.35698 ^ ^4.40961 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^1.91342 ^ ^4.6194 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^1.45142 ^ ^4.7847 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^0.97545 ^ ^4.90393 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^0.49009 ^ ^4.97592 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^0 ^ ^5 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-0.49009 ^ ^4.97592 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-0.97545 ^ ^4.90393 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-1.45142 ^ ^4.7847 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-1.91342 ^ ^4.6194 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-2.35698 ^ ^4.40961 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-2.77785 ^ ^4.15735 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-3.17197 ^ ^3.86505 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-3.53553 ^ ^3.53553 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-3.86505 ^ ^3.17197 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-4.15735 ^ ^2.77785 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-4.40961 ^ ^2.35698 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-4.6194 ^ ^1.91342 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-4.7847 ^ ^1.45142 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-4.90393 ^ ^0.97545 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-4.97592 ^ ^0.49009 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-5 ^ ^0 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-4.97592 ^ ^-0.49009 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-4.90393 ^ ^-0.97545 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-4.7847 ^ ^-1.45142 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-4.6194 ^ ^-1.91342 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-4.40961 ^ ^-2.35698 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-4.15735 ^ ^-2.77785 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-3.86505 ^ ^-3.17197 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-3.53553 ^ ^-3.53553 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-3.17197 ^ ^-3.86505 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-2.77785 ^ ^-4.15735 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-2.35698 ^ ^-4.40961 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-1.91342 ^ ^-4.6194 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-1.45142 ^ ^-4.7847 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-0.97545 ^ ^-4.90393 0 0 0 0 1 -particle dust 0.482 0.890 1.000 1.2 ^-0.49009 ^ ^-4.97592 0 0 0 0 1 From 04f0fb5bcb77b2333828d80b04496f2d5eb5ad0d Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 19 Oct 2025 03:58:45 +0900 Subject: [PATCH 31/66] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E5=89=8A=E9=99=A42?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1062.azure_wave/summon/debug.mcfunction | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 Asset/data/asset/functions/object/1062.azure_wave/summon/debug.mcfunction diff --git a/Asset/data/asset/functions/object/1062.azure_wave/summon/debug.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/summon/debug.mcfunction deleted file mode 100644 index 593012c0dc0..00000000000 --- a/Asset/data/asset/functions/object/1062.azure_wave/summon/debug.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:object/1062.azure_wave/summon/debug -# -# 動作チェック用の召喚処理 使い終わったら消してもいいかも -# -# @user -# @private - -# 召喚 - data modify storage api: Argument.ID set value 1062 - function api:object/summon \ No newline at end of file From a3bf3202b629bad5e6645bdedbe0b7ddca5c25cf Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 19 Oct 2025 04:08:27 +0900 Subject: [PATCH 32/66] =?UTF-8?q?=E9=9F=B3=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/tick/sound.mcfunction | 4 ---- .../object/1062.azure_wave/tick/.mcfunction | 10 ++-------- .../object/1062.azure_wave/tick/sound.mcfunction | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 12 deletions(-) create mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/sound.mcfunction diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/sound.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/sound.mcfunction index b710297a820..96949d4df3a 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/sound.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/sound.mcfunction @@ -5,10 +5,6 @@ # @within function asset:object/1061.azure_jelly/tick/ execute if score $Interval Temporary matches 0 run playsound ogg:ambient.nether.crimson_forest.shine1 player @a[distance=..12] ~ ~ ~ 0.05 1.3 - execute if score $Interval Temporary matches 0 run playsound entity.dolphin.jump player @a ~ ~ ~ 0.20 0.8 - execute if score $Interval Temporary matches 1 run playsound entity.dolphin.jump player @a ~ ~ ~ 0.25 0.85 - execute if score $Interval Temporary matches 2 run playsound entity.dolphin.jump player @a ~ ~ ~ 0.30 0.9 - execute if score $Interval Temporary matches 0 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 2 execute if score $Interval Temporary matches 0 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 1.2 execute if score $Interval Temporary matches 0 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 0.6 diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction index 72d09d108a3..cca271d349d 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction @@ -7,14 +7,8 @@ # Tick加算 scoreboard players add @s General.Object.Tick 1 -# 演出 - #execute if score @s General.Object.Tick matches 1 run function asset:object/1062.azure_wave/tick/vfx/1 - #execute if score @s General.Object.Tick matches 2 run function asset:object/1062.azure_wave/tick/vfx/2 - #execute if score @s General.Object.Tick matches 3 run function asset:object/1062.azure_wave/tick/vfx/3 - #execute if score @s General.Object.Tick matches 4 run function asset:object/1062.azure_wave/tick/vfx/4 - #execute if score @s General.Object.Tick matches 5 run function asset:object/1062.azure_wave/tick/vfx/5 - -#tp @s ~ ~ ~ ~3 ~ +# 音 + function asset:object/1062.azure_wave/tick/sound # 拡大 execute if score @s General.Object.Tick matches 3 run function asset:object/1062.azure_wave/tick/transformation diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/sound.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/sound.mcfunction new file mode 100644 index 00000000000..d78e1e21c00 --- /dev/null +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/sound.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/1062.azure_wave/tick/sound +# +# +# +# @within function asset:object/1062.azure_wave/tick/ + + execute if score @s General.Object.Tick matches 3 run playsound ogg:ambient.nether.crimson_forest.shine1 player @a[distance=..12] ~ ~ ~ 0.05 1.3 + execute if score @s General.Object.Tick matches 3 run playsound entity.dolphin.jump player @a ~ ~ ~ 0.20 0.8 + execute if score @s General.Object.Tick matches 4 run playsound entity.dolphin.jump player @a ~ ~ ~ 0.25 0.85 + execute if score @s General.Object.Tick matches 5 run playsound entity.dolphin.jump player @a ~ ~ ~ 0.30 0.9 + + execute if score @s General.Object.Tick matches 3 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 2 + execute if score @s General.Object.Tick matches 3 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 1.2 + execute if score @s General.Object.Tick matches 3 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 0.6 From 3119c18b285cb76eda13fbcfdaa7b27cdc5aefea Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 19 Oct 2025 04:10:03 +0900 Subject: [PATCH 33/66] =?UTF-8?q?=E6=B5=B7=E6=9C=88=E3=81=AE=E9=9F=B3?= =?UTF-8?q?=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/object/1061.azure_jelly/tick/.mcfunction | 3 --- .../functions/object/1061.azure_jelly/tick/turn/.mcfunction | 5 ++--- .../object/1061.azure_jelly/tick/{ => turn}/sound.mcfunction | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) rename Asset/data/asset/functions/object/1061.azure_jelly/tick/{ => turn}/sound.mcfunction (82%) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index 3d46368a324..efb44a0aa59 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -26,9 +26,6 @@ scoreboard players operation $Interval Temporary = @s General.Object.Tick scoreboard players operation $Interval Temporary %= $50 Const -# playsound - execute if score $Interval Temporary matches 0..3 run function asset:object/1061.azure_jelly/tick/sound - # 移動方向設定 execute if score $Interval Temporary matches 0 run function asset:object/1061.azure_jelly/tick/turn/ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction index 4bc6b9d3187..53a8111dd54 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/.mcfunction @@ -12,9 +12,8 @@ # - プレイヤーから「離れていないなら」最寄りの敵の方へ移動する # - プレイヤーから「離れているなら」プレイヤーの方へ戻る -# 演出 - #execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/turn/vfx/circle - #execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/turn/vfx/circle2 +# 音 + function asset:object/1061.azure_jelly/tick/turn/sound # 敵がいないなら # Ownerが近くならテキトーな方向へ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/sound.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/sound.mcfunction similarity index 82% rename from Asset/data/asset/functions/object/1061.azure_jelly/tick/sound.mcfunction rename to Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/sound.mcfunction index 96949d4df3a..ed5733cb649 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/sound.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/sound.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1061.azure_jelly/tick/sound +#> asset:object/1061.azure_jelly/tick/turn/sound # # # -# @within function asset:object/1061.azure_jelly/tick/ +# @within function asset:object/1061.azure_jelly/tick/turn/ execute if score $Interval Temporary matches 0 run playsound ogg:ambient.nether.crimson_forest.shine1 player @a[distance=..12] ~ ~ ~ 0.05 1.3 execute if score $Interval Temporary matches 0 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 2 From ecaf0c07dbbda29db93c80ef36c436efc97e906c Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 19 Oct 2025 04:10:48 +0900 Subject: [PATCH 34/66] =?UTF-8?q?=E3=83=97=E3=83=AC=E3=82=A4=E3=83=A4?= =?UTF-8?q?=E3=83=BC=E3=81=8C=E9=9B=A2=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B?= =?UTF-8?q?=E3=81=8B=E3=81=A9=E3=81=86=E3=81=8B=E3=81=AE=E7=AF=84=E5=9B=B2?= =?UTF-8?q?=E3=82=92=E7=B8=AE=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/predicate/far_player.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction index 5b73645bf82..e50bc1dcb37 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/turn/ # プレイヤーが近くにいたらfail - execute if entity @p[tag=1061.Owner,distance=..32] run return 0 + execute if entity @p[tag=1061.Owner,distance=..20] run return 0 # 成功 return 1 From 6bfa8681c3b99f743ecdeab717b64d641aa1643d Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 19 Oct 2025 04:28:29 +0900 Subject: [PATCH 35/66] =?UTF-8?q?CD=E3=81=AE=E3=83=95=E3=82=A3=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=83=89=E3=81=ABCD=E3=81=A8CD=E3=81=AE=E7=8F=BE?= =?UTF-8?q?=E5=9C=A8=E5=80=A4=E3=81=AE=E4=BA=8C=E3=81=A4=E3=82=92=E4=BD=BF?= =?UTF-8?q?=E3=81=86=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1061.azure_jelly/register.mcfunction | 3 ++- .../functions/object/1061.azure_jelly/tick/attack/.mcfunction | 4 ++-- .../object/1061.azure_jelly/tick/attack/attack.mcfunction | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction index b3b9ea1cc82..aa5ee2283a3 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -19,7 +19,8 @@ # フィールド(オプション) data modify storage asset:object Field.IsFirst set value true data modify storage asset:object Field.IsUpper set value true - data modify storage asset:object Field.AttackCD set value 50 + data modify storage asset:object Field.AttackCD.Current set value 0 + data modify storage asset:object Field.AttackCD._ set value 50 data modify storage asset:object Field.SpeedMultiplier set value 1 data modify storage asset:object Field.Damage set value 1 data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction index 5ebb59f854e..96dcd69d40d 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction @@ -5,10 +5,10 @@ # @within function asset:object/1061.azure_jelly/tick/ # クールダウンをデクリメント - execute store result storage asset:context this.AttackCD int 0.9999999999 run data get storage asset:context this.AttackCD + execute store result storage asset:context this.AttackCD.Current int 0.9999999999 run data get storage asset:context this.AttackCD.Current # CDが0でなければreturn - execute unless data storage asset:context this{AttackCD:0} run return fail + execute unless data storage asset:context this.AttackCD{Current:0} run return fail # 敵が近くにいたら攻撃 execute positioned ~-3 ~-3 ~-3 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=5,dy=5,dz=5] at @s run function asset:object/1061.azure_jelly/tick/attack/attack diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction index f9059b86076..3e853256179 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction @@ -30,4 +30,4 @@ tag @e[type=#lib:living_without_player,tag=BoundingCylinder,distance=..7] remove BoundingCylinder # AttackCD初期化 - data modify storage asset:context this.AttackCD set value 50 + data modify storage asset:context this.AttackCD.Current set from storage asset:context this.AttackCD._ From 1093681d75702c4ebad80640cd1f43375c3df9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=91=A0=E7=92=83?= <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 19 Oct 2025 12:41:12 +0900 Subject: [PATCH 36/66] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=81=AB=E5=85=B7=E4=BD=93=E7=9A=84=E3=81=AA=E6=95=B0=E5=80=A4?= =?UTF-8?q?=E3=82=92=E4=BD=BF=E3=82=8F=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/tick/angle/init.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction index 3e9e18bc261..0a1be1ee67c 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction @@ -10,8 +10,8 @@ # 上下どちらの移動をするかトグルで切り替える function asset:object/1061.azure_jelly/tick/angle/switch_up_down -# trueなら-6000して保存しておく +# trueなら少し減らして保存しておく execute if data storage asset:context this{IsUpper:true} run scoreboard players remove @s 1061.Pitch 6000 -# falseなら+3000 +# falseなら少し増やす execute if data storage asset:context this{IsUpper:false} run scoreboard players add @s 1061.Pitch 1500 From 1ca4f550c2fb91ba18e782a5accb1be66a4c6b6c Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 20 Oct 2025 21:10:04 +0900 Subject: [PATCH 37/66] =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E3=81=8D?= =?UTF-8?q?=E3=82=8C=E3=81=84=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1062.azure_wave/summon/.mcfunction | 2 +- .../object/1062.azure_wave/tick/.mcfunction | 7 +++++-- .../1062.azure_wave/tick/disappear.mcfunction | 15 +++++++++++++++ ...ransformation.mcfunction => expand.mcfunction} | 5 +++-- 4 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction rename Asset/data/asset/functions/object/1062.azure_wave/tick/{transformation.mcfunction => expand.mcfunction} (56%) diff --git a/Asset/data/asset/functions/object/1062.azure_wave/summon/.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/summon/.mcfunction index 9f9ef0fdbe8..642c4189ce8 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/summon/.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/summon/.mcfunction @@ -4,4 +4,4 @@ # # @within asset:object/alias/1062/summon - summon item_display ~ ~ ~ {Tags:["ObjectInit"],Rotation:[90f,0f],teleport_duration:1,interpolation_duration:30,brightness:{sky:10,block:10},item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20579}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,2f,0f],translation:[0f,1f,0f]}} + summon item_display ~ ~ ~ {Tags:["ObjectInit"],Rotation:[90f,0f],teleport_duration:1,interpolation_duration:30,brightness:{sky:10,block:10},item:{id:"minecraft:stick",Count:1b,tag:{CustomModelData:20579}},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],scale:[0f,5f,0f],translation:[0f,2.5f,0f]}} diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction index cca271d349d..468cefa8edd 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction @@ -11,7 +11,10 @@ function asset:object/1062.azure_wave/tick/sound # 拡大 - execute if score @s General.Object.Tick matches 3 run function asset:object/1062.azure_wave/tick/transformation + execute if score @s General.Object.Tick matches 3 run function asset:object/1062.azure_wave/tick/expand + +# 見えなくなる + execute if score @s General.Object.Tick matches 28 run function asset:object/1062.azure_wave/tick/disappear # 消滅処理 - kill @s[scores={General.Object.Tick=30..}] + kill @s[scores={General.Object.Tick=50..}] diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction new file mode 100644 index 00000000000..8d3d1098da0 --- /dev/null +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/1062.azure_wave/tick/disappear +# +# +# +# @within function asset:object/1062.azure_wave/tick/ + +# start_interpolation + data modify entity @s start_interpolation set value 0 + +# interpolation_duration + data modify entity @s interpolation_duration set value 6 + +# 回転 + data modify entity @s transformation.scale set value [9f,0f,9f] + data modify entity @s transformation.translation set value [0f,0f,0f] diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/transformation.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/expand.mcfunction similarity index 56% rename from Asset/data/asset/functions/object/1062.azure_wave/tick/transformation.mcfunction rename to Asset/data/asset/functions/object/1062.azure_wave/tick/expand.mcfunction index 815f20bfa57..6a41cbac09d 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/transformation.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/expand.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1062.azure_wave/tick/transformation +#> asset:object/1062.azure_wave/tick/expand # # # @@ -9,4 +9,5 @@ # 回転 data modify entity @s transformation.left_rotation set value [0f,0.7071f,0f,0.7071f] - data modify entity @s transformation.scale set value [6f,2f,6f] + data modify entity @s transformation.scale set value [9f,6f,9f] + #data modify entity @s transformation.translation set value [0f,3f,0f] From b2acd8bfc6bcbbed5d129aa50ec80a2fa219ca6d Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 20 Oct 2025 21:10:34 +0900 Subject: [PATCH 38/66] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AAif=20score?= =?UTF-8?q?=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/tick/turn/sound.mcfunction | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/sound.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/sound.mcfunction index ed5733cb649..1a2120efba6 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/sound.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/sound.mcfunction @@ -4,7 +4,7 @@ # # @within function asset:object/1061.azure_jelly/tick/turn/ - execute if score $Interval Temporary matches 0 run playsound ogg:ambient.nether.crimson_forest.shine1 player @a[distance=..12] ~ ~ ~ 0.05 1.3 - execute if score $Interval Temporary matches 0 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 2 - execute if score $Interval Temporary matches 0 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 1.2 - execute if score $Interval Temporary matches 0 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 0.6 + playsound ogg:ambient.nether.crimson_forest.shine1 player @a[distance=..12] ~ ~ ~ 0.05 1.3 + playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 2 + playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 1.2 + playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 0.6 From ad77f0fd423a5d1ee72f7ef317b140906010c8ea Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 20 Oct 2025 21:11:49 +0900 Subject: [PATCH 39/66] =?UTF-8?q?playsound=E3=82=92neutral=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/summon_effect/vfx.mcfunction | 12 ++++++------ .../1061.azure_jelly/tick/turn/sound.mcfunction | 8 ++++---- .../object/1062.azure_wave/tick/sound.mcfunction | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/vfx.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/vfx.mcfunction index 9bd42e764f1..446889610f5 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/vfx.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/vfx.mcfunction @@ -7,9 +7,9 @@ # 演出 particle scrape ~ ~1 ~ 0 0.3 0 4.5 50 normal @a - playsound ogg:ambient.nether.crimson_forest.shine1 player @a[distance=..12] ~ ~ ~ 0.05 1.3 - playsound entity.dolphin.jump player @a ~ ~ ~ 0.40 0.8 - playsound entity.dolphin.jump player @a ~ ~ ~ 0.40 0.85 - playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 2 - playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 1.2 - playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 0.6 + playsound ogg:ambient.nether.crimson_forest.shine1 neutral @a[distance=..12] ~ ~ ~ 0.05 1.3 + playsound entity.dolphin.jump neutral @a ~ ~ ~ 0.40 0.8 + playsound entity.dolphin.jump neutral @a ~ ~ ~ 0.40 0.85 + playsound ogg:block.amethyst.shimmer neutral @a ~ ~ ~ 0.5 2 + playsound ogg:block.amethyst.shimmer neutral @a ~ ~ ~ 0.5 1.2 + playsound ogg:block.amethyst.shimmer neutral @a ~ ~ ~ 0.5 0.6 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/sound.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/sound.mcfunction index 1a2120efba6..a0e478f1fc3 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/sound.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/sound.mcfunction @@ -4,7 +4,7 @@ # # @within function asset:object/1061.azure_jelly/tick/turn/ - playsound ogg:ambient.nether.crimson_forest.shine1 player @a[distance=..12] ~ ~ ~ 0.05 1.3 - playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 2 - playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 1.2 - playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 0.6 + playsound ogg:ambient.nether.crimson_forest.shine1 neutral @a[distance=..12] ~ ~ ~ 0.05 1.3 + playsound ogg:block.amethyst.shimmer neutral @a ~ ~ ~ 0.5 2 + playsound ogg:block.amethyst.shimmer neutral @a ~ ~ ~ 0.5 1.2 + playsound ogg:block.amethyst.shimmer neutral @a ~ ~ ~ 0.5 0.6 diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/sound.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/sound.mcfunction index d78e1e21c00..f6a2e90ec2a 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/sound.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/sound.mcfunction @@ -4,11 +4,11 @@ # # @within function asset:object/1062.azure_wave/tick/ - execute if score @s General.Object.Tick matches 3 run playsound ogg:ambient.nether.crimson_forest.shine1 player @a[distance=..12] ~ ~ ~ 0.05 1.3 - execute if score @s General.Object.Tick matches 3 run playsound entity.dolphin.jump player @a ~ ~ ~ 0.20 0.8 - execute if score @s General.Object.Tick matches 4 run playsound entity.dolphin.jump player @a ~ ~ ~ 0.25 0.85 - execute if score @s General.Object.Tick matches 5 run playsound entity.dolphin.jump player @a ~ ~ ~ 0.30 0.9 + execute if score @s General.Object.Tick matches 3 run playsound ogg:ambient.nether.crimson_forest.shine1 neutral @a[distance=..12] ~ ~ ~ 0.05 1.3 + execute if score @s General.Object.Tick matches 3 run playsound entity.dolphin.jump neutral @a ~ ~ ~ 0.20 0.8 + execute if score @s General.Object.Tick matches 4 run playsound entity.dolphin.jump neutral @a ~ ~ ~ 0.25 0.85 + execute if score @s General.Object.Tick matches 5 run playsound entity.dolphin.jump neutral @a ~ ~ ~ 0.30 0.9 - execute if score @s General.Object.Tick matches 3 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 2 - execute if score @s General.Object.Tick matches 3 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 1.2 - execute if score @s General.Object.Tick matches 3 run playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 0.5 0.6 + execute if score @s General.Object.Tick matches 3 run playsound ogg:block.amethyst.shimmer neutral @a ~ ~ ~ 0.5 2 + execute if score @s General.Object.Tick matches 3 run playsound ogg:block.amethyst.shimmer neutral @a ~ ~ ~ 0.5 1.2 + execute if score @s General.Object.Tick matches 3 run playsound ogg:block.amethyst.shimmer neutral @a ~ ~ ~ 0.5 0.6 From b48e6c1582f4d0a021a11e4f5fc041ae4c6cb657 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 20 Oct 2025 21:12:33 +0900 Subject: [PATCH 40/66] =?UTF-8?q?=E3=83=AC=E3=83=83=E3=83=89=E3=82=B7?= =?UTF-8?q?=E3=83=A3=E3=83=BC=E3=83=89=E3=81=AB=E7=99=BB=E9=8C=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1144.cradle_of_azure_moon/register.mcfunction | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/register.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/register.mcfunction index b4d93a038cc..a240ee8cf9b 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/register.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/register.mcfunction @@ -4,4 +4,5 @@ # # @within tag/function asset:artifact/register -data modify storage asset:artifact RarityRegistry[4] append value [1144] \ No newline at end of file +data modify storage asset:artifact RarityRegistry[4] append value [1144] +data modify storage asset:artifact RarityRegistryWithColor.Red[4] append value [1144] From 8acc7f513c92149719505dd93dbbbefd22071646 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 20 Oct 2025 21:15:44 +0900 Subject: [PATCH 41/66] =?UTF-8?q?=E6=9C=80=E4=BD=8E=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=82=8B=E8=B7=9D=E9=9B=A2=E3=82=92=E6=8B=A1?= =?UTF-8?q?=E5=A4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/turn/set_speed_multiplier/enemy.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy.mcfunction index df46a9aa47d..49a9af63a20 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy.mcfunction @@ -8,4 +8,4 @@ execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..40] run data modify storage asset:context this.SpeedMultiplier set value 3 execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..20] run data modify storage asset:context this.SpeedMultiplier set value 2 execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] run data modify storage asset:context this.SpeedMultiplier set value 1 - execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..3] run data modify storage asset:context this.SpeedMultiplier set value 0.5 + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run data modify storage asset:context this.SpeedMultiplier set value 0.5 From e55a50d6fdf1a537752a6d31a46f1309895fa0bf Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 20 Oct 2025 21:45:56 +0900 Subject: [PATCH 42/66] =?UTF-8?q?=E6=B3=A2=E3=81=AE=E8=A6=8B=E3=81=88?= =?UTF-8?q?=E3=81=AA=E3=81=8F=E3=81=AA=E3=82=8B=E6=BC=94=E5=87=BA=E3=82=92?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/object/1062.azure_wave/tick/.mcfunction | 2 +- .../functions/object/1062.azure_wave/tick/disappear.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction index 468cefa8edd..b2ac90cd968 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction @@ -14,7 +14,7 @@ execute if score @s General.Object.Tick matches 3 run function asset:object/1062.azure_wave/tick/expand # 見えなくなる - execute if score @s General.Object.Tick matches 28 run function asset:object/1062.azure_wave/tick/disappear + execute if score @s General.Object.Tick matches 30 run function asset:object/1062.azure_wave/tick/disappear # 消滅処理 kill @s[scores={General.Object.Tick=50..}] diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction index 8d3d1098da0..ae64268d834 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction @@ -8,7 +8,7 @@ data modify entity @s start_interpolation set value 0 # interpolation_duration - data modify entity @s interpolation_duration set value 6 + data modify entity @s interpolation_duration set value 4 # 回転 data modify entity @s transformation.scale set value [9f,0f,9f] From f2bf00c260e001004fa344d3bad83f3bb9b48d0d Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 20 Oct 2025 21:59:00 +0900 Subject: [PATCH 43/66] =?UTF-8?q?=E6=B3=A2=E3=81=8C=E5=B7=A6=E5=9B=9E?= =?UTF-8?q?=E8=BB=A2=E3=81=A8=E5=8F=B3=E5=9B=9E=E8=BB=A2=E3=81=AE2?= =?UTF-8?q?=E3=83=91=E3=82=BF=E3=83=BC=E3=83=B3=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/register.mcfunction | 1 + .../1061.azure_jelly/tick/attack/attack.mcfunction | 4 ++-- .../tick/attack/summon_wave/.mcfunction | 13 +++++++++++++ .../tick/attack/summon_wave/switch.mcfunction | 9 +++++++++ .../object/1062.azure_wave/register.mcfunction | 8 ++++---- .../object/1062.azure_wave/tick/expand.mcfunction | 3 ++- 6 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/summon_wave/.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/summon_wave/switch.mcfunction diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction index aa5ee2283a3..869d4dd3c46 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -19,6 +19,7 @@ # フィールド(オプション) data modify storage asset:object Field.IsFirst set value true data modify storage asset:object Field.IsUpper set value true + data modify storage asset:object Field.WaveLeftRotate set value true data modify storage asset:object Field.AttackCD.Current set value 0 data modify storage asset:object Field.AttackCD._ set value 50 data modify storage asset:object Field.SpeedMultiplier set value 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction index 3e853256179..9f43d614c5f 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction @@ -8,8 +8,8 @@ execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/vfx/circle1 execute rotated ~ 0 positioned ~ ~-0.3 ~ run function asset:object/1061.azure_jelly/tick/vfx/circle2 - data modify storage api: Argument.ID set value 1062 - execute positioned ~ ~-0.3 ~ run function api:object/summon +# 波Objectの演出 + function asset:object/1061.azure_jelly/tick/attack/summon_wave/ # 円柱Libを用いて判定する data modify storage lib: Argument.BoundingCylinder.Radius set value 4.5d diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/summon_wave/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/summon_wave/.mcfunction new file mode 100644 index 00000000000..34301c4e31a --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/summon_wave/.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1061.azure_jelly/tick/attack/summon_wave/ +# +# +# +# @within function asset:object/1061.azure_jelly/tick/attack/attack + +# トグルで切替 + function asset:object/1061.azure_jelly/tick/attack/summon_wave/switch + +# 召喚 + data modify storage api: Argument.ID set value 1062 + data modify storage api: Argument.FieldOverride.LeftRotate set from storage asset:context this.WaveLeftRotate + execute positioned ~ ~-0.3 ~ run function api:object/summon diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/summon_wave/switch.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/summon_wave/switch.mcfunction new file mode 100644 index 00000000000..a4d2b7bc2d1 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/summon_wave/switch.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/1061.azure_jelly/tick/attack/summon_wave/switch +# +# +# +# @within function asset:object/1061.azure_jelly/tick/attack/summon_wave/ + +# トグル + execute if data storage asset:context this{WaveLeftRotate:true} run return run data modify storage asset:context this.WaveLeftRotate set value false + execute unless data storage asset:context this{WaveLeftRotate:true} run data modify storage asset:context this.WaveLeftRotate set value true diff --git a/Asset/data/asset/functions/object/1062.azure_wave/register.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/register.mcfunction index 61a86d8126d..087091d6d5b 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/register.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/register.mcfunction @@ -5,16 +5,16 @@ # @within function asset:object/alias/1062/register # 継承(オプション) - # data modify storage asset:object Extends append value + # data modify storage asset:object Extends append value # function asset:object/extends # 他のObjectに継承されることを許可するか (boolean) (オプション) - # data modify storage asset:object ExtendsSafe set value + # data modify storage asset:object ExtendsSafe set value # 継承されることを前提とした、抽象的なObjectであるかどうか(boolean) data modify storage asset:object IsAbstract set value false # Tickするかどうか(boolean) (オプション) - # data modify storage asset:object IsTicking set value + # data modify storage asset:object IsTicking set value # ID (int) data modify storage asset:object ID set value 1062 # フィールド(オプション) - # data modify storage asset:object Field.myValue set value \ No newline at end of file + data modify storage asset:object Field.LeftRotate set value false diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/expand.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/expand.mcfunction index 6a41cbac09d..0a90fb0213a 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/expand.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/expand.mcfunction @@ -8,6 +8,7 @@ data modify entity @s start_interpolation set value 0 # 回転 - data modify entity @s transformation.left_rotation set value [0f,0.7071f,0f,0.7071f] + execute if data storage asset:context this{LeftRotate:true} run data modify entity @s transformation.left_rotation set value [0f,0.7071f,0f,0.7071f] + execute unless data storage asset:context this{LeftRotate:true} run data modify entity @s transformation.left_rotation set value [0f,-0.7071f,0f,0.7071f] data modify entity @s transformation.scale set value [9f,6f,9f] #data modify entity @s transformation.translation set value [0f,3f,0f] From b1c10e8f95bf392492a96c67d2389edd42ad28cd Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 20 Oct 2025 22:02:45 +0900 Subject: [PATCH 44/66] =?UTF-8?q?=E5=B0=8F=E3=81=95=E3=81=8F=E3=81=AA?= =?UTF-8?q?=E3=82=8B=E6=99=82=E3=81=AE=E6=95=B0=E5=80=A4=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1062.azure_wave/tick/disappear.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction index ae64268d834..ca987b3d060 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction @@ -10,6 +10,6 @@ # interpolation_duration data modify entity @s interpolation_duration set value 4 -# 回転 +# 小さくなる data modify entity @s transformation.scale set value [9f,0f,9f] - data modify entity @s transformation.translation set value [0f,0f,0f] + data modify entity @s transformation.translation set value [0f,-0.5f,0f] From 8e2bab8eccd27a3ad8926abe6f95b2a255831abd Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 20 Oct 2025 22:03:11 +0900 Subject: [PATCH 45/66] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1062.azure_wave/tick/expand.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/expand.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/expand.mcfunction index 0a90fb0213a..287e6cd5aa6 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/expand.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/expand.mcfunction @@ -7,7 +7,7 @@ # start_interpolation data modify entity @s start_interpolation set value 0 -# 回転 +# 拡大しながら回転 execute if data storage asset:context this{LeftRotate:true} run data modify entity @s transformation.left_rotation set value [0f,0.7071f,0f,0.7071f] execute unless data storage asset:context this{LeftRotate:true} run data modify entity @s transformation.left_rotation set value [0f,-0.7071f,0f,0.7071f] data modify entity @s transformation.scale set value [9f,6f,9f] From 7466fa4f7ef109c23cdba9a42d19db38dffec1d5 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 20 Oct 2025 22:07:24 +0900 Subject: [PATCH 46/66] =?UTF-8?q?=E6=B3=A2=E3=81=AE=E6=8C=99=E5=8B=95?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/object/1062.azure_wave/tick/.mcfunction | 4 ++-- .../object/1062.azure_wave/tick/disappear.mcfunction | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction index b2ac90cd968..e38e28ab387 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction @@ -14,7 +14,7 @@ execute if score @s General.Object.Tick matches 3 run function asset:object/1062.azure_wave/tick/expand # 見えなくなる - execute if score @s General.Object.Tick matches 30 run function asset:object/1062.azure_wave/tick/disappear + execute if score @s General.Object.Tick matches 29 run function asset:object/1062.azure_wave/tick/disappear # 消滅処理 - kill @s[scores={General.Object.Tick=50..}] + kill @s[scores={General.Object.Tick=35..}] diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction index ca987b3d060..a1f9cd86614 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction @@ -8,7 +8,7 @@ data modify entity @s start_interpolation set value 0 # interpolation_duration - data modify entity @s interpolation_duration set value 4 + data modify entity @s interpolation_duration set value 5 # 小さくなる data modify entity @s transformation.scale set value [9f,0f,9f] From c8e411678345fcb6d55c86336eeb923979c5010b Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 21 Oct 2025 00:07:52 +0900 Subject: [PATCH 47/66] =?UTF-8?q?=E6=B6=88=E3=81=88=E6=96=B9=E3=82=92?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/object/1062.azure_wave/tick/.mcfunction | 2 +- .../object/1062.azure_wave/tick/disappear.mcfunction | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction index e38e28ab387..524a4682e9a 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/.mcfunction @@ -17,4 +17,4 @@ execute if score @s General.Object.Tick matches 29 run function asset:object/1062.azure_wave/tick/disappear # 消滅処理 - kill @s[scores={General.Object.Tick=35..}] + kill @s[scores={General.Object.Tick=38..}] diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction index a1f9cd86614..8caa51b206d 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction @@ -8,8 +8,8 @@ data modify entity @s start_interpolation set value 0 # interpolation_duration - data modify entity @s interpolation_duration set value 5 + data modify entity @s interpolation_duration set value 8 # 小さくなる - data modify entity @s transformation.scale set value [9f,0f,9f] + data modify entity @s transformation.scale set value [12f,0.1f,12f] data modify entity @s transformation.translation set value [0f,-0.5f,0f] From f33cf323ea57104a6657902cb4d819ad681d04db Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 21 Oct 2025 02:19:53 +0900 Subject: [PATCH 48/66] =?UTF-8?q?=E3=83=97=E3=83=AC=E3=82=A4=E3=83=A4?= =?UTF-8?q?=E3=83=BC=E3=81=8C=E8=BF=91=E3=81=8F=E3=81=AB=E3=81=84=E3=82=8B?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E3=82=92=E7=8B=AD=E3=82=81=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/predicate/far_player.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction index e50bc1dcb37..af043300aca 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/turn/ # プレイヤーが近くにいたらfail - execute if entity @p[tag=1061.Owner,distance=..20] run return 0 + execute if entity @p[tag=1061.Owner,distance=..15] run return 0 # 成功 return 1 From 7e4c73a160cd55719218a54ce17797632ac1cc83 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 22 Oct 2025 01:10:16 +0900 Subject: [PATCH 49/66] =?UTF-8?q?predicate=E5=90=8D=E3=82=92=E8=AA=BF?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../predicate/{collision.mcfunction => no_collision.mcfunction} | 2 +- .../functions/object/1061.azure_jelly/tick/move/.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename Asset/data/asset/functions/object/1061.azure_jelly/predicate/{collision.mcfunction => no_collision.mcfunction} (91%) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/no_collision.mcfunction similarity index 91% rename from Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction rename to Asset/data/asset/functions/object/1061.azure_jelly/predicate/no_collision.mcfunction index 7d1ee2765ac..481ff5cf9d4 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/collision.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/no_collision.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1061.azure_jelly/predicate/collision +#> asset:object/1061.azure_jelly/predicate/no_collision # # # diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction index 2f827fc8647..774e27cfd5b 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/ # そもそも: 完全に埋まってたら少しずつ上に行ってreturn - execute unless function asset:object/1061.azure_jelly/predicate/collision run return run tp @s ~ ~0.1 ~ + execute unless function asset:object/1061.azure_jelly/predicate/no_collision run return run tp @s ~ ~0.1 ~ # 速度付きで前方が安全か判定してから進む # ちょっとでも軽くしたいな～ってことでreturnで実行数がそんなに増えないようにする From 98c11e520d141c193a18f39eb2e341363852ab02 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 22 Oct 2025 18:37:32 +0900 Subject: [PATCH 50/66] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E6=BC=8F=E3=82=8C?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1061.azure_jelly/tick/move/check_collision.m.mcfunction | 2 +- .../1061.azure_jelly/tick/move/with_collision.mcfunction | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction index 45b8cd72a29..0bc7f5f089d 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction @@ -8,7 +8,7 @@ # asset:object/1061.azure_jelly/tick/summon_effect/ # 前方が問題ないか判定 - $execute positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/collision run data modify storage asset:temp 1061.Success set value true + $execute positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/no_collision run data modify storage asset:temp 1061.Success set value true # 前方が問題ないならそのままtp $execute if data storage asset:temp 1061{Success:true} run tp @s ^ ^ ^$(Speed) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction index 056953a0cc6..9802ca0481f 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction @@ -5,10 +5,10 @@ # @within function asset:object/1061.azure_jelly/tick/move/check_collision.m # x - $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned 0.0 ~ ~ positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/collision run tp @s ~ ~ ~ + $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned 0.0 ~ ~ positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/no_collision run tp @s ~ ~ ~ # y - $execute positioned ^ ^ ^$(Speed) rotated ~180 ~ positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/collision run tp @s ~ ~ ~ + $execute positioned ^ ^ ^$(Speed) rotated ~180 ~ positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/no_collision run tp @s ~ ~ ~ # z - $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned ~ ~ 0.0 positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/collision run tp @s ~ ~ ~ + $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned ~ ~ 0.0 positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/no_collision run tp @s ~ ~ ~ From 8ce3b194fd6720fe337a3ea667dad5d1368dd4ec Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 22 Oct 2025 18:38:11 +0900 Subject: [PATCH 51/66] =?UTF-8?q?=E6=8B=A1=E6=95=A3=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AE=E4=BB=95=E6=A7=98=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/turn/chase_player/.mcfunction | 10 ++------- .../chase_player/forward_spread.m.mcfunction | 21 ------------------- .../tick/turn/chase_player/spread.mcfunction | 20 ++++++++++++++++++ 3 files changed, 22 insertions(+), 29 deletions(-) delete mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/spread.mcfunction diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/.mcfunction index 9d99a85ad98..b612cb7f394 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/.mcfunction @@ -4,14 +4,8 @@ # # @within function asset:object/1061.azure_jelly/tick/turn/ -# プレイヤーの方を見る - execute facing entity @p[tag=1061.Owner] eyes run tp @s ~ ~ ~ ~ ~ - -# プレイヤーの距離に応じて前方拡散の拡散率を変える -# 遠いほど拡散を小っちゃくする - execute if entity @p[tag=1061.Owner,distance=..10] unless entity @p[tag=1061.Owner,distance=10..] run function asset:object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m {Spread:3} - execute if entity @p[tag=1061.Owner,distance=..20] unless entity @p[tag=1061.Owner,distance=20..] run function asset:object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m {Spread:2} - execute if entity @p[tag=1061.Owner,distance=20..] run function asset:object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m {Spread:1} +# プレイヤーの近くのランダムな位置へ向かう + execute at @p[tag=1061.Owner] run function asset:object/1061.azure_jelly/tick/turn/chase_player/spread # プレイヤーとの距離に応じて速度倍率を設定する function asset:object/1061.azure_jelly/tick/turn/set_speed_multiplier/player diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m.mcfunction deleted file mode 100644 index f0412b1629e..00000000000 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -#> asset:object/1061.azure_jelly/tick/turn/chase_player/forward_spread.m -# -# -# -# @within function asset:object/1061.azure_jelly/tick/turn/chase_player/ - -#> Private -# @private - #declare tag SpreadMarker - -# 前方拡散 - summon marker ~ ~ ~ {Tags:["SpreadMarker"]} - data modify storage lib: Argument.Distance set value 4 - $data modify storage lib: Argument.Spread set value $(Speed) - execute as @e[type=marker,tag=SpreadMarker,distance=..0.01,limit=1] run function lib:forward_spreader/circle - -# SpreadMarkerを見る - execute facing entity @e[type=marker,tag=SpreadMarker,distance=..10] feet run tp @s ~ ~ ~ ~ ~ - -# リセット - kill @e[type=marker,tag=SpreadMarker,distance=..10] diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/spread.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/spread.mcfunction new file mode 100644 index 00000000000..c2707ede0eb --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_player/spread.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/1061.azure_jelly/tick/turn/chase_player/spread +# +# +# +# @within function asset:object/1061.azure_jelly/tick/turn/chase_player/ + +#> Private +# @private + #declare tag SpreadMarker + +# マーカーを拡散し、そのMarkerにfacingする + summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + data modify storage lib: Argument.Bounds set value [[3d,3d],[0d,0d],[3d,3d]] + execute as @e[type=marker,tag=SpreadMarker,distance=..0.01,limit=1] at @s run function lib:spread_entity/ + +# SpreadMarkerを見る + execute at @s facing entity @e[type=marker,tag=SpreadMarker,distance=..100] feet run tp @s ~ ~ ~ ~ ~ + +# リセット + kill @e[type=marker,tag=SpreadMarker,distance=..10] From 49a68a278bd3ff26739ef7a026dcfe7a5b8aed9b Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 23 Nov 2025 17:40:03 +0900 Subject: [PATCH 52/66] =?UTF-8?q?=E6=95=B5=E3=81=8C=E8=BF=91=E3=81=8F?= =?UTF-8?q?=E3=81=AB=E3=81=84=E3=82=8B=E3=81=8B=EF=BC=9F=20=E3=81=AE?= =?UTF-8?q?=E5=88=A4=E5=AE=9A=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1061.azure_jelly/predicate/near_enemy.mcfunction | 2 +- .../1061.azure_jelly/tick/turn/chase_enemy.mcfunction | 8 ++++---- .../tick/turn/set_speed_multiplier/enemy.mcfunction | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction index 7e7bab9cddf..edb06fd106e 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/near_enemy.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/turn/ # 敵が近くにいるかを判定 - execute positioned ~-14 ~-14 ~-14 unless entity @e[type=#lib:living_without_player,tag=Enemy,dx=27,dy=27,dz=27,limit=1] run return 0 + execute positioned ~-8 ~-8 ~-8 unless entity @e[type=#lib:living_without_player,tag=Enemy,dx=15,dy=15,dz=15,limit=1] run return 0 # 成功 return 1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction index ca09a7760b2..59549094a8a 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction @@ -4,14 +4,14 @@ # # @within function asset:object/1061.azure_jelly/tick/turn/ -# 最寄りの敵のy座標が近いかを判定 - execute positioned ~-14 ~ ~-14 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=27,dy=0.0,dz=27,limit=1] run data modify storage asset:temp 1061.Success set value true +# 最も近くの敵のy座標が近いかを判定 + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] at @s positioned ~-8 ~ ~-8 if entity @e[type=armor_stand,tag=this,dx=15,dy=0,dz=15,sort=nearest,limit=1] run data modify storage asset:temp 1061.Success set value true # 近いならrotated ~ 0で敵の方を向く - execute if data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..40] feet rotated ~ 0 run tp @s ~ ~ ~ ~ ~ + execute if data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] feet rotated ~ 0 run tp @s ~ ~ ~ ~ ~ # 近くなければそのままfacingする - execute unless data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..40] feet run tp @s ~ ~ ~ ~ ~ + execute unless data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] feet run tp @s ~ ~ ~ ~ ~ # リセット data remove storage asset:temp 1061 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy.mcfunction index 49a9af63a20..2bc37558f94 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/set_speed_multiplier/enemy.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/turn/chase_enemy # 敵との距離に応じて速度倍率を設定する - execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..40] run data modify storage asset:context this.SpeedMultiplier set value 3 + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] run data modify storage asset:context this.SpeedMultiplier set value 3 execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..20] run data modify storage asset:context this.SpeedMultiplier set value 2 execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] run data modify storage asset:context this.SpeedMultiplier set value 1 execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run data modify storage asset:context this.SpeedMultiplier set value 0.5 From f7bb0b22b1b72f19708177afa52c33ebd8dd79b4 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 4 Feb 2026 03:19:30 +0900 Subject: [PATCH 53/66] =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=81=AE=E3=83=96=E3=83=AC=E3=82=92=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1144.cradle_of_azure_moon/give/2.give.mcfunction | 2 +- .../trigger/3.main.mcfunction | 2 +- .../object/1061.azure_jelly/register.mcfunction | 2 +- .../1061.azure_jelly/tick/attack/attack.mcfunction | 12 ++++-------- .../1061.azure_jelly/tick/attack/damage.m.mcfunction | 12 ++++++++++++ 5 files changed, 19 insertions(+), 11 deletions(-) create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/damage.m.mcfunction diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction index 9f43e36e840..2a4f021d809 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction @@ -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 [1000] + data modify storage asset:artifact AttackInfo.Damage set value [600,800] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Magic] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction index 6c828752eff..deabcc4389c 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction @@ -11,6 +11,6 @@ # Object召喚 data modify storage api: Argument.ID set value 1061 - data modify storage api: Argument.FieldOverride.Damage set value 1000 + data modify storage api: Argument.FieldOverride.Damage set value {Min:600,Max:800} execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute anchored eyes rotated ~ 0 positioned ^ ^-1 ^1.5 run function api:object/summon diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction index 869d4dd3c46..b1f6ec4e9ea 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -23,5 +23,5 @@ data modify storage asset:object Field.AttackCD.Current set value 0 data modify storage asset:object Field.AttackCD._ set value 50 data modify storage asset:object Field.SpeedMultiplier set value 1 - data modify storage asset:object Field.Damage set value 1 + data modify storage asset:object Field.Damage set value {Min:1,Max:10} data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction index 9f43d614c5f..eb337cbca06 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction @@ -17,14 +17,10 @@ data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7]" execute positioned ~ ~-5 ~ run function lib:bounding_cylinder/ - -# ダメージ - data modify storage api: Argument.Damage set from storage asset:context this.Damage - data modify storage api: Argument.AttackType set value "Magic" - data modify storage api: Argument.ElementType set value "Water" - execute as @p[tag=1061.Owner] run function api:damage/modifier - execute as @e[type=#lib:living_without_player,tag=Enemy,tag=BoundingCylinder,tag=!Uninterferable,distance=..7] if function asset:object/1061.azure_jelly/tick/attack/check_block/ run function api:damage/ - function api:damage/reset +# 壁貫通していない敵にダメージ + function api:damage/single_damage_session/open + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=BoundingCylinder,tag=!Uninterferable,distance=..7] if function asset:object/1061.azure_jelly/tick/attack/check_block/ run function asset:object/1061.azure_jelly/tick/attack/damage.m with storage asset:context this.Damage + function api:damage/single_damage_session/close # リセット tag @e[type=#lib:living_without_player,tag=BoundingCylinder,distance=..7] remove BoundingCylinder diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/damage.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/damage.m.mcfunction new file mode 100644 index 00000000000..c901db9be98 --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/damage.m.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/1061.azure_jelly/tick/attack/damage.m +# +# +# +# @within function asset:object/1061.azure_jelly/tick/attack/attack + + $execute store result storage api: Argument.Damage int 1 run random value $(Min)..$(Max) + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "Water" + execute as @p[tag=1061.Owner] run function api:damage/modifier + function api:damage/ + function api:damage/reset From 52af9203867b0aed91ba307199461ec35ab52b8e Mon Sep 17 00:00:00 2001 From: satukiharu Date: Mon, 23 Mar 2026 03:33:27 +0900 Subject: [PATCH 54/66] =?UTF-8?q?=E3=81=8F=E3=82=89=E3=81=92=E3=81=AE?= =?UTF-8?q?=E8=AA=BF=E6=95=B4=20=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8300-50?= =?UTF-8?q?0=201CD550=202CD100=20=E5=87=BA=E7=8F=BE=E6=99=82=E9=96=93750?= =?UTF-8?q?=20=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E6=84=9F=E8=A6=9A45?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1144.cradle_of_azure_moon/give/2.give.mcfunction | 11 +++++++---- .../trigger/3.main.mcfunction | 2 +- .../object/1061.azure_jelly/register.mcfunction | 2 +- .../object/1061.azure_jelly/tick/.mcfunction | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction index 2a4f021d809..9bf817b2ffb 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/give/2.give.mcfunction @@ -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 [600,800] + data modify storage asset:artifact AttackInfo.Damage set value [300,500] # 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackType set value [Magic] # 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) @@ -41,7 +41,7 @@ # 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) data modify storage asset:artifact AttackInfo.AttackRange set value "4.5" # MP消費量 (int) - data modify storage asset:artifact MPCost set value 100 + data modify storage asset:artifact MPCost set value 200 # MP必要量 (int) (オプション) # data modify storage asset:artifact MPRequire set value # MP回復量 (int) @@ -49,8 +49,11 @@ # 神器のクールダウン (int) (オプション) # data modify storage asset:artifact LocalCooldown set value # 種別クールダウン ({Type: string, Duration: int}) (オプション) - # data modify storage asset:artifact TypeCooldown.Type set value - # data modify storage asset:artifact TypeCooldown.Duration set value + data modify storage asset:artifact TypeCooldown.Type set value "summon" + data modify storage asset:artifact TypeCooldown.Duration set value 550 +# 第二種別クールダウン ({Type: string, Duration: int}) (オプション) + data modify storage asset:artifact SecondaryTypeCooldown.Type set value "longRange" + data modify storage asset:artifact SecondaryTypeCooldown.Duration set value 100 # グローバルクールダウン (int) (オプション) # data modify storage asset:artifact SpecialCooldown set value # クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction index deabcc4389c..f372da1e630 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction @@ -11,6 +11,6 @@ # Object召喚 data modify storage api: Argument.ID set value 1061 - data modify storage api: Argument.FieldOverride.Damage set value {Min:600,Max:800} + data modify storage api: Argument.FieldOverride.Damage set value {Min:300,Max:500} execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute anchored eyes rotated ~ 0 positioned ^ ^-1 ^1.5 run function api:object/summon diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction index b1f6ec4e9ea..4a1fc5a9c53 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -21,7 +21,7 @@ data modify storage asset:object Field.IsUpper set value true data modify storage asset:object Field.WaveLeftRotate set value true data modify storage asset:object Field.AttackCD.Current set value 0 - data modify storage asset:object Field.AttackCD._ set value 50 + data modify storage asset:object Field.AttackCD._ set value 45 data modify storage asset:object Field.SpeedMultiplier set value 1 data modify storage asset:object Field.Damage set value {Min:1,Max:10} data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index efb44a0aa59..a8cc69f23b6 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -47,4 +47,4 @@ tag @p[tag=1061.Owner] remove 1061.Owner # 消滅処理 - execute if entity @s[scores={General.Object.Tick=500..}] run function asset:object/1061.azure_jelly/tick/kill + execute if entity @s[scores={General.Object.Tick=750..}] run function asset:object/1061.azure_jelly/tick/kill From 8ceae98730eb653a7194a1d3e7f71776e4bab15b Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 25 Mar 2026 19:12:44 +0900 Subject: [PATCH 55/66] =?UTF-8?q?=E5=AD=98=E5=9C=A8=E6=99=82=E9=96=93?= =?UTF-8?q?=E3=82=92=E7=A5=9E=E5=99=A8=E5=81=B4=E3=81=A7=E5=AE=9A=E7=BE=A9?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1144.cradle_of_azure_moon/trigger/3.main.mcfunction | 1 + .../functions/object/1061.azure_jelly/register.mcfunction | 1 + .../functions/object/1061.azure_jelly/tick/.mcfunction | 8 ++++---- .../1061.azure_jelly/tick/summon_effect/.mcfunction | 3 +++ 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction index f372da1e630..8c5cb5286d6 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction @@ -12,5 +12,6 @@ # Object召喚 data modify storage api: Argument.ID set value 1061 data modify storage api: Argument.FieldOverride.Damage set value {Min:300,Max:500} + data modify storage api: Argument.FieldOverride.Tick set value 750 execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute anchored eyes rotated ~ 0 positioned ^ ^-1 ^1.5 run function api:object/summon diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction index 4a1fc5a9c53..2e0c7bf35ce 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -17,6 +17,7 @@ # ID (int) data modify storage asset:object ID set value 1061 # フィールド(オプション) + data modify storage asset:object Field.Tick set value 750 data modify storage asset:object Field.IsFirst set value true data modify storage asset:object Field.IsUpper set value true data modify storage asset:object Field.WaveLeftRotate set value true diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index a8cc69f23b6..e0dae95768c 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -8,8 +8,8 @@ # @private #declare score_holder $UserID -# Tick加算 - scoreboard players add @s General.Object.Tick 1 +# 存在時間フィールド減算 + execute store result storage asset:context this.Tick int 0.9999999999 run data get storage asset:context this.Tick # 常時演出 particle dust 0.267 0.729 0.945 0.9 ~ ~ ~ 0.4 0.6 0.4 0 1 normal @a @@ -23,7 +23,7 @@ execute as @a if score @s UserID = $UserID Temporary run tag @s add 1061.Owner # インターバル - scoreboard players operation $Interval Temporary = @s General.Object.Tick + execute store result score $Interval Temporary run data get storage asset:context this.Tick scoreboard players operation $Interval Temporary %= $50 Const # 移動方向設定 @@ -47,4 +47,4 @@ tag @p[tag=1061.Owner] remove 1061.Owner # 消滅処理 - execute if entity @s[scores={General.Object.Tick=750..}] run function asset:object/1061.azure_jelly/tick/kill + execute if data storage asset:context this{Tick:0} run function asset:object/1061.azure_jelly/tick/kill diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/.mcfunction index 06273fb4108..230e049cdb0 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/.mcfunction @@ -4,6 +4,9 @@ # # @within function asset:object/1061.azure_jelly/tick/ +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + # メモ # -80スタートで、0まで行きたいから合計加算角度は80くらいである必要がある From 84ba6eae413426a7e40df37c48a6e4010944bdc6 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 25 Mar 2026 19:13:44 +0900 Subject: [PATCH 56/66] =?UTF-8?q?AttackCD=E3=81=AE=E3=83=95=E3=82=A3?= =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=83=89=E5=90=8D=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1061.azure_jelly/register.mcfunction | 4 ++-- .../functions/object/1061.azure_jelly/tick/attack/.mcfunction | 2 +- .../object/1061.azure_jelly/tick/attack/attack.mcfunction | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction index 2e0c7bf35ce..348ed2f9c94 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/register.mcfunction @@ -21,8 +21,8 @@ data modify storage asset:object Field.IsFirst set value true data modify storage asset:object Field.IsUpper set value true data modify storage asset:object Field.WaveLeftRotate set value true - data modify storage asset:object Field.AttackCD.Current set value 0 - data modify storage asset:object Field.AttackCD._ set value 45 + data modify storage asset:object Field.AttackCD._ set value 0 + data modify storage asset:object Field.AttackCD.Max set value 45 data modify storage asset:object Field.SpeedMultiplier set value 1 data modify storage asset:object Field.Damage set value {Min:1,Max:10} data modify storage asset:object Field.UserID set value -1 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction index 96dcd69d40d..c0384aaa630 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/ # クールダウンをデクリメント - execute store result storage asset:context this.AttackCD.Current int 0.9999999999 run data get storage asset:context this.AttackCD.Current + execute store result storage asset:context this.AttackCD._ int 0.9999999999 run data get storage asset:context this.AttackCD._ # CDが0でなければreturn execute unless data storage asset:context this.AttackCD{Current:0} run return fail diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction index eb337cbca06..b6ed7db66ce 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction @@ -26,4 +26,4 @@ tag @e[type=#lib:living_without_player,tag=BoundingCylinder,distance=..7] remove BoundingCylinder # AttackCD初期化 - data modify storage asset:context this.AttackCD.Current set from storage asset:context this.AttackCD._ + data modify storage asset:context this.AttackCD._ set from storage asset:context this.AttackCD.Max From f6f6a5a1980658fbb9b8ee7425ca49f61515f1e4 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 25 Mar 2026 19:14:36 +0900 Subject: [PATCH 57/66] =?UTF-8?q?=E6=94=BB=E6=92=83=E9=96=93=E9=9A=94?= =?UTF-8?q?=E3=82=92=E7=A5=9E=E5=99=A8=E5=81=B4=E3=81=A7=E5=AE=9A=E7=BE=A9?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction | 1 + 1 file changed, 1 insertion(+) diff --git a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction index 8c5cb5286d6..b3c6932ce95 100644 --- a/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1144.cradle_of_azure_moon/trigger/3.main.mcfunction @@ -13,5 +13,6 @@ data modify storage api: Argument.ID set value 1061 data modify storage api: Argument.FieldOverride.Damage set value {Min:300,Max:500} data modify storage api: Argument.FieldOverride.Tick set value 750 + data modify storage api: Argument.FieldOverride.AttackCD.Max set value 45 execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID execute anchored eyes rotated ~ 0 positioned ^ ^-1 ^1.5 run function api:object/summon From acd1aebb2f5bafa32fc50b3685ae135a766a4e98 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Wed, 25 Mar 2026 19:44:58 +0900 Subject: [PATCH 58/66] =?UTF-8?q?=E7=A7=BB=E5=8B=95=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=82=92=E3=83=A9=E3=82=A4=E3=83=96=E3=83=A9=E3=83=AA=E3=82=92?= =?UTF-8?q?=E7=94=A8=E3=81=84=E3=81=9F=E5=87=A6=E7=90=86=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 --- .../tick/move/check_collision.m.mcfunction | 22 ------------------- .../tick/move/move.m.mcfunction | 13 +++++++++++ .../tick/move/speed_multiplier.m.mcfunction | 4 ++-- .../tick/move/with_collision.mcfunction | 14 ------------ .../tick/summon_effect/.mcfunction | 12 +++++----- 5 files changed, 21 insertions(+), 44 deletions(-) delete mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction create mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/move.m.mcfunction delete mode 100644 Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction deleted file mode 100644 index 0bc7f5f089d..00000000000 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/check_collision.m.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -#> asset:object/1061.azure_jelly/tick/move/check_collision.m -# -# args: -# Speed : float -# -# @within function -# asset:object/1061.azure_jelly/tick/move/speed_multiplier.m -# asset:object/1061.azure_jelly/tick/summon_effect/ - -# 前方が問題ないか判定 - $execute positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/no_collision run data modify storage asset:temp 1061.Success set value true - -# 前方が問題ないならそのままtp - $execute if data storage asset:temp 1061{Success:true} run tp @s ^ ^ ^$(Speed) - -# そうでないならSpeedの半分を引数として色々する - $execute unless data storage asset:temp 1061{Success:true} run data modify storage asset:temp 1061.Speed set value $(Speed) - execute unless data storage asset:temp 1061{Success:true} store result storage asset:temp 1061.Speed float 0.005 run data get storage asset:temp 1061.Speed 100 - execute unless data storage asset:temp 1061{Success:true} run function asset:object/1061.azure_jelly/tick/move/with_collision with storage asset:temp 1061 - -# リセット - data remove storage asset:temp 1061 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/move.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/move.m.mcfunction new file mode 100644 index 00000000000..27fa696a39b --- /dev/null +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/move.m.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/1061.azure_jelly/tick/move/move.m +# +# args: +# Speed : float +# +# @within function +# asset:object/1061.azure_jelly/tick/move/speed_multiplier.m +# asset:object/1061.azure_jelly/tick/summon_effect/ + +# 壁貫通のないように移動 + $data modify storage lib: Argument.SlideMove.Speed set value $(Speed) + data modify storage lib: Argument.SlideMove.Conditions set value "unless function asset:object/1061.azure_jelly/predicate/no_collision" + function lib:slide_move/ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/speed_multiplier.m.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/speed_multiplier.m.mcfunction index d62946fe773..cb06e829c8f 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/speed_multiplier.m.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/speed_multiplier.m.mcfunction @@ -12,7 +12,7 @@ #tellraw @a {"storage":"asset:context","nbt":"this.SpeedMultiplier"} # SpeedMultiplier:1ならそのまま実行してreturn - $execute if data storage asset:context this{SpeedMultiplier:1} run return run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:$(Speed)} + $execute if data storage asset:context this{SpeedMultiplier:1} run return run function asset:object/1061.azure_jelly/tick/move/move.m {Speed:$(Speed)} # 設定された速度と倍率を取得 $data modify storage asset:temp 1061.Speed set value $(Speed) @@ -22,7 +22,7 @@ # 速度をstorageに入れてマクロで実行 execute store result storage asset:temp 1061.Speed float 0.0001 run scoreboard players operation $Speed Temporary *= $SpeedMultiplier Temporary - function asset:object/1061.azure_jelly/tick/move/check_collision.m with storage asset:temp 1061 + function asset:object/1061.azure_jelly/tick/move/move.m with storage asset:temp 1061 # リセット scoreboard players reset $Speed Temporary diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction deleted file mode 100644 index 9802ca0481f..00000000000 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/move/with_collision.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:object/1061.azure_jelly/tick/move/with_collision -# -# -# -# @within function asset:object/1061.azure_jelly/tick/move/check_collision.m - -# x - $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned 0.0 ~ ~ positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/no_collision run tp @s ~ ~ ~ - -# y - $execute positioned ^ ^ ^$(Speed) rotated ~180 ~ positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/no_collision run tp @s ~ ~ ~ - -# z - $execute positioned 0.0 0.0 0.0 positioned ^ ^ ^-1 positioned ~ ~ 0.0 positioned ^ ^ ^0.5 facing 0.0 0.0 0.0 positioned as @s positioned ^ ^ ^-$(Speed) rotated as @s positioned ^ ^ ^$(Speed) if function asset:object/1061.azure_jelly/predicate/no_collision run tp @s ~ ~ ~ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/.mcfunction index 230e049cdb0..61b2db510c5 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/summon_effect/.mcfunction @@ -25,12 +25,12 @@ execute if score @s General.Object.Tick matches 32..39 at @s run tp @s ~ ~ ~ ~ ~3 # 移動 - execute if score @s General.Object.Tick matches 00..05 at @s run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.1} - execute if score @s General.Object.Tick matches 06..12 at @s run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.15} - execute if score @s General.Object.Tick matches 13..22 at @s run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.2} - execute if score @s General.Object.Tick matches 23..30 at @s run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.15} - execute if score @s General.Object.Tick matches 31..35 at @s run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.12} - execute if score @s General.Object.Tick matches 36..39 at @s run function asset:object/1061.azure_jelly/tick/move/check_collision.m {Speed:0.1} + execute if score @s General.Object.Tick matches 00..05 at @s run function asset:object/1061.azure_jelly/tick/move/move.m {Speed:0.1} + execute if score @s General.Object.Tick matches 06..12 at @s run function asset:object/1061.azure_jelly/tick/move/move.m {Speed:0.15} + execute if score @s General.Object.Tick matches 13..22 at @s run function asset:object/1061.azure_jelly/tick/move/move.m {Speed:0.2} + execute if score @s General.Object.Tick matches 23..30 at @s run function asset:object/1061.azure_jelly/tick/move/move.m {Speed:0.15} + execute if score @s General.Object.Tick matches 31..35 at @s run function asset:object/1061.azure_jelly/tick/move/move.m {Speed:0.12} + execute if score @s General.Object.Tick matches 36..39 at @s run function asset:object/1061.azure_jelly/tick/move/move.m {Speed:0.1} # 召喚演出終了 execute if score @s General.Object.Tick matches 40.. run function asset:object/1061.azure_jelly/tick/summon_effect/end From ba9eac6d8e0545ad64caba315186788f8c8a6103 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 26 Mar 2026 00:48:45 +0900 Subject: [PATCH 59/66] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1062.azure_wave/tick/disappear.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction b/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction index 8caa51b206d..bb8ced096a5 100644 --- a/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction +++ b/Asset/data/asset/functions/object/1062.azure_wave/tick/disappear.mcfunction @@ -10,6 +10,6 @@ # interpolation_duration data modify entity @s interpolation_duration set value 8 -# 小さくなる +# デカくなる data modify entity @s transformation.scale set value [12f,0.1f,12f] data modify entity @s transformation.translation set value [0f,-0.5f,0f] From 67e9f2b3487c3e17ea6dad833fd4a65e83037c02 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 26 Mar 2026 01:17:41 +0900 Subject: [PATCH 60/66] =?UTF-8?q?=E6=94=BB=E6=92=83=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/1061.azure_jelly/tick/attack/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction index c0384aaa630..afa0d9fec24 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/.mcfunction @@ -8,7 +8,7 @@ execute store result storage asset:context this.AttackCD._ int 0.9999999999 run data get storage asset:context this.AttackCD._ # CDが0でなければreturn - execute unless data storage asset:context this.AttackCD{Current:0} run return fail + execute unless data storage asset:context this.AttackCD{_:0} run return fail # 敵が近くにいたら攻撃 execute positioned ~-3 ~-3 ~-3 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=5,dy=5,dz=5] at @s run function asset:object/1061.azure_jelly/tick/attack/attack From 5eb2ea781fe51a09628838c19038b2736bc4b621 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 26 Mar 2026 02:59:12 +0900 Subject: [PATCH 61/66] =?UTF-8?q?=E7=B8=A6=E5=88=A4=E5=AE=9A=E3=82=92?= =?UTF-8?q?=E7=B8=AE=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/tick/attack/attack.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction index b6ed7db66ce..bc6c30db9e9 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/attack/attack.mcfunction @@ -13,9 +13,9 @@ # 円柱Libを用いて判定する data modify storage lib: Argument.BoundingCylinder.Radius set value 4.5d - data modify storage lib: Argument.BoundingCylinder.Height set value 10.0d + data modify storage lib: Argument.BoundingCylinder.Height set value 7.0d data modify storage lib: Argument.BoundingCylinder.Selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7]" - execute positioned ~ ~-5 ~ run function lib:bounding_cylinder/ + execute positioned ~ ~-3 ~ run function lib:bounding_cylinder/ # 壁貫通していない敵にダメージ function api:damage/single_damage_session/open From 98d52be3ad87f7b9d019b6257b8ea0490e85cb2e Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 26 Mar 2026 02:59:47 +0900 Subject: [PATCH 62/66] =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8Tag=E3=82=92?= =?UTF-8?q?=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/object/1061.azure_jelly/_index.d.mcfunction | 1 - 1 file changed, 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction index 5b63b4f5866..e23a4f9bdf1 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/_index.d.mcfunction @@ -4,6 +4,5 @@ #> tag # @within function asset:object/1061.azure_jelly/** #declare tag 1061.Owner - #declare tag 1061.Target #declare score_holder $Interval #declare score_holder $Recursive From 2817dcb5a8da5e0307040fb4b4e357e1e46bb977 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 26 Mar 2026 03:05:28 +0900 Subject: [PATCH 63/66] =?UTF-8?q?far=5Fplayer=E3=81=AE=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E3=82=92near=E3=83=97=E3=83=AC=E3=82=A4=E3=83=A4=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E9=80=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/predicate/far_player.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction index af043300aca..baf70ac2b6a 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/predicate/far_player.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1061.azure_jelly/tick/turn/ # プレイヤーが近くにいたらfail - execute if entity @p[tag=1061.Owner,distance=..15] run return 0 + execute positioned ~-6 ~-1 ~-6 if entity @p[tag=1061.Owner,dx=11,dy=1,dz=11] run return 0 # 成功 return 1 From 4e04e75596193bb41e7476db3686d710b010a6d3 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 26 Mar 2026 03:06:56 +0900 Subject: [PATCH 64/66] angle -> pitch --- .../asset/functions/object/1061.azure_jelly/tick/.mcfunction | 4 ++-- .../object/1061.azure_jelly/tick/{angle => pitch}/.mcfunction | 2 +- .../1061.azure_jelly/tick/{angle => pitch}/init.mcfunction | 4 ++-- .../tick/{angle => pitch}/switch_up_down.mcfunction | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename Asset/data/asset/functions/object/1061.azure_jelly/tick/{angle => pitch}/.mcfunction (91%) rename Asset/data/asset/functions/object/1061.azure_jelly/tick/{angle => pitch}/init.mcfunction (83%) rename Asset/data/asset/functions/object/1061.azure_jelly/tick/{angle => pitch}/switch_up_down.mcfunction (75%) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction index e0dae95768c..c7edfadcd00 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/.mcfunction @@ -30,8 +30,8 @@ execute if score $Interval Temporary matches 0 run function asset:object/1061.azure_jelly/tick/turn/ # 角度 - execute if score $Interval Temporary matches 0 at @s run function asset:object/1061.azure_jelly/tick/angle/init - execute at @s run function asset:object/1061.azure_jelly/tick/angle/ + execute if score $Interval Temporary matches 0 at @s run function asset:object/1061.azure_jelly/tick/pitch/init + execute at @s run function asset:object/1061.azure_jelly/tick/pitch/ # 移動 execute at @s run function asset:object/1061.azure_jelly/tick/move/ diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/pitch/.mcfunction similarity index 91% rename from Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction rename to Asset/data/asset/functions/object/1061.azure_jelly/tick/pitch/.mcfunction index ccc1e6ed72d..dfc528ce70a 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/pitch/.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1061.azure_jelly/tick/angle/ +#> asset:object/1061.azure_jelly/tick/pitch/ # # # diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/pitch/init.mcfunction similarity index 83% rename from Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction rename to Asset/data/asset/functions/object/1061.azure_jelly/tick/pitch/init.mcfunction index 0a1be1ee67c..d5fc4d0a41b 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/init.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/pitch/init.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/1061.azure_jelly/tick/angle/init +#> asset:object/1061.azure_jelly/tick/pitch/init # # # @@ -8,7 +8,7 @@ execute store result score @s 1061.Pitch run data get entity @s Rotation[1] 100 # 上下どちらの移動をするかトグルで切り替える - function asset:object/1061.azure_jelly/tick/angle/switch_up_down + function asset:object/1061.azure_jelly/tick/pitch/switch_up_down # trueなら少し減らして保存しておく execute if data storage asset:context this{IsUpper:true} run scoreboard players remove @s 1061.Pitch 6000 diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/switch_up_down.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/pitch/switch_up_down.mcfunction similarity index 75% rename from Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/switch_up_down.mcfunction rename to Asset/data/asset/functions/object/1061.azure_jelly/tick/pitch/switch_up_down.mcfunction index af6365e9c75..119e3cb74b6 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/angle/switch_up_down.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/pitch/switch_up_down.mcfunction @@ -1,8 +1,8 @@ -#> asset:object/1061.azure_jelly/tick/angle/switch_up_down +#> asset:object/1061.azure_jelly/tick/pitch/switch_up_down # # トグルで上下どちらかにいるかを切り替える # -# @within function asset:object/1061.azure_jelly/tick/angle/init +# @within function asset:object/1061.azure_jelly/tick/pitch/init # トグルでtrue/falseを切り替え execute if data storage asset:context this{IsUpper:true} run return run data modify storage asset:context this.IsUpper set value false From 44e3d098f700d9390593639dc4c869c4a132d39c Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 26 Mar 2026 03:07:47 +0900 Subject: [PATCH 65/66] =?UTF-8?q?playsound=E3=81=AEplayer=E3=82=92neutral?= =?UTF-8?q?=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/tick/kill.mcfunction | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/kill.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/kill.mcfunction index d8d5e37601d..3aa5022058c 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/kill.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/kill.mcfunction @@ -8,13 +8,13 @@ particle scrape ~ ~1 ~ 0 0 0 6 50 normal @a particle dust 0.267 0.729 0.945 0.9 ~ ~1 ~ 0.5 0.6 0.4 0 50 normal @a - playsound ogg:ambient.nether.crimson_forest.shine1 player @a[distance=..12] ~ ~ ~ 0.05 1.3 - playsound entity.dolphin.jump player @a ~ ~ ~ 0.25 0.8 - playsound entity.dolphin.jump player @a ~ ~ ~ 0.25 0.85 - playsound entity.dolphin.jump player @a ~ ~ ~ 0.25 0.9 + playsound ogg:ambient.nether.crimson_forest.shine1 neutral @a[distance=..12] ~ ~ ~ 0.05 1.3 + playsound entity.dolphin.jump neutral @a ~ ~ ~ 0.25 0.8 + playsound entity.dolphin.jump neutral @a ~ ~ ~ 0.25 0.85 + playsound entity.dolphin.jump neutral @a ~ ~ ~ 0.25 0.9 - playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 1 2 - playsound ogg:block.amethyst.shimmer player @a ~ ~ ~ 1 1.6 + playsound ogg:block.amethyst.shimmer neutral @a ~ ~ ~ 1 2 + playsound ogg:block.amethyst.shimmer neutral @a ~ ~ ~ 1 1.6 # 消滅 execute on passengers run kill @s From a8c5000ab3797770220259e43521acde0ba11b22 Mon Sep 17 00:00:00 2001 From: Lapis-LJA Date: Thu, 26 Mar 2026 03:10:07 +0900 Subject: [PATCH 66/66] =?UTF-8?q?=E7=99=BA=E7=94=9F=E3=81=97=E3=81=88?= =?UTF-8?q?=E3=81=AA=E3=81=84=E5=87=A6=E7=90=86=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction index 59549094a8a..4a136fafa57 100644 --- a/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction +++ b/Asset/data/asset/functions/object/1061.azure_jelly/tick/turn/chase_enemy.mcfunction @@ -11,7 +11,7 @@ execute if data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] feet rotated ~ 0 run tp @s ~ ~ ~ ~ ~ # 近くなければそのままfacingする - execute unless data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] feet run tp @s ~ ~ ~ ~ ~ + # execute unless data storage asset:temp 1061{Success:true} facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] feet run tp @s ~ ~ ~ ~ ~ # リセット data remove storage asset:temp 1061