diff --git a/Asset/data/asset/functions/mob/0301.karmic/_index.d.mcfunction b/Asset/data/asset/functions/mob/0301.karmic/_index.d.mcfunction index 9b34275452..ae8aac5c28 100644 --- a/Asset/data/asset/functions/mob/0301.karmic/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0301.karmic/_index.d.mcfunction @@ -50,3 +50,5 @@ #declare function animated_java:karmic/animations/fall/stop #declare function animated_java:karmic/animations/guntpstart/stop #declare function animated_java:karmic/animations/guntp/stop + #declare function animated_java:karmic/pause_all + #declare function animated_java:karmic/animations/dead/play diff --git a/Asset/data/asset/functions/mob/0301.karmic/death/.mcfunction b/Asset/data/asset/functions/mob/0301.karmic/death/.mcfunction index 98f27287e9..db7e998ec8 100644 --- a/Asset/data/asset/functions/mob/0301.karmic/death/.mcfunction +++ b/Asset/data/asset/functions/mob/0301.karmic/death/.mcfunction @@ -3,3 +3,12 @@ # Mobの死亡時の処理 # # @within function asset:mob/alias/301/death + +# AJ死亡モーション + execute as @e[type=item_display,tag=8D.AJ,sort=nearest,limit=1] run function asset:mob/0301.karmic/death/animation_reset + execute as @e[type=item_display,tag=8D.AJ,sort=nearest,limit=1] run function animated_java:karmic/pause_all + execute as @e[type=item_display,tag=8D.AJ,sort=nearest,limit=1] run function animated_java:karmic/animations/dead/play + +# 召喚 + data modify storage api: Argument.ID set value 2219 + execute at @s run function api:object/summon diff --git a/Asset/data/asset/functions/mob/0301.karmic/death/animation_reset.mcfunction b/Asset/data/asset/functions/mob/0301.karmic/death/animation_reset.mcfunction new file mode 100644 index 0000000000..f26ff11af6 --- /dev/null +++ b/Asset/data/asset/functions/mob/0301.karmic/death/animation_reset.mcfunction @@ -0,0 +1,10 @@ +#> asset:mob/0301.karmic/death/animation_reset +# +# +# +# @within function asset:mob/0301.karmic/death/ + +function animated_java:karmic/animations/wait/stop +function animated_java:karmic/animations/sword_wait/stop +function animated_java:karmic/animations/fall/stop +function animated_java:karmic/animations/run_loop/stop diff --git a/Asset/data/asset/functions/object/2219.karmic_death/register.mcfunction b/Asset/data/asset/functions/object/2219.karmic_death/register.mcfunction new file mode 100644 index 0000000000..e5cbab7af7 --- /dev/null +++ b/Asset/data/asset/functions/object/2219.karmic_death/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2219.karmic_death/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2219/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 2219 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2219.karmic_death/summon/.mcfunction b/Asset/data/asset/functions/object/2219.karmic_death/summon/.mcfunction new file mode 100644 index 0000000000..7d769be33b --- /dev/null +++ b/Asset/data/asset/functions/object/2219.karmic_death/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2219.karmic_death/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2219/summon + +# 元となるEntityを召喚する + summon marker ~ ~ ~ {Tags:["ObjectInit"]} diff --git a/Asset/data/asset/functions/object/2219.karmic_death/summon/debug.mcfunction b/Asset/data/asset/functions/object/2219.karmic_death/summon/debug.mcfunction new file mode 100644 index 0000000000..e7929cf52f --- /dev/null +++ b/Asset/data/asset/functions/object/2219.karmic_death/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2219.karmic_death/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 2219 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2219.karmic_death/tick/.mcfunction b/Asset/data/asset/functions/object/2219.karmic_death/tick/.mcfunction new file mode 100644 index 0000000000..4c1745315d --- /dev/null +++ b/Asset/data/asset/functions/object/2219.karmic_death/tick/.mcfunction @@ -0,0 +1,16 @@ +#> asset:object/2219.karmic_death/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2219/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 演出 + execute if score @s General.Object.Tick matches 4 run playsound minecraft:entity.player.attack.nodamage hostile @a ~ ~ ~ 1 0.4 + execute if score @s General.Object.Tick matches 85 run playsound minecraft:item.trident.return hostile @a ~ ~ ~ 1 2 + execute if score @s General.Object.Tick matches 105 run function asset:object/2219.karmic_death/tick/shot + +# 死 + execute if score @s General.Object.Tick matches 140 run function asset:object/2219.karmic_death/tick/kill diff --git a/Asset/data/asset/functions/object/2219.karmic_death/tick/kill.mcfunction b/Asset/data/asset/functions/object/2219.karmic_death/tick/kill.mcfunction new file mode 100644 index 0000000000..c24ff8f87f --- /dev/null +++ b/Asset/data/asset/functions/object/2219.karmic_death/tick/kill.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/2219.karmic_death/tick/kill +# +# +# +# @within function asset:object/2219.karmic_death/tick/ + +#> private +# @private +#declare function animated_java:karmic/remove/this + +# 消滅 + execute as @e[type=item_display,distance=..0.1,sort=nearest,limit=1] run function animated_java:karmic/remove/this + +# ボスドロ +# まだない diff --git a/Asset/data/asset/functions/object/2219.karmic_death/tick/shot.mcfunction b/Asset/data/asset/functions/object/2219.karmic_death/tick/shot.mcfunction new file mode 100644 index 0000000000..5bc15028be --- /dev/null +++ b/Asset/data/asset/functions/object/2219.karmic_death/tick/shot.mcfunction @@ -0,0 +1,16 @@ +#> asset:object/2219.karmic_death/tick/shot +# +# +# +# @within function asset:object/2219.karmic_death/tick/ + +# 演出 + particle dust 0.09 0.09 0.09 6 ~ ~ ~ 0 1 0 0 6 + particle dust 1 1 1 6 ~ ~ ~ 0.03 1.03 0.03 0 6 + particle dust 1 1 1 6 ~ ~ ~ 0.03 1.03 0.03 0 6 + +# 演出 + playsound minecraft:entity.zombie.attack_wooden_door hostile @a ~ ~ ~ 1 2 + playsound minecraft:entity.zombie.attack_wooden_door hostile @a ~ ~ ~ 1 0 + playsound minecraft:entity.generic.explode hostile @a ~ ~ ~ 0.8 2 + playsound minecraft:entity.firework_rocket.blast hostile @a ~ ~ ~ 1 0.5 diff --git a/Asset/data/asset/functions/object/alias/2219/register.mcfunction b/Asset/data/asset/functions/object/alias/2219/register.mcfunction new file mode 100644 index 0000000000..d530f4a6de --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2219/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2219/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2219.karmic_death/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2219/summon.mcfunction b/Asset/data/asset/functions/object/alias/2219/summon.mcfunction new file mode 100644 index 0000000000..7659818c16 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2219/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2219/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2219.karmic_death/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2219/tick.mcfunction b/Asset/data/asset/functions/object/alias/2219/tick.mcfunction new file mode 100644 index 0000000000..f5912b5b6a --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2219/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2219/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2219.karmic_death/tick/ \ No newline at end of file