From 42277c2d91a0a88f57232f6bc228e03335384136 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 29 Oct 2024 00:57:33 +0900 Subject: [PATCH 001/103] =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E9=80=94=E4=B8=AD=E3=81=BE=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 10 +++ .../mob/0372.tutankhamen/death/.mcfunction | 5 ++ .../mob/0372.tutankhamen/hurt/.mcfunction | 5 ++ .../mob/0372.tutankhamen/init/.mcfunction | 8 +++ .../mob/0372.tutankhamen/load.mcfunction | 9 +++ .../mob/0372.tutankhamen/register.mcfunction | 65 +++++++++++++++++++ .../mob/0372.tutankhamen/summon/.mcfunction | 8 +++ .../0372.tutankhamen/summon/debug.mcfunction | 10 +++ .../mob/0372.tutankhamen/tick/.mcfunction | 14 ++++ .../tick/skill/laser/.mcfunction | 30 +++++++++ .../tick/skill/laser/recursive.mcfunction | 25 +++++++ .../tick/skill/laser/shoot.mcfunction | 12 ++++ .../tick/skill/reset.mcfunction | 11 ++++ .../tick/skill_branch.mcfunction | 8 +++ .../tick/skill_select.mcfunction | 23 +++++++ .../functions/mob/alias/372/death.mcfunction | 8 +++ .../functions/mob/alias/372/hurt.mcfunction | 8 +++ .../functions/mob/alias/372/init.mcfunction | 8 +++ .../mob/alias/372/register.mcfunction | 8 +++ .../functions/mob/alias/372/summon.mcfunction | 8 +++ .../functions/mob/alias/372/tick.mcfunction | 8 +++ .../mob/death/0372.tutankhamen.json | 29 +++++++++ Asset/data/asset/tags/functions/mob/load.json | 3 +- 23 files changed, 322 insertions(+), 1 deletion(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/hurt/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/summon/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/372/death.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/372/hurt.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/372/init.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/372/register.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/372/summon.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/372/tick.mcfunction create mode 100644 Asset/data/asset/loot_tables/mob/death/0372.tutankhamen.json diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction new file mode 100644 index 0000000000..a6e2699865 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -0,0 +1,10 @@ +#> asset:mob/0372.tutankhamen/_index.d +# @private + +#> tag +# @within function asset:mob/0372.tutankhamen/** + #declare tag AC.Laser + #declare tag AC.LaserDisplay + #declare tag AC.GiantSkull + #declare score_holder $Recursive + #declare score_holder $Interval diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction new file mode 100644 index 0000000000..7eb60ec300 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction @@ -0,0 +1,5 @@ +#> asset:mob/0372.tutankhamen/death/ +# +# Mobの死亡時の処理 +# +# @within function asset:mob/alias/372/death diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/.mcfunction new file mode 100644 index 0000000000..3d47b032a9 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/.mcfunction @@ -0,0 +1,5 @@ +#> asset:mob/0372.tutankhamen/hurt/ +# +# Mobのダメージ時の処理 +# +# @within function asset:mob/alias/372/hurt diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction new file mode 100644 index 0000000000..27a4efee06 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/0372.tutankhamen/init/ +# +# Mobのinit時の処理 +# +# @within asset:mob/alias/372/init + +# スコア初期化 + scoreboard players set @s General.Mob.Tick -80 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction new file mode 100644 index 0000000000..465ad24ab9 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction @@ -0,0 +1,9 @@ +#> asset:mob/0372.tutankhamen/load +# +# Mobに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:mob/load + +#> 定義類はここに +# @within function asset:mob/0372.tutankhamen/** + scoreboard objectives add \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction new file mode 100644 index 0000000000..83f2ff8682 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction @@ -0,0 +1,65 @@ +#> asset:mob/0372.tutankhamen/register +# +# Mobのデータを指定 +# +# @within function asset:mob/alias/372/register + +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:mob ExtendsSafe set value +# 継承されることを前提とした、抽象的なモブであるかどうか(boolean) + data modify storage asset:mob IsAbstract set value false +# ID (int) + data modify storage asset:mob ID set value 372 +# Type (string) Wikiを参照 + data modify storage asset:mob Type set value "Enemy.Boss" +# 干渉可能か否か (boolean) + data modify storage asset:mob Interferable set value true +# 名前 (TextComponentString) (オプション) + # data modify storage asset:mob Name set value +# Mobの説明文 (TextComponentString[]) (オプション) + # data modify storage asset:mob Lore set value +# 武器 + # メインハンド (Compound(Item)) (オプション) + # data modify storage asset:mob Weapon.Mainhand set value + # オフハンド (Compound(Item)) (オプション) + # data modify storage asset:mob Weapon.Offhand set value +# 武器ドロップ率 ([float, float]) (オプション) + # data modify storage asset:mob WeaponDropChances set value +# 防具 + # 頭 (Compound(Item)) (オプション) + # data modify storage asset:mob Armor.Head set value + # 胴 (Compound(Item)) (オプション) + # data modify storage asset:mob Armor.Chest set value + # 脚 (Compound(Item)) (オプション) + # data modify storage asset:mob Armor.Legs set value + # 足 (Compound(Item)) (オプション) + # data modify storage asset:mob Armor.Feet set value +# 防具ドロップ率 ([float, float]) (オプション) + # data modify storage asset:mob ArmorDropChances set value +# 体力 (double) (オプション) + # data modify storage asset:mob Health set value +# 攻撃力 (double) (オプション) + # data modify storage asset:mob AttackDamage set value +# 防御力 (double) (オプション) // 被ダメージがある程度大きい場合1ptにつき0.8%カット、小さい場合1ptにつき約4%カット 20pt以上は頭打ち + # data modify storage asset:mob Defense set value +# 特殊防御力 (double) (オプション) // 4pointにつきダメージを大きく減らす + # data modify storage asset:mob SpecialDefense set value +# 移動速度 (double) (オプション) + # data modify storage asset:mob Speed set value +# 索敵範囲 (double) (オプション) + # data modify storage asset:mob FollowRange set value +# ノックバック耐性 (double) (オプション) + # data modify storage asset:mob KnockBackResist set value +# 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る + # 物理倍率 (float) (オプション) + # data modify storage asset:mob Resist.Physical set value + # 魔法倍率 (float) (オプション) + # data modify storage asset:mob Resist.Magic set value + # 火倍率 (float) (オプション) + # data modify storage asset:mob Resist.Fire set value + # 水倍率 (float) (オプション) + # data modify storage asset:mob Resist.Water set value + # 雷倍率 (float) (オプション) + # data modify storage asset:mob Resist.Thunder set value +# フィールド + # data modify storage asset:mob Field.myValue set value diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/summon/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/summon/.mcfunction new file mode 100644 index 0000000000..e42e7fa4df --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/0372.tutankhamen/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:mob/alias/372/summon + +# 元となるEntityを召喚する + summon wither_skeleton ~ ~ ~ {NoAI:1b,Tags:["MobInit"],DeathLootTable:"asset:mob/death/0372.tutankhamen"} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/summon/debug.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/summon/debug.mcfunction new file mode 100644 index 0000000000..a45f30cf72 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:mob/0372.tutankhamen/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 372 + function api:mob/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction new file mode 100644 index 0000000000..112ded003d --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction @@ -0,0 +1,14 @@ +#> asset:mob/0372.tutankhamen/tick/ +# +# Mobのtick時の処理 +# +# @within asset:mob/alias/372/tick + +# スコア + scoreboard players add @s General.Mob.Tick 1 + +# スキル選択 + execute if entity @s[scores={General.Mob.Tick=0}] run function asset:mob/0372.tutankhamen/tick/skill_select + +# スキル実行 + execute if entity @s[scores={General.Mob.Tick=0..}] run function asset:mob/0372.tutankhamen/tick/skill_branch diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction new file mode 100644 index 0000000000..5c2343aee6 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -0,0 +1,30 @@ +#> asset:mob/0372.tutankhamen/tick/skill/laser/ +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill_branch + +# + + + execute as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound block.note_block.bit hostile @s ~ ~ ~ 0.4 1 1 + +# displayを前方に召喚 + execute if entity @s[scores={General.Mob.Tick=20}] anchored eyes positioned ^-0.35 ^-0.5 ^8 run summon item_display ~ ~ ~ {teleport_duration:1,Tags:["AC.LaserDisplay"],item:{id:"cyan_stained_glass_pane",Count:1b},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.12f,0.12f,250f]}} + +# プレイヤーの方を向く + #tp @s ~ ~ ~ facing entity @p eyes + execute anchored eyes facing entity @p eyes anchored feet positioned ^ ^ ^ run tp @s ~ ~ ~ ~ ~ + +# displayをプレイヤーの方へ向ける + execute if entity @s[scores={General.Mob.Tick=20..100}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^8 run tp @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] ~ ~ ~ ~ ~ + #execute if entity @s[scores={General.Mob.Tick=20..100}] run data modify entity @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] Rotation set from entity @s Rotation + +# displayを消す + execute if entity @s[scores={General.Mob.Tick=100}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] + +# レーザー発射 + execute if entity @s[scores={General.Mob.Tick=100}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot + +# リセット + execute if entity @s[scores={General.Mob.Tick=100..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction new file mode 100644 index 0000000000..4d2920fbbb --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction @@ -0,0 +1,25 @@ +#> asset:mob/0372.tutankhamen/tick/skill/laser/recursive +# +# +# +# @within function +# asset:mob/0372.tutankhamen/tick/skill/laser/shoot +# asset:mob/0372.tutankhamen/tick/skill/laser/recursive + +# 演出 + particle soul_fire_flame ~ ~ ~ 0 0 0 0 1 normal @a + particle soul_fire_flame ^ ^ ^0.25 0 0 0 0 1 normal @a + particle soul_fire_flame ~ ~ ~ 0 0 0 0.4 3 normal @a + particle soul ~ ~ ~ 0 0 0 0.25 3 normal @a + +# 一定間隔での演出 + scoreboard players operation $Interval Temporary = $Recursive Temporary + scoreboard players operation $Interval Temporary %= $10 Const + execute if score $Interval Temporary matches 0 run particle sonic_boom ~ ~ ~ 0 0 0 0 1 + scoreboard players reset $Interval Temporary + +# 再帰スコア + scoreboard players add $Recursive Temporary 1 + +# 再帰 + execute if score $Recursive Temporary matches ..60 positioned ^ ^ ^0.5 run function asset:mob/0372.tutankhamen/tick/skill/laser/recursive diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction new file mode 100644 index 0000000000..49261266a5 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction @@ -0,0 +1,12 @@ +#> asset:mob/0372.tutankhamen/tick/skill/laser/shoot +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/laser/ + +# 再帰発射 + function asset:mob/0372.tutankhamen/tick/skill/laser/recursive + scoreboard players reset $Recursive Temporary + +# 演出 + execute as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 2 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction new file mode 100644 index 0000000000..2a6949df25 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -0,0 +1,11 @@ +#> asset:mob/0372.tutankhamen/tick/skill/reset +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/** + +# スコアをセット + scoreboard players set @s General.Mob.Tick -80 + +# Tagを削除 + tag @s remove AC.Laser diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction new file mode 100644 index 0000000000..dfc40ecb6c --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/0372.tutankhamen/tick/skill_branch +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/ + +# レーザー + execute if entity @s[tag=AC.Laser] run function asset:mob/0372.tutankhamen/tick/skill/laser/ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction new file mode 100644 index 0000000000..8d86fe105d --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -0,0 +1,23 @@ +#> asset:mob/0372.tutankhamen/tick/skill_select +# +# スキルを選択する +# +# @within function asset:mob/0372.tutankhamen/tick/ + +#> private +# @private + #declare score_holder $Random + +# 乱数取得 + execute store result score $Random Temporary run function lib:random/ + scoreboard players operation $Random Temporary %= $7 Const + +# デバッグのコマンド + scoreboard players set $Random Temporary 0 + +# スキル選択 + execute if score $Random Temporary matches 0 run tag @s add AC.Laser + execute if score $Random Temporary matches 1 run tag @s add AC.GiantSkull + +# リセット + scoreboard players reset $Random Temporary diff --git a/Asset/data/asset/functions/mob/alias/372/death.mcfunction b/Asset/data/asset/functions/mob/alias/372/death.mcfunction new file mode 100644 index 0000000000..060b4f4316 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/372/death.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/372/death +# +# Mobの死亡時の処理のエイリアス +# +# @within asset_manager:mob/triggers/death/death.m + +# 本来の処理を呼び出す + function asset:mob/0372.tutankhamen/death/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/372/hurt.mcfunction b/Asset/data/asset/functions/mob/alias/372/hurt.mcfunction new file mode 100644 index 0000000000..84e56473f2 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/372/hurt.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/372/hurt +# +# Mobのダメージ時の処理のエイリアス +# +# @within asset_manager:mob/triggers/hurt/hurt.m + +# 本来の処理を呼び出す + function asset:mob/0372.tutankhamen/hurt/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/372/init.mcfunction b/Asset/data/asset/functions/mob/alias/372/init.mcfunction new file mode 100644 index 0000000000..a191f67411 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/372/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/372/init +# +# Init処理のエイリアス +# +# @within asset_manager:mob/triggers/init/init.m + +# 元のInit処理を呼び出す + function asset:mob/0372.tutankhamen/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/372/register.mcfunction b/Asset/data/asset/functions/mob/alias/372/register.mcfunction new file mode 100644 index 0000000000..4f4742b143 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/372/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/372/register +# +# Mobのデータ指定処理のエイリアス +# +# @within asset_manager:mob/triggers/summon/register.m + +# 元の登録処理を呼び出す + function asset:mob/0372.tutankhamen/register \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/372/summon.mcfunction b/Asset/data/asset/functions/mob/alias/372/summon.mcfunction new file mode 100644 index 0000000000..f33546354e --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/372/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/372/summon +# +# Mob召喚処理のエイリアス +# +# @within asset_manager:mob/triggers/summon/summon.m + +# 本来の処理を呼び出す + function asset:mob/0372.tutankhamen/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/372/tick.mcfunction b/Asset/data/asset/functions/mob/alias/372/tick.mcfunction new file mode 100644 index 0000000000..bd22a24887 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/372/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/372/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:mob/triggers/tick/tick.m + +# 元のTick処理を呼び出す + function asset:mob/0372.tutankhamen/tick/ \ No newline at end of file diff --git a/Asset/data/asset/loot_tables/mob/death/0372.tutankhamen.json b/Asset/data/asset/loot_tables/mob/death/0372.tutankhamen.json new file mode 100644 index 0000000000..a54c787974 --- /dev/null +++ b/Asset/data/asset/loot_tables/mob/death/0372.tutankhamen.json @@ -0,0 +1,29 @@ +{ + "type": "entity", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "loot_table", + "name": "asset:mob/death/abstract_detect_item", + "functions": [ + { + "function": "set_nbt", + "tag": "{TSB:{ID:372}}" + } + ] + } + ] + }, + { + "rolls": 1, + "entries": [ + { + "type": "loot_table", + "name": "entities/wither_skeleton" + } + ] + } + ] +} \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/mob/load.json b/Asset/data/asset/tags/functions/mob/load.json index 8d1aa45c2c..754d559603 100644 --- a/Asset/data/asset/tags/functions/mob/load.json +++ b/Asset/data/asset/tags/functions/mob/load.json @@ -1,5 +1,6 @@ { "values": [ + "asset:mob/0372.tutankhamen/load", "asset:mob/0266.small_dark_ball/load", "asset:mob/0265.dark_familiar/load", "asset:mob/0264.dark_summoner/load", @@ -93,4 +94,4 @@ "asset:mob/0059.jack_o_lantern/0.load", "asset:mob/0139.blast_eye/0.load" ] -} +} \ No newline at end of file From b372db6a029b1f04ae4fd2d98278f125e0e17955 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 29 Oct 2024 02:09:39 +0900 Subject: [PATCH 002/103] =?UTF-8?q?=E9=AD=82=E5=BC=BE=E3=81=AE=E5=A4=A7?= =?UTF-8?q?=E4=BD=93=E3=81=AE=E6=8C=99=E5=8B=95=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2092.soul_bullet/hit_entity/.mcfunction | 5 +++ .../object/2092.soul_bullet/init/.mcfunction | 13 +++++++ .../object/2092.soul_bullet/kill/.mcfunction | 15 ++++++++ .../2092.soul_bullet/register.mcfunction | 18 ++++++++++ .../2092.soul_bullet/summon/.mcfunction | 8 +++++ .../2092.soul_bullet/summon/debug.mcfunction | 10 ++++++ .../object/2092.soul_bullet/tick/.mcfunction | 36 +++++++++++++++++++ .../object/alias/2092/hit_entity.mcfunction | 8 +++++ .../object/alias/2092/init.mcfunction | 8 +++++ .../object/alias/2092/kill.mcfunction | 8 +++++ .../object/alias/2092/register.mcfunction | 8 +++++ .../object/alias/2092/summon.mcfunction | 8 +++++ .../object/alias/2092/tick.mcfunction | 8 +++++ 13 files changed, 153 insertions(+) create mode 100644 Asset/data/asset/functions/object/2092.soul_bullet/hit_entity/.mcfunction create mode 100644 Asset/data/asset/functions/object/2092.soul_bullet/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/2092.soul_bullet/kill/.mcfunction create mode 100644 Asset/data/asset/functions/object/2092.soul_bullet/register.mcfunction create mode 100644 Asset/data/asset/functions/object/2092.soul_bullet/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/2092.soul_bullet/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/2092.soul_bullet/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2092/hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2092/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2092/kill.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2092/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2092/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2092/tick.mcfunction diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/hit_entity/.mcfunction b/Asset/data/asset/functions/object/2092.soul_bullet/hit_entity/.mcfunction new file mode 100644 index 0000000000..20dfcf4a0d --- /dev/null +++ b/Asset/data/asset/functions/object/2092.soul_bullet/hit_entity/.mcfunction @@ -0,0 +1,5 @@ +#> asset:object/2092.soul_bullet/hit_entity/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/2092/hit_entity diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/init/.mcfunction b/Asset/data/asset/functions/object/2092.soul_bullet/init/.mcfunction new file mode 100644 index 0000000000..3479447a5d --- /dev/null +++ b/Asset/data/asset/functions/object/2092.soul_bullet/init/.mcfunction @@ -0,0 +1,13 @@ +#> asset:object/2092.soul_bullet/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2092/init + +# スピード設定 + data modify storage asset:context this.Speed set value 1 + data modify storage asset:context this.Range set value 300 + data modify storage asset:context this.MovePerStep set value 0.1 + +# 継承 + function asset:object/super.init diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/kill/.mcfunction b/Asset/data/asset/functions/object/2092.soul_bullet/kill/.mcfunction new file mode 100644 index 0000000000..9808c370eb --- /dev/null +++ b/Asset/data/asset/functions/object/2092.soul_bullet/kill/.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/2092.soul_bullet/kill/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/2092/kill + +# 演出 + particle soul ~ ~ ~ 0.2 0.2 0.2 0.25 100 normal @a + + + + + +# + kill @s diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/register.mcfunction b/Asset/data/asset/functions/object/2092.soul_bullet/register.mcfunction new file mode 100644 index 0000000000..729e1cf8a9 --- /dev/null +++ b/Asset/data/asset/functions/object/2092.soul_bullet/register.mcfunction @@ -0,0 +1,18 @@ +#> asset:object/2092.soul_bullet/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2092/register + +# 継承(オプション) + data modify storage asset:object Extends append value 1 + function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(boolean) + data modify storage asset:object IsAbstract set value false + +# ID (int) + data modify storage asset:object ID set value 2092 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/summon/.mcfunction b/Asset/data/asset/functions/object/2092.soul_bullet/summon/.mcfunction new file mode 100644 index 0000000000..a48a73597f --- /dev/null +++ b/Asset/data/asset/functions/object/2092.soul_bullet/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2092.soul_bullet/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2092/summon + +# 元となるEntityを召喚する + summon marker ~ ~ ~ {Rotation:[0.0f,-90.0f],Tags:["ObjectInit"]} diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/summon/debug.mcfunction b/Asset/data/asset/functions/object/2092.soul_bullet/summon/debug.mcfunction new file mode 100644 index 0000000000..f26282c292 --- /dev/null +++ b/Asset/data/asset/functions/object/2092.soul_bullet/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2092.soul_bullet/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 2092 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/tick/.mcfunction b/Asset/data/asset/functions/object/2092.soul_bullet/tick/.mcfunction new file mode 100644 index 0000000000..d445738415 --- /dev/null +++ b/Asset/data/asset/functions/object/2092.soul_bullet/tick/.mcfunction @@ -0,0 +1,36 @@ +#> asset:object/2092.soul_bullet/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2092/tick + +#> Private +# @private + #declare score_holder $Interval + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 演出 + particle soul ~ ~ ~ 0.25 0.25 0.25 0 4 normal @a + +# 一度止まる + execute if entity @s[scores={General.Object.Tick=40}] run data modify storage asset:context this.Speed set value 0 + +# プレイヤーの方を見て動き出す + execute if entity @s[scores={General.Object.Tick=80}] run tp @s ~ ~ ~ facing entity @p eyes + execute if entity @s[scores={General.Object.Tick=80}] run data modify storage asset:context this.Speed set value 1 + execute if entity @s[scores={General.Object.Tick=80}] run data modify storage asset:context this.MovePerStep set value 0.8 + +# 定期的に追加で演出 + scoreboard players operation $Interval Temporary = @s General.Object.Tick + scoreboard players operation $Interval Temporary %= $5 Const + #execute if score $Interval Temporary matches 0 run playsound ogg:mob.vex.idle1 hostile @a ~ ~ ~ 0.8 0.5 0 + #execute if score $Interval Temporary matches 0 run playsound entity.blaze.shoot hostile @a ~ ~ ~ 0.15 1.8 0 + scoreboard players reset $Interval Temporary + +# 継承 + execute at @s run function asset:object/super.tick + +# 消滅処理 + kill @s[scores={General.Object.Tick=200..}] diff --git a/Asset/data/asset/functions/object/alias/2092/hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/2092/hit_entity.mcfunction new file mode 100644 index 0000000000..19501ac631 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2092/hit_entity.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2092/hit_entity +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/2092.soul_bullet/hit_entity/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2092/init.mcfunction b/Asset/data/asset/functions/object/alias/2092/init.mcfunction new file mode 100644 index 0000000000..7122f2503e --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2092/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2092/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/2092.soul_bullet/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2092/kill.mcfunction b/Asset/data/asset/functions/object/alias/2092/kill.mcfunction new file mode 100644 index 0000000000..9775aa114e --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2092/kill.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2092/kill +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のメソッド処理を呼び出す + function asset:object/2092.soul_bullet/kill/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2092/register.mcfunction b/Asset/data/asset/functions/object/alias/2092/register.mcfunction new file mode 100644 index 0000000000..3a15f350bf --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2092/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2092/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2092.soul_bullet/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2092/summon.mcfunction b/Asset/data/asset/functions/object/alias/2092/summon.mcfunction new file mode 100644 index 0000000000..b9bb0f5d4e --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2092/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2092/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2092.soul_bullet/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2092/tick.mcfunction b/Asset/data/asset/functions/object/alias/2092/tick.mcfunction new file mode 100644 index 0000000000..8c424143c8 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2092/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2092/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2092.soul_bullet/tick/ \ No newline at end of file From 4af2cf8f7c47943d284b2cb032a345e38b6f195b Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Tue, 5 Nov 2024 02:50:28 +0900 Subject: [PATCH 003/103] =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E6=BC=94=E5=87=BA=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/laser/.mcfunction | 6 ++-- .../tick/skill/laser/recursive.mcfunction | 1 + .../tick/skill/laser/vfx.mcfunction | 34 +++++++++++++++++++ 3 files changed, 38 insertions(+), 3 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction index 5c2343aee6..5c567e5214 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -21,10 +21,10 @@ #execute if entity @s[scores={General.Mob.Tick=20..100}] run data modify entity @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] Rotation set from entity @s Rotation # displayを消す - execute if entity @s[scores={General.Mob.Tick=100}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] + execute if entity @s[scores={General.Mob.Tick=50}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] # レーザー発射 - execute if entity @s[scores={General.Mob.Tick=100}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot + execute if entity @s[scores={General.Mob.Tick=50}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot # リセット - execute if entity @s[scores={General.Mob.Tick=100..}] run function asset:mob/0372.tutankhamen/tick/skill/reset + execute if entity @s[scores={General.Mob.Tick=50..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction index 4d2920fbbb..d89fc21598 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction @@ -16,6 +16,7 @@ scoreboard players operation $Interval Temporary = $Recursive Temporary scoreboard players operation $Interval Temporary %= $10 Const execute if score $Interval Temporary matches 0 run particle sonic_boom ~ ~ ~ 0 0 0 0 1 + execute if score $Interval Temporary matches 0 run function asset:mob/0372.tutankhamen/tick/skill/laser/vfx scoreboard players reset $Interval Temporary # 再帰スコア diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction new file mode 100644 index 0000000000..971c884d2d --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction @@ -0,0 +1,34 @@ +#> asset:mob/0372.tutankhamen/tick/skill/laser/vfx +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/laser/recursive + +# 演出 + particle soul_fire_flame ~ ~ ~ ^ ^30000000 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^7764571 ^28977774 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^15000000 ^25980762 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^21213203 ^21213203 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^25980762 ^15000000 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^28977774 ^7764571 ^ 0.000000006 0 normal @a + + particle soul_fire_flame ~ ~ ~ ^30000000 ^ ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^-7764571 ^28977774 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^-15000000 ^25980762 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^-21213203 ^21213203 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^-25980762 ^15000000 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^-28977774 ^7764571 ^ 0.000000006 0 normal @a + + particle soul_fire_flame ~ ~ ~ ^ ^-30000000 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^7764571 ^-28977774 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^15000000 ^-25980762 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^21213203 ^-21213203 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^25980762 ^-15000000 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^28977774 ^-7764571 ^ 0.000000006 0 normal @a + + particle soul_fire_flame ~ ~ ~ ^-30000000 ^ ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^-7764571 ^-28977774 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^-15000000 ^-25980762 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^-21213203 ^-21213203 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^-25980762 ^-15000000 ^ 0.000000006 0 normal @a + particle soul_fire_flame ~ ~ ~ ^-28977774 ^-7764571 ^ 0.000000006 0 normal @a From 1cae3cc4195a431a623b90f4638f94d0acdee42c Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 22 Nov 2024 15:00:37 +0900 Subject: [PATCH 004/103] =?UTF-8?q?init=E3=81=A7AJ=E3=82=92=E5=8F=AC?= =?UTF-8?q?=E5=96=9A=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 --- .../mob/0372.tutankhamen/_index.d.mcfunction | 14 ++++++++++++++ .../mob/0372.tutankhamen/init/.mcfunction | 3 +++ .../mob/0372.tutankhamen/register.mcfunction | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index a6e2699865..ecf04c7416 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -8,3 +8,17 @@ #declare tag AC.GiantSkull #declare score_holder $Recursive #declare score_holder $Interval + # + # + #declare function animated_java:tutankhamen/summon + + + + + + + + + + +# diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction index 27a4efee06..f75f4c1b2a 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction @@ -4,5 +4,8 @@ # # @within asset:mob/alias/372/init +# AJ召喚 + execute rotated ~ 0 run function animated_java:tutankhamen/summon + # スコア初期化 scoreboard players set @s General.Mob.Tick -80 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction index 83f2ff8682..1854d05be5 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction @@ -37,7 +37,7 @@ # 防具ドロップ率 ([float, float]) (オプション) # data modify storage asset:mob ArmorDropChances set value # 体力 (double) (オプション) - # data modify storage asset:mob Health set value + data modify storage asset:mob Health set value 1 # 攻撃力 (double) (オプション) # data modify storage asset:mob AttackDamage set value # 防御力 (double) (オプション) // 被ダメージがある程度大きい場合1ptにつき0.8%カット、小さい場合1ptにつき約4%カット 20pt以上は頭打ち From 5bfe17539525869e3694e85b4128490ad97402da Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 22 Nov 2024 16:59:12 +0900 Subject: [PATCH 005/103] =?UTF-8?q?=E4=B8=80=E6=97=A6=E3=83=AC=E3=83=BC?= =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=AE=E6=8C=99=E5=8B=95=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 13 ++++- .../mob/0372.tutankhamen/death/.mcfunction | 3 ++ .../mob/0372.tutankhamen/init/.mcfunction | 9 +++- .../mob/0372.tutankhamen/summon/.mcfunction | 2 +- .../mob/0372.tutankhamen/tick/.mcfunction | 10 +++- .../common/summon_laser_display.m.mcfunction | 10 ++++ .../tick/skill/common/tp.mcfunction | 7 +++ .../tick/skill/laser/.mcfunction | 50 ++++++++++++------- .../skill/laser/facing_target.m.mcfunction | 16 ++++++ .../tick/skill/opening/.mcfunction | 12 +++++ .../tick/skill/reset.mcfunction | 5 ++ .../tick/skill_branch.mcfunction | 3 ++ 12 files changed, 117 insertions(+), 23 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/tp.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/opening/.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index ecf04c7416..f34392c095 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -6,12 +6,23 @@ #declare tag AC.Laser #declare tag AC.LaserDisplay #declare tag AC.GiantSkull + #declare tag AC.AJ + #declare tag AC.AJLink + #declare tag AC.Opening #declare score_holder $Recursive #declare score_holder $Interval # # #declare function animated_java:tutankhamen/summon - + #declare function animated_java:tutankhamen/remove/this + #declare function animated_java:tutankhamen/animations/neutral/play + #declare function animated_java:tutankhamen/animations/neutral/stop + #declare function animated_java:tutankhamen/animations/spawn/play + #declare function animated_java:tutankhamen/animations/spawn/stop + #declare function animated_java:tutankhamen/animations/beam_start/play + #declare function animated_java:tutankhamen/animations/beam_start/stop + #declare function animated_java:tutankhamen/animations/beam_shot/play + #declare function animated_java:tutankhamen/animations/beam_shot/stop diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction index 7eb60ec300..f640ec65f8 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction @@ -3,3 +3,6 @@ # Mobの死亡時の処理 # # @within function asset:mob/alias/372/death + +# デバッグ用としてAJを消す + execute as @e[type=item_display,tag=AC.AJ,distance=..100,sort=nearest,limit=1] run function animated_java:tutankhamen/remove/this diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction index f75f4c1b2a..32550d2e32 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction @@ -7,5 +7,12 @@ # AJ召喚 execute rotated ~ 0 run function animated_java:tutankhamen/summon +# tpさせる +# AC.AJはAJリポジトリ側で召喚時に付与されている + execute at @s as @e[type=item_display,tag=AC.AJ,sort=nearest,limit=1] run tp @s ~ ~ ~ + # スコア初期化 - scoreboard players set @s General.Mob.Tick -80 + scoreboard players set @s General.Mob.Tick -1 + +# 召喚モーション用Tagを自身に付与 + tag @s add AC.Opening diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/summon/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/summon/.mcfunction index e42e7fa4df..1e7e760227 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/372/summon # 元となるEntityを召喚する - summon wither_skeleton ~ ~ ~ {NoAI:1b,Tags:["MobInit"],DeathLootTable:"asset:mob/death/0372.tutankhamen"} + summon wither_skeleton ~ ~ ~ {NoAI:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0372.tutankhamen"} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction index 112ded003d..2d9e160bdd 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction @@ -7,8 +7,14 @@ # スコア scoreboard players add @s General.Mob.Tick 1 -# スキル選択 - execute if entity @s[scores={General.Mob.Tick=0}] run function asset:mob/0372.tutankhamen/tick/skill_select +# AJモデルとの紐づけ + tag @e[type=item_display,tag=AC.AJ,distance=..0.01,sort=nearest,limit=1] add AC.AJLink + +# スキル選択 開幕は実行しない + execute if entity @s[tag=!AC.Opening,scores={General.Mob.Tick=0}] run function asset:mob/0372.tutankhamen/tick/skill_select # スキル実行 execute if entity @s[scores={General.Mob.Tick=0..}] run function asset:mob/0372.tutankhamen/tick/skill_branch + +# AJモデルとの紐づけ解除 + execute at @s run tag @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] remove AC.AJLink diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction new file mode 100644 index 0000000000..d61d5989cc --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction @@ -0,0 +1,10 @@ +#> asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m +# +# レーザー用displayを召喚 +# +# @input args: +# Rotation : double @ 2 +# @within function asset:mob/0372.tutankhamen/tick/skill/** + +# 召喚 + $summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,Tags:["AC.LaserDisplay"],item:{id:"cyan_stained_glass_pane",Count:1b},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.12f,0.12f,250f]}} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/tp.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/tp.mcfunction new file mode 100644 index 0000000000..f1dd43e960 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/tp.mcfunction @@ -0,0 +1,7 @@ +#> asset:mob/0372.tutankhamen/tick/skill/common/tp +# +# 移動する +# +# @within function asset:mob/0372.tutankhamen/tick/skill/** + +# AJも一緒に動かす diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction index 5c567e5214..e4fecd8a99 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -4,27 +4,41 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill_branch -# - - - execute as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound block.note_block.bit hostile @s ~ ~ ~ 0.4 1 1 - -# displayを前方に召喚 - execute if entity @s[scores={General.Mob.Tick=20}] anchored eyes positioned ^-0.35 ^-0.5 ^8 run summon item_display ~ ~ ~ {teleport_duration:1,Tags:["AC.LaserDisplay"],item:{id:"cyan_stained_glass_pane",Count:1b},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.12f,0.12f,250f]}} - -# プレイヤーの方を向く - #tp @s ~ ~ ~ facing entity @p eyes - execute anchored eyes facing entity @p eyes anchored feet positioned ^ ^ ^ run tp @s ~ ~ ~ ~ ~ - -# displayをプレイヤーの方へ向ける - execute if entity @s[scores={General.Mob.Tick=20..100}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^8 run tp @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] ~ ~ ~ ~ ~ - #execute if entity @s[scores={General.Mob.Tick=20..100}] run data modify entity @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] Rotation set from entity @s Rotation +# AJアニメーション + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_start/play + execute if entity @s[scores={General.Mob.Tick=11}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_shot/play + +# 狙うプレイヤーを決定しフィールドに放り込む + execute if entity @s[scores={General.Mob.Tick=0}] as @r[distance=..30] run function lib:get_name/ + execute if entity @s[scores={General.Mob.Tick=0}] run data modify storage asset:context this.TargetName set from storage lib: Return.Name + +# 警告音 + execute if entity @s[scores={General.Mob.Tick=20..45}] as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound block.note_block.bit hostile @s ~ ~ ~ 0.4 1 1 + execute if entity @s[scores={General.Mob.Tick=55..65}] as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound block.note_block.bit hostile @s ~ ~ ~ 0.4 1 1 + execute if entity @s[scores={General.Mob.Tick=75..85}] as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound block.note_block.bit hostile @s ~ ~ ~ 0.4 1 1 + +# ターゲットの方を向く + execute if entity @s[scores={General.Mob.Tick=20..35}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=55}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=75}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this + +# Rotationをフィールドに入れてからdisplayを前方に召喚 + execute if entity @s[scores={General.Mob.Tick=20}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation + execute if entity @s[scores={General.Mob.Tick=20}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^8 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=55}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation + execute if entity @s[scores={General.Mob.Tick=55}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^8 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=75}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation + execute if entity @s[scores={General.Mob.Tick=75}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^8 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this # displayを消す - execute if entity @s[scores={General.Mob.Tick=50}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] + execute if entity @s[scores={General.Mob.Tick=45}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] + execute if entity @s[scores={General.Mob.Tick=65}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] + execute if entity @s[scores={General.Mob.Tick=85}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] # レーザー発射 - execute if entity @s[scores={General.Mob.Tick=50}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot + execute if entity @s[scores={General.Mob.Tick=45}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot + execute if entity @s[scores={General.Mob.Tick=65}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot + execute if entity @s[scores={General.Mob.Tick=85}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot # リセット - execute if entity @s[scores={General.Mob.Tick=50..}] run function asset:mob/0372.tutankhamen/tick/skill/reset + execute if entity @s[scores={General.Mob.Tick=120..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction new file mode 100644 index 0000000000..97ac727952 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction @@ -0,0 +1,16 @@ +#> asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m +# +# ターゲットの方を向く +# +# @input args: +# TargetName : String +# @within function asset:mob/0372.tutankhamen/tick/skill/laser/ + +# ターゲットの方を向く + $execute anchored eyes facing entity $(TargetName) eyes anchored feet positioned ^ ^ ^ run tp @s ~ ~ ~ ~ ~-3 + +# AJも一緒に回転 + execute at @s run tp @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] ~ ~ ~ ~ ~ + +# さらにdisplayも一緒に回転 + execute at @s anchored eyes positioned ^-0.35 ^-0.5 ^8 run tp @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/opening/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/opening/.mcfunction new file mode 100644 index 0000000000..db73215043 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/opening/.mcfunction @@ -0,0 +1,12 @@ +#> asset:mob/0372.tutankhamen/tick/skill/opening/ +# +# 開幕演出の処理 +# +# @within function asset:mob/0372.tutankhamen/tick/skill_branch + +# AJ処理 + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/spawn/play + +# 共通リセット処理 + execute if entity @s[scores={General.Mob.Tick=59..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index 2a6949df25..fe7ebccca0 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -7,5 +7,10 @@ # スコアをセット scoreboard players set @s General.Mob.Tick -80 +# アニメーションを元に戻す + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/spawn/stop + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/play + # Tagを削除 + tag @s remove AC.Opening tag @s remove AC.Laser diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction index dfc40ecb6c..a5472772e3 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction @@ -4,5 +4,8 @@ # # @within function asset:mob/0372.tutankhamen/tick/ +# 開幕演出 + execute if entity @s[tag=AC.Opening] run function asset:mob/0372.tutankhamen/tick/skill/opening/ + # レーザー execute if entity @s[tag=AC.Laser] run function asset:mob/0372.tutankhamen/tick/skill/laser/ From 5aa6f74c1274c151c0c66f9bb32b8f09cc68109e Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 22 Nov 2024 20:08:19 +0900 Subject: [PATCH 006/103] =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 4 + .../mob/0372.tutankhamen/load.mcfunction | 2 +- .../tick/skill/laser/.mcfunction | 25 ++- .../skill/laser/facing_target.m.mcfunction | 9 +- .../tick/skill/laser/recursive.mcfunction | 1 - .../tick/skill/laser/shoot.mcfunction | 21 +++ .../tick/skill/laser/vfx.mcfunction | 147 ++++++++++++++---- 7 files changed, 171 insertions(+), 38 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index f34392c095..72f1b466b6 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -9,6 +9,8 @@ #declare tag AC.AJ #declare tag AC.AJLink #declare tag AC.Opening + #declare tag AC.Hit + #declare tag AC.RotationMarker #declare score_holder $Recursive #declare score_holder $Interval # @@ -23,6 +25,8 @@ #declare function animated_java:tutankhamen/animations/beam_start/stop #declare function animated_java:tutankhamen/animations/beam_shot/play #declare function animated_java:tutankhamen/animations/beam_shot/stop + #declare function animated_java:tutankhamen/animations/beam_end/play + #declare function animated_java:tutankhamen/animations/beam_end/stop diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction index 465ad24ab9..9c51a7ef06 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction @@ -6,4 +6,4 @@ #> 定義類はここに # @within function asset:mob/0372.tutankhamen/** - scoreboard objectives add \ No newline at end of file + #scoreboard objectives add diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction index e4fecd8a99..8dfef70596 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -4,9 +4,10 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill_branch -# AJアニメーション +# AJの開始アニメーション + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_start/play - execute if entity @s[scores={General.Mob.Tick=11}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_shot/play + #execute if entity @s[scores={General.Mob.Tick=11}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_shot/play # 狙うプレイヤーを決定しフィールドに放り込む execute if entity @s[scores={General.Mob.Tick=0}] as @r[distance=..30] run function lib:get_name/ @@ -24,21 +25,29 @@ # Rotationをフィールドに入れてからdisplayを前方に召喚 execute if entity @s[scores={General.Mob.Tick=20}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=20}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^8 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=20}] at @s anchored eyes positioned ^0.2 ^-0.5 ^8 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this execute if entity @s[scores={General.Mob.Tick=55}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=55}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^8 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=55}] at @s anchored eyes positioned ^0.2 ^-0.5 ^8 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this execute if entity @s[scores={General.Mob.Tick=75}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=75}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^8 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=75}] at @s anchored eyes positioned ^0.2 ^-0.5 ^8 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this # displayを消す execute if entity @s[scores={General.Mob.Tick=45}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] execute if entity @s[scores={General.Mob.Tick=65}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] execute if entity @s[scores={General.Mob.Tick=85}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] +# 発射アニメーション + execute if entity @s[scores={General.Mob.Tick=45}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_shot/play + execute if entity @s[scores={General.Mob.Tick=65}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_shot/play + execute if entity @s[scores={General.Mob.Tick=85}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_shot/play + # レーザー発射 - execute if entity @s[scores={General.Mob.Tick=45}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot - execute if entity @s[scores={General.Mob.Tick=65}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot - execute if entity @s[scores={General.Mob.Tick=85}] at @s anchored eyes positioned ^-0.35 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot + execute if entity @s[scores={General.Mob.Tick=45}] at @s anchored eyes positioned ^0.2 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot + execute if entity @s[scores={General.Mob.Tick=65}] at @s anchored eyes positioned ^0.2 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot + execute if entity @s[scores={General.Mob.Tick=85}] at @s anchored eyes positioned ^0.2 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot + +# ビーム終了アニメ + execute if entity @s[scores={General.Mob.Tick=105}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_end/play # リセット execute if entity @s[scores={General.Mob.Tick=120..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction index 97ac727952..b958373979 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction @@ -10,7 +10,12 @@ $execute anchored eyes facing entity $(TargetName) eyes anchored feet positioned ^ ^ ^ run tp @s ~ ~ ~ ~ ~-3 # AJも一緒に回転 - execute at @s run tp @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] ~ ~ ~ ~ ~ + execute at @s run tp @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] ~ ~ ~ ~ 0 # さらにdisplayも一緒に回転 - execute at @s anchored eyes positioned ^-0.35 ^-0.5 ^8 run tp @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] ~ ~ ~ ~ ~ +# markerを召喚し、displayにそれを向かせる + execute at @s rotated ~ 0 anchored eyes positioned ^0.2 ^-0.5 ^1 run summon marker ~ ~ ~ {Tags:["AC.RotationMarker"]} + execute at @s rotated ~ 0 anchored eyes positioned ^0.2 ^-0.5 ^5 run particle flame ~ ~ ~ 0 0 0 0.1 5 normal @a + execute at @s anchored eyes positioned ^0.2 ^-0.5 ^8 run tp @e[type=item_display,tag=AC.LaserDisplay,distance=..50,limit=1] ~ ~ ~ ~ ~ + execute at @s as @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] at @s facing entity @e[type=marker,tag=AC.RotationMarker,distance=..50,limit=1] feet run tp @s ~ ~ ~ ~ ~ + kill @e[type=marker,tag=AC.RotationMarker,distance=..30] diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction index d89fc21598..4d2920fbbb 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction @@ -16,7 +16,6 @@ scoreboard players operation $Interval Temporary = $Recursive Temporary scoreboard players operation $Interval Temporary %= $10 Const execute if score $Interval Temporary matches 0 run particle sonic_boom ~ ~ ~ 0 0 0 0 1 - execute if score $Interval Temporary matches 0 run function asset:mob/0372.tutankhamen/tick/skill/laser/vfx scoreboard players reset $Interval Temporary # 再帰スコア diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction index 49261266a5..e86022f0d5 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction @@ -10,3 +10,24 @@ # 演出 execute as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 2 + function asset:mob/0372.tutankhamen/tick/skill/laser/vfx + +# 回転するxyzLibを使ってヒット判定を行う +# x,yは半径0.75に+0.3して判定する + data modify storage lib: args.dx set value 1.05 + data modify storage lib: args.dy set value 1.05 + data modify storage lib: args.dz set value 15.3 + data modify storage lib: args.selector set value "@a[tag=!PlayerShouldInvulnerable,distance=..40]" + execute at @s positioned ^ ^ ^16 run function lib:rotatable_dxyz/m with storage lib: args + +# ダメージ + data modify storage api: Argument.Damage set value 45.0d + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "Fire" + #data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' + function api:damage/modifier + execute as @a[tag=DXYZ,distance=..40] run function api:damage/ + function api:damage/reset + +# DXYZタグを削除 + tag @a[tag=DXYZ] remove DXYZ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction index 971c884d2d..9c68cd1e17 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction @@ -2,33 +2,128 @@ # # # -# @within function asset:mob/0372.tutankhamen/tick/skill/laser/recursive +# @within function asset:mob/0372.tutankhamen/tick/skill/laser/shoot -# 演出 - particle soul_fire_flame ~ ~ ~ ^ ^30000000 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^7764571 ^28977774 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^15000000 ^25980762 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^21213203 ^21213203 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^25980762 ^15000000 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^28977774 ^7764571 ^ 0.000000006 0 normal @a +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iJQAdPQE1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1YkAukA_3 +# 円 1 +particle soul_fire_flame ^0 ^-1.5 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.5 ^0 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.46239 ^0.33378 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.35145 ^0.65083 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.17275 ^0.93523 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.93523 ^1.17275 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.65083 ^1.35145 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.33378 ^1.46239 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0 ^1.5 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.33378 ^1.46239 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.65083 ^1.35145 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.93523 ^1.17275 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.17275 ^0.93523 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.35145 ^0.65083 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.46239 ^0.33378 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.5 ^0 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.0000005 0 normal @a - particle soul_fire_flame ~ ~ ~ ^30000000 ^ ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^-7764571 ^28977774 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^-15000000 ^25980762 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^-21213203 ^21213203 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^-25980762 ^15000000 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^-28977774 ^7764571 ^ 0.000000006 0 normal @a +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iJQAdPQE1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1YkAukA_3 +# 円 1 +particle soul_fire_flame ^0 ^-1.5 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^1.5 ^0 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^1.46239 ^0.33378 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^1.35145 ^0.65083 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^1.17275 ^0.93523 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^0.93523 ^1.17275 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^0.65083 ^1.35145 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^0.33378 ^1.46239 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^0 ^1.5 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-0.33378 ^1.46239 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-0.65083 ^1.35145 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-0.93523 ^1.17275 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-1.17275 ^0.93523 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-1.35145 ^0.65083 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-1.46239 ^0.33378 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-1.5 ^0 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.000001 0 normal @a +particle soul_fire_flame ^-0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.000001 0 normal @a - particle soul_fire_flame ~ ~ ~ ^ ^-30000000 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^7764571 ^-28977774 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^15000000 ^-25980762 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^21213203 ^-21213203 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^25980762 ^-15000000 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^28977774 ^-7764571 ^ 0.000000006 0 normal @a +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iJQAdPQE1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1YkAukA_3 +# 円 1 +particle soul_fire_flame ^0 ^-1.5 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.5 ^0 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.46239 ^0.33378 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.35145 ^0.65083 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.17275 ^0.93523 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.93523 ^1.17275 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.65083 ^1.35145 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.33378 ^1.46239 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0 ^1.5 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.33378 ^1.46239 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.65083 ^1.35145 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.93523 ^1.17275 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.17275 ^0.93523 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.35145 ^0.65083 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.46239 ^0.33378 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.5 ^0 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.0000015 0 normal @a - particle soul_fire_flame ~ ~ ~ ^-30000000 ^ ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^-7764571 ^-28977774 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^-15000000 ^-25980762 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^-21213203 ^-21213203 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^-25980762 ^-15000000 ^ 0.000000006 0 normal @a - particle soul_fire_flame ~ ~ ~ ^-28977774 ^-7764571 ^ 0.000000006 0 normal @a +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iJQAdPQE1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1YkAukA_3 +# 円 1 +particle soul_fire_flame ^0 ^-1.5 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^1.5 ^0 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^1.46239 ^0.33378 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^1.35145 ^0.65083 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^1.17275 ^0.93523 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^0.93523 ^1.17275 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^0.65083 ^1.35145 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^0.33378 ^1.46239 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^0 ^1.5 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-0.33378 ^1.46239 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-0.65083 ^1.35145 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-0.93523 ^1.17275 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-1.17275 ^0.93523 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-1.35145 ^0.65083 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-1.46239 ^0.33378 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-1.5 ^0 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.000002 0 normal @a +particle soul_fire_flame ^-0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.000002 0 normal @a From ca53e1af531fe9b0d6f507de5a915775f6bc5552 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 22 Nov 2024 20:44:36 +0900 Subject: [PATCH 007/103] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=82=92?= =?UTF-8?q?=E7=A0=B4=E5=A3=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction | 1 - 1 file changed, 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction index b958373979..2c238732a0 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction @@ -15,7 +15,6 @@ # さらにdisplayも一緒に回転 # markerを召喚し、displayにそれを向かせる execute at @s rotated ~ 0 anchored eyes positioned ^0.2 ^-0.5 ^1 run summon marker ~ ~ ~ {Tags:["AC.RotationMarker"]} - execute at @s rotated ~ 0 anchored eyes positioned ^0.2 ^-0.5 ^5 run particle flame ~ ~ ~ 0 0 0 0.1 5 normal @a execute at @s anchored eyes positioned ^0.2 ^-0.5 ^8 run tp @e[type=item_display,tag=AC.LaserDisplay,distance=..50,limit=1] ~ ~ ~ ~ ~ execute at @s as @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] at @s facing entity @e[type=marker,tag=AC.RotationMarker,distance=..50,limit=1] feet run tp @s ~ ~ ~ ~ ~ kill @e[type=marker,tag=AC.RotationMarker,distance=..30] From 18a5d1954975c565ac8afe8e4a7a951d1e6cacbc Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 22 Nov 2024 20:56:55 +0900 Subject: [PATCH 008/103] =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E9=96=A2=E4=BF=82=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/common/summon_laser_display.m.mcfunction | 2 +- .../mob/0372.tutankhamen/tick/skill/laser/.mcfunction | 6 +++--- .../tick/skill/laser/facing_target.m.mcfunction | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction index d61d5989cc..892f2d47fc 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction @@ -7,4 +7,4 @@ # @within function asset:mob/0372.tutankhamen/tick/skill/** # 召喚 - $summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,Tags:["AC.LaserDisplay"],item:{id:"cyan_stained_glass_pane",Count:1b},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.12f,0.12f,250f]}} + $summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,Tags:["AC.LaserDisplay"],item:{id:"cyan_stained_glass_pane",Count:1b},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.12f,0.12f,500f]}} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction index 8dfef70596..ddf1fd83dd 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -25,11 +25,11 @@ # Rotationをフィールドに入れてからdisplayを前方に召喚 execute if entity @s[scores={General.Mob.Tick=20}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=20}] at @s anchored eyes positioned ^0.2 ^-0.5 ^8 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=20}] at @s anchored eyes positioned ^0.2 ^-0.5 ^16 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this execute if entity @s[scores={General.Mob.Tick=55}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=55}] at @s anchored eyes positioned ^0.2 ^-0.5 ^8 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=55}] at @s anchored eyes positioned ^0.2 ^-0.5 ^16 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this execute if entity @s[scores={General.Mob.Tick=75}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=75}] at @s anchored eyes positioned ^0.2 ^-0.5 ^8 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=75}] at @s anchored eyes positioned ^0.2 ^-0.5 ^16 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this # displayを消す execute if entity @s[scores={General.Mob.Tick=45}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction index 2c238732a0..4320bc87a4 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction @@ -15,6 +15,6 @@ # さらにdisplayも一緒に回転 # markerを召喚し、displayにそれを向かせる execute at @s rotated ~ 0 anchored eyes positioned ^0.2 ^-0.5 ^1 run summon marker ~ ~ ~ {Tags:["AC.RotationMarker"]} - execute at @s anchored eyes positioned ^0.2 ^-0.5 ^8 run tp @e[type=item_display,tag=AC.LaserDisplay,distance=..50,limit=1] ~ ~ ~ ~ ~ - execute at @s as @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] at @s facing entity @e[type=marker,tag=AC.RotationMarker,distance=..50,limit=1] feet run tp @s ~ ~ ~ ~ ~ + execute at @s anchored eyes positioned ^0.2 ^-0.5 ^16 run tp @e[type=item_display,tag=AC.LaserDisplay,distance=..50,limit=1] ~ ~ ~ ~ ~ + execute at @s as @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] at @s facing entity @e[type=marker,tag=AC.RotationMarker,distance=..50,limit=1] feet facing ^ ^ ^-1 run tp @s ~ ~ ~ ~ ~ kill @e[type=marker,tag=AC.RotationMarker,distance=..30] From 4faf80a3e58842a3f8c536af2d8ba2d69c0710ef Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 22 Nov 2024 21:04:19 +0900 Subject: [PATCH 009/103] =?UTF-8?q?=E6=BC=94=E5=87=BA=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 --- .../tick/skill/laser/vfx.mcfunction | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction index 9c68cd1e17..1432245982 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction @@ -127,3 +127,34 @@ particle soul_fire_flame ^-1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.000002 0 normal @a particle soul_fire_flame ^-0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.000002 0 normal @a particle soul_fire_flame ^-0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.000002 0 normal @a particle soul_fire_flame ^-0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.000002 0 normal @a + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iJQAdPQE1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1YkAukA_3 +# 円 1 +particle soul_fire_flame ^0 ^-1.5 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.5 ^0 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.46239 ^0.33378 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.35145 ^0.65083 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.17275 ^0.93523 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.93523 ^1.17275 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.65083 ^1.35145 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.33378 ^1.46239 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0 ^1.5 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.33378 ^1.46239 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.65083 ^1.35145 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.93523 ^1.17275 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.17275 ^0.93523 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.35145 ^0.65083 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.46239 ^0.33378 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.5 ^0 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.0000025 0 normal @a From dcf49e6b4e1c5a17c5308573a15d7068c6aa6cb6 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Fri, 22 Nov 2024 22:13:56 +0900 Subject: [PATCH 010/103] =?UTF-8?q?=E9=80=A3=E7=B6=9A=E9=AD=82=E5=BC=BE?= =?UTF-8?q?=E7=99=BA=E5=B0=84=E3=81=AE=E9=96=8B=E5=A7=8B=E3=83=AA=E3=82=BB?= =?UTF-8?q?=E3=83=83=E3=83=88=E3=81=A0=E3=81=91=E3=82=92=E4=BD=9C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 3 +++ .../tick/skill/many_shoot/.mcfunction | 12 ++++++++++++ .../mob/0372.tutankhamen/tick/skill/reset.mcfunction | 2 ++ .../0372.tutankhamen/tick/skill_branch.mcfunction | 3 +++ .../0372.tutankhamen/tick/skill_select.mcfunction | 5 +++-- 5 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 72f1b466b6..97d0ff29f9 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -5,6 +5,7 @@ # @within function asset:mob/0372.tutankhamen/** #declare tag AC.Laser #declare tag AC.LaserDisplay + #declare tag AC.ManyShoot #declare tag AC.GiantSkull #declare tag AC.AJ #declare tag AC.AJLink @@ -27,6 +28,8 @@ #declare function animated_java:tutankhamen/animations/beam_shot/stop #declare function animated_java:tutankhamen/animations/beam_end/play #declare function animated_java:tutankhamen/animations/beam_end/stop + #declare function animated_java:tutankhamen/animations/soul_shot/play + #declare function animated_java:tutankhamen/animations/soul_shot/stop diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction new file mode 100644 index 0000000000..c36a78135e --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction @@ -0,0 +1,12 @@ +#> asset:mob/0372.tutankhamen/tick/skill/many_shoot/ +# +# 沢山球を撃つ +# +# @within function asset:mob/0372.tutankhamen/tick/skill_branch + +# AJ + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/soul_shot/play + +# 共通リセット処理 + execute if entity @s[scores={General.Mob.Tick=88..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index fe7ebccca0..87cffc1fc3 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -9,8 +9,10 @@ # アニメーションを元に戻す execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/spawn/stop + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/soul_shot/stop execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/play # Tagを削除 tag @s remove AC.Opening tag @s remove AC.Laser + tag @s remove AC.ManyShoot diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction index a5472772e3..416ec3ddf6 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction @@ -9,3 +9,6 @@ # レーザー execute if entity @s[tag=AC.Laser] run function asset:mob/0372.tutankhamen/tick/skill/laser/ + +# いっぱい撃つ + execute if entity @s[tag=AC.ManyShoot] run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index 8d86fe105d..77348f0c63 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -13,11 +13,12 @@ scoreboard players operation $Random Temporary %= $7 Const # デバッグのコマンド - scoreboard players set $Random Temporary 0 + scoreboard players set $Random Temporary 1 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser - execute if score $Random Temporary matches 1 run tag @s add AC.GiantSkull + execute if score $Random Temporary matches 1 run tag @s add AC.ManyShoot + execute if score $Random Temporary matches 2 run tag @s add AC.GiantSkull # リセット scoreboard players reset $Random Temporary From 0db132c5a9a0c1676b5c5c2b23b6b63295213903 Mon Sep 17 00:00:00 2001 From: NonameSister Date: Sat, 23 Nov 2024 01:36:51 +0900 Subject: [PATCH 011/103] =?UTF-8?q?=E7=91=A0=E7=92=83=E3=81=AE=E8=A6=81?= =?UTF-8?q?=E6=9C=9B=EF=BC=9A=E3=83=93=E3=83=BC=E3=83=A0=E5=BE=85=E6=A9=9F?= =?UTF-8?q?=E7=8A=B6=E6=85=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/mob/0372.tutankhamen/_index.d.mcfunction | 2 ++ .../functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction | 2 +- .../functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 72f1b466b6..3a3c067bbe 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -25,6 +25,8 @@ #declare function animated_java:tutankhamen/animations/beam_start/stop #declare function animated_java:tutankhamen/animations/beam_shot/play #declare function animated_java:tutankhamen/animations/beam_shot/stop + #declare function animated_java:tutankhamen/animations/beam_charge/play + #declare function animated_java:tutankhamen/animations/beam_charge/stop #declare function animated_java:tutankhamen/animations/beam_end/play #declare function animated_java:tutankhamen/animations/beam_end/stop diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction index ddf1fd83dd..0d39b44753 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -7,7 +7,7 @@ # AJの開始アニメーション execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_start/play - #execute if entity @s[scores={General.Mob.Tick=11}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_shot/play + execute if entity @s[scores={General.Mob.Tick=11}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_charge/play # 狙うプレイヤーを決定しフィールドに放り込む execute if entity @s[scores={General.Mob.Tick=0}] as @r[distance=..30] run function lib:get_name/ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index fe7ebccca0..d1957ad093 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -8,7 +8,7 @@ scoreboard players set @s General.Mob.Tick -80 # アニメーションを元に戻す - execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/spawn/stop + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_charge/stop execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/play # Tagを削除 From a10c6b70ad0f7bce7d069b5c830695fcd1497caf Mon Sep 17 00:00:00 2001 From: NonameSister Date: Sat, 23 Nov 2024 01:45:57 +0900 Subject: [PATCH 012/103] =?UTF-8?q?beamcharge=E3=81=AE=E5=90=8D=E5=89=8D?= =?UTF-8?q?=E5=A4=89=E3=81=88=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/mob/0372.tutankhamen/_index.d.mcfunction | 4 ++-- .../mob/0372.tutankhamen/tick/skill/laser/.mcfunction | 2 +- .../mob/0372.tutankhamen/tick/skill/reset.mcfunction | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 3a3c067bbe..28a9a1d888 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -25,8 +25,8 @@ #declare function animated_java:tutankhamen/animations/beam_start/stop #declare function animated_java:tutankhamen/animations/beam_shot/play #declare function animated_java:tutankhamen/animations/beam_shot/stop - #declare function animated_java:tutankhamen/animations/beam_charge/play - #declare function animated_java:tutankhamen/animations/beam_charge/stop + #declare function animated_java:tutankhamen/animations/beam_wait/play + #declare function animated_java:tutankhamen/animations/beam_wait/stop #declare function animated_java:tutankhamen/animations/beam_end/play #declare function animated_java:tutankhamen/animations/beam_end/stop diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction index 0d39b44753..a7f2751c47 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -7,7 +7,7 @@ # AJの開始アニメーション execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_start/play - execute if entity @s[scores={General.Mob.Tick=11}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_charge/play + execute if entity @s[scores={General.Mob.Tick=11}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_wait/play # 狙うプレイヤーを決定しフィールドに放り込む execute if entity @s[scores={General.Mob.Tick=0}] as @r[distance=..30] run function lib:get_name/ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index d1957ad093..3a7767ed99 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -8,7 +8,7 @@ scoreboard players set @s General.Mob.Tick -80 # アニメーションを元に戻す - execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_charge/stop + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_wait/stop execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/play # Tagを削除 From d2bb4b9eb8cea7c603e21b47ed83a5d036062a75 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 23 Nov 2024 10:30:29 +0900 Subject: [PATCH 013/103] =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E5=87=A6=E7=90=86=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/laser/.mcfunction | 18 ++++-------------- .../skill/laser/facing_target.m.mcfunction | 2 +- .../tick/skill/laser/shoot.mcfunction | 12 +++++++++--- .../tick/skill_select.mcfunction | 2 +- 4 files changed, 15 insertions(+), 19 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction index ddf1fd83dd..6e71021e0d 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -18,11 +18,6 @@ execute if entity @s[scores={General.Mob.Tick=55..65}] as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound block.note_block.bit hostile @s ~ ~ ~ 0.4 1 1 execute if entity @s[scores={General.Mob.Tick=75..85}] as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound block.note_block.bit hostile @s ~ ~ ~ 0.4 1 1 -# ターゲットの方を向く - execute if entity @s[scores={General.Mob.Tick=20..35}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this - execute if entity @s[scores={General.Mob.Tick=55}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this - execute if entity @s[scores={General.Mob.Tick=75}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this - # Rotationをフィールドに入れてからdisplayを前方に召喚 execute if entity @s[scores={General.Mob.Tick=20}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation execute if entity @s[scores={General.Mob.Tick=20}] at @s anchored eyes positioned ^0.2 ^-0.5 ^16 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this @@ -31,15 +26,10 @@ execute if entity @s[scores={General.Mob.Tick=75}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation execute if entity @s[scores={General.Mob.Tick=75}] at @s anchored eyes positioned ^0.2 ^-0.5 ^16 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this -# displayを消す - execute if entity @s[scores={General.Mob.Tick=45}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] - execute if entity @s[scores={General.Mob.Tick=65}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] - execute if entity @s[scores={General.Mob.Tick=85}] run kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] - -# 発射アニメーション - execute if entity @s[scores={General.Mob.Tick=45}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_shot/play - execute if entity @s[scores={General.Mob.Tick=65}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_shot/play - execute if entity @s[scores={General.Mob.Tick=85}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_shot/play +# ターゲットの方を向く + execute if entity @s[scores={General.Mob.Tick=20..35}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=55}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=75}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this # レーザー発射 execute if entity @s[scores={General.Mob.Tick=45}] at @s anchored eyes positioned ^0.2 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction index 4320bc87a4..3e2d631c4a 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction @@ -14,7 +14,7 @@ # さらにdisplayも一緒に回転 # markerを召喚し、displayにそれを向かせる - execute at @s rotated ~ 0 anchored eyes positioned ^0.2 ^-0.5 ^1 run summon marker ~ ~ ~ {Tags:["AC.RotationMarker"]} + execute at @s rotated ~ 0 anchored eyes positioned ^0.2 ^-0.5 ^1.5 run summon marker ~ ~ ~ {Tags:["AC.RotationMarker"]} execute at @s anchored eyes positioned ^0.2 ^-0.5 ^16 run tp @e[type=item_display,tag=AC.LaserDisplay,distance=..50,limit=1] ~ ~ ~ ~ ~ execute at @s as @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] at @s facing entity @e[type=marker,tag=AC.RotationMarker,distance=..50,limit=1] feet facing ^ ^ ^-1 run tp @s ~ ~ ~ ~ ~ kill @e[type=marker,tag=AC.RotationMarker,distance=..30] diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction index e86022f0d5..a16fc197b9 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction @@ -4,13 +4,19 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill/laser/ +# 演出 + execute as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 2 + function asset:mob/0372.tutankhamen/tick/skill/laser/vfx + # 再帰発射 function asset:mob/0372.tutankhamen/tick/skill/laser/recursive scoreboard players reset $Recursive Temporary -# 演出 - execute as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 2 - function asset:mob/0372.tutankhamen/tick/skill/laser/vfx +# displayを消す + kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] + +# 発射アニメーション + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_shot/play # 回転するxyzLibを使ってヒット判定を行う # x,yは半径0.75に+0.3して判定する diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index 77348f0c63..838683dedb 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -13,7 +13,7 @@ scoreboard players operation $Random Temporary %= $7 Const # デバッグのコマンド - scoreboard players set $Random Temporary 1 + scoreboard players set $Random Temporary 0 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser From e8a194ed099fb508de5a5739f184c2df43e7a19d Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 23 Nov 2024 10:33:55 +0900 Subject: [PATCH 014/103] =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E7=94=A8display=E3=81=ABbrightness=E3=82=92=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/common/summon_laser_display.m.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction index 892f2d47fc..760904530e 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction @@ -7,4 +7,4 @@ # @within function asset:mob/0372.tutankhamen/tick/skill/** # 召喚 - $summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,Tags:["AC.LaserDisplay"],item:{id:"cyan_stained_glass_pane",Count:1b},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.12f,0.12f,500f]}} + $summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,brightness:{sky:15,block:15},Tags:["AC.LaserDisplay"],item:{id:"cyan_stained_glass_pane",Count:1b},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.12f,0.12f,500f]}} From 7d0d66bbe283ffeda3ee23b4bff016835ce99d79 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 23 Nov 2024 10:40:03 +0900 Subject: [PATCH 015/103] =?UTF-8?q?=E3=83=AA=E3=82=BB=E3=83=83=E3=83=88?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index cff25a3151..439bb0db26 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -8,6 +8,9 @@ scoreboard players set @s General.Mob.Tick -80 # アニメーションを元に戻す + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/spawn/stop + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/soul_shot/stop + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_wait/stop execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/play # Tagを削除 From 7cd2715fb0f3ee3693ddd4475f928ca3d8108ae0 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 23 Nov 2024 17:06:00 +0900 Subject: [PATCH 016/103] =?UTF-8?q?=E9=96=8B=E5=A7=8B=E3=81=8B=E3=82=89?= =?UTF-8?q?=E3=83=97=E3=83=AC=E3=82=A4=E3=83=A4=E3=83=BC=E3=81=AE=E6=96=B9?= =?UTF-8?q?=E3=82=92=E5=90=91=E3=81=8F=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/mob/0372.tutankhamen/tick/skill/laser/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction index 2e5eb3fe62..d1d0e853c2 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -27,7 +27,7 @@ execute if entity @s[scores={General.Mob.Tick=75}] at @s anchored eyes positioned ^0.2 ^-0.5 ^16 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this # ターゲットの方を向く - execute if entity @s[scores={General.Mob.Tick=20..35}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=0..35}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this execute if entity @s[scores={General.Mob.Tick=55}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this execute if entity @s[scores={General.Mob.Tick=75}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this From a0418c0c02fd723f2ff937be50fd59503bd1a8e7 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 23 Nov 2024 17:10:15 +0900 Subject: [PATCH 017/103] =?UTF-8?q?=E4=BA=88=E5=91=8Adisplay=E3=81=AE?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/tick/skill/laser/.mcfunction | 9 +++------ .../tick/skill/laser/facing_target.m.mcfunction | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction index d1d0e853c2..383c351432 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -19,12 +19,9 @@ execute if entity @s[scores={General.Mob.Tick=75..85}] as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound block.note_block.bit hostile @s ~ ~ ~ 0.4 1 1 # Rotationをフィールドに入れてからdisplayを前方に召喚 - execute if entity @s[scores={General.Mob.Tick=20}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=20}] at @s anchored eyes positioned ^0.2 ^-0.5 ^16 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this - execute if entity @s[scores={General.Mob.Tick=55}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=55}] at @s anchored eyes positioned ^0.2 ^-0.5 ^16 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this - execute if entity @s[scores={General.Mob.Tick=75}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=75}] at @s anchored eyes positioned ^0.2 ^-0.5 ^16 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=20}] at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with entity @s Rotation + execute if entity @s[scores={General.Mob.Tick=55}] at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with entity @s Rotation + execute if entity @s[scores={General.Mob.Tick=75}] at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with entity @s Rotation # ターゲットの方を向く execute if entity @s[scores={General.Mob.Tick=0..35}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction index 3e2d631c4a..2847225c2b 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction @@ -15,6 +15,6 @@ # さらにdisplayも一緒に回転 # markerを召喚し、displayにそれを向かせる execute at @s rotated ~ 0 anchored eyes positioned ^0.2 ^-0.5 ^1.5 run summon marker ~ ~ ~ {Tags:["AC.RotationMarker"]} - execute at @s anchored eyes positioned ^0.2 ^-0.5 ^16 run tp @e[type=item_display,tag=AC.LaserDisplay,distance=..50,limit=1] ~ ~ ~ ~ ~ + execute at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run tp @e[type=item_display,tag=AC.LaserDisplay,distance=..50,limit=1] ~ ~ ~ ~ ~ execute at @s as @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] at @s facing entity @e[type=marker,tag=AC.RotationMarker,distance=..50,limit=1] feet facing ^ ^ ^-1 run tp @s ~ ~ ~ ~ ~ kill @e[type=marker,tag=AC.RotationMarker,distance=..30] From cafa3a1f4f633d7237506f1e7a73f92f5fbfb674 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 23 Nov 2024 18:21:20 +0900 Subject: [PATCH 018/103] =?UTF-8?q?=E3=83=9F=E3=82=B9=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/tick/skill/laser/.mcfunction | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction index 383c351432..92618c6c52 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -19,9 +19,12 @@ execute if entity @s[scores={General.Mob.Tick=75..85}] as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound block.note_block.bit hostile @s ~ ~ ~ 0.4 1 1 # Rotationをフィールドに入れてからdisplayを前方に召喚 - execute if entity @s[scores={General.Mob.Tick=20}] at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=55}] at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=75}] at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with entity @s Rotation + execute if entity @s[scores={General.Mob.Tick=20}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation + execute if entity @s[scores={General.Mob.Tick=20}] at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=55}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation + execute if entity @s[scores={General.Mob.Tick=55}] at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this + execute if entity @s[scores={General.Mob.Tick=75}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation + execute if entity @s[scores={General.Mob.Tick=75}] at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this # ターゲットの方を向く execute if entity @s[scores={General.Mob.Tick=0..35}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this From a09fd023ea7533790bfb3a8fdf135781e6a6e5ee Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sat, 23 Nov 2024 23:55:04 +0900 Subject: [PATCH 019/103] =?UTF-8?q?=E3=83=8F=E3=82=A4=E3=83=91=E3=83=BC?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AE=E9=80=94=E4=B8=AD?= =?UTF-8?q?=E3=81=BE=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 7 +++ .../tick/skill/hyper_laser/.mcfunction | 43 +++++++++++++++++++ .../tick/skill/hyper_laser/shoot.mcfunction | 5 +++ .../hyper_laser/summon_square.mcfunction | 10 +++++ .../tick/skill/reset.mcfunction | 4 +- .../tick/skill_branch.mcfunction | 3 ++ .../tick/skill_select.mcfunction | 3 +- .../2090.magic_square/_index.d.mcfunction | 6 +++ .../object/2090.magic_square/init/.mcfunction | 5 +++ .../object/2090.magic_square/load.mcfunction | 9 ++++ .../2090.magic_square/register.mcfunction | 23 ++++++++++ .../2090.magic_square/summon/.m.mcfunction | 9 ++++ .../2090.magic_square/summon/.mcfunction | 8 ++++ .../2090.magic_square/summon/debug.mcfunction | 10 +++++ .../object/2090.magic_square/tick/.mcfunction | 25 +++++++++++ .../2090.magic_square/tick/spin.mcfunction | 26 +++++++++++ .../object/alias/2090/init.mcfunction | 8 ++++ .../object/alias/2090/register.mcfunction | 8 ++++ .../object/alias/2090/summon.mcfunction | 8 ++++ .../object/alias/2090/tick.mcfunction | 8 ++++ .../asset/tags/functions/object/load.json | 1 + 21 files changed, 227 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square.mcfunction create mode 100644 Asset/data/asset/functions/object/2090.magic_square/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/2090.magic_square/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/2090.magic_square/load.mcfunction create mode 100644 Asset/data/asset/functions/object/2090.magic_square/register.mcfunction create mode 100644 Asset/data/asset/functions/object/2090.magic_square/summon/.m.mcfunction create mode 100644 Asset/data/asset/functions/object/2090.magic_square/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/2090.magic_square/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/2090.magic_square/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/2090.magic_square/tick/spin.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2090/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2090/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2090/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2090/tick.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index a80b68081c..4d0ca7f6d4 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -7,6 +7,7 @@ #declare tag AC.LaserDisplay #declare tag AC.ManyShoot #declare tag AC.GiantSkull + #declare tag AC.HyperLaser #declare tag AC.AJ #declare tag AC.AJLink #declare tag AC.Opening @@ -32,6 +33,12 @@ #declare function animated_java:tutankhamen/animations/beam_end/stop #declare function animated_java:tutankhamen/animations/soul_shot/play #declare function animated_java:tutankhamen/animations/soul_shot/stop + #declare function animated_java:tutankhamen/animations/beam_long/play + #declare function animated_java:tutankhamen/animations/beam_long/stop + #declare function animated_java:tutankhamen/animations/beam_long_charge/play + #declare function animated_java:tutankhamen/animations/beam_long_charge/stop + #declare function animated_java:tutankhamen/animations/beam_long_shot/play + #declare function animated_java:tutankhamen/animations/beam_long_shot/stop diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction new file mode 100644 index 0000000000..e7a5464b96 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction @@ -0,0 +1,43 @@ +#> asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ +# +# ハイパーレーザー +# +# @within function asset:mob/0372.tutankhamen/tick/skill_branch + +# AJ +# 構え開始(21tick) + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long/play + +# 構えループ(1ループ17tick) + execute if entity @s[scores={General.Mob.Tick=21}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_charge/play + +# 発射(32tick) + execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_charge/stop + execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_shot/play + +# 前方に魔法陣を召喚 + execute if entity @s[scores={General.Mob.Tick=14}] run data modify storage api: Argument.FieldOverride set value {Scale:[3.0f,3.0f,0.01f],Color:3523276} + execute if entity @s[scores={General.Mob.Tick=14}] anchored eyes positioned ^ ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + + execute if entity @s[scores={General.Mob.Tick=15}] run data modify storage api: Argument.FieldOverride set value {Scale:[2.0f,2.0f,0.01f],CMD:20444,Color:3523276,LeftRotate:true} + execute if entity @s[scores={General.Mob.Tick=15}] anchored eyes positioned ^ ^-0.4 ^3.0 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + + execute if entity @s[scores={General.Mob.Tick=15}] run data modify storage api: Argument.FieldOverride set value {Scale:[1.0f,1.0f,0.01f],CMD:20444,Color:3523276} + execute if entity @s[scores={General.Mob.Tick=15}] anchored eyes positioned ^ ^-0.4 ^3.4 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + +# 発射 + execute if entity @s[scores={General.Mob.Tick=14}] anchored eyes positioned ^ ^-0.4 ^2.6 run function asset + +# 共通リセット処理 + execute if entity @s[scores={General.Mob.Tick=87..}] run function asset:mob/0372.tutankhamen/tick/skill/reset + + + + + + + + + +# diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction new file mode 100644 index 0000000000..94c6194731 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction @@ -0,0 +1,5 @@ +#> asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square.mcfunction new file mode 100644 index 0000000000..930d85e152 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square.mcfunction @@ -0,0 +1,10 @@ +#> asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ + +# 魔法陣召喚 + data modify storage api: Argument.ID set value 2090 + data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + function api:object/summon diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index 439bb0db26..8f0059f131 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -5,15 +5,17 @@ # @within function asset:mob/0372.tutankhamen/tick/skill/** # スコアをセット - scoreboard players set @s General.Mob.Tick -80 + scoreboard players set @s General.Mob.Tick -10 # アニメーションを元に戻す execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/spawn/stop execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/soul_shot/stop execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_wait/stop + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_shot/stop execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/play # Tagを削除 tag @s remove AC.Opening tag @s remove AC.Laser tag @s remove AC.ManyShoot + tag @s remove AC.HyperLaser diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction index 416ec3ddf6..a2441f2c21 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction @@ -12,3 +12,6 @@ # いっぱい撃つ execute if entity @s[tag=AC.ManyShoot] run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/ + +# ハイパーレーザー + execute if entity @s[tag=AC.HyperLaser] run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index 838683dedb..63a5cd68f8 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -13,12 +13,13 @@ scoreboard players operation $Random Temporary %= $7 Const # デバッグのコマンド - scoreboard players set $Random Temporary 0 + scoreboard players set $Random Temporary 3 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser execute if score $Random Temporary matches 1 run tag @s add AC.ManyShoot execute if score $Random Temporary matches 2 run tag @s add AC.GiantSkull + execute if score $Random Temporary matches 3 run tag @s add AC.HyperLaser # リセット scoreboard players reset $Random Temporary diff --git a/Asset/data/asset/functions/object/2090.magic_square/_index.d.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/_index.d.mcfunction new file mode 100644 index 0000000000..f4381195aa --- /dev/null +++ b/Asset/data/asset/functions/object/2090.magic_square/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:object/2090.magic_square/_index.d +# @private + +#> tag +# @within function asset:object/2090.magic_square/** + #declare \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2090.magic_square/init/.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/init/.mcfunction new file mode 100644 index 0000000000..59ae3b9892 --- /dev/null +++ b/Asset/data/asset/functions/object/2090.magic_square/init/.mcfunction @@ -0,0 +1,5 @@ +#> asset:object/2090.magic_square/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2090/init diff --git a/Asset/data/asset/functions/object/2090.magic_square/load.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/load.mcfunction new file mode 100644 index 0000000000..b246347959 --- /dev/null +++ b/Asset/data/asset/functions/object/2090.magic_square/load.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/2090.magic_square/load +# +# Objectに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:object/load + +#> 定義類はここに +# @within function asset:object/2090.magic_square/** + scoreboard objectives add 2090.SpinCount dummy diff --git a/Asset/data/asset/functions/object/2090.magic_square/register.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/register.mcfunction new file mode 100644 index 0000000000..b8bf5311d5 --- /dev/null +++ b/Asset/data/asset/functions/object/2090.magic_square/register.mcfunction @@ -0,0 +1,23 @@ +#> asset:object/2090.magic_square/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2090/register + +# 継承(オプション) + # data modify storage asset:object Extends append value + # function asset:object/extends +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:object ExtendsSafe set value +# 継承されることを前提とした、抽象的なオブジェクトであるかどうか(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 2090 +# フィールド(オプション) + data modify storage asset:object Field.Rotation set value [0.0f,0.0f] + data modify storage asset:object Field.Color set value 16777215 + data modify storage asset:object Field.Scale set value [1.0f,1.0f,1.0f] + data modify storage asset:object Field.CMD set value 20443 diff --git a/Asset/data/asset/functions/object/2090.magic_square/summon/.m.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/summon/.m.mcfunction new file mode 100644 index 0000000000..7daf5fb1eb --- /dev/null +++ b/Asset/data/asset/functions/object/2090.magic_square/summon/.m.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/2090.magic_square/summon/.m +# +# マクロで召喚する +# +# @input args: +# Rotation : double @ 2 +# @within function asset:object/2090.magic_square/summon/ + + $summon minecraft:item_display ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"],interpolation_duration:15,teleport_duration:1,item:{id:"leather_horse_armor",Count:1b,tag:{CustomModelData:$(CMD),display:{color:$(Color)}}},transformation:{left_rotation:[0.0f,0.0f,0.0f,1.0f],right_rotation:[0.0f,0.0f,0.0f,1.0f],translation:[0.0f,0.0f,0.0f],scale:[0.0f,0.0f,0.0f]}} diff --git a/Asset/data/asset/functions/object/2090.magic_square/summon/.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/summon/.mcfunction new file mode 100644 index 0000000000..3ce9433234 --- /dev/null +++ b/Asset/data/asset/functions/object/2090.magic_square/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2090.magic_square/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2090/summon + +# 元となるEntityを召喚する + function asset:object/2090.magic_square/summon/.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/2090.magic_square/summon/debug.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/summon/debug.mcfunction new file mode 100644 index 0000000000..613ca6f6e5 --- /dev/null +++ b/Asset/data/asset/functions/object/2090.magic_square/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2090.magic_square/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 2090 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2090.magic_square/tick/.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/tick/.mcfunction new file mode 100644 index 0000000000..ded2ed5e18 --- /dev/null +++ b/Asset/data/asset/functions/object/2090.magic_square/tick/.mcfunction @@ -0,0 +1,25 @@ +#> asset:object/2090.magic_square/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2090/tick + +#> Private +# @private + #declare score_holder $Interval + +# デカくなる + execute if entity @s[scores={General.Object.Tick=3}] run data modify entity @s start_interpolation set value 0 + execute if entity @s[scores={General.Object.Tick=3}] run data modify entity @s transformation.scale set from storage asset:context this.Scale + +# 一定間隔で回転 + scoreboard players operation $Interval Temporary = @s General.Object.Tick + scoreboard players operation $Interval Temporary %= $12 Const + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=3..}] run function asset:object/2090.magic_square/tick/spin + scoreboard players reset $Interval Temporary + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 消滅処理 + kill @s[scores={General.Object.Tick=100..}] diff --git a/Asset/data/asset/functions/object/2090.magic_square/tick/spin.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/tick/spin.mcfunction new file mode 100644 index 0000000000..37502f13b9 --- /dev/null +++ b/Asset/data/asset/functions/object/2090.magic_square/tick/spin.mcfunction @@ -0,0 +1,26 @@ +#> asset:object/2090.magic_square/tick/spin +# +# +# +# @within function asset:object/2090.magic_square/tick/ + +# 回転のカウント + scoreboard players add @s 2090.SpinCount 1 + +# start_interpolation + data modify entity @s start_interpolation set value 0 + +# 回転 フィールドによって回転方向を変える +# 2,4は共通 + execute if entity @s[scores={2090.SpinCount=1}] unless data storage asset:context this{LeftRotate:true} run data modify entity @s transformation set value [-0.0f,1.0f,0.0f,0.0f,-1.0f,-0.0f,0.0f,0.0f,0.0f,0.0f,1.0f,0.0f,0.0f,0.0f,0.0f,1.0f] + execute if entity @s[scores={2090.SpinCount=1}] if data storage asset:context this{LeftRotate:true} run data modify entity @s transformation set value [-0.0f,-1.0f,0.0f,0.0f,1.0f,-0.0f,0.0f,0.0f,0.0f,0.0f,1.0f,0.0f,0.0f,0.0f,0.0f,1.0f] + execute if entity @s[scores={2090.SpinCount=2}] run data modify entity @s transformation set value [-1.0f,-0.0f,0.0f,0.0f,0.0f,-1.0f,0.0f,0.0f,0.0f,0.0f,1.0f,0.0f,0.0f,0.0f,0.0f,1.0f] + execute if entity @s[scores={2090.SpinCount=3}] unless data storage asset:context this{LeftRotate:true} run data modify entity @s transformation set value [-0.0f,-1.0f,0.0f,0.0f,1.0f,-0.0f,0.0f,0.0f,0.0f,0.0f,1.0f,0.0f,0.0f,0.0f,0.0f,1.0f] + execute if entity @s[scores={2090.SpinCount=3}] if data storage asset:context this{LeftRotate:true} run data modify entity @s transformation set value [-0.0f,1.0f,0.0f,0.0f,-1.0f,-0.0f,0.0f,0.0f,0.0f,0.0f,1.0f,0.0f,0.0f,0.0f,0.0f,1.0f] + execute if entity @s[scores={2090.SpinCount=4}] run data modify entity @s transformation set value [1.0f,0.0f,0.0f,0.0f,0.0f,1.0f,0.0f,0.0f,0.0f,0.0f,1.0f,0.0f,0.0f,0.0f,0.0f,1.0f] + +# Scaleだけ別で設定し直す + data modify entity @s transformation.scale set from storage asset:context this.Scale + +# 回転カウントのリセット + execute if entity @s[scores={2090.SpinCount=4..}] run scoreboard players reset @s 2090.SpinCount diff --git a/Asset/data/asset/functions/object/alias/2090/init.mcfunction b/Asset/data/asset/functions/object/alias/2090/init.mcfunction new file mode 100644 index 0000000000..85e457b2a2 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2090/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2090/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/2090.magic_square/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2090/register.mcfunction b/Asset/data/asset/functions/object/alias/2090/register.mcfunction new file mode 100644 index 0000000000..92f201f050 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2090/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2090/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2090.magic_square/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2090/summon.mcfunction b/Asset/data/asset/functions/object/alias/2090/summon.mcfunction new file mode 100644 index 0000000000..4b58542d11 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2090/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2090/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2090.magic_square/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2090/tick.mcfunction b/Asset/data/asset/functions/object/alias/2090/tick.mcfunction new file mode 100644 index 0000000000..78d2f166ca --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2090/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2090/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2090.magic_square/tick/ \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/object/load.json b/Asset/data/asset/tags/functions/object/load.json index 09a66d158f..c64262d446 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/2090.magic_square/load", "asset:object/1052.maid/load", "asset:object/1029.barrage_spirit/load", "asset:object/1059.book_of_hero/load", From fa34deb93893d3f95d32e454593ed5f5e70d14c4 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 24 Nov 2024 03:55:43 +0900 Subject: [PATCH 020/103] =?UTF-8?q?=E3=83=8F=E3=82=A4=E3=83=91=E3=83=BC?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC=E9=80=94=E4=B8=AD=E3=81=BE?= =?UTF-8?q?=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/summon_laser_display.m.mcfunction | 2 +- .../tick/skill/hyper_laser/.mcfunction | 20 +- .../skill/hyper_laser/recursive.mcfunction | 24 ++ .../tick/skill/hyper_laser/shoot.mcfunction | 14 +- .../tick/skill/hyper_laser/vfx.mcfunction | 285 ++++++++++++++++++ .../tick/skill/laser/recursive.mcfunction | 1 - .../tick/skill_select.mcfunction | 2 +- 7 files changed, 334 insertions(+), 14 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/recursive.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/vfx.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction index 760904530e..a5c83f319f 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction @@ -7,4 +7,4 @@ # @within function asset:mob/0372.tutankhamen/tick/skill/** # 召喚 - $summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,brightness:{sky:15,block:15},Tags:["AC.LaserDisplay"],item:{id:"cyan_stained_glass_pane",Count:1b},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.12f,0.12f,500f]}} + $summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,brightness:{sky:15,block:15},Tags:["AC.LaserDisplay"],item:{id:"cyan_stained_glass_pane",Count:1b},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.05f,0.05f,500f]}} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction index e7a5464b96..ed3a9ced8c 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction @@ -12,22 +12,24 @@ # 構えループ(1ループ17tick) execute if entity @s[scores={General.Mob.Tick=21}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_charge/play -# 発射(32tick) - execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_charge/stop - execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_shot/play - # 前方に魔法陣を召喚 - execute if entity @s[scores={General.Mob.Tick=14}] run data modify storage api: Argument.FieldOverride set value {Scale:[3.0f,3.0f,0.01f],Color:3523276} + execute if entity @s[scores={General.Mob.Tick=14}] run data modify storage api: Argument.FieldOverride set value {Scale:[4.2f,4.2f,0.01f],Color:3523276} execute if entity @s[scores={General.Mob.Tick=14}] anchored eyes positioned ^ ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square execute if entity @s[scores={General.Mob.Tick=15}] run data modify storage api: Argument.FieldOverride set value {Scale:[2.0f,2.0f,0.01f],CMD:20444,Color:3523276,LeftRotate:true} - execute if entity @s[scores={General.Mob.Tick=15}] anchored eyes positioned ^ ^-0.4 ^3.0 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + execute if entity @s[scores={General.Mob.Tick=15}] anchored eyes positioned ^1.5 ^1 ^2.8 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + + execute if entity @s[scores={General.Mob.Tick=15}] run data modify storage api: Argument.FieldOverride set value {Scale:[1.4f,1.4f,0.01f],CMD:20444,Color:3523276} + execute if entity @s[scores={General.Mob.Tick=15}] anchored eyes positioned ^-1.2 ^1 ^2.9 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square - execute if entity @s[scores={General.Mob.Tick=15}] run data modify storage api: Argument.FieldOverride set value {Scale:[1.0f,1.0f,0.01f],CMD:20444,Color:3523276} - execute if entity @s[scores={General.Mob.Tick=15}] anchored eyes positioned ^ ^-0.4 ^3.4 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + +# 発射(32tick) + execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_charge/stop + execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_shot/play # 発射 - execute if entity @s[scores={General.Mob.Tick=14}] anchored eyes positioned ^ ^-0.4 ^2.6 run function asset + execute if entity @s[scores={General.Mob.Tick=55}] anchored eyes positioned ^ ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot + #execute if entity @s[scores={General.Mob.Tick=55}] anchored eyes positioned ^7 ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot # 共通リセット処理 execute if entity @s[scores={General.Mob.Tick=87..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/recursive.mcfunction new file mode 100644 index 0000000000..db84e27d0f --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/recursive.mcfunction @@ -0,0 +1,24 @@ +#> asset:mob/0372.tutankhamen/tick/skill/hyper_laser/recursive +# +# +# +# @within function +# asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot +# asset:mob/0372.tutankhamen/tick/skill/hyper_laser/recursive + +# 演出 + particle soul_fire_flame ~ ~ ~ 0.1 0.1 0.1 0.08 2 normal @a + particle soul_fire_flame ^ ^ ^0.25 0.1 0.1 0.1 0.08 2 normal @a + particle soul ~ ~ ~ 0 0 0 0.25 3 normal @a + +# 一定間隔での演出 + scoreboard players operation $Interval Temporary = $Recursive Temporary + scoreboard players operation $Interval Temporary %= $10 Const + execute if score $Interval Temporary matches 0 run particle sonic_boom ~ ~ ~ 0 0 0 0 1 + scoreboard players reset $Interval Temporary + +# 再帰スコア + scoreboard players add $Recursive Temporary 1 + +# 再帰 + execute if score $Recursive Temporary matches ..60 positioned ^ ^ ^0.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/recursive diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction index 94c6194731..61243ed33f 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction @@ -1,5 +1,15 @@ #> asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot # -# # -# @within function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ \ No newline at end of file +# +# @within function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ + +# vfx + function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/vfx + execute as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 1.8 + execute as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 1.6 + + +# 発射 + function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/recursive + scoreboard players reset $Recursive Temporary diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/vfx.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/vfx.mcfunction new file mode 100644 index 0000000000..54992cf6ee --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/vfx.mcfunction @@ -0,0 +1,285 @@ +#> asset:mob/0372.tutankhamen/tick/skill/hyper_laser/vfx +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iG4AdG4E1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1Yl44NDwFDAOQwDmDppmxGQUAkzCwpSUbmLipJSkgrSU9OzUcHBiAtRsJ1y0cNS8rGbaehSALE1AEuRgCN9ExmCxWHQZexOFxITyoHzNfyIcDBULhMBRYqxBJJMApNIZShZRH5QpIWglMoVKo1OrJRpMZrRLwODCaPxIADMBAAVoQdDAkJQCFw4AAvNDc3FgNqdOk9fqDEZjOATKbYaoENoAISlMowfQG5TVTHGSC1M3iAF0gA_3 +# 多角形 1 +particle soul_fire_flame ^1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0 ^1.8 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +# 円 1 +particle soul_fire_flame ^0 ^-2.2 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^2.2 ^0 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0 ^2.2 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-2.2 ^0 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000005 0 normal @a + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iG4AdG4E1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1Yl44NDwFDAOQwDmDppmxGQUAkzCwpSUbmLipJSkgrSU9OzUcHBiAtRsJ1y0cNS8rGbaehSALE1AEuRgCN9ExmCxWHQZexOFxITyoHzNfyIcDBULhMBRYqxBJJMApNIZShZRH5QpIWglMoVKo1OrJRpMZrRLwODCaPxIADMBAAVoQdDAkJQCFw4AAvNDc3FgNqdOk9fqDEZjOATKbYaoENoAISlMowfQG5TVTHGSC1M3iAF0gA_3 +# 多角形 1 +particle soul_fire_flame ^1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0 ^1.8 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +# 円 1 +particle soul_fire_flame ^0 ^-2.2 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^2.2 ^0 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0 ^2.2 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-2.2 ^0 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000010 0 normal @a + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iG4AdG4E1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1Yl44NDwFDAOQwDmDppmxGQUAkzCwpSUbmLipJSkgrSU9OzUcHBiAtRsJ1y0cNS8rGbaehSALE1AEuRgCN9ExmCxWHQZexOFxITyoHzNfyIcDBULhMBRYqxBJJMApNIZShZRH5QpIWglMoVKo1OrJRpMZrRLwODCaPxIADMBAAVoQdDAkJQCFw4AAvNDc3FgNqdOk9fqDEZjOATKbYaoENoAISlMowfQG5TVTHGSC1M3iAF0gA_3 +# 多角形 1 +particle soul_fire_flame ^1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0 ^1.8 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +# 円 1 +particle soul_fire_flame ^0 ^-2.2 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^2.2 ^0 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0 ^2.2 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-2.2 ^0 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000015 0 normal @a + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iG4AdG4E1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1Yl44NDwFDAOQwDmDppmxGQUAkzCwpSUbmLipJSkgrSU9OzUcHBiAtRsJ1y0cNS8rGbaehSALE1AEuRgCN9ExmCxWHQZexOFxITyoHzNfyIcDBULhMBRYqxBJJMApNIZShZRH5QpIWglMoVKo1OrJRpMZrRLwODCaPxIADMBAAVoQdDAkJQCFw4AAvNDc3FgNqdOk9fqDEZjOATKbYaoENoAISlMowfQG5TVTHGSC1M3iAF0gA_3 +# 多角形 1 +particle soul_fire_flame ^1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0 ^1.8 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +# 円 1 +particle soul_fire_flame ^0 ^-2.2 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^2.2 ^0 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0 ^2.2 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-2.2 ^0 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000020 0 normal @a + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iG4AdG4E1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1Yl44NDwFDAOQwDmDppmxGQUAkzCwpSUbmLipJSkgrSU9OzUcHBiAtRsJ1y0cNS8rGbaehSALE1AEuRgCN9ExmCxWHQZexOFxITyoHzNfyIcDBULhMBRYqxBJJMApNIZShZRH5QpIWglMoVKo1OrJRpMZrRLwODCaPxIADMBAAVoQdDAkJQCFw4AAvNDc3FgNqdOk9fqDEZjOATKbYaoENoAISlMowfQG5TVTHGSC1M3iAF0gA_3 +# 多角形 1 +particle soul_fire_flame ^1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0 ^1.8 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +# 円 1 +particle soul_fire_flame ^0 ^-2.2 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^2.2 ^0 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0 ^2.2 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-2.2 ^0 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000025 0 normal @a diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction index 4d2920fbbb..161da009d7 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction @@ -9,7 +9,6 @@ # 演出 particle soul_fire_flame ~ ~ ~ 0 0 0 0 1 normal @a particle soul_fire_flame ^ ^ ^0.25 0 0 0 0 1 normal @a - particle soul_fire_flame ~ ~ ~ 0 0 0 0.4 3 normal @a particle soul ~ ~ ~ 0 0 0 0.25 3 normal @a # 一定間隔での演出 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index 63a5cd68f8..13fc47bd8f 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -13,7 +13,7 @@ scoreboard players operation $Random Temporary %= $7 Const # デバッグのコマンド - scoreboard players set $Random Temporary 3 + scoreboard players set $Random Temporary 0 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser From bd4e6a07bc50015cc2ab27eb8e8759fde886b5a8 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 24 Nov 2024 14:17:51 +0900 Subject: [PATCH 021/103] =?UTF-8?q?=E3=83=8F=E3=82=A4=E3=83=91=E3=83=BC?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC=E7=94=A8Object=E4=BD=9C?= =?UTF-8?q?=E3=82=8B=E3=81=A8=E3=81=93=E3=81=BE=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2091.hyper_laser_manager/init/.mcfunction | 5 +++++ .../register.mcfunction | 20 +++++++++++++++++++ .../summon/.m.mcfunction | 8 ++++++++ .../summon/.mcfunction | 7 +++++++ .../summon/debug.mcfunction | 10 ++++++++++ .../2091.hyper_laser_manager/tick/.mcfunction | 11 ++++++++++ .../object/alias/2091/init.mcfunction | 8 ++++++++ .../object/alias/2091/register.mcfunction | 8 ++++++++ .../object/alias/2091/summon.mcfunction | 8 ++++++++ .../object/alias/2091/tick.mcfunction | 8 ++++++++ 10 files changed, 93 insertions(+) create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/register.mcfunction create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.m.mcfunction create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2091/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2091/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2091/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2091/tick.mcfunction diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/init/.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/init/.mcfunction new file mode 100644 index 0000000000..4c4b358aac --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/init/.mcfunction @@ -0,0 +1,5 @@ +#> asset:object/2091.hyper_laser_manager/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2091/init diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/register.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/register.mcfunction new file mode 100644 index 0000000000..cfc11c02ec --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2091.hyper_laser_manager/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2091/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 2091 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.m.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.m.mcfunction new file mode 100644 index 0000000000..5564c98def --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.m.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2091.hyper_laser_manager/summon/.m +# +# +# +# @within function asset:object/2091.hyper_laser_manager/summon/ + +# 召喚する + $summon marker ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"]} diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.mcfunction new file mode 100644 index 0000000000..8214735d0b --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/2091.hyper_laser_manager/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2091/summon + +# 元となるEntityを召喚する diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/debug.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/debug.mcfunction new file mode 100644 index 0000000000..4110a93247 --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2091.hyper_laser_manager/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 2091 + function api:object/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction new file mode 100644 index 0000000000..bd4907596c --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/2091.hyper_laser_manager/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2091/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 消滅処理 + kill @s[scores={General.Object.Tick=1000..}] diff --git a/Asset/data/asset/functions/object/alias/2091/init.mcfunction b/Asset/data/asset/functions/object/alias/2091/init.mcfunction new file mode 100644 index 0000000000..9801d03d0e --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2091/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2091/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/2091.hyper_laser_manager/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2091/register.mcfunction b/Asset/data/asset/functions/object/alias/2091/register.mcfunction new file mode 100644 index 0000000000..56f5f5a2eb --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2091/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2091/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2091.hyper_laser_manager/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2091/summon.mcfunction b/Asset/data/asset/functions/object/alias/2091/summon.mcfunction new file mode 100644 index 0000000000..6ec9aa93fc --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2091/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2091/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2091.hyper_laser_manager/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2091/tick.mcfunction b/Asset/data/asset/functions/object/alias/2091/tick.mcfunction new file mode 100644 index 0000000000..bb19684a97 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2091/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2091/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2091.hyper_laser_manager/tick/ \ No newline at end of file From 9f609584bf37b8a4f5a7d924f0721c5eaaa14b20 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 27 Nov 2024 17:27:07 +0900 Subject: [PATCH 022/103] =?UTF-8?q?laser=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 --- .../mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction index 161da009d7..76aad2f1e3 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction @@ -13,7 +13,7 @@ # 一定間隔での演出 scoreboard players operation $Interval Temporary = $Recursive Temporary - scoreboard players operation $Interval Temporary %= $10 Const + scoreboard players operation $Interval Temporary %= $5 Const execute if score $Interval Temporary matches 0 run particle sonic_boom ~ ~ ~ 0 0 0 0 1 scoreboard players reset $Interval Temporary From fdd57420f0080da7197babcfabf1fe93cb93fadb Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:11:30 +0900 Subject: [PATCH 023/103] =?UTF-8?q?=E3=83=8F=E3=82=A4=E3=83=91=E3=83=BC?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC=E7=94=A8entity=E3=82=92?= =?UTF-8?q?=E4=BD=9C=E6=88=90=E3=81=BE=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/hyper_laser/.mcfunction | 14 +- .../skill/hyper_laser/recursive.mcfunction | 16 - .../tick/skill/hyper_laser/shoot.mcfunction | 9 - .../hyper_laser/summon_square.mcfunction | 4 +- .../tick/skill_select.mcfunction | 2 +- .../_index.d.mcfunction | 7 + .../summon/.m.mcfunction | 4 +- .../summon/.mcfunction | 1 + .../2091.hyper_laser_manager/tick/.mcfunction | 15 +- .../tick/recursive.mcfunction | 24 ++ .../tick/shoot.mcfunction | 14 + .../tick/summon_square.mcfunction | 10 + .../tick/vfx.mcfunction | 285 ++++++++++++++++++ 13 files changed, 365 insertions(+), 40 deletions(-) create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/recursive.mcfunction create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/summon_square.mcfunction create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/vfx.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction index ed3a9ced8c..0e12096401 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction @@ -13,22 +13,16 @@ execute if entity @s[scores={General.Mob.Tick=21}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_charge/play # 前方に魔法陣を召喚 - execute if entity @s[scores={General.Mob.Tick=14}] run data modify storage api: Argument.FieldOverride set value {Scale:[4.2f,4.2f,0.01f],Color:3523276} execute if entity @s[scores={General.Mob.Tick=14}] anchored eyes positioned ^ ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + execute if entity @s[scores={General.Mob.Tick=14}] anchored eyes positioned ^7 ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + execute if entity @s[scores={General.Mob.Tick=14}] anchored eyes positioned ^-7 ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square - execute if entity @s[scores={General.Mob.Tick=15}] run data modify storage api: Argument.FieldOverride set value {Scale:[2.0f,2.0f,0.01f],CMD:20444,Color:3523276,LeftRotate:true} - execute if entity @s[scores={General.Mob.Tick=15}] anchored eyes positioned ^1.5 ^1 ^2.8 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square - - execute if entity @s[scores={General.Mob.Tick=15}] run data modify storage api: Argument.FieldOverride set value {Scale:[1.4f,1.4f,0.01f],CMD:20444,Color:3523276} - execute if entity @s[scores={General.Mob.Tick=15}] anchored eyes positioned ^-1.2 ^1 ^2.9 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square - - -# 発射(32tick) +# 発射モーション(32tick) execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_charge/stop execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_shot/play # 発射 - execute if entity @s[scores={General.Mob.Tick=55}] anchored eyes positioned ^ ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot + #execute if entity @s[scores={General.Mob.Tick=55}] anchored eyes positioned ^ ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot #execute if entity @s[scores={General.Mob.Tick=55}] anchored eyes positioned ^7 ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot # 共通リセット処理 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/recursive.mcfunction index db84e27d0f..7761a4263e 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/recursive.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/recursive.mcfunction @@ -6,19 +6,3 @@ # asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot # asset:mob/0372.tutankhamen/tick/skill/hyper_laser/recursive -# 演出 - particle soul_fire_flame ~ ~ ~ 0.1 0.1 0.1 0.08 2 normal @a - particle soul_fire_flame ^ ^ ^0.25 0.1 0.1 0.1 0.08 2 normal @a - particle soul ~ ~ ~ 0 0 0 0.25 3 normal @a - -# 一定間隔での演出 - scoreboard players operation $Interval Temporary = $Recursive Temporary - scoreboard players operation $Interval Temporary %= $10 Const - execute if score $Interval Temporary matches 0 run particle sonic_boom ~ ~ ~ 0 0 0 0 1 - scoreboard players reset $Interval Temporary - -# 再帰スコア - scoreboard players add $Recursive Temporary 1 - -# 再帰 - execute if score $Recursive Temporary matches ..60 positioned ^ ^ ^0.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/recursive diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction index 61243ed33f..9431d248de 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction @@ -4,12 +4,3 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ -# vfx - function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/vfx - execute as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 1.8 - execute as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 1.6 - - -# 発射 - function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/recursive - scoreboard players reset $Recursive Temporary diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square.mcfunction index 930d85e152..906bdea4e7 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square.mcfunction @@ -4,7 +4,7 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ -# 魔法陣召喚 - data modify storage api: Argument.ID set value 2090 +# + data modify storage api: Argument.ID set value 2091 data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation function api:object/summon diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index 13fc47bd8f..63a5cd68f8 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -13,7 +13,7 @@ scoreboard players operation $Random Temporary %= $7 Const # デバッグのコマンド - scoreboard players set $Random Temporary 0 + scoreboard players set $Random Temporary 3 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/_index.d.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/_index.d.mcfunction new file mode 100644 index 0000000000..060ea78bc3 --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/2091.hyper_laser_manager/_index.d +# @private + +#> tag +# @within function asset:object/2091.hyper_laser_manager/** + #declare score_holder $Interval + #declare score_holder $Recursive diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.m.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.m.mcfunction index 5564c98def..541385fb1c 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.m.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.m.mcfunction @@ -1,7 +1,9 @@ #> asset:object/2091.hyper_laser_manager/summon/.m # +# マクロを使って召喚する # -# +# @input args: +# Rotation : double @ 2 # @within function asset:object/2091.hyper_laser_manager/summon/ # 召喚する diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.mcfunction index 8214735d0b..8ac002482d 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/summon/.mcfunction @@ -5,3 +5,4 @@ # @within asset:object/alias/2091/summon # 元となるEntityを召喚する + function asset:object/2091.hyper_laser_manager/summon/.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction index bd4907596c..c8cdb923ed 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction @@ -7,5 +7,18 @@ # Tick加算 scoreboard players add @s General.Object.Tick 1 +# 前方に魔法陣を召喚 + execute if entity @s[scores={General.Object.Tick=1}] run data modify storage api: Argument.FieldOverride set value {Scale:[4.2f,4.2f,0.01f],Color:5436415} + execute if entity @s[scores={General.Object.Tick=1}] anchored eyes positioned ^ ^ ^ run function asset:object/2091.hyper_laser_manager/tick/summon_square + + execute if entity @s[scores={General.Object.Tick=2}] run data modify storage api: Argument.FieldOverride set value {Scale:[2.8f,2.8f,0.01f],CMD:20444,Color:5436415,LeftRotate:true} + execute if entity @s[scores={General.Object.Tick=2}] anchored eyes positioned ^ ^ ^0.2 run function asset:object/2091.hyper_laser_manager/tick/summon_square + + execute if entity @s[scores={General.Object.Tick=3}] run data modify storage api: Argument.FieldOverride set value {Scale:[1.4f,1.4f,0.01f],CMD:20444,Color:5436415} + execute if entity @s[scores={General.Object.Tick=3}] anchored eyes positioned ^ ^ ^0.4 run function asset:object/2091.hyper_laser_manager/tick/summon_square + +# 発射 + execute if entity @s[scores={General.Object.Tick=42}] anchored eyes positioned ^ ^ ^ run function asset:object/2091.hyper_laser_manager/tick/shoot + # 消滅処理 - kill @s[scores={General.Object.Tick=1000..}] + kill @s[scores={General.Object.Tick=42..}] diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/recursive.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/recursive.mcfunction new file mode 100644 index 0000000000..8ed019a00f --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/recursive.mcfunction @@ -0,0 +1,24 @@ +#> asset:object/2091.hyper_laser_manager/tick/recursive +# +# +# +# @within function +# asset:object/2091.hyper_laser_manager/tick/shoot +# asset:object/2091.hyper_laser_manager/tick/recursive + +# 演出 + particle soul_fire_flame ~ ~ ~ 0.1 0.1 0.1 0.08 2 normal @a + particle soul_fire_flame ^ ^ ^0.25 0.1 0.1 0.1 0.08 2 normal @a + particle soul ~ ~ ~ 0 0 0 0.25 3 normal @a + +# 一定間隔での演出 + scoreboard players operation $Interval Temporary = $Recursive Temporary + scoreboard players operation $Interval Temporary %= $5 Const + execute if score $Interval Temporary matches 0 run particle sonic_boom ~ ~ ~ 0 0 0 0 1 + scoreboard players reset $Interval Temporary + +# 再帰スコア + scoreboard players add $Recursive Temporary 1 + +# 再帰 + execute if score $Recursive Temporary matches ..60 positioned ^ ^ ^0.5 run function asset:object/2091.hyper_laser_manager/tick/recursive diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction new file mode 100644 index 0000000000..c20746d014 --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction @@ -0,0 +1,14 @@ +#> asset:object/2091.hyper_laser_manager/tick/shoot +# +# +# +# @within function asset:object/2091.hyper_laser_manager/tick/ + +# vfx + function asset:object/2091.hyper_laser_manager/tick/vfx + execute as @a[distance=..30] at @s facing entity @e[type=marker,tag=this,distance=..30] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 1.8 + execute as @a[distance=..30] at @s facing entity @e[type=marker,tag=this,distance=..30] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 1.6 + +# 発射 + function asset:object/2091.hyper_laser_manager/tick/recursive + scoreboard players reset $Recursive Temporary diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/summon_square.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/summon_square.mcfunction new file mode 100644 index 0000000000..5b0618cc75 --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/summon_square.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2091.hyper_laser_manager/tick/summon_square +# +# +# +# @within function asset:object/2091.hyper_laser_manager/tick/ + +# 魔法陣召喚 + data modify storage api: Argument.ID set value 2090 + data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + function api:object/summon diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/vfx.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/vfx.mcfunction new file mode 100644 index 0000000000..be394aa6b7 --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/vfx.mcfunction @@ -0,0 +1,285 @@ +#> asset:object/2091.hyper_laser_manager/tick/vfx +# +# +# +# @within function asset:object/2091.hyper_laser_manager/tick/shoot + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iG4AdG4E1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1Yl44NDwFDAOQwDmDppmxGQUAkzCwpSUbmLipJSkgrSU9OzUcHBiAtRsJ1y0cNS8rGbaehSALE1AEuRgCN9ExmCxWHQZexOFxITyoHzNfyIcDBULhMBRYqxBJJMApNIZShZRH5QpIWglMoVKo1OrJRpMZrRLwODCaPxIADMBAAVoQdDAkJQCFw4AAvNDc3FgNqdOk9fqDEZjOATKbYaoENoAISlMowfQG5TVTHGSC1M3iAF0gA_3 +# 多角形 1 +particle soul_fire_flame ^1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0 ^1.8 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000005 0 normal @a +# 円 1 +particle soul_fire_flame ^0 ^-2.2 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^2.2 ^0 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^0 ^2.2 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-2.2 ^0 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000005 0 normal @a +particle soul_fire_flame ^-0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000005 0 normal @a + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iG4AdG4E1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1Yl44NDwFDAOQwDmDppmxGQUAkzCwpSUbmLipJSkgrSU9OzUcHBiAtRsJ1y0cNS8rGbaehSALE1AEuRgCN9ExmCxWHQZexOFxITyoHzNfyIcDBULhMBRYqxBJJMApNIZShZRH5QpIWglMoVKo1OrJRpMZrRLwODCaPxIADMBAAVoQdDAkJQCFw4AAvNDc3FgNqdOk9fqDEZjOATKbYaoENoAISlMowfQG5TVTHGSC1M3iAF0gA_3 +# 多角形 1 +particle soul_fire_flame ^1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0 ^1.8 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000010 0 normal @a +# 円 1 +particle soul_fire_flame ^0 ^-2.2 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^2.2 ^0 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^0 ^2.2 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-2.2 ^0 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000010 0 normal @a +particle soul_fire_flame ^-0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000010 0 normal @a + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iG4AdG4E1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1Yl44NDwFDAOQwDmDppmxGQUAkzCwpSUbmLipJSkgrSU9OzUcHBiAtRsJ1y0cNS8rGbaehSALE1AEuRgCN9ExmCxWHQZexOFxITyoHzNfyIcDBULhMBRYqxBJJMApNIZShZRH5QpIWglMoVKo1OrJRpMZrRLwODCaPxIADMBAAVoQdDAkJQCFw4AAvNDc3FgNqdOk9fqDEZjOATKbYaoENoAISlMowfQG5TVTHGSC1M3iAF0gA_3 +# 多角形 1 +particle soul_fire_flame ^1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0 ^1.8 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000015 0 normal @a +# 円 1 +particle soul_fire_flame ^0 ^-2.2 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^2.2 ^0 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^0 ^2.2 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-2.2 ^0 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000015 0 normal @a +particle soul_fire_flame ^-0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000015 0 normal @a + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iG4AdG4E1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1Yl44NDwFDAOQwDmDppmxGQUAkzCwpSUbmLipJSkgrSU9OzUcHBiAtRsJ1y0cNS8rGbaehSALE1AEuRgCN9ExmCxWHQZexOFxITyoHzNfyIcDBULhMBRYqxBJJMApNIZShZRH5QpIWglMoVKo1OrJRpMZrRLwODCaPxIADMBAAVoQdDAkJQCFw4AAvNDc3FgNqdOk9fqDEZjOATKbYaoENoAISlMowfQG5TVTHGSC1M3iAF0gA_3 +# 多角形 1 +particle soul_fire_flame ^1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0 ^1.8 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000020 0 normal @a +# 円 1 +particle soul_fire_flame ^0 ^-2.2 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^2.2 ^0 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^0 ^2.2 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-2.2 ^0 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000020 0 normal @a +particle soul_fire_flame ^-0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000020 0 normal @a + +# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iG4AdG4E1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1Yl44NDwFDAOQwDmDppmxGQUAkzCwpSUbmLipJSkgrSU9OzUcHBiAtRsJ1y0cNS8rGbaehSALE1AEuRgCN9ExmCxWHQZexOFxITyoHzNfyIcDBULhMBRYqxBJJMApNIZShZRH5QpIWglMoVKo1OrJRpMZrRLwODCaPxIADMBAAVoQdDAkJQCFw4AAvNDc3FgNqdOk9fqDEZjOATKbYaoENoAISlMowfQG5TVTHGSC1M3iAF0gA_3 +# 多角形 1 +particle soul_fire_flame ^1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0 ^1.8 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.19486 ^1.4625 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.38971 ^1.125 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.58457 ^0.7875 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.77942 ^0.45 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.97428 ^0.1125 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.225 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.36399 ^-0.5625 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.55885 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.38971 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.77942 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.16913 ^-0.9 ^ ^ ^ ^1000000 0.0000025 0 normal @a +# 円 1 +particle soul_fire_flame ^0 ^-2.2 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^2.2 ^0 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^0 ^2.2 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.48955 ^2.14484 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.95454 ^1.98213 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.37168 ^1.72003 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.72003 ^1.37168 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.98213 ^0.95454 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-2.14484 ^0.48955 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-2.2 ^0 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-2.14484 ^-0.48955 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.98213 ^-0.95454 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.72003 ^-1.37168 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-1.37168 ^-1.72003 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.95454 ^-1.98213 ^ ^ ^ ^1000000 0.0000025 0 normal @a +particle soul_fire_flame ^-0.48955 ^-2.14484 ^ ^ ^ ^1000000 0.0000025 0 normal @a From 2a018fe9e300dbf1591c95fa4ec9fb02e7a9ec2a Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 27 Nov 2024 18:18:57 +0900 Subject: [PATCH 024/103] =?UTF-8?q?=E5=A4=A9=E4=BD=BF=E6=8A=BD=E8=B1=A1?= =?UTF-8?q?=E3=82=92=E7=B6=99=E6=89=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 2 ++ .../functions/mob/0372.tutankhamen/death/.mcfunction | 4 ++++ .../functions/mob/0372.tutankhamen/hurt/.mcfunction | 3 +++ .../functions/mob/0372.tutankhamen/init/.mcfunction | 3 +++ .../mob/0372.tutankhamen/register.mcfunction | 4 ++++ .../functions/mob/0372.tutankhamen/remove/.mcfunction | 11 +++++++++++ .../asset/functions/mob/alias/372/remove.mcfunction | 8 ++++++++ 7 files changed, 35 insertions(+) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/remove/.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/372/remove.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 4d0ca7f6d4..9859a386f7 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -23,6 +23,8 @@ #declare function animated_java:tutankhamen/animations/neutral/stop #declare function animated_java:tutankhamen/animations/spawn/play #declare function animated_java:tutankhamen/animations/spawn/stop + #declare function animated_java:tutankhamen/animations/death/play + #declare function animated_java:tutankhamen/animations/death/stop #declare function animated_java:tutankhamen/animations/beam_start/play #declare function animated_java:tutankhamen/animations/beam_start/stop #declare function animated_java:tutankhamen/animations/beam_shot/play diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction index f640ec65f8..2c8a5f9ac5 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction @@ -4,5 +4,9 @@ # # @within function asset:mob/alias/372/death +# super.death呼び出し + function asset:mob/super.death + # デバッグ用としてAJを消す execute as @e[type=item_display,tag=AC.AJ,distance=..100,sort=nearest,limit=1] run function animated_java:tutankhamen/remove/this + #execute as @e[type=item_display,tag=AC.AJ,distance=..100,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/death/play diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/.mcfunction index 3d47b032a9..ba197b6e33 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/.mcfunction @@ -3,3 +3,6 @@ # Mobのダメージ時の処理 # # @within function asset:mob/alias/372/hurt + +# super.hurt呼び出し + function asset:mob/super.hurt diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction index 32550d2e32..50bd69d240 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction @@ -4,6 +4,9 @@ # # @within asset:mob/alias/372/init +# super.init呼び出し + function asset:mob/super.init + # AJ召喚 execute rotated ~ 0 run function animated_java:tutankhamen/summon diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction index 1854d05be5..db50656e0e 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction @@ -4,6 +4,10 @@ # # @within function asset:mob/alias/372/register +# 継承　 + data modify storage asset:mob Extends append value 2000 + function asset:mob/extends + # 他のモブに継承されることを許可するか (boolean) (オプション) # data modify storage asset:mob ExtendsSafe set value # 継承されることを前提とした、抽象的なモブであるかどうか(boolean) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/remove/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/remove/.mcfunction new file mode 100644 index 0000000000..3d7cbb24b7 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/remove/.mcfunction @@ -0,0 +1,11 @@ +#> asset:mob/0372.tutankhamen/remove/ +# +# 天使が居なくなる際に実行される処理 +# +# @within asset:mob/alias/372/remove + +# super.remove呼び出し + function asset:mob/super.remove + +# AJ削除 + execute at @s as @e[type=item_display,tag=AC.AJ,distance=..100,sort=nearest,limit=1] run function animated_java:tutankhamen/remove/this diff --git a/Asset/data/asset/functions/mob/alias/372/remove.mcfunction b/Asset/data/asset/functions/mob/alias/372/remove.mcfunction new file mode 100644 index 0000000000..e158c9c243 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/372/remove.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/372/init +# +# Remove処理のエイリアス +# +# @within asset_manager:mob/remove/remove.m + +# 元のInit処理を呼び出す + function asset:mob/0372.tutankhamen/remove/ \ No newline at end of file From 38001e1595e7d5c256ca28b3456b561496f8509d Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 28 Nov 2024 21:42:46 +0900 Subject: [PATCH 025/103] =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3?= =?UTF-8?q?=E3=82=B0=E3=82=84playsound=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/hyper_laser/.mcfunction | 4 ++-- .../object/2090.magic_square/tick/.mcfunction | 1 + .../2091.hyper_laser_manager/tick/.mcfunction | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction index 0e12096401..9e4bc3a26a 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction @@ -14,8 +14,8 @@ # 前方に魔法陣を召喚 execute if entity @s[scores={General.Mob.Tick=14}] anchored eyes positioned ^ ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square - execute if entity @s[scores={General.Mob.Tick=14}] anchored eyes positioned ^7 ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square - execute if entity @s[scores={General.Mob.Tick=14}] anchored eyes positioned ^-7 ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + execute if entity @s[scores={General.Mob.Tick=24}] anchored eyes positioned ^7 ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + execute if entity @s[scores={General.Mob.Tick=24}] anchored eyes positioned ^-7 ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square # 発射モーション(32tick) execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_charge/stop diff --git a/Asset/data/asset/functions/object/2090.magic_square/tick/.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/tick/.mcfunction index ded2ed5e18..efec0e674d 100644 --- a/Asset/data/asset/functions/object/2090.magic_square/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2090.magic_square/tick/.mcfunction @@ -14,6 +14,7 @@ # 一定間隔で回転 scoreboard players operation $Interval Temporary = @s General.Object.Tick + scoreboard players add $Interval Temporary 9 scoreboard players operation $Interval Temporary %= $12 Const execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=3..}] run function asset:object/2090.magic_square/tick/spin scoreboard players reset $Interval Temporary diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction index c8cdb923ed..f832de0cc4 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction @@ -17,6 +17,21 @@ execute if entity @s[scores={General.Object.Tick=3}] run data modify storage api: Argument.FieldOverride set value {Scale:[1.4f,1.4f,0.01f],CMD:20444,Color:5436415} execute if entity @s[scores={General.Object.Tick=3}] anchored eyes positioned ^ ^ ^0.4 run function asset:object/2091.hyper_laser_manager/tick/summon_square +# 一定間隔での演出 + scoreboard players operation $Interval Temporary = @s General.Object.Tick + scoreboard players operation $Interval Temporary %= $3 Const + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=1..5}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.2 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=6..10}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.3 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=11..15}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.4 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=16..20}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.5 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=21..25}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.7 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=26..30}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.8 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=31..35}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.9 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=36..}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 2.0 + scoreboard players reset $Interval Temporary + +# 演出 + # 発射 execute if entity @s[scores={General.Object.Tick=42}] anchored eyes positioned ^ ^ ^ run function asset:object/2091.hyper_laser_manager/tick/shoot From b78830ccd68648abb37b7bdbcc21df77fdafb901 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Mon, 2 Dec 2024 22:40:14 +0900 Subject: [PATCH 026/103] =?UTF-8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88?= =?UTF-8?q?=E3=81=9A=E9=AD=94=E6=B3=95=E9=99=A3=E3=82=92=E3=81=9F=E3=81=8F?= =?UTF-8?q?=E3=81=95=E3=82=93=E5=87=BA=E3=81=99=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/summon_laser_display.m.mcfunction | 2 +- .../tick/skill/many_shoot/.mcfunction | 8 ++++++++ .../skill/many_shoot/summon_square.mcfunction | 20 +++++++++++++++++++ .../tick/skill_select.mcfunction | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon_square.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction index a5c83f319f..c91e84a384 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction @@ -7,4 +7,4 @@ # @within function asset:mob/0372.tutankhamen/tick/skill/** # 召喚 - $summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,brightness:{sky:15,block:15},Tags:["AC.LaserDisplay"],item:{id:"cyan_stained_glass_pane",Count:1b},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.05f,0.05f,500f]}} + $summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,brightness:{sky:15,block:15},Tags:["AC.LaserDisplay"],item:{id:"cyan_stained_glass",Count:1b},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.05f,0.05f,36f]}} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction index c36a78135e..d8ab26c007 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction @@ -8,5 +8,13 @@ execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/soul_shot/play +# 上側に魔法陣を沢山召喚する + execute if entity @s[scores={General.Mob.Tick=3}] rotated ~ 0 positioned ^ ^4.5 ^ summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square + execute if entity @s[scores={General.Mob.Tick=6}] rotated ~ 0 positioned ^2 ^3.5 ^-1 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square + execute if entity @s[scores={General.Mob.Tick=9}] rotated ~ 0 positioned ^-2.5 ^3.7 ^0.5 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square + execute if entity @s[scores={General.Mob.Tick=12}] rotated ~ 0 positioned ^-1 ^3.2 ^-0.5 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square + execute if entity @s[scores={General.Mob.Tick=12}] rotated ~ 0 positioned ^3.2 ^3.2 ^0.5 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square + #execute if entity @s[scores={General.Mob.Tick=12}] rotated ~ 0 positioned ^-1 ^4.2 ^1 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square + # 共通リセット処理 execute if entity @s[scores={General.Mob.Tick=88..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon_square.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon_square.mcfunction new file mode 100644 index 0000000000..785dc3adc0 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon_square.mcfunction @@ -0,0 +1,20 @@ +#> asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square +# +# 魔法陣を召喚 +# +# @within function asset:mob/0372.tutankhamen/tick/skill/many_shoot/ + +# プレイヤーの方を向く + tp @s ~ ~ ~ facing entity @p eyes + +# 50:50で左回転か右回転か決める + execute if predicate lib:random_pass_per/50 run data modify storage api: Argument.FieldOverride.LeftRotate set value true + + data modify storage api: Argument.ID set value 2090 + data modify storage api: Argument.FieldOverride.Scale set value [2f,2f,0.01f] + data modify storage api: Argument.FieldOverride.CMD set value 20443 + data modify storage api: Argument.FieldOverride.Color set value 5436415 + data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + function api:object/summon + +kill @s diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index 63a5cd68f8..dd5c91f7e2 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -13,7 +13,7 @@ scoreboard players operation $Random Temporary %= $7 Const # デバッグのコマンド - scoreboard players set $Random Temporary 3 + scoreboard players set $Random Temporary 1 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser From e565524f35864bc7daa7c46128ecfe7c43c2b03f Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 4 Dec 2024 01:33:52 +0900 Subject: [PATCH 027/103] =?UTF-8?q?=E9=AD=82=E5=BC=BE=E3=81=AEnamespace?= =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0372.tutankhamen/tick/skill/many_shoot/.mcfunction | 10 +++++----- .../{summon_square.mcfunction => summon.mcfunction} | 2 +- .../hit_entity/.mcfunction | 2 +- .../init/.mcfunction | 2 +- .../kill/.mcfunction | 2 +- .../register.mcfunction | 2 +- .../summon/.mcfunction | 2 +- .../summon/debug.mcfunction | 4 ++-- .../tick/.mcfunction | 2 +- .../functions/object/alias/2092/hit_entity.mcfunction | 2 +- .../asset/functions/object/alias/2092/init.mcfunction | 2 +- .../asset/functions/object/alias/2092/kill.mcfunction | 2 +- .../functions/object/alias/2092/register.mcfunction | 2 +- .../functions/object/alias/2092/summon.mcfunction | 2 +- .../asset/functions/object/alias/2092/tick.mcfunction | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/{summon_square.mcfunction => summon.mcfunction} (91%) rename Asset/data/asset/functions/object/{2092.soul_bullet => 2092.ghost_bullet}/hit_entity/.mcfunction (67%) rename Asset/data/asset/functions/object/{2092.soul_bullet => 2092.ghost_bullet}/init/.mcfunction (89%) rename Asset/data/asset/functions/object/{2092.soul_bullet => 2092.ghost_bullet}/kill/.mcfunction (81%) rename Asset/data/asset/functions/object/{2092.soul_bullet => 2092.ghost_bullet}/register.mcfunction (94%) rename Asset/data/asset/functions/object/{2092.soul_bullet => 2092.ghost_bullet}/summon/.mcfunction (83%) rename Asset/data/asset/functions/object/{2092.soul_bullet => 2092.ghost_bullet}/summon/debug.mcfunction (69%) rename Asset/data/asset/functions/object/{2092.soul_bullet => 2092.ghost_bullet}/tick/.mcfunction (97%) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction index d8ab26c007..878e4fe493 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction @@ -9,11 +9,11 @@ execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/soul_shot/play # 上側に魔法陣を沢山召喚する - execute if entity @s[scores={General.Mob.Tick=3}] rotated ~ 0 positioned ^ ^4.5 ^ summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square - execute if entity @s[scores={General.Mob.Tick=6}] rotated ~ 0 positioned ^2 ^3.5 ^-1 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square - execute if entity @s[scores={General.Mob.Tick=9}] rotated ~ 0 positioned ^-2.5 ^3.7 ^0.5 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square - execute if entity @s[scores={General.Mob.Tick=12}] rotated ~ 0 positioned ^-1 ^3.2 ^-0.5 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square - execute if entity @s[scores={General.Mob.Tick=12}] rotated ~ 0 positioned ^3.2 ^3.2 ^0.5 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square + execute if entity @s[scores={General.Mob.Tick=3}] rotated ~ 0 positioned ^ ^4.5 ^ summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon + execute if entity @s[scores={General.Mob.Tick=6}] rotated ~ 0 positioned ^2 ^3.5 ^-1 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon + execute if entity @s[scores={General.Mob.Tick=9}] rotated ~ 0 positioned ^-2.5 ^3.7 ^0.5 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon + execute if entity @s[scores={General.Mob.Tick=12}] rotated ~ 0 positioned ^-1 ^3.2 ^-0.5 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon + execute if entity @s[scores={General.Mob.Tick=12}] rotated ~ 0 positioned ^3.2 ^3.2 ^0.5 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon #execute if entity @s[scores={General.Mob.Tick=12}] rotated ~ 0 positioned ^-1 ^4.2 ^1 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square # 共通リセット処理 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon_square.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction similarity index 91% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon_square.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction index 785dc3adc0..488e9a8883 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon_square.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square +#> asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon # # 魔法陣を召喚 # diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/hit_entity/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/hit_entity/.mcfunction similarity index 67% rename from Asset/data/asset/functions/object/2092.soul_bullet/hit_entity/.mcfunction rename to Asset/data/asset/functions/object/2092.ghost_bullet/hit_entity/.mcfunction index 20dfcf4a0d..9d87a9c663 100644 --- a/Asset/data/asset/functions/object/2092.soul_bullet/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/hit_entity/.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/2092.soul_bullet/hit_entity/ +#> asset:object/2092.ghost_bullet/hit_entity/ # # 継承先などから実行される処理 # diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/init/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction similarity index 89% rename from Asset/data/asset/functions/object/2092.soul_bullet/init/.mcfunction rename to Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction index 3479447a5d..1e73fa666e 100644 --- a/Asset/data/asset/functions/object/2092.soul_bullet/init/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/2092.soul_bullet/init/ +#> asset:object/2092.ghost_bullet/init/ # # Objectのinit時の処理 # diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/kill/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/kill/.mcfunction similarity index 81% rename from Asset/data/asset/functions/object/2092.soul_bullet/kill/.mcfunction rename to Asset/data/asset/functions/object/2092.ghost_bullet/kill/.mcfunction index 9808c370eb..d807d252da 100644 --- a/Asset/data/asset/functions/object/2092.soul_bullet/kill/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/kill/.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/2092.soul_bullet/kill/ +#> asset:object/2092.ghost_bullet/kill/ # # 継承先などから実行される処理 # diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/register.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/register.mcfunction similarity index 94% rename from Asset/data/asset/functions/object/2092.soul_bullet/register.mcfunction rename to Asset/data/asset/functions/object/2092.ghost_bullet/register.mcfunction index 729e1cf8a9..ec9bab7be9 100644 --- a/Asset/data/asset/functions/object/2092.soul_bullet/register.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/register.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/2092.soul_bullet/register +#> asset:object/2092.ghost_bullet/register # # Objectのデータを指定 # diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/summon/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.mcfunction similarity index 83% rename from Asset/data/asset/functions/object/2092.soul_bullet/summon/.mcfunction rename to Asset/data/asset/functions/object/2092.ghost_bullet/summon/.mcfunction index a48a73597f..9897805d54 100644 --- a/Asset/data/asset/functions/object/2092.soul_bullet/summon/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/2092.soul_bullet/summon/ +#> asset:object/2092.ghost_bullet/summon/ # # Object召喚処理の呼び出し時に実行されるfunction # diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/summon/debug.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/debug.mcfunction similarity index 69% rename from Asset/data/asset/functions/object/2092.soul_bullet/summon/debug.mcfunction rename to Asset/data/asset/functions/object/2092.ghost_bullet/summon/debug.mcfunction index f26282c292..a63ba96541 100644 --- a/Asset/data/asset/functions/object/2092.soul_bullet/summon/debug.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/debug.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/2092.soul_bullet/summon/debug +#> asset:object/2092.ghost_bullet/summon/debug # # 動作チェック用の召喚処理 使い終わったら消してもいいかも # @@ -7,4 +7,4 @@ # 召喚 data modify storage api: Argument.ID set value 2092 - function api:object/summon \ No newline at end of file + function api:object/summon diff --git a/Asset/data/asset/functions/object/2092.soul_bullet/tick/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction similarity index 97% rename from Asset/data/asset/functions/object/2092.soul_bullet/tick/.mcfunction rename to Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction index d445738415..f9152d49d8 100644 --- a/Asset/data/asset/functions/object/2092.soul_bullet/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/2092.soul_bullet/tick/ +#> asset:object/2092.ghost_bullet/tick/ # # Objectのtick時の処理 # diff --git a/Asset/data/asset/functions/object/alias/2092/hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/2092/hit_entity.mcfunction index 19501ac631..c3d24abbe8 100644 --- a/Asset/data/asset/functions/object/alias/2092/hit_entity.mcfunction +++ b/Asset/data/asset/functions/object/alias/2092/hit_entity.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/tick/tick.m # 元のメソッド処理を呼び出す - function asset:object/2092.soul_bullet/hit_entity/ \ No newline at end of file + function asset:object/2092.ghost_bullet/hit_entity/ diff --git a/Asset/data/asset/functions/object/alias/2092/init.mcfunction b/Asset/data/asset/functions/object/alias/2092/init.mcfunction index 7122f2503e..6a24506133 100644 --- a/Asset/data/asset/functions/object/alias/2092/init.mcfunction +++ b/Asset/data/asset/functions/object/alias/2092/init.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/init/init.m # 元のInit処理を呼び出す - function asset:object/2092.soul_bullet/init/ \ No newline at end of file + function asset:object/2092.ghost_bullet/init/ diff --git a/Asset/data/asset/functions/object/alias/2092/kill.mcfunction b/Asset/data/asset/functions/object/alias/2092/kill.mcfunction index 9775aa114e..da2dda1ee6 100644 --- a/Asset/data/asset/functions/object/alias/2092/kill.mcfunction +++ b/Asset/data/asset/functions/object/alias/2092/kill.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/tick/tick.m # 元のメソッド処理を呼び出す - function asset:object/2092.soul_bullet/kill/ \ No newline at end of file + function asset:object/2092.ghost_bullet/kill/ diff --git a/Asset/data/asset/functions/object/alias/2092/register.mcfunction b/Asset/data/asset/functions/object/alias/2092/register.mcfunction index 3a15f350bf..0a47a476b5 100644 --- a/Asset/data/asset/functions/object/alias/2092/register.mcfunction +++ b/Asset/data/asset/functions/object/alias/2092/register.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/summon/register.m # 元の登録処理を呼び出す - function asset:object/2092.soul_bullet/register \ No newline at end of file + function asset:object/2092.ghost_bullet/register diff --git a/Asset/data/asset/functions/object/alias/2092/summon.mcfunction b/Asset/data/asset/functions/object/alias/2092/summon.mcfunction index b9bb0f5d4e..7b2330b61b 100644 --- a/Asset/data/asset/functions/object/alias/2092/summon.mcfunction +++ b/Asset/data/asset/functions/object/alias/2092/summon.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/summon/summon.m # 元の召喚処理を呼び出す - function asset:object/2092.soul_bullet/summon/ \ No newline at end of file + function asset:object/2092.ghost_bullet/summon/ diff --git a/Asset/data/asset/functions/object/alias/2092/tick.mcfunction b/Asset/data/asset/functions/object/alias/2092/tick.mcfunction index 8c424143c8..264dad8ace 100644 --- a/Asset/data/asset/functions/object/alias/2092/tick.mcfunction +++ b/Asset/data/asset/functions/object/alias/2092/tick.mcfunction @@ -5,4 +5,4 @@ # @within asset_manager:object/tick/tick.m # 元のTick処理を呼び出す - function asset:object/2092.soul_bullet/tick/ \ No newline at end of file + function asset:object/2092.ghost_bullet/tick/ From 4d00b9798f005d28246bad4cd53925ab774c5e2f Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 8 Dec 2024 21:36:54 +0900 Subject: [PATCH 028/103] =?UTF-8?q?=E3=83=AB=E3=83=BC=E3=83=88=E3=83=86?= =?UTF-8?q?=E3=83=BC=E3=83=96=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 --- .../mob/0372.tutankhamen/summon/.mcfunction | 2 +- .../mob/death/0372.tutankhamen.json | 29 ------------------- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 Asset/data/asset/loot_tables/mob/death/0372.tutankhamen.json diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/summon/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/summon/.mcfunction index 1e7e760227..6922a83769 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/summon/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:mob/alias/372/summon # 元となるEntityを召喚する - summon wither_skeleton ~ ~ ~ {NoAI:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"asset:mob/death/0372.tutankhamen"} + summon wither_skeleton ~ ~ ~ {NoAI:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty"} diff --git a/Asset/data/asset/loot_tables/mob/death/0372.tutankhamen.json b/Asset/data/asset/loot_tables/mob/death/0372.tutankhamen.json deleted file mode 100644 index a54c787974..0000000000 --- a/Asset/data/asset/loot_tables/mob/death/0372.tutankhamen.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "type": "entity", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "asset:mob/death/abstract_detect_item", - "functions": [ - { - "function": "set_nbt", - "tag": "{TSB:{ID:372}}" - } - ] - } - ] - }, - { - "rolls": 1, - "entries": [ - { - "type": "loot_table", - "name": "entities/wither_skeleton" - } - ] - } - ] -} \ No newline at end of file From 58c090c8405f4355ee05198b2e680c45e9f329b8 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 8 Dec 2024 22:38:24 +0900 Subject: [PATCH 029/103] =?UTF-8?q?=E9=87=91=E3=81=AE=E6=A3=BA=E3=82=92?= =?UTF-8?q?=E5=8F=AC=E5=96=9A=E3=81=AF=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0373.gold_coffin/_index.d.mcfunction | 6 ++ .../mob/0373.gold_coffin/death/.mcfunction | 5 ++ .../mob/0373.gold_coffin/init/.mcfunction | 5 ++ .../mob/0373.gold_coffin/register.mcfunction | 65 +++++++++++++++++++ .../mob/0373.gold_coffin/summon/.mcfunction | 8 +++ .../0373.gold_coffin/summon/debug.mcfunction | 10 +++ .../mob/0373.gold_coffin/tick/.mcfunction | 11 ++++ .../functions/mob/alias/373/death.mcfunction | 8 +++ .../functions/mob/alias/373/init.mcfunction | 8 +++ .../mob/alias/373/register.mcfunction | 8 +++ .../functions/mob/alias/373/summon.mcfunction | 8 +++ .../functions/mob/alias/373/tick.mcfunction | 8 +++ 12 files changed, 150 insertions(+) create mode 100644 Asset/data/asset/functions/mob/0373.gold_coffin/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/mob/0373.gold_coffin/death/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0373.gold_coffin/init/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0373.gold_coffin/register.mcfunction create mode 100644 Asset/data/asset/functions/mob/0373.gold_coffin/summon/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0373.gold_coffin/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/mob/0373.gold_coffin/tick/.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/373/death.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/373/init.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/373/register.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/373/summon.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/373/tick.mcfunction diff --git a/Asset/data/asset/functions/mob/0373.gold_coffin/_index.d.mcfunction b/Asset/data/asset/functions/mob/0373.gold_coffin/_index.d.mcfunction new file mode 100644 index 0000000000..f369f0a325 --- /dev/null +++ b/Asset/data/asset/functions/mob/0373.gold_coffin/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:mob/0373.gold_coffin/_index.d +# @private + +#> tag +# @within function asset:mob/0373.gold_coffin/** + #declare tag diff --git a/Asset/data/asset/functions/mob/0373.gold_coffin/death/.mcfunction b/Asset/data/asset/functions/mob/0373.gold_coffin/death/.mcfunction new file mode 100644 index 0000000000..34be8e191d --- /dev/null +++ b/Asset/data/asset/functions/mob/0373.gold_coffin/death/.mcfunction @@ -0,0 +1,5 @@ +#> asset:mob/0373.gold_coffin/death/ +# +# Mobの死亡時の処理 +# +# @within function asset:mob/alias/373/death diff --git a/Asset/data/asset/functions/mob/0373.gold_coffin/init/.mcfunction b/Asset/data/asset/functions/mob/0373.gold_coffin/init/.mcfunction new file mode 100644 index 0000000000..d63b065503 --- /dev/null +++ b/Asset/data/asset/functions/mob/0373.gold_coffin/init/.mcfunction @@ -0,0 +1,5 @@ +#> asset:mob/0373.gold_coffin/init/ +# +# Mobのinit時の処理 +# +# @within asset:mob/alias/373/init diff --git a/Asset/data/asset/functions/mob/0373.gold_coffin/register.mcfunction b/Asset/data/asset/functions/mob/0373.gold_coffin/register.mcfunction new file mode 100644 index 0000000000..dbce0d4c57 --- /dev/null +++ b/Asset/data/asset/functions/mob/0373.gold_coffin/register.mcfunction @@ -0,0 +1,65 @@ +#> asset:mob/0373.gold_coffin/register +# +# Mobのデータを指定 +# +# @within function asset:mob/alias/373/register + +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:mob ExtendsSafe set value +# 継承されることを前提とした、抽象的なモブであるかどうか(boolean) + data modify storage asset:mob IsAbstract set value false +# ID (int) + data modify storage asset:mob ID set value 373 +# Type (string) Wikiを参照 + data modify storage asset:mob Type set value "Enemy" +# 干渉可能か否か (boolean) + data modify storage asset:mob Interferable set value true +# 名前 (TextComponentString) (オプション) + # data modify storage asset:mob Name set value +# Mobの説明文 (TextComponentString[]) (オプション) + # data modify storage asset:mob Lore set value +# 武器 + # メインハンド (Compound(Item)) (オプション) + # data modify storage asset:mob Weapon.Mainhand set value + # オフハンド (Compound(Item)) (オプション) + # data modify storage asset:mob Weapon.Offhand set value +# 武器ドロップ率 ([float, float]) (オプション) + # data modify storage asset:mob WeaponDropChances set value +# 防具 + # 頭 (Compound(Item)) (オプション) + # data modify storage asset:mob Armor.Head set value + # 胴 (Compound(Item)) (オプション) + # data modify storage asset:mob Armor.Chest set value + # 脚 (Compound(Item)) (オプション) + # data modify storage asset:mob Armor.Legs set value + # 足 (Compound(Item)) (オプション) + # data modify storage asset:mob Armor.Feet set value +# 防具ドロップ率 ([float, float]) (オプション) + # data modify storage asset:mob ArmorDropChances set value +# 体力 (double) (オプション) + # data modify storage asset:mob Health set value +# 攻撃力 (double) (オプション) + # data modify storage asset:mob AttackDamage set value +# 防御力 (double) (オプション) // 被ダメージがある程度大きい場合1ptにつき0.8%カット、小さい場合1ptにつき約4%カット 20pt以上は頭打ち + # data modify storage asset:mob Defense set value +# 特殊防御力 (double) (オプション) // 4pointにつきダメージを大きく減らす + # data modify storage asset:mob SpecialDefense set value +# 移動速度 (double) (オプション) + # data modify storage asset:mob Speed set value +# 索敵範囲 (double) (オプション) + # data modify storage asset:mob FollowRange set value +# ノックバック耐性 (double) (オプション) + # data modify storage asset:mob KnockBackResist set value +# 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る + # 物理倍率 (float) (オプション) + # data modify storage asset:mob Resist.Physical set value + # 魔法倍率 (float) (オプション) + # data modify storage asset:mob Resist.Magic set value + # 火倍率 (float) (オプション) + # data modify storage asset:mob Resist.Fire set value + # 水倍率 (float) (オプション) + # data modify storage asset:mob Resist.Water set value + # 雷倍率 (float) (オプション) + # data modify storage asset:mob Resist.Thunder set value +# フィールド + # data modify storage asset:mob Field.myValue set value diff --git a/Asset/data/asset/functions/mob/0373.gold_coffin/summon/.mcfunction b/Asset/data/asset/functions/mob/0373.gold_coffin/summon/.mcfunction new file mode 100644 index 0000000000..1767188f54 --- /dev/null +++ b/Asset/data/asset/functions/mob/0373.gold_coffin/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/0373.gold_coffin/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:mob/alias/373/summon + +# 元となるEntityを召喚する + summon polar_bear ~ ~ ~ {NoAI:1b,Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty",Passengers:[{id:"item_display",Tags:["AssetMob","AutoKillWhenDieVehicle"],item:{id:"stick",Count:1b,tag:{CustomModelData:20446}},transformation:{left_rotation:[-0.7071f,0f,0f,0.7071f],right_rotation:[0f,0f,0f,1f],translation:[0f,-0.7f,0.7f],scale:[1.35f,1.35f,1.35f]}}]} diff --git a/Asset/data/asset/functions/mob/0373.gold_coffin/summon/debug.mcfunction b/Asset/data/asset/functions/mob/0373.gold_coffin/summon/debug.mcfunction new file mode 100644 index 0000000000..81dcd0b59b --- /dev/null +++ b/Asset/data/asset/functions/mob/0373.gold_coffin/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:mob/0373.gold_coffin/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 373 + function api:mob/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/0373.gold_coffin/tick/.mcfunction b/Asset/data/asset/functions/mob/0373.gold_coffin/tick/.mcfunction new file mode 100644 index 0000000000..a11c5bfc80 --- /dev/null +++ b/Asset/data/asset/functions/mob/0373.gold_coffin/tick/.mcfunction @@ -0,0 +1,11 @@ +#> asset:mob/0373.gold_coffin/tick/ +# +# Mobのtick時の処理 +# +# @within asset:mob/alias/373/tick + +# スコア + scoreboard players add @s General.Mob.Tick 1 + +# 一定時間で消滅 + execute if entity @s[scores={General.Mob.Tick=200..}] run kill @s diff --git a/Asset/data/asset/functions/mob/alias/373/death.mcfunction b/Asset/data/asset/functions/mob/alias/373/death.mcfunction new file mode 100644 index 0000000000..240a5f2e5c --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/373/death.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/373/death +# +# Mobの死亡時の処理のエイリアス +# +# @within asset_manager:mob/triggers/death/death.m + +# 本来の処理を呼び出す + function asset:mob/0373.gold_coffin/death/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/373/init.mcfunction b/Asset/data/asset/functions/mob/alias/373/init.mcfunction new file mode 100644 index 0000000000..21eee1090b --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/373/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/373/init +# +# Init処理のエイリアス +# +# @within asset_manager:mob/triggers/init/init.m + +# 元のInit処理を呼び出す + function asset:mob/0373.gold_coffin/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/373/register.mcfunction b/Asset/data/asset/functions/mob/alias/373/register.mcfunction new file mode 100644 index 0000000000..eae653f0b4 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/373/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/373/register +# +# Mobのデータ指定処理のエイリアス +# +# @within asset_manager:mob/triggers/summon/register.m + +# 元の登録処理を呼び出す + function asset:mob/0373.gold_coffin/register \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/373/summon.mcfunction b/Asset/data/asset/functions/mob/alias/373/summon.mcfunction new file mode 100644 index 0000000000..54c51c0a14 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/373/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/373/summon +# +# Mob召喚処理のエイリアス +# +# @within asset_manager:mob/triggers/summon/summon.m + +# 本来の処理を呼び出す + function asset:mob/0373.gold_coffin/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/373/tick.mcfunction b/Asset/data/asset/functions/mob/alias/373/tick.mcfunction new file mode 100644 index 0000000000..5e0b495eb6 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/373/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/373/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:mob/triggers/tick/tick.m + +# 元のTick処理を呼び出す + function asset:mob/0373.gold_coffin/tick/ \ No newline at end of file From f391e2149ab5c97ddd24458113aad39aed2ea512 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 8 Dec 2024 23:04:15 +0900 Subject: [PATCH 030/103] =?UTF-8?q?=EF=BE=8A=EF=BE=9F=EF=BD=AF=EF=BD=B6?= =?UTF-8?q?=EF=BD=B0=EF=BE=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/asset/functions/mob/0373.gold_coffin/tick/.mcfunction | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Asset/data/asset/functions/mob/0373.gold_coffin/tick/.mcfunction b/Asset/data/asset/functions/mob/0373.gold_coffin/tick/.mcfunction index a11c5bfc80..7aa6a0f365 100644 --- a/Asset/data/asset/functions/mob/0373.gold_coffin/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0373.gold_coffin/tick/.mcfunction @@ -7,5 +7,8 @@ # スコア scoreboard players add @s General.Mob.Tick 1 +# ﾊﾟｯｶｰﾝ + execute if entity @s[scores={General.Mob.Tick=100}] on passengers run data modify entity @s item.tag.CustomModelData set value 20447 + # 一定時間で消滅 execute if entity @s[scores={General.Mob.Tick=200..}] run kill @s From d47861100977c192821a1231563c93ba5a879b11 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 11 Dec 2024 22:54:28 +0900 Subject: [PATCH 031/103] =?UTF-8?q?=E6=B2=A2=E5=B1=B1=E6=89=93=E3=81=A4?= =?UTF-8?q?=E3=82=B9=E3=82=AD=E3=83=AB=E9=80=94=E4=B8=AD=E3=81=BE=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/many_shoot/.mcfunction | 12 +++++------- .../tick/skill/many_shoot/spread.mcfunction | 18 ++++++++++++++++++ .../tick/skill/many_shoot/summon.mcfunction | 14 +++++--------- .../2092.ghost_bullet/summon/.m.mcfunction | 8 ++++++++ .../2092.ghost_bullet/summon/.mcfunction | 2 +- .../object/2092.ghost_bullet/tick/.mcfunction | 11 ++++++++--- 6 files changed, 45 insertions(+), 20 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/spread.mcfunction create mode 100644 Asset/data/asset/functions/object/2092.ghost_bullet/summon/.m.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction index 878e4fe493..f1172ea58c 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction @@ -8,13 +8,11 @@ execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/soul_shot/play -# 上側に魔法陣を沢山召喚する - execute if entity @s[scores={General.Mob.Tick=3}] rotated ~ 0 positioned ^ ^4.5 ^ summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon - execute if entity @s[scores={General.Mob.Tick=6}] rotated ~ 0 positioned ^2 ^3.5 ^-1 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon - execute if entity @s[scores={General.Mob.Tick=9}] rotated ~ 0 positioned ^-2.5 ^3.7 ^0.5 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon - execute if entity @s[scores={General.Mob.Tick=12}] rotated ~ 0 positioned ^-1 ^3.2 ^-0.5 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon - execute if entity @s[scores={General.Mob.Tick=12}] rotated ~ 0 positioned ^3.2 ^3.2 ^0.5 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon - #execute if entity @s[scores={General.Mob.Tick=12}] rotated ~ 0 positioned ^-1 ^4.2 ^1 summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon_square +# 一定間隔で拡散して召喚 + scoreboard players operation $Interval Temporary = @s General.Mob.Tick + scoreboard players operation $Interval Temporary %= $4 Const + execute if entity @s[scores={General.Mob.Tick=15..59}] if score $Interval Temporary matches 0 rotated ~ 0 positioned ^ ^3 ^ summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/spread + scoreboard players reset $Interval Temporary # 共通リセット処理 execute if entity @s[scores={General.Mob.Tick=88..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/spread.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/spread.mcfunction new file mode 100644 index 0000000000..3a631db789 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/spread.mcfunction @@ -0,0 +1,18 @@ +#> asset:mob/0372.tutankhamen/tick/skill/many_shoot/spread +# +# 拡散して召喚する +# +# @within function asset:mob/0372.tutankhamen/tick/skill/many_shoot/ + +#> SpreadLib +# @private + #declare tag SpreadMarker + +# 拡散 + summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + data modify storage lib: Argument.Bounds set value [[5d,5d],[0.3d,0d],[5d,5d]] + execute as @e[type=marker,tag=SpreadMarker,distance=..0.01,limit=1] at @s run function lib:spread_entity/ + execute at @e[type=marker,tag=SpreadMarker,distance=..20,limit=1] summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon + +# リセット + kill @e[type=marker,tag=SpreadMarker] diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction index 488e9a8883..25c90da126 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction @@ -2,19 +2,15 @@ # # 魔法陣を召喚 # -# @within function asset:mob/0372.tutankhamen/tick/skill/many_shoot/ +# @within function asset:mob/0372.tutankhamen/tick/skill/many_shoot/spread # プレイヤーの方を向く tp @s ~ ~ ~ facing entity @p eyes -# 50:50で左回転か右回転か決める - execute if predicate lib:random_pass_per/50 run data modify storage api: Argument.FieldOverride.LeftRotate set value true - - data modify storage api: Argument.ID set value 2090 - data modify storage api: Argument.FieldOverride.Scale set value [2f,2f,0.01f] - data modify storage api: Argument.FieldOverride.CMD set value 20443 - data modify storage api: Argument.FieldOverride.Color set value 5436415 +# 召喚 + data modify storage api: Argument.ID set value 2092 data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation function api:object/summon -kill @s +# 消滅 + kill @s diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.m.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.m.mcfunction new file mode 100644 index 0000000000..1130801d4e --- /dev/null +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.m.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2092.ghost_bullet/summon/.m +# +# +# +# @within function asset:object/2092.ghost_bullet/summon/ + +# 元となるEntityを召喚する + $summon item_display ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"],teleport_duration:1,item:{id:"minecraft:wither_skeleton_skull",Count:1b},transformation:{left_rotation:[0.0f,0.0f,0.0f,1.0f],right_rotation:[0.0f,0.0f,0.0f,1.0f],translation:[0f,0f,0f],scale:[0.8f,0.8f,0.8f]}} diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.mcfunction index 9897805d54..572e933e41 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/2092/summon # 元となるEntityを召喚する - summon marker ~ ~ ~ {Rotation:[0.0f,-90.0f],Tags:["ObjectInit"]} + function asset:object/2092.ghost_bullet/summon/.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction index f9152d49d8..12212f2ff7 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction @@ -12,10 +12,15 @@ scoreboard players add @s General.Object.Tick 1 # 演出 - particle soul ~ ~ ~ 0.25 0.25 0.25 0 4 normal @a + particle soul ~ ~ ~ 0.25 0.25 0.25 0 1 normal @a + +# 最初は少し上昇する +# 上向き移動の際はobjectを上に向かせる必要があり、プレイヤーの方を見ていてほしく +# displayのtransformationを弄る必要があるので飛翔体抽象の処理は用いない + execute if entity @s[scores={General.Object.Tick=..50}] run tp @s ~ ~0.05 ~ # 一度止まる - execute if entity @s[scores={General.Object.Tick=40}] run data modify storage asset:context this.Speed set value 0 + #execute if entity @s[scores={General.Object.Tick=40}] run data modify storage asset:context this.Speed set value 0 # プレイヤーの方を見て動き出す execute if entity @s[scores={General.Object.Tick=80}] run tp @s ~ ~ ~ facing entity @p eyes @@ -30,7 +35,7 @@ scoreboard players reset $Interval Temporary # 継承 - execute at @s run function asset:object/super.tick + execute if entity @s[scores={General.Object.Tick=80..}] at @s run function asset:object/super.tick # 消滅処理 kill @s[scores={General.Object.Tick=200..}] From db9ddeaee74b15c0b3f438e866035bef700d64ac Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 12 Dec 2024 01:36:43 +0900 Subject: [PATCH 032/103] =?UTF-8?q?=E6=B2=A2=E5=B1=B1=E6=89=93=E3=81=A4?= =?UTF-8?q?=E3=82=B9=E3=82=AD=E3=83=AB=E3=81=AE=E9=80=94=E4=B8=AD=E3=81=BE?= =?UTF-8?q?=E3=81=A72?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 2 ++ .../mob/0372.tutankhamen/load.mcfunction | 2 +- .../mob/0372.tutankhamen/register.mcfunction | 2 +- .../tick/skill/common/select_taget.mcfunction | 11 +++++++++ .../tick/skill/many_shoot/.mcfunction | 16 ++++++++++++- .../tick/skill/many_shoot/spread.mcfunction | 2 +- .../tick/skill/many_shoot/summon.mcfunction | 24 ++++++++++++++++++- .../object/2092.ghost_bullet/init/.mcfunction | 6 +++++ .../object/2092.ghost_bullet/load.mcfunction | 9 +++++++ .../2092.ghost_bullet/summon/.m.mcfunction | 2 +- .../object/2092.ghost_bullet/tick/.mcfunction | 18 +++++++++----- .../asset/tags/functions/object/load.json | 3 ++- 12 files changed, 84 insertions(+), 13 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/select_taget.mcfunction create mode 100644 Asset/data/asset/functions/object/2092.ghost_bullet/load.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 9859a386f7..75b6c8a80a 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -13,7 +13,9 @@ #declare tag AC.Opening #declare tag AC.Hit #declare tag AC.RotationMarker + #declare tag Target #declare score_holder $Recursive + #declare score_holder $Random #declare score_holder $Interval # # diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction index 9c51a7ef06..db91536bf5 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction @@ -6,4 +6,4 @@ #> 定義類はここに # @within function asset:mob/0372.tutankhamen/** - #scoreboard objectives add + scoreboard objectives add AC.TargetID dummy diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction index db50656e0e..e39fb523c5 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction @@ -66,4 +66,4 @@ # 雷倍率 (float) (オプション) # data modify storage asset:mob Resist.Thunder set value # フィールド - # data modify storage asset:mob Field.myValue set value + data modify storage asset:mob Field.Damage.ManyShoot set value 40f diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/select_taget.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/select_taget.mcfunction new file mode 100644 index 0000000000..0367a52134 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/select_taget.mcfunction @@ -0,0 +1,11 @@ +#> asset:mob/0372.tutankhamen/tick/skill/common/select_taget +# +# ターゲット選定 +# +# @within function asset:mob/0372.tutankhamen/tick/skill/** + +# 自身のスコアに突っ込む + scoreboard players operation @s AC.TargetID = @r[gamemode=!spectator,distance=..50] UserID + +# ターゲットのUserIDをフィールドにも突っ込む + execute store result storage asset:context this.TargetID int 1 run scoreboard players get @s AC.TargetID diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction index f1172ea58c..50d0bb7d91 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction @@ -8,6 +8,20 @@ execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/soul_shot/play +# 演出 + #xecute if entity @s[scores={General.Mob.Tick=15}] run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 1 0.8 0 + #execute if entity @s[scores={General.Mob.Tick=25}] run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 1 1.0 0 + #execute if entity @s[scores={General.Mob.Tick=35}] run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 1 1.2 0 + +# ターゲット選定 + function asset:mob/0372.tutankhamen/tick/skill/common/select_taget + +# ターゲットの方を向き続ける + execute at @a[distance=..100] if score @s AC.TargetID = @p UserID run tag @p add Target + execute facing entity @p[tag=Target] eyes rotated ~ 0 run tp @s ~ ~ ~ ~ ~ + tp @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] ~ ~ ~ ~ ~ + tag @p[tag=Target] remove Target + # 一定間隔で拡散して召喚 scoreboard players operation $Interval Temporary = @s General.Mob.Tick scoreboard players operation $Interval Temporary %= $4 Const @@ -15,4 +29,4 @@ scoreboard players reset $Interval Temporary # 共通リセット処理 - execute if entity @s[scores={General.Mob.Tick=88..}] run function asset:mob/0372.tutankhamen/tick/skill/reset + execute if entity @s[scores={General.Mob.Tick=128..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/spread.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/spread.mcfunction index 3a631db789..5cc8426110 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/spread.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/spread.mcfunction @@ -10,7 +10,7 @@ # 拡散 summon marker ~ ~ ~ {Tags:["SpreadMarker"]} - data modify storage lib: Argument.Bounds set value [[5d,5d],[0.3d,0d],[5d,5d]] + data modify storage lib: Argument.Bounds set value [[3.5d,3.5d],[0.3d,0d],[3.5d,3.5d]] execute as @e[type=marker,tag=SpreadMarker,distance=..0.01,limit=1] at @s run function lib:spread_entity/ execute at @e[type=marker,tag=SpreadMarker,distance=..20,limit=1] summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/summon diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction index 25c90da126..2392890f2b 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction @@ -4,13 +4,35 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill/many_shoot/spread +#> Private +# @private + #declare score_holder $StartDelay + # プレイヤーの方を向く - tp @s ~ ~ ~ facing entity @p eyes + tp @s ~ ~ ~ facing entity @p[distance=..100] eyes + +# StartDelayを59にする + scoreboard players set $StartDelay Temporary 49 + +# 発射タイミングをある程度一定にする + scoreboard players operation $StartDelay Temporary -= @s General.Mob.Tick + +# 発射タイミングのランダム性 + execute store result score $Random Temporary run function lib:random/ + scoreboard players operation $Random Temporary %= $10 Const + scoreboard players remove $Random Temporary 10 + scoreboard players operation $StartDelay Temporary += $Random Temporary # 召喚 data modify storage api: Argument.ID set value 2092 data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + execute store result storage api: Argument.FieldOverride.TargetID int 1 run scoreboard players get @e[type=wither_skeleton,tag=this,distance=..10,sort=nearest,limit=1] AC.TargetID + execute store result storage api: Argument.FieldOverride.StartDelay int 1 run scoreboard players get $StartDelay Temporary function api:object/summon +# リセット + scoreboard players reset $StartDelay Temporary + scoreboard players reset $Random Temporary + # 消滅 kill @s diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction index 1e73fa666e..b5b9e099fb 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction @@ -4,6 +4,12 @@ # # @within asset:object/alias/2092/init +# StartDelay + execute store result score @s General.Object.Tick run data get storage asset:context this.StartDelay -1 + +# TargetID + execute store result score @s 2092.TargetID run data get storage asset:context this.TargetID + # スピード設定 data modify storage asset:context this.Speed set value 1 data modify storage asset:context this.Range set value 300 diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/load.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/load.mcfunction new file mode 100644 index 0000000000..0ef81be20f --- /dev/null +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/load.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/2092.ghost_bullet/load +# +# Objectに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:object/load + +#> 定義類はここに +# @within function asset:object/2092.ghost_bullet/** + scoreboard objectives add 2092.TargetID dummy diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.m.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.m.mcfunction index 1130801d4e..693812ffd5 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.m.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.m.mcfunction @@ -5,4 +5,4 @@ # @within function asset:object/2092.ghost_bullet/summon/ # 元となるEntityを召喚する - $summon item_display ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"],teleport_duration:1,item:{id:"minecraft:wither_skeleton_skull",Count:1b},transformation:{left_rotation:[0.0f,0.0f,0.0f,1.0f],right_rotation:[0.0f,0.0f,0.0f,1.0f],translation:[0f,0f,0f],scale:[0.8f,0.8f,0.8f]}} + $summon item_display ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"],teleport_duration:1,item:{id:"minecraft:wither_skeleton_skull",Count:1b},transformation:{left_rotation:[0.0f,1.0f,0.0f,0.0f],right_rotation:[0.0f,0.0f,0.0f,1.0f],translation:[0f,0f,0f],scale:[0.8f,0.8f,0.8f]}} diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction index 12212f2ff7..640f1b7145 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction @@ -6,26 +6,32 @@ #> Private # @private + #declare tag Target #declare score_holder $Interval # Tick加算 scoreboard players add @s General.Object.Tick 1 # 演出 - particle soul ~ ~ ~ 0.25 0.25 0.25 0 1 normal @a + # particle soul ~ ~ ~ 0.25 0.25 0.25 0 1 normal @a # 最初は少し上昇する # 上向き移動の際はobjectを上に向かせる必要があり、プレイヤーの方を見ていてほしく # displayのtransformationを弄る必要があるので飛翔体抽象の処理は用いない - execute if entity @s[scores={General.Object.Tick=..50}] run tp @s ~ ~0.05 ~ + execute if entity @s[scores={General.Object.Tick=..0}] run tp @s ~ ~0.05 ~ + +# ターゲットの方を見る + execute at @a if score @s 2092.TargetID = @p UserID run tag @p add Target + execute if entity @s[scores={General.Object.Tick=..0}] at @s facing entity @p[tag=Target] eyes run tp @s ~ ~ ~ ~ ~ + tag @p[tag=Target] remove Target # 一度止まる #execute if entity @s[scores={General.Object.Tick=40}] run data modify storage asset:context this.Speed set value 0 # プレイヤーの方を見て動き出す - execute if entity @s[scores={General.Object.Tick=80}] run tp @s ~ ~ ~ facing entity @p eyes - execute if entity @s[scores={General.Object.Tick=80}] run data modify storage asset:context this.Speed set value 1 - execute if entity @s[scores={General.Object.Tick=80}] run data modify storage asset:context this.MovePerStep set value 0.8 + execute if entity @s[scores={General.Object.Tick=0}] at @s run tp @s ~ ~ ~ facing entity @p eyes + execute if entity @s[scores={General.Object.Tick=0}] run data modify storage asset:context this.Speed set value 1 + execute if entity @s[scores={General.Object.Tick=0}] run data modify storage asset:context this.MovePerStep set value 0.8 # 定期的に追加で演出 scoreboard players operation $Interval Temporary = @s General.Object.Tick @@ -35,7 +41,7 @@ scoreboard players reset $Interval Temporary # 継承 - execute if entity @s[scores={General.Object.Tick=80..}] at @s run function asset:object/super.tick + execute if entity @s[scores={General.Object.Tick=0..}] at @s run function asset:object/super.tick # 消滅処理 kill @s[scores={General.Object.Tick=200..}] diff --git a/Asset/data/asset/tags/functions/object/load.json b/Asset/data/asset/tags/functions/object/load.json index eaca80b9f1..621686e0dd 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/2092.ghost_bullet/load", "asset:object/2090.magic_square/load", "asset:object/1050.call_fulstuka/load", "asset:object/1040.thelema_persuit_sword/load", @@ -19,4 +20,4 @@ "asset:object/2031.giant_pumpkin/load", "asset:object/0001.abstract_projectile/load" ] -} +} \ No newline at end of file From 278a3d333f7c978f7d1b51a9ef43af41f576ea8e Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 12 Dec 2024 02:33:33 +0900 Subject: [PATCH 033/103] =?UTF-8?q?=E6=B2=A2=E5=B1=B1=E6=92=83=E3=81=A4?= =?UTF-8?q?=E3=82=B9=E3=82=AD=E3=83=AB=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88?= =?UTF-8?q?=E3=81=9A=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/many_shoot/summon.mcfunction | 6 ++++-- .../2092.ghost_bullet/hit_entity/.mcfunction | 5 ----- .../object/2092.ghost_bullet/init/.mcfunction | 9 +++++++-- .../object/2092.ghost_bullet/kill/.mcfunction | 16 +++++++++++----- .../2092.ghost_bullet/recursive/.mcfunction | 8 ++++++++ .../object/2092.ghost_bullet/tick/.mcfunction | 16 ++++++++-------- .../object/alias/2092/hit_entity.mcfunction | 8 -------- .../object/alias/2092/recursive.mcfunction | 8 ++++++++ 8 files changed, 46 insertions(+), 30 deletions(-) delete mode 100644 Asset/data/asset/functions/object/2092.ghost_bullet/hit_entity/.mcfunction create mode 100644 Asset/data/asset/functions/object/2092.ghost_bullet/recursive/.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/2092/hit_entity.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2092/recursive.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction index 2392890f2b..56f9f9cc3c 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction @@ -20,14 +20,16 @@ # 発射タイミングのランダム性 execute store result score $Random Temporary run function lib:random/ scoreboard players operation $Random Temporary %= $10 Const - scoreboard players remove $Random Temporary 10 + scoreboard players remove $Random Temporary 20 scoreboard players operation $StartDelay Temporary += $Random Temporary # 召喚 data modify storage api: Argument.ID set value 2092 data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation - execute store result storage api: Argument.FieldOverride.TargetID int 1 run scoreboard players get @e[type=wither_skeleton,tag=this,distance=..10,sort=nearest,limit=1] AC.TargetID + execute store result storage api: Argument.FieldOverride.Damage int 1 run data get storage asset:context this.Damage.ManyShoot execute store result storage api: Argument.FieldOverride.StartDelay int 1 run scoreboard players get $StartDelay Temporary + execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @e[type=wither_skeleton,tag=this,distance=..10,sort=nearest,limit=1] MobUUID + execute store result storage api: Argument.FieldOverride.TargetID int 1 run scoreboard players get @e[type=wither_skeleton,tag=this,distance=..10,sort=nearest,limit=1] AC.TargetID function api:object/summon # リセット diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/hit_entity/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/hit_entity/.mcfunction deleted file mode 100644 index 9d87a9c663..0000000000 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/hit_entity/.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> asset:object/2092.ghost_bullet/hit_entity/ -# -# 継承先などから実行される処理 -# -# @within asset:object/alias/2092/hit_entity diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction index b5b9e099fb..82bcfc5f58 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction @@ -4,6 +4,11 @@ # # @within asset:object/alias/2092/init +# 演出 + particle soul ~ ~ ~ 0 0 0 0.05 20 normal @a + playsound block.sculk_sensor.clicking hostile @a ~ ~ ~ 0.8 0 0 + playsound block.fire.ambient hostile @a ~ ~ ~ 1.5 0.8 0 + # StartDelay execute store result score @s General.Object.Tick run data get storage asset:context this.StartDelay -1 @@ -11,9 +16,9 @@ execute store result score @s 2092.TargetID run data get storage asset:context this.TargetID # スピード設定 - data modify storage asset:context this.Speed set value 1 + data modify storage asset:context this.Speed set value 2 data modify storage asset:context this.Range set value 300 - data modify storage asset:context this.MovePerStep set value 0.1 + data modify storage asset:context this.MovePerStep set value 0.4 # 継承 function asset:object/super.init diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/kill/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/kill/.mcfunction index d807d252da..85a0a06ee8 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/kill/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/kill/.mcfunction @@ -5,11 +5,17 @@ # @within asset:object/alias/2092/kill # 演出 - particle soul ~ ~ ~ 0.2 0.2 0.2 0.25 100 normal @a + particle soul ~ ~ ~ 0.2 0.2 0.2 0.2 30 normal @a + playsound ogg:mob.vex.idle1 hostile @a ~ ~ ~ 0.8 0.5 0 +# ダメージ + 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 "Fire" + data modify storage api: Argument.MobUUID set from storage asset:context this.MobUUID + function api:damage/modifier_manual + execute positioned ~-0.5 ~-0.5 ~-0.5 as @p[tag=!PlayerShouldInvulnerable,dx=0] run function api:damage/ + function api:damage/reset - - - -# +# 消滅 kill @s diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/recursive/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/recursive/.mcfunction new file mode 100644 index 0000000000..fb116b40b0 --- /dev/null +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/recursive/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2092.ghost_bullet/recursive/ +# +# 継承先などから実行される処理 +# +# @within asset:object/alias/2092/recursive + +# 演出 + particle soul ~ ~-0.1 ~ 0.15 0.15 0.15 0 1 normal @a diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction index 640f1b7145..b214233b72 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/tick/.mcfunction @@ -13,7 +13,7 @@ scoreboard players add @s General.Object.Tick 1 # 演出 - # particle soul ~ ~ ~ 0.25 0.25 0.25 0 1 normal @a + # # 最初は少し上昇する # 上向き移動の際はobjectを上に向かせる必要があり、プレイヤーの方を見ていてほしく @@ -23,15 +23,12 @@ # ターゲットの方を見る execute at @a if score @s 2092.TargetID = @p UserID run tag @p add Target execute if entity @s[scores={General.Object.Tick=..0}] at @s facing entity @p[tag=Target] eyes run tp @s ~ ~ ~ ~ ~ - tag @p[tag=Target] remove Target -# 一度止まる - #execute if entity @s[scores={General.Object.Tick=40}] run data modify storage asset:context this.Speed set value 0 +# スコアが0の時に演出 + execute if entity @s[scores={General.Object.Tick=0}] run playsound entity.blaze.shoot hostile @a ~ ~ ~ 1 0.8 0 -# プレイヤーの方を見て動き出す - execute if entity @s[scores={General.Object.Tick=0}] at @s run tp @s ~ ~ ~ facing entity @p eyes - execute if entity @s[scores={General.Object.Tick=0}] run data modify storage asset:context this.Speed set value 1 - execute if entity @s[scores={General.Object.Tick=0}] run data modify storage asset:context this.MovePerStep set value 0.8 +# 発射してすぐまでは誘導 + execute if entity @s[scores={General.Object.Tick=0..10}] at @s facing entity @p[tag=Target] eyes positioned ^ ^ ^-120 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~ # 定期的に追加で演出 scoreboard players operation $Interval Temporary = @s General.Object.Tick @@ -43,5 +40,8 @@ # 継承 execute if entity @s[scores={General.Object.Tick=0..}] at @s run function asset:object/super.tick +# リセット + tag @p[tag=Target] remove Target + # 消滅処理 kill @s[scores={General.Object.Tick=200..}] diff --git a/Asset/data/asset/functions/object/alias/2092/hit_entity.mcfunction b/Asset/data/asset/functions/object/alias/2092/hit_entity.mcfunction deleted file mode 100644 index c3d24abbe8..0000000000 --- a/Asset/data/asset/functions/object/alias/2092/hit_entity.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/2092/hit_entity -# -# メソッド処理のエイリアス -# -# @within asset_manager:object/tick/tick.m - -# 元のメソッド処理を呼び出す - function asset:object/2092.ghost_bullet/hit_entity/ diff --git a/Asset/data/asset/functions/object/alias/2092/recursive.mcfunction b/Asset/data/asset/functions/object/alias/2092/recursive.mcfunction new file mode 100644 index 0000000000..5e84d026d7 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2092/recursive.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2092/recursive +# +# メソッド処理のエイリアス +# +# @within asset_manager:object/call_method/run_method.m + +# 元のメソッド処理を呼び出す + function asset:object/2092.ghost_bullet/recursive/ \ No newline at end of file From fec201cb26aec1e15135f17f996db8bd23302897 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 12 Dec 2024 04:03:32 +0900 Subject: [PATCH 034/103] =?UTF-8?q?=E5=90=8D=E5=89=8D=E3=82=92=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/mob/0372.tutankhamen/register.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction index e39fb523c5..22f9ed515b 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction @@ -19,7 +19,7 @@ # 干渉可能か否か (boolean) data modify storage asset:mob Interferable set value true # 名前 (TextComponentString) (オプション) - # data modify storage asset:mob Name set value + data modify storage asset:mob Name set value '{"text":"ツタンカーメン"}' # Mobの説明文 (TextComponentString[]) (オプション) # data modify storage asset:mob Lore set value # 武器 From 43d51cea1fc1d179b1ac43b7464c158597ae0e69 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 12 Dec 2024 06:17:05 +0900 Subject: [PATCH 035/103] =?UTF-8?q?=E3=81=B2=E3=81=A8=E3=81=BE=E3=81=9A?= =?UTF-8?q?=E5=8F=AC=E5=96=9A=E3=81=A7=E3=81=8D=E3=82=8B=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 --- .../mob/0374.gray_coffin/death/.mcfunction | 5 ++ .../mob/0374.gray_coffin/register.mcfunction | 65 +++++++++++++++++++ .../mob/0374.gray_coffin/summon/.m.mcfunction | 8 +++ .../mob/0374.gray_coffin/summon/.mcfunction | 8 +++ .../0374.gray_coffin/summon/debug.mcfunction | 10 +++ .../mob/0374.gray_coffin/tick/.mcfunction | 14 ++++ .../0374.gray_coffin/tick/summon.mcfunction | 5 ++ .../functions/mob/alias/374/death.mcfunction | 8 +++ .../mob/alias/374/register.mcfunction | 8 +++ .../functions/mob/alias/374/summon.mcfunction | 8 +++ .../functions/mob/alias/374/tick.mcfunction | 8 +++ 11 files changed, 147 insertions(+) create mode 100644 Asset/data/asset/functions/mob/0374.gray_coffin/death/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0374.gray_coffin/register.mcfunction create mode 100644 Asset/data/asset/functions/mob/0374.gray_coffin/summon/.m.mcfunction create mode 100644 Asset/data/asset/functions/mob/0374.gray_coffin/summon/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0374.gray_coffin/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/mob/0374.gray_coffin/tick/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0374.gray_coffin/tick/summon.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/374/death.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/374/register.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/374/summon.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/374/tick.mcfunction diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/death/.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/death/.mcfunction new file mode 100644 index 0000000000..287f9759e6 --- /dev/null +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/death/.mcfunction @@ -0,0 +1,5 @@ +#> asset:mob/0374.gray_coffin/death/ +# +# Mobの死亡時の処理 +# +# @within function asset:mob/alias/374/death diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/register.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/register.mcfunction new file mode 100644 index 0000000000..86de608475 --- /dev/null +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/register.mcfunction @@ -0,0 +1,65 @@ +#> asset:mob/0374.gray_coffin/register +# +# Mobのデータを指定 +# +# @within function asset:mob/alias/374/register + +# 他のモブに継承されることを許可するか (boolean) (オプション) + # data modify storage asset:mob ExtendsSafe set value +# 継承されることを前提とした、抽象的なモブであるかどうか(boolean) + data modify storage asset:mob IsAbstract set value false +# ID (int) + data modify storage asset:mob ID set value 374 +# Type (string) Wikiを参照 + data modify storage asset:mob Type set value "" +# 干渉可能か否か (boolean) + data modify storage asset:mob Interferable set value +# 名前 (TextComponentString) (オプション) + # data modify storage asset:mob Name set value +# Mobの説明文 (TextComponentString[]) (オプション) + # data modify storage asset:mob Lore set value +# 武器 + # メインハンド (Compound(Item)) (オプション) + # data modify storage asset:mob Weapon.Mainhand set value + # オフハンド (Compound(Item)) (オプション) + # data modify storage asset:mob Weapon.Offhand set value +# 武器ドロップ率 ([float, float]) (オプション) + # data modify storage asset:mob WeaponDropChances set value +# 防具 + # 頭 (Compound(Item)) (オプション) + # data modify storage asset:mob Armor.Head set value + # 胴 (Compound(Item)) (オプション) + # data modify storage asset:mob Armor.Chest set value + # 脚 (Compound(Item)) (オプション) + # data modify storage asset:mob Armor.Legs set value + # 足 (Compound(Item)) (オプション) + # data modify storage asset:mob Armor.Feet set value +# 防具ドロップ率 ([float, float]) (オプション) + # data modify storage asset:mob ArmorDropChances set value +# 体力 (double) (オプション) + # data modify storage asset:mob Health set value +# 攻撃力 (double) (オプション) + # data modify storage asset:mob AttackDamage set value +# 防御力 (double) (オプション) // 被ダメージがある程度大きい場合1ptにつき0.8%カット、小さい場合1ptにつき約4%カット 20pt以上は頭打ち + # data modify storage asset:mob Defense set value +# 特殊防御力 (double) (オプション) // 4pointにつきダメージを大きく減らす + # data modify storage asset:mob SpecialDefense set value +# 移動速度 (double) (オプション) + # data modify storage asset:mob Speed set value +# 索敵範囲 (double) (オプション) + # data modify storage asset:mob FollowRange set value +# ノックバック耐性 (double) (オプション) + # data modify storage asset:mob KnockBackResist set value +# 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る + # 物理倍率 (float) (オプション) + # data modify storage asset:mob Resist.Physical set value + # 魔法倍率 (float) (オプション) + # data modify storage asset:mob Resist.Magic set value + # 火倍率 (float) (オプション) + # data modify storage asset:mob Resist.Fire set value + # 水倍率 (float) (オプション) + # data modify storage asset:mob Resist.Water set value + # 雷倍率 (float) (オプション) + # data modify storage asset:mob Resist.Thunder set value +# フィールド + # data modify storage asset:mob Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.m.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.m.mcfunction new file mode 100644 index 0000000000..6ff8f8e717 --- /dev/null +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.m.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/0374.gray_coffin/summon/.m +# +# +# +# @within function asset:mob/0374.gray_coffin/summon/ + +# 元となるEntityを召喚する + summon polar_bear ~ ~ ~ {NoAI:1b,Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty",Passengers:[{id:"item_display",Tags:["AssetMob","AutoKillWhenDieVehicle"],item:{id:"stick",Count:1b,tag:{CustomModelData:20448}},transformation:{left_rotation:[-0.7071f,0f,0f,0.7071f],right_rotation:[0f,0f,0f,1f],translation:[0f,-0.7f,0.7f],scale:[1.35f,1.35f,1.35f]}}]} diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.mcfunction new file mode 100644 index 0000000000..898b4fd0b1 --- /dev/null +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/0374.gray_coffin/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:mob/alias/374/summon + +# 元となるEntityを召喚する + function asset:mob/0374.gray_coffin/summon/.m with storage asset:context this diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/summon/debug.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/summon/debug.mcfunction new file mode 100644 index 0000000000..683ece34c3 --- /dev/null +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:mob/0374.gray_coffin/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 374 + function api:mob/summon \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/tick/.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/.mcfunction new file mode 100644 index 0000000000..2215ce157c --- /dev/null +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/.mcfunction @@ -0,0 +1,14 @@ +#> asset:mob/0374.gray_coffin/tick/ +# +# Mobのtick時の処理 +# +# @within asset:mob/alias/374/tick + +# スコア + scoreboard players add @s General.Mob.Tick 1 + +# ﾊﾟｯｶｰﾝ + execute if entity @s[scores={General.Mob.Tick=100}] on passengers run data modify entity @s item.tag.CustomModelData set value 20449 + +# 一定時間で消滅 + execute if entity @s[scores={General.Mob.Tick=200..}] run kill @s diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/tick/summon.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/summon.mcfunction new file mode 100644 index 0000000000..b69c84bb84 --- /dev/null +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/summon.mcfunction @@ -0,0 +1,5 @@ +#> asset:mob/0374.gray_coffin/tick/summon +# +# +# +# @within function asset:mob/0374.gray_coffin/tick/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/374/death.mcfunction b/Asset/data/asset/functions/mob/alias/374/death.mcfunction new file mode 100644 index 0000000000..610b4ce89e --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/374/death.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/374/death +# +# Mobの死亡時の処理のエイリアス +# +# @within asset_manager:mob/triggers/death/death.m + +# 本来の処理を呼び出す + function asset:mob/0374.gray_coffin/death/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/374/register.mcfunction b/Asset/data/asset/functions/mob/alias/374/register.mcfunction new file mode 100644 index 0000000000..81ba071e61 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/374/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/374/register +# +# Mobのデータ指定処理のエイリアス +# +# @within asset_manager:mob/triggers/summon/register.m + +# 元の登録処理を呼び出す + function asset:mob/0374.gray_coffin/register \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/374/summon.mcfunction b/Asset/data/asset/functions/mob/alias/374/summon.mcfunction new file mode 100644 index 0000000000..5a491d19db --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/374/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/374/summon +# +# Mob召喚処理のエイリアス +# +# @within asset_manager:mob/triggers/summon/summon.m + +# 本来の処理を呼び出す + function asset:mob/0374.gray_coffin/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/alias/374/tick.mcfunction b/Asset/data/asset/functions/mob/alias/374/tick.mcfunction new file mode 100644 index 0000000000..a723f250f1 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/374/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/374/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:mob/triggers/tick/tick.m + +# 元のTick処理を呼び出す + function asset:mob/0374.gray_coffin/tick/ \ No newline at end of file From 5f70327688e9aef8b47537f404ad75e47f19b26b Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 12 Dec 2024 17:33:26 +0900 Subject: [PATCH 036/103] =?UTF-8?q?=E7=81=B0=E8=89=B2=E3=81=AE=E6=A3=BA?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0374.gray_coffin/register.mcfunction | 53 ++++++++++--------- .../mob/0374.gray_coffin/summon/.m.mcfunction | 2 +- .../mob/0374.gray_coffin/tick/.mcfunction | 12 +++-- .../tick/open_and_close.mcfunction | 35 ++++++++++++ .../tick/penalty_explode.mcfunction | 23 ++++++++ .../tick/penalty_ready.mcfunction | 34 ++++++++++++ .../0374.gray_coffin/tick/summon.mcfunction | 29 +++++++++- 7 files changed, 155 insertions(+), 33 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0374.gray_coffin/tick/open_and_close.mcfunction create mode 100644 Asset/data/asset/functions/mob/0374.gray_coffin/tick/penalty_explode.mcfunction create mode 100644 Asset/data/asset/functions/mob/0374.gray_coffin/tick/penalty_ready.mcfunction diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/register.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/register.mcfunction index 86de608475..0d867bc487 100644 --- a/Asset/data/asset/functions/mob/0374.gray_coffin/register.mcfunction +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/register.mcfunction @@ -5,61 +5,62 @@ # @within function asset:mob/alias/374/register # 他のモブに継承されることを許可するか (boolean) (オプション) - # data modify storage asset:mob ExtendsSafe set value + # data modify storage asset:mob ExtendsSafe set value # 継承されることを前提とした、抽象的なモブであるかどうか(boolean) data modify storage asset:mob IsAbstract set value false # ID (int) data modify storage asset:mob ID set value 374 # Type (string) Wikiを参照 - data modify storage asset:mob Type set value "" + data modify storage asset:mob Type set value "Enemy" # 干渉可能か否か (boolean) - data modify storage asset:mob Interferable set value + data modify storage asset:mob Interferable set value true # 名前 (TextComponentString) (オプション) - # data modify storage asset:mob Name set value + # data modify storage asset:mob Name set value # Mobの説明文 (TextComponentString[]) (オプション) - # data modify storage asset:mob Lore set value + # data modify storage asset:mob Lore set value # 武器 # メインハンド (Compound(Item)) (オプション) - # data modify storage asset:mob Weapon.Mainhand set value + # data modify storage asset:mob Weapon.Mainhand set value # オフハンド (Compound(Item)) (オプション) - # data modify storage asset:mob Weapon.Offhand set value + # data modify storage asset:mob Weapon.Offhand set value # 武器ドロップ率 ([float, float]) (オプション) - # data modify storage asset:mob WeaponDropChances set value + # data modify storage asset:mob WeaponDropChances set value # 防具 # 頭 (Compound(Item)) (オプション) - # data modify storage asset:mob Armor.Head set value + # data modify storage asset:mob Armor.Head set value # 胴 (Compound(Item)) (オプション) - # data modify storage asset:mob Armor.Chest set value + # data modify storage asset:mob Armor.Chest set value # 脚 (Compound(Item)) (オプション) - # data modify storage asset:mob Armor.Legs set value + # data modify storage asset:mob Armor.Legs set value # 足 (Compound(Item)) (オプション) - # data modify storage asset:mob Armor.Feet set value + # data modify storage asset:mob Armor.Feet set value # 防具ドロップ率 ([float, float]) (オプション) - # data modify storage asset:mob ArmorDropChances set value + # data modify storage asset:mob ArmorDropChances set value # 体力 (double) (オプション) - # data modify storage asset:mob Health set value + # data modify storage asset:mob Health set value # 攻撃力 (double) (オプション) - # data modify storage asset:mob AttackDamage set value + # data modify storage asset:mob AttackDamage set value # 防御力 (double) (オプション) // 被ダメージがある程度大きい場合1ptにつき0.8%カット、小さい場合1ptにつき約4%カット 20pt以上は頭打ち - # data modify storage asset:mob Defense set value + # data modify storage asset:mob Defense set value # 特殊防御力 (double) (オプション) // 4pointにつきダメージを大きく減らす - # data modify storage asset:mob SpecialDefense set value + # data modify storage asset:mob SpecialDefense set value # 移動速度 (double) (オプション) - # data modify storage asset:mob Speed set value + # data modify storage asset:mob Speed set value # 索敵範囲 (double) (オプション) - # data modify storage asset:mob FollowRange set value + # data modify storage asset:mob FollowRange set value # ノックバック耐性 (double) (オプション) - # data modify storage asset:mob KnockBackResist set value + # data modify storage asset:mob KnockBackResist set value # 属性倍率 // 1.0fで100% 最低でも25%は軽減されずに入る # 物理倍率 (float) (オプション) - # data modify storage asset:mob Resist.Physical set value + # data modify storage asset:mob Resist.Physical set value # 魔法倍率 (float) (オプション) - # data modify storage asset:mob Resist.Magic set value + # data modify storage asset:mob Resist.Magic set value # 火倍率 (float) (オプション) - # data modify storage asset:mob Resist.Fire set value + # data modify storage asset:mob Resist.Fire set value # 水倍率 (float) (オプション) - # data modify storage asset:mob Resist.Water set value + # data modify storage asset:mob Resist.Water set value # 雷倍率 (float) (オプション) - # data modify storage asset:mob Resist.Thunder set value + # data modify storage asset:mob Resist.Thunder set value # フィールド - # data modify storage asset:mob Field.myValue set value \ No newline at end of file + data modify storage asset:mob Field.Damage set value 36.0f + data modify storage asset:mob Field.RotationX set value 0.0f diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.m.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.m.mcfunction index 6ff8f8e717..bbd7d6351e 100644 --- a/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.m.mcfunction +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.m.mcfunction @@ -5,4 +5,4 @@ # @within function asset:mob/0374.gray_coffin/summon/ # 元となるEntityを召喚する - summon polar_bear ~ ~ ~ {NoAI:1b,Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty",Passengers:[{id:"item_display",Tags:["AssetMob","AutoKillWhenDieVehicle"],item:{id:"stick",Count:1b,tag:{CustomModelData:20448}},transformation:{left_rotation:[-0.7071f,0f,0f,0.7071f],right_rotation:[0f,0f,0f,1f],translation:[0f,-0.7f,0.7f],scale:[1.35f,1.35f,1.35f]}}]} + $summon polar_bear ~ ~ ~ {Rotation:[$(RotationX)f,0.0f],NoAI:1b,Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty",Passengers:[{id:"item_display",Tags:["AssetMob","AutoKillWhenDieVehicle"],item:{id:"stick",Count:1b,tag:{CustomModelData:20448}},transformation:{left_rotation:[-0.7071f,0f,0f,0.7071f],right_rotation:[0f,0f,0f,1f],translation:[0f,-0.7f,0.7f],scale:[1.35f,1.35f,1.35f]}}]} diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/tick/.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/.mcfunction index 2215ce157c..05368d1889 100644 --- a/Asset/data/asset/functions/mob/0374.gray_coffin/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/.mcfunction @@ -7,8 +7,12 @@ # スコア scoreboard players add @s General.Mob.Tick 1 -# ﾊﾟｯｶｰﾝ - execute if entity @s[scores={General.Mob.Tick=100}] on passengers run data modify entity @s item.tag.CustomModelData set value 20449 +# 演出 + execute if predicate lib:random_pass_per/30 run particle witch ^ ^1 ^0.5 0.5 0.5 0.5 0 1 normal @a + execute if predicate lib:random_pass_per/30 run particle witch ^ ^1 ^-0.5 0.5 0.5 0.5 0 1 normal @a -# 一定時間で消滅 - execute if entity @s[scores={General.Mob.Tick=200..}] run kill @s +# 開閉を繰り返す + execute if entity @s[scores={General.Mob.Tick=..1000}] run function asset:mob/0374.gray_coffin/tick/open_and_close + +# ペナルティとして爆発する + execute if entity @s[scores={General.Mob.Tick=1000..}] run function asset:mob/0374.gray_coffin/tick/penalty_ready diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/tick/open_and_close.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/open_and_close.mcfunction new file mode 100644 index 0000000000..fb04bf2e19 --- /dev/null +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/open_and_close.mcfunction @@ -0,0 +1,35 @@ +#> asset:mob/0374.gray_coffin/tick/open_and_close +# +# 開閉を繰り返す +# +# @within function asset:mob/0374.gray_coffin/tick/ + +#> Private +# @private + #declare score_holder $Interval + #declare score_holder $201 + +# 201を定義 + scoreboard players set $201 Temporary 201 + +# 一定周期で開閉を繰り返す + scoreboard players operation $Interval Temporary = @s General.Mob.Tick + scoreboard players operation $Interval Temporary %= $201 Temporary + +# ﾊﾟｯｶｰﾝ + execute if score $Interval Temporary matches 100 on passengers run data modify entity @s item.tag.CustomModelData set value 20449 + execute if score $Interval Temporary matches 100 run playsound block.chest.open hostile @a ~ ~ ~ 1 0.5 0 + +# 召喚 + execute if score $Interval Temporary matches 120 positioned ^ ^2.5 ^0.6 summon marker run function asset:mob/0374.gray_coffin/tick/summon + execute if score $Interval Temporary matches 140 positioned ^ ^2.5 ^0.3 summon marker run function asset:mob/0374.gray_coffin/tick/summon + execute if score $Interval Temporary matches 160 positioned ^ ^2.5 ^0.0 summon marker run function asset:mob/0374.gray_coffin/tick/summon + execute if score $Interval Temporary matches 180 positioned ^ ^2.5 ^-0.3 summon marker run function asset:mob/0374.gray_coffin/tick/summon + +# 閉じる + execute if score $Interval Temporary matches 200 on passengers run data modify entity @s item.tag.CustomModelData set value 20448 + execute if score $Interval Temporary matches 200 run playsound block.chest.close hostile @a ~ ~ ~ 1 0.5 0 + +# リセット + scoreboard players reset $Interval Temporary + scoreboard players reset $201 Temporary diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/tick/penalty_explode.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/penalty_explode.mcfunction new file mode 100644 index 0000000000..48e8d6b5da --- /dev/null +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/penalty_explode.mcfunction @@ -0,0 +1,23 @@ +#> asset:mob/0374.gray_coffin/tick/penalty_explode +# +# 爆発 +# +# @within function asset:mob/0374.gray_coffin/tick/penalty_ready + +# 演出 + particle soul ~ ~1 ~ 0.2 0.3 0.2 0.2 300 normal @a + particle soul_fire_flame ~ ~1 ~ 0.2 0.3 0.2 0.3 100 normal @a + playsound entity.generic.explode hostile @a ~ ~ ~ 1 0.5 0 + playsound block.sculk_shrieker.shriek hostile @a ~ ~ ~ 1 0.8 0 + +# ダメージ + data modify storage api: Argument.Damage set value 50f + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "Fire" + #data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"api:","interpret":true}]}' + function api:damage/modifier + execute as @a[tag=!PlayerShouldInvulnerable,distance=..5] run function api:damage/ + function api:damage/reset + +# 消滅 + function api:mob/remove diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/tick/penalty_ready.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/penalty_ready.mcfunction new file mode 100644 index 0000000000..11205408b3 --- /dev/null +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/penalty_ready.mcfunction @@ -0,0 +1,34 @@ +#> asset:mob/0374.gray_coffin/tick/penalty_ready +# +# +# +# @within function asset:mob/0374.gray_coffin/tick/ + +# 高速で開閉を繰り返して爆発する + execute if entity @s[scores={General.Mob.Tick=1000}] on passengers run data modify entity @s item.tag.CustomModelData set value 20448 + execute if entity @s[scores={General.Mob.Tick=1000}] run playsound block.chest.close hostile @a ~ ~ ~ 1 0.7 0 + execute if entity @s[scores={General.Mob.Tick=1008}] on passengers run data modify entity @s item.tag.CustomModelData set value 20449 + execute if entity @s[scores={General.Mob.Tick=1008}] run playsound block.chest.open hostile @a ~ ~ ~ 1 0.7 0 + + execute if entity @s[scores={General.Mob.Tick=1015}] on passengers run data modify entity @s item.tag.CustomModelData set value 20448 + execute if entity @s[scores={General.Mob.Tick=1015}] run playsound block.chest.close hostile @a ~ ~ ~ 1 0.8 0 + execute if entity @s[scores={General.Mob.Tick=1022}] on passengers run data modify entity @s item.tag.CustomModelData set value 20449 + execute if entity @s[scores={General.Mob.Tick=1022}] run playsound block.chest.open hostile @a ~ ~ ~ 1 0.8 0 + + execute if entity @s[scores={General.Mob.Tick=1028}] on passengers run data modify entity @s item.tag.CustomModelData set value 20448 + execute if entity @s[scores={General.Mob.Tick=1028}] run playsound block.chest.close hostile @a ~ ~ ~ 1 0.9 0 + execute if entity @s[scores={General.Mob.Tick=1034}] on passengers run data modify entity @s item.tag.CustomModelData set value 20449 + execute if entity @s[scores={General.Mob.Tick=1034}] run playsound block.chest.open hostile @a ~ ~ ~ 1 0.9 0 + + execute if entity @s[scores={General.Mob.Tick=1039}] on passengers run data modify entity @s item.tag.CustomModelData set value 20448 + execute if entity @s[scores={General.Mob.Tick=1039}] run playsound block.chest.close hostile @a ~ ~ ~ 1 1.0 0 + execute if entity @s[scores={General.Mob.Tick=1044}] on passengers run data modify entity @s item.tag.CustomModelData set value 20449 + execute if entity @s[scores={General.Mob.Tick=1044}] run playsound block.chest.open hostile @a ~ ~ ~ 1 1.0 0 + + execute if entity @s[scores={General.Mob.Tick=1048}] on passengers run data modify entity @s item.tag.CustomModelData set value 20448 + execute if entity @s[scores={General.Mob.Tick=1048}] run playsound block.chest.close hostile @a ~ ~ ~ 1 1.1 0 + execute if entity @s[scores={General.Mob.Tick=1052}] on passengers run data modify entity @s item.tag.CustomModelData set value 20449 + execute if entity @s[scores={General.Mob.Tick=1052}] run playsound block.chest.open hostile @a ~ ~ ~ 1 1.1 0 + +# 爆発 + execute if entity @s[scores={General.Mob.Tick=1060..}] run function asset:mob/0374.gray_coffin/tick/penalty_explode diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/tick/summon.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/summon.mcfunction index b69c84bb84..a369222516 100644 --- a/Asset/data/asset/functions/mob/0374.gray_coffin/tick/summon.mcfunction +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/summon.mcfunction @@ -1,5 +1,30 @@ #> asset:mob/0374.gray_coffin/tick/summon # -# +# 怨霊弾を召喚する # -# @within function asset:mob/0374.gray_coffin/tick/ \ No newline at end of file +# @within function asset:mob/0374.gray_coffin/tick/open_and_close + +#> Private +# @private + #declare tag Target + +# ランダムなプレイヤーをターゲットとする + tag @r[gamemode=!spectator,distance=..50] add Target + +# プレイヤーの方を見る + tp @s ~ ~ ~ facing entity @p[tag=Target] eyes + +# 召喚 + data modify storage api: Argument.ID set value 2092 + data modify storage api: Argument.FieldOverride.StartDelay set value 50 + execute store result storage api: Argument.FieldOverride.TargetID int 1 run scoreboard players get @p[tag=Target] UserID + execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @e[type=polar_bear,tag=this,distance=..5,sort=nearest,limit=1] MobUUID + data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.Damage + data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + function api:object/summon + +# リセット + tag @p[tag=Target] remove Target + +# 消滅 + kill @s From a99d1563b974a3cee4f9e474fa7d73fe1094f5fd Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 18 Dec 2024 19:19:01 +0900 Subject: [PATCH 037/103] =?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 --- .../mob/0372.tutankhamen/_index.d.mcfunction | 8 ++++++- .../mob/0372.tutankhamen/death/.mcfunction | 6 ++++++ .../mob/0372.tutankhamen/init/.mcfunction | 15 ++++++++++++- .../mob/0372.tutankhamen/remove/.mcfunction | 6 ++++++ .../tick/skill/coffin/.mcfunction | 21 +++++++++++++++++++ .../tick/skill/coffin/summon.mcfunction | 12 +++++++++++ .../tick/skill_branch.mcfunction | 3 +++ .../tick/skill_select.mcfunction | 3 ++- 8 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/summon.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 75b6c8a80a..7695b3adc1 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -8,6 +8,9 @@ #declare tag AC.ManyShoot #declare tag AC.GiantSkull #declare tag AC.HyperLaser + #declare tag AC.Coffin + #declare tag AC.SpawnMarker + #declare tag AC.CoffinPoint #declare tag AC.AJ #declare tag AC.AJLink #declare tag AC.Opening @@ -43,7 +46,10 @@ #declare function animated_java:tutankhamen/animations/beam_long_charge/stop #declare function animated_java:tutankhamen/animations/beam_long_shot/play #declare function animated_java:tutankhamen/animations/beam_long_shot/stop - + #declare function animated_java:tutankhamen/animations/rod_ground/play + #declare function animated_java:tutankhamen/animations/rod_ground/stop + #declare function animated_java:tutankhamen/animations/rod_ground_end/play + #declare function animated_java:tutankhamen/animations/rod_ground_end/stop diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction index 2c8a5f9ac5..680af67fb4 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction @@ -7,6 +7,12 @@ # super.death呼び出し function asset:mob/super.death +# SpawnMarkerを削除 + kill @e[type=marker,tag=AC.SpawnMarker] + +# CoffinPointを削除 + kill @e[type=marker,tag=AC.CoffinPoint] + # デバッグ用としてAJを消す execute as @e[type=item_display,tag=AC.AJ,distance=..100,sort=nearest,limit=1] run function animated_java:tutankhamen/remove/this #execute as @e[type=item_display,tag=AC.AJ,distance=..100,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/death/play diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction index 50bd69d240..d58f18d793 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction @@ -7,8 +7,21 @@ # super.init呼び出し function asset:mob/super.init +# 召喚位置を記録するマーカーを召喚 + summon marker ~ ~ ~ {Tags:["AC.SpawnMarker"]} + +# 棺召喚位置用markerを召喚 + execute rotated ~0 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} + execute rotated ~45 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} + execute rotated ~90 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} + execute rotated ~135 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} + execute rotated ~180 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} + execute rotated ~225 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} + execute rotated ~270 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} + execute rotated ~315 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} + # AJ召喚 - execute rotated ~ 0 run function animated_java:tutankhamen/summon + execute rotated ~ 0 run function animated_java:tutankhamen/summon {args:{}} # tpさせる # AC.AJはAJリポジトリ側で召喚時に付与されている diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/remove/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/remove/.mcfunction index 3d7cbb24b7..63bfcf0347 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/remove/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/remove/.mcfunction @@ -7,5 +7,11 @@ # super.remove呼び出し function asset:mob/super.remove +# SpawnMarkerを削除 + kill @e[type=marker,tag=AC.SpawnMarker] + +# CoffinPointを削除 + kill @e[type=marker,tag=AC.CoffinPoint] + # AJ削除 execute at @s as @e[type=item_display,tag=AC.AJ,distance=..100,sort=nearest,limit=1] run function animated_java:tutankhamen/remove/this diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/.mcfunction new file mode 100644 index 0000000000..c556eb7268 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/.mcfunction @@ -0,0 +1,21 @@ +#> asset:mob/0372.tutankhamen/tick/skill/coffin/ +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill_branch + +# AJ + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/rod_ground/play + execute if entity @s[scores={General.Mob.Tick=34}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/rod_ground/stop + execute if entity @s[scores={General.Mob.Tick=34}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/rod_ground_end/play + +# 演出 + execute if entity @s[scores={General.Mob.Tick=29}] rotated ~ 0 positioned ^ ^0.2 ^0.4 run particle soul ~ ~ ~ 0 0 0 0.2 100 + execute if entity @s[scores={General.Mob.Tick=29}] rotated ~ 0 positioned ^ ^0.2 ^0.4 run particle soul ~ ~ ~ 0 0 0 0.4 100 + +# 棺召喚 + execute if entity @s[scores={General.Mob.Tick=30}] at @e[type=marker,tag=AC.SpawnMarker,distance=..100] run function asset:mob/0372.tutankhamen/tick/skill/coffin/summon + +# 共通リセット処理 + execute if entity @s[scores={General.Mob.Tick=67..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/summon.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/summon.mcfunction new file mode 100644 index 0000000000..f9ec88a71b --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/summon.mcfunction @@ -0,0 +1,12 @@ +#> asset:mob/0372.tutankhamen/tick/skill/coffin/summon +# +# 棺を召喚する +# +# @within function asset:mob/0372.tutankhamen/tick/skill/coffin/ + +# 配列を作成 + data modify storage asset:context this.CoffinPoints set value [0,1,2,3,4,5,6,7,8] + +# どこに棺がいるかチェックする +# 該当箇所に棺があれば対応する要素を配列から削除する + execute rotated ~ 0 positioned ^ ^ ^7 if entity @e[type=polar_bear,scores={MobID=373..374},distance=..0.01] run data remove storage asset:context this.CoffinPoints diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction index a2441f2c21..ab7dde8fa0 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction @@ -15,3 +15,6 @@ # ハイパーレーザー execute if entity @s[tag=AC.HyperLaser] run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ + +# 棺召喚 + execute if entity @s[tag=AC.Coffin] run function asset:mob/0372.tutankhamen/tick/skill/coffin/ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index dd5c91f7e2..b0f0a96c23 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -13,13 +13,14 @@ scoreboard players operation $Random Temporary %= $7 Const # デバッグのコマンド - scoreboard players set $Random Temporary 1 + scoreboard players set $Random Temporary 4 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser execute if score $Random Temporary matches 1 run tag @s add AC.ManyShoot execute if score $Random Temporary matches 2 run tag @s add AC.GiantSkull execute if score $Random Temporary matches 3 run tag @s add AC.HyperLaser + execute if score $Random Temporary matches 4 run tag @s add AC.Coffin # リセット scoreboard players reset $Random Temporary From 744f14a394a4581b498e9ede21995b01a1331ddc Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 18 Dec 2024 21:06:11 +0900 Subject: [PATCH 038/103] =?UTF-8?q?=E6=A3=BA=E5=8F=AC=E5=96=9A=E3=82=B9?= =?UTF-8?q?=E3=82=AD=E3=83=AB=E6=9A=AB=E5=AE=9A=E7=9A=84=E3=81=AB=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/init/.mcfunction | 16 +++++++-------- .../tick/skill/coffin/.mcfunction | 3 +++ .../tick/skill/coffin/summon.mcfunction | 20 +++++++++++++++---- .../mob/0374.gray_coffin/init/.mcfunction | 9 +++++++++ .../mob/0374.gray_coffin/summon/.m.mcfunction | 2 +- .../functions/mob/alias/374/init.mcfunction | 8 ++++++++ 6 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0374.gray_coffin/init/.mcfunction create mode 100644 Asset/data/asset/functions/mob/alias/374/init.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction index d58f18d793..a0f7f18718 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction @@ -11,14 +11,14 @@ summon marker ~ ~ ~ {Tags:["AC.SpawnMarker"]} # 棺召喚位置用markerを召喚 - execute rotated ~0 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} - execute rotated ~45 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} - execute rotated ~90 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} - execute rotated ~135 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} - execute rotated ~180 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} - execute rotated ~225 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} - execute rotated ~270 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} - execute rotated ~315 0 positioned ^ ^ ^7 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"]} + execute rotated ~0 0 positioned ^ ^ ^12 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"],Rotation:[180.0f,0.0f]} + execute rotated ~45 0 positioned ^ ^ ^12 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"],Rotation:[225.0f,0.0f]} + execute rotated ~90 0 positioned ^ ^ ^12 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"],Rotation:[270.0f,0.0f]} + execute rotated ~135 0 positioned ^ ^ ^12 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"],Rotation:[315.0f,0.0f]} + execute rotated ~180 0 positioned ^ ^ ^12 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"],Rotation:[0.0f,0.0f]} + execute rotated ~225 0 positioned ^ ^ ^12 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"],Rotation:[45.0f,0.0f]} + execute rotated ~270 0 positioned ^ ^ ^12 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"],Rotation:[90.0f,0.0f]} + execute rotated ~315 0 positioned ^ ^ ^12 run summon marker ~ ~ ~ {Tags:["AC.CoffinPoint"],Rotation:[135.0f,0.0f]} # AJ召喚 execute rotated ~ 0 run function animated_java:tutankhamen/summon {args:{}} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/.mcfunction index c556eb7268..4bab2477ce 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/.mcfunction @@ -15,7 +15,10 @@ execute if entity @s[scores={General.Mob.Tick=29}] rotated ~ 0 positioned ^ ^0.2 ^0.4 run particle soul ~ ~ ~ 0 0 0 0.4 100 # 棺召喚 +# 難易度比例で召喚数を変える execute if entity @s[scores={General.Mob.Tick=30}] at @e[type=marker,tag=AC.SpawnMarker,distance=..100] run function asset:mob/0372.tutankhamen/tick/skill/coffin/summon + execute if entity @s[scores={General.Mob.Tick=38}] if predicate api:global_vars/difficulty/min/normal at @e[type=marker,tag=AC.SpawnMarker,distance=..100] run function asset:mob/0372.tutankhamen/tick/skill/coffin/summon + execute if entity @s[scores={General.Mob.Tick=46}] if predicate api:global_vars/difficulty/min/hard at @e[type=marker,tag=AC.SpawnMarker,distance=..100] run function asset:mob/0372.tutankhamen/tick/skill/coffin/summon # 共通リセット処理 execute if entity @s[scores={General.Mob.Tick=67..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/summon.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/summon.mcfunction index f9ec88a71b..6975ff031a 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/summon.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/summon.mcfunction @@ -4,9 +4,21 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill/coffin/ -# 配列を作成 - data modify storage asset:context this.CoffinPoints set value [0,1,2,3,4,5,6,7,8] +#> Private +# @private + #declare tag Summoned + #declare tag TargetCoffin # どこに棺がいるかチェックする -# 該当箇所に棺があれば対応する要素を配列から削除する - execute rotated ~ 0 positioned ^ ^ ^7 if entity @e[type=polar_bear,scores={MobID=373..374},distance=..0.01] run data remove storage asset:context this.CoffinPoints +# 棺が召喚済みならSummonedをつける + execute as @e[type=marker,tag=AC.CoffinPoint,distance=..50] at @s if entity @e[type=polar_bear,scores={MobID=373..374},distance=..0.01] run tag @s add Summoned + +# Summonedではないランダムなmarkerの位置で棺を召喚 + tag @e[type=marker,tag=AC.CoffinPoint,tag=!Summoned,distance=..50,sort=random,limit=1] add TargetCoffin + data modify storage api: Argument.ID set value 374 + data modify storage api: Argument.FieldOverride.RotationX set from entity @e[type=marker,tag=TargetCoffin,distance=..50,limit=1] Rotation[0] + execute at @e[type=marker,tag=TargetCoffin,distance=..50,limit=1] run function api:mob/summon + +# Summonedを削除 + tag @e[type=marker,tag=AC.CoffinPoint,tag=Summoned,distance=..50] remove Summoned + tag @e[type=marker,tag=TargetCoffin,distance=..50] remove TargetCoffin diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/init/.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/init/.mcfunction new file mode 100644 index 0000000000..949b557b1f --- /dev/null +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/init/.mcfunction @@ -0,0 +1,9 @@ +#> asset:mob/0374.gray_coffin/init/ +# +# Mobのinit時の処理 +# +# @within asset:mob/alias/374/init + +# 演出 + particle soul ^ ^1 ^0.5 0.4 0.4 0.4 0.05 60 normal @a + particle soul ^ ^1 ^-0.5 0.4 0.4 0.4 0.05 60 normal @a diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.m.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.m.mcfunction index bbd7d6351e..426e505601 100644 --- a/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.m.mcfunction +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/summon/.m.mcfunction @@ -5,4 +5,4 @@ # @within function asset:mob/0374.gray_coffin/summon/ # 元となるEntityを召喚する - $summon polar_bear ~ ~ ~ {Rotation:[$(RotationX)f,0.0f],NoAI:1b,Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty",Passengers:[{id:"item_display",Tags:["AssetMob","AutoKillWhenDieVehicle"],item:{id:"stick",Count:1b,tag:{CustomModelData:20448}},transformation:{left_rotation:[-0.7071f,0f,0f,0.7071f],right_rotation:[0f,0f,0f,1f],translation:[0f,-0.7f,0.7f],scale:[1.35f,1.35f,1.35f]}}]} + $summon polar_bear ~ ~ ~ {Rotation:[$(RotationX)f,0.0f],NoAI:1b,Silent:1b,Tags:["MobInit","AlwaysInvisible"],DeathLootTable:"empty",Passengers:[{id:"item_display",Rotation:[$(RotationX)f,0.0f],Tags:["AssetMob","AutoKillWhenDieVehicle"],item:{id:"stick",Count:1b,tag:{CustomModelData:20448}},transformation:{left_rotation:[-0.7071f,0f,0f,0.7071f],right_rotation:[0f,0f,0f,1f],translation:[0f,-0.7f,0.7f],scale:[1.35f,1.35f,1.35f]}}]} diff --git a/Asset/data/asset/functions/mob/alias/374/init.mcfunction b/Asset/data/asset/functions/mob/alias/374/init.mcfunction new file mode 100644 index 0000000000..19ccc86f38 --- /dev/null +++ b/Asset/data/asset/functions/mob/alias/374/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/alias/374/init +# +# Init処理のエイリアス +# +# @within asset_manager:mob/triggers/init/init.m + +# 元のInit処理を呼び出す + function asset:mob/0374.gray_coffin/init/ \ No newline at end of file From a6e135122ed7b752122f937335027eb01ce2a0dd Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 18 Dec 2024 22:53:17 +0900 Subject: [PATCH 039/103] =?UTF-8?q?=E3=83=80=E3=83=83=E3=82=B7=E3=83=A5?= =?UTF-8?q?=E6=96=AC=E6=92=83=E3=82=B9=E3=82=AD=E3=83=AB=E3=81=AE=E7=94=9F?= =?UTF-8?q?=E6=88=90=E3=81=A0=E3=81=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/0372.tutankhamen/_index.d.mcfunction | 9 +++++++++ .../0372.tutankhamen/tick/skill/dash_slash/.mcfunction | 5 +++++ .../mob/0372.tutankhamen/tick/skill_select.mcfunction | 1 + 3 files changed, 15 insertions(+) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 7695b3adc1..19a7eebbc2 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -8,6 +8,7 @@ #declare tag AC.ManyShoot #declare tag AC.GiantSkull #declare tag AC.HyperLaser + #declare tag AC.DashSlash #declare tag AC.Coffin #declare tag AC.SpawnMarker #declare tag AC.CoffinPoint @@ -24,6 +25,7 @@ # #declare function animated_java:tutankhamen/summon #declare function animated_java:tutankhamen/remove/this + #declare function animated_java:tutankhamen/summon #declare function animated_java:tutankhamen/animations/neutral/play #declare function animated_java:tutankhamen/animations/neutral/stop #declare function animated_java:tutankhamen/animations/spawn/play @@ -50,6 +52,13 @@ #declare function animated_java:tutankhamen/animations/rod_ground/stop #declare function animated_java:tutankhamen/animations/rod_ground_end/play #declare function animated_java:tutankhamen/animations/rod_ground_end/stop + #declare function animated_java:tutankhamen/animations/dash/play + #declare function animated_java:tutankhamen/animations/dash/stop + #declare function animated_java:tutankhamen/animations/dash_slash/play + #declare function animated_java:tutankhamen/animations/dash_slash/stop + #declare function animated_java:tutankhamen/animations/dash_end/play + #declare function animated_java:tutankhamen/animations/dash_end/tween + #declare function animated_java:tutankhamen/animations/dash_end/stop diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction new file mode 100644 index 0000000000..6a1e88ef2c --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction @@ -0,0 +1,5 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash_slash/ +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill_branch \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index b0f0a96c23..4676b831e2 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -21,6 +21,7 @@ execute if score $Random Temporary matches 2 run tag @s add AC.GiantSkull execute if score $Random Temporary matches 3 run tag @s add AC.HyperLaser execute if score $Random Temporary matches 4 run tag @s add AC.Coffin + execute if score $Random Temporary matches 5 run tag @s add AC.DashSlash # リセット scoreboard players reset $Random Temporary From a807c31018c8b0e429e790363693c6ae970649d6 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:07:03 +0900 Subject: [PATCH 040/103] =?UTF-8?q?=E5=A4=9A=E6=96=B9=E5=90=91=E3=83=AC?= =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=83=BC=E9=80=94=E4=B8=AD=E3=81=BE=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/0372.tutankhamen/_index.d.mcfunction | 1 + .../0372.tutankhamen/tick/skill/many_laser/.mcfunction | 10 ++++++++++ .../tick/skill/many_laser/summon_square.mcfunction | 5 +++++ .../mob/0372.tutankhamen/tick/skill_select.mcfunction | 1 + 4 files changed, 17 insertions(+) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/summon_square.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 19a7eebbc2..fad0380789 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -10,6 +10,7 @@ #declare tag AC.HyperLaser #declare tag AC.DashSlash #declare tag AC.Coffin + #declare tag AC.ManyLaser #declare tag AC.SpawnMarker #declare tag AC.CoffinPoint #declare tag AC.AJ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/.mcfunction new file mode 100644 index 0000000000..b1d086b43c --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/.mcfunction @@ -0,0 +1,10 @@ +#> asset:mob/0372.tutankhamen/tick/skill/many_laser/ +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill_branch + +# AJの開始アニメーション + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_start/play + execute if entity @s[scores={General.Mob.Tick=11}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_wait/play diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/summon_square.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/summon_square.mcfunction new file mode 100644 index 0000000000..54514a7b40 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/summon_square.mcfunction @@ -0,0 +1,5 @@ +#> asset:mob/0372.tutankhamen/tick/skill/many_laser/summon_square +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/many_laser/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index 4676b831e2..fb4ec685c4 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -22,6 +22,7 @@ execute if score $Random Temporary matches 3 run tag @s add AC.HyperLaser execute if score $Random Temporary matches 4 run tag @s add AC.Coffin execute if score $Random Temporary matches 5 run tag @s add AC.DashSlash + execute if score $Random Temporary matches 6 run tag @s add AC.ManyLaser # リセット scoreboard players reset $Random Temporary From 162feaa3f272a7eee6293f6a5dc70c8ced12f872 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Thu, 19 Dec 2024 17:28:35 +0900 Subject: [PATCH 041/103] =?UTF-8?q?=E3=83=80=E3=83=83=E3=82=B7=E3=83=A5?= =?UTF-8?q?=E3=82=B9=E3=83=A9=E3=83=83=E3=82=B7=E3=83=A5=E3=82=92=E5=8B=95?= =?UTF-8?q?=E3=81=8D=E3=81=A0=E3=81=91=E5=AE=9F=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 4 ++++ .../tick/skill/dash_slash/.mcfunction | 21 +++++++++++++++++-- .../tick/skill/reset.mcfunction | 6 +----- .../tick/skill_branch.mcfunction | 3 +++ .../tick/skill_select.mcfunction | 2 +- 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index fad0380789..e624965fb7 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -9,6 +9,7 @@ #declare tag AC.GiantSkull #declare tag AC.HyperLaser #declare tag AC.DashSlash + #declare tag AC.DashSlash.IsNearPlayer #declare tag AC.Coffin #declare tag AC.ManyLaser #declare tag AC.SpawnMarker @@ -28,6 +29,7 @@ #declare function animated_java:tutankhamen/remove/this #declare function animated_java:tutankhamen/summon #declare function animated_java:tutankhamen/animations/neutral/play + #declare function animated_java:tutankhamen/animations/neutral/tween #declare function animated_java:tutankhamen/animations/neutral/stop #declare function animated_java:tutankhamen/animations/spawn/play #declare function animated_java:tutankhamen/animations/spawn/stop @@ -54,8 +56,10 @@ #declare function animated_java:tutankhamen/animations/rod_ground_end/play #declare function animated_java:tutankhamen/animations/rod_ground_end/stop #declare function animated_java:tutankhamen/animations/dash/play + #declare function animated_java:tutankhamen/animations/dash/tween #declare function animated_java:tutankhamen/animations/dash/stop #declare function animated_java:tutankhamen/animations/dash_slash/play + #declare function animated_java:tutankhamen/animations/dash_slash/tween #declare function animated_java:tutankhamen/animations/dash_slash/stop #declare function animated_java:tutankhamen/animations/dash_end/play #declare function animated_java:tutankhamen/animations/dash_end/tween diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction index 6a1e88ef2c..4c18ed657c 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction @@ -1,5 +1,22 @@ #> asset:mob/0372.tutankhamen/tick/skill/dash_slash/ # -# # -# @within function asset:mob/0372.tutankhamen/tick/skill_branch \ No newline at end of file +# +# @within function asset:mob/0372.tutankhamen/tick/skill_branch + +# AJ + execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 5} + execute if entity @s[scores={General.Mob.Tick=1001}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash_slash/tween {to_frame: 0, duration: 5} + +# プレイヤーの方へ誘導する + execute if entity @s[scores={General.Mob.Tick=..99}] facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s rotated ~ 0 run tp @s ^ ^ ^0.4 ~ ~ + execute if entity @s[scores={General.Mob.Tick=..99}] at @s run tp @e[type=item_display,tag=AC.AJLink,distance=..1,sort=nearest,limit=1] ~ ~ ~ ~ ~ + +# プレイヤーが近くに来たらスコアを変える + execute if entity @s[scores={General.Mob.Tick=..999}] at @s if entity @p[gamemode=!spectator,distance=..5] run scoreboard players set @s General.Mob.Tick 1000 + +# 斬撃アニメーション + +# 共通リセット処理 + execute if entity @s[scores={General.Mob.Tick=100..999}] run function asset:mob/0372.tutankhamen/tick/skill/reset + execute if entity @s[scores={General.Mob.Tick=1100..}] run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index 8f0059f131..ef05932cdf 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -8,11 +8,7 @@ scoreboard players set @s General.Mob.Tick -10 # アニメーションを元に戻す - execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/spawn/stop - execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/soul_shot/stop - execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_wait/stop - execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_shot/stop - execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/play + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/tween {to_frame: 0, duration: 5} # Tagを削除 tag @s remove AC.Opening diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction index ab7dde8fa0..64089cf6de 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction @@ -16,5 +16,8 @@ # ハイパーレーザー execute if entity @s[tag=AC.HyperLaser] run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ +# ダッシュスラッシュ + execute if entity @s[tag=AC.DashSlash] run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ + # 棺召喚 execute if entity @s[tag=AC.Coffin] run function asset:mob/0372.tutankhamen/tick/skill/coffin/ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index fb4ec685c4..7a6664d7bf 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -13,7 +13,7 @@ scoreboard players operation $Random Temporary %= $7 Const # デバッグのコマンド - scoreboard players set $Random Temporary 4 + scoreboard players set $Random Temporary 5 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser From 41356f5accf5783d87e8bff0a508e94643b940ba Mon Sep 17 00:00:00 2001 From: Chuzume Date: Tue, 24 Dec 2024 12:28:14 +0900 Subject: [PATCH 042/103] =?UTF-8?q?=E2=80=A6=E3=81=A8=E3=82=8A=E3=81=82?= =?UTF-8?q?=E3=81=88=E3=81=9A=E3=83=80=E3=83=83=E3=82=B7=E3=83=A5=E3=82=B9?= =?UTF-8?q?=E3=83=A9=E3=83=83=E3=82=B7=E3=83=A5=E3=81=AE=E8=A1=8C=E5=8B=95?= =?UTF-8?q?=E3=82=92=E4=BD=9C=E3=81=A3=E3=81=9F=E3=80=82=E3=83=80=E3=83=A1?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E5=88=A4=E5=AE=9A=E3=81=AE=E7=94=98=E3=81=95?= =?UTF-8?q?=E3=82=84=E9=81=BF=E3=81=91=E3=82=84=E3=81=99=E3=81=99=E3=81=8E?= =?UTF-8?q?=E3=82=8B=E7=82=B9=E3=81=AB=E9=96=A2=E3=81=97=E3=81=A6=E3=81=AF?= =?UTF-8?q?=E5=BE=8C=E3=81=BB=E3=81=A9=E8=AA=BF=E6=95=B4=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 5 +-- .../mob/0372.tutankhamen/tick/.mcfunction | 3 ++ .../tick/skill/dash_slash/.mcfunction | 34 +++++++++++++------ .../tick/skill/dash_slash/move.mcfunction | 20 +++++++++++ .../skill/dash_slash/slash/damage.mcfunction | 27 +++++++++++++++ .../skill/dash_slash/slash/windup.mcfunction | 16 +++++++++ .../dash_slash/slash/windup_2.mcfunction | 10 ++++++ .../tick/skill/dash_slash/start.mcfunction | 14 ++++++++ .../tick/skill/reset.mcfunction | 4 +++ 9 files changed, 120 insertions(+), 13 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/damage.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup_2.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/start.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index e624965fb7..8db3728dbc 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -25,6 +25,7 @@ #declare score_holder $Interval # # + #>Animated Java #declare function animated_java:tutankhamen/summon #declare function animated_java:tutankhamen/remove/this #declare function animated_java:tutankhamen/summon @@ -64,8 +65,8 @@ #declare function animated_java:tutankhamen/animations/dash_end/play #declare function animated_java:tutankhamen/animations/dash_end/tween #declare function animated_java:tutankhamen/animations/dash_end/stop - - + #declare function animated_java:tutankhamen/animations/attack_melee_1/tween + #declare function animated_java:tutankhamen/animations/attack_dash_1/tween diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction index 2d9e160bdd..c86b4858b4 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction @@ -10,6 +10,9 @@ # AJモデルとの紐づけ tag @e[type=item_display,tag=AC.AJ,distance=..0.01,sort=nearest,limit=1] add AC.AJLink +# モデルを追従？ + execute at @s run tp @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] ~ ~ ~ ~ ~ + # スキル選択 開幕は実行しない execute if entity @s[tag=!AC.Opening,scores={General.Mob.Tick=0}] run function asset:mob/0372.tutankhamen/tick/skill_select diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction index 4c18ed657c..ed007ff1a6 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction @@ -4,19 +4,31 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill_branch -# AJ - execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 5} - execute if entity @s[scores={General.Mob.Tick=1001}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash_slash/tween {to_frame: 0, duration: 5} +# ダッシュ開始 + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/start # プレイヤーの方へ誘導する - execute if entity @s[scores={General.Mob.Tick=..99}] facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s rotated ~ 0 run tp @s ^ ^ ^0.4 ~ ~ - execute if entity @s[scores={General.Mob.Tick=..99}] at @s run tp @e[type=item_display,tag=AC.AJLink,distance=..1,sort=nearest,limit=1] ~ ~ ~ ~ ~ + execute if score @s General.Mob.Tick matches ..99 run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/move -# プレイヤーが近くに来たらスコアを変える - execute if entity @s[scores={General.Mob.Tick=..999}] at @s if entity @p[gamemode=!spectator,distance=..5] run scoreboard players set @s General.Mob.Tick 1000 +# プレイヤーが前方の範囲にいたらスコアを変える + execute if score @s General.Mob.Tick matches ..99 at @s positioned ^ ^ ^2 if entity @p[gamemode=!spectator,distance=..4] run scoreboard players set @s General.Mob.Tick 100 -# 斬撃アニメーション +# 斬撃の構え + execute if score @s General.Mob.Tick matches 100 run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup -# 共通リセット処理 - execute if entity @s[scores={General.Mob.Tick=100..999}] run function asset:mob/0372.tutankhamen/tick/skill/reset - execute if entity @s[scores={General.Mob.Tick=1100..}] run function asset:mob/0372.tutankhamen/tick/skill/reset +# 構えその2 + execute if score @s General.Mob.Tick matches 115 run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup_2 + +# そして斬撃のダメージ + execute if score @s General.Mob.Tick matches 118 run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/slash/damage + +# ニュートラルに戻る + execute if score @s General.Mob.Tick matches 140 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/tween {to_frame: 0, duration: 5} + execute if score @s General.Mob.Tick matches 140 run tp @s ~ ~ ~ ~ 0 +# ウソ慣性 + execute if score @s General.Mob.Tick matches 100..105 run tp @s ^ ^ ^0.5 + execute if score @s General.Mob.Tick matches 106 run tp @s ^ ^ ^0.3 + execute if score @s General.Mob.Tick matches 107..110 run tp @s ^ ^ ^0.1 + +# リセット + execute if score @s General.Mob.Tick matches 150.. run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction new file mode 100644 index 0000000000..7671dc3041 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction @@ -0,0 +1,20 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash_slash/move +# +# 移動処理 +# +# @within function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ + +#> インターバルのスコアホルダー +# @private + #declare score_holder $Interval + +# ホーミング + execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ ~ + +# 実行時間を移す + scoreboard players operation $Interval Temporary = @s General.Mob.Tick + +# 数Tickごとにサウンド + scoreboard players operation $Interval Temporary %= $2 Const + execute if score $Interval Temporary matches 0 run playsound minecraft:entity.breeze.slide hostile @a ~ ~ ~ 2 1.5 + scoreboard players reset $Interval Temporary diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/damage.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/damage.mcfunction new file mode 100644 index 0000000000..f116eeabde --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/damage.mcfunction @@ -0,0 +1,27 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash_slash/slash/damage +# +# 発動、ってかダメージ部分 +# +# @within function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ + +# 演出 + playsound minecraft:entity.witch.throw player @a ~ ~ ~ 1.5 0.7 + playsound minecraft:item.trident.throw player @a ~ ~ ~ 1.5 0.7 + playsound minecraft:item.axe.scrape player @a ~ ~ ~ 1 1.0 + +# 斬撃オブジェクトを出す + data modify storage api: Argument.FieldOverride set value {Item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:0}}},Color:16760576,Frames:[20353,20354,20355],Scale:[7f,7f,0.1f],Transformation:{left_rotation:[0.478f,0.521f,0.596f,-0.38f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f]}} + data modify storage api: Argument.ID set value 2001 + execute rotated ~ ~ positioned ~ ~1.5 ~ positioned ^ ^ ^1.5 run function api:object/summon + +# ダメージ判定 + data modify storage api: Argument.Damage set value 45f +# 属性 + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "None" +# 補正functionを実行 + function api:damage/modifier +# 対象 + execute positioned ^ ^ ^1.5 as @p[tag=!PlayerShouldInvulnerable,distance=..3] run function api:damage/ +# リセット + function api:damage/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup.mcfunction new file mode 100644 index 0000000000..1cec41f1c2 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup.mcfunction @@ -0,0 +1,16 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup +# +# 斬撃前には構えるものだ +# +# @within function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ + +# アニメ + execute as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_dash_1/tween {to_frame: 0, duration: 5} + +# プレイヤーのほうを向く + execute facing entity @p[distance=..16] feet run tp @s ~ ~ ~ ~ ~ + +# 演出 + playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 1 1 + playsound minecraft:block.grindstone.use hostile @a ~ ~ ~ 1 1.5 + playsound minecraft:item.trident.return hostile @a ~ ~ ~ 1 2 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup_2.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup_2.mcfunction new file mode 100644 index 0000000000..1eda482855 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup_2.mcfunction @@ -0,0 +1,10 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup_2 +# +# 予告その2 +# +# @within function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ + +# 演出 + playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 1 2 + playsound minecraft:block.grindstone.use hostile @a ~ ~ ~ 1 2 + playsound minecraft:item.trident.return hostile @a ~ ~ ~ 1 2 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/start.mcfunction new file mode 100644 index 0000000000..0bb124ff75 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/start.mcfunction @@ -0,0 +1,14 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash_slash/start +# +# ダッシュ開始 +# +# @within function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ + +# アニメ開始 + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 1} + +# 演出 +# playsound minecraft:entity.wither.shoot hostile @a ~ ~ ~ 1 2 + playsound minecraft:entity.breeze.wind_burst hostile @a ~ ~ ~ 2 0.5 + particle minecraft:crit ~ ~ ~ 0 0 0 1 25 + particle minecraft:poof ~ ~ ~ 0 0 0 0.3 50 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index ef05932cdf..5abeb204f7 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -14,4 +14,8 @@ tag @s remove AC.Opening tag @s remove AC.Laser tag @s remove AC.ManyShoot + tag @s remove AC.GiantSkull tag @s remove AC.HyperLaser + tag @s remove AC.Coffin + tag @s remove AC.DashSlash + tag @s remove AC.ManyLaser From 3f4a8c449bc53049e83f52fb1cd62f12f34386b1 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Tue, 24 Dec 2024 13:08:14 +0900 Subject: [PATCH 043/103] =?UTF-8?q?=E5=9C=B0=E5=BD=A2=E5=9F=8B=E3=81=BE?= =?UTF-8?q?=E3=82=8A=E5=AF=BE=E7=AD=96=E3=81=8C=E3=81=A7=E3=81=8D=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=81=AE=E3=81=A7=E3=80=81=E3=81=A8=E3=82=8A=E3=81=82?= =?UTF-8?q?=E3=81=88=E3=81=9A=E3=83=80=E3=83=83=E3=82=B7=E3=83=A5=E3=82=B9?= =?UTF-8?q?=E3=83=A9=E3=83=83=E3=82=B7=E3=83=A5=E3=81=A7=E4=B8=8A=E4=B8=8B?= =?UTF-8?q?=E3=81=AE=E3=82=A8=E3=82=A4=E3=83=A0=E3=82=92=E8=A1=8C=E3=82=8F?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E3=81=AA=E3=81=A3?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction | 2 +- .../tick/skill/dash_slash/slash/windup.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction index 7671dc3041..d63956eef2 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction @@ -9,7 +9,7 @@ #declare score_holder $Interval # ホーミング - execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ ~ + execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ 0 # 実行時間を移す scoreboard players operation $Interval Temporary = @s General.Mob.Tick diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup.mcfunction index 1cec41f1c2..4ad2113709 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup.mcfunction @@ -8,7 +8,7 @@ execute as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_dash_1/tween {to_frame: 0, duration: 5} # プレイヤーのほうを向く - execute facing entity @p[distance=..16] feet run tp @s ~ ~ ~ ~ ~ + execute facing entity @p[distance=..16] feet run tp @s ~ ~ ~ ~ 0 # 演出 playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 1 1 From 084710cf14db8d23d505952ad4c39c2fd06d57f4 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Tue, 24 Dec 2024 13:08:28 +0900 Subject: [PATCH 044/103] =?UTF-8?q?=E3=80=8C=E6=94=BB=E6=92=83=E5=88=A4?= =?UTF-8?q?=E5=AE=9A=E4=BB=98=E3=81=8D=E3=81=AE=E7=A7=BB=E5=8B=95=E3=80=8D?= =?UTF-8?q?=E3=81=A7=E3=81=82=E3=82=8B=E7=AA=81=E9=80=B2=E6=94=BB=E6=92=83?= =?UTF-8?q?=E3=82=92=E4=BD=9C=E3=81=A3=E3=81=A6=E3=81=BF=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 12 ++++-- .../mob/0372.tutankhamen/register.mcfunction | 2 +- .../tick/skill/charge/.mcfunction | 37 +++++++++++++++++++ .../tick/skill/charge/backstep.mcfunction | 14 +++++++ .../tick/skill/charge/move.mcfunction | 37 +++++++++++++++++++ .../tick/skill/charge/start.mcfunction | 15 ++++++++ .../tick/skill/reset.mcfunction | 1 + .../tick/skill_branch.mcfunction | 3 ++ .../tick/skill_select.mcfunction | 3 +- 9 files changed, 118 insertions(+), 6 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/backstep.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/start.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 8db3728dbc..9cfac82278 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -3,17 +3,21 @@ #> tag # @within function asset:mob/0372.tutankhamen/** +#>スキルリスト #declare tag AC.Laser - #declare tag AC.LaserDisplay #declare tag AC.ManyShoot #declare tag AC.GiantSkull #declare tag AC.HyperLaser #declare tag AC.DashSlash #declare tag AC.DashSlash.IsNearPlayer - #declare tag AC.Coffin #declare tag AC.ManyLaser - #declare tag AC.SpawnMarker + #declare tag AC.Charge + +#>その他タグ + #declare tag AC.LaserDisplay + #declare tag AC.Coffin #declare tag AC.CoffinPoint + #declare tag AC.SpawnMarker #declare tag AC.AJ #declare tag AC.AJLink #declare tag AC.Opening @@ -25,7 +29,7 @@ #declare score_holder $Interval # # - #>Animated Java +#>Animated Java #declare function animated_java:tutankhamen/summon #declare function animated_java:tutankhamen/remove/this #declare function animated_java:tutankhamen/summon diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction index 22f9ed515b..9e1d67e602 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction @@ -41,7 +41,7 @@ # 防具ドロップ率 ([float, float]) (オプション) # data modify storage asset:mob ArmorDropChances set value # 体力 (double) (オプション) - data modify storage asset:mob Health set value 1 + data modify storage asset:mob Health set value 100 # 攻撃力 (double) (オプション) # data modify storage asset:mob AttackDamage set value # 防御力 (double) (オプション) // 被ダメージがある程度大きい場合1ptにつき0.8%カット、小さい場合1ptにつき約4%カット 20pt以上は頭打ち diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/.mcfunction new file mode 100644 index 0000000000..a579389683 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/.mcfunction @@ -0,0 +1,37 @@ +#> asset:mob/0372.tutankhamen/tick/skill/charge/ +# +# 「チャージ」と言っても力を溜めることではなく、突進のことである +# +# @within function asset:mob/0372.tutankhamen/tick/skill_branch + +# バックステップアニメ + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/charge/backstep + +# 後ろに下がる + execute if score @s General.Mob.Tick matches 0..5 run tp @s ^ ^ ^-0.5 + execute if score @s General.Mob.Tick matches 6..10 run tp @s ^ ^ ^-0.3 + execute if score @s General.Mob.Tick matches 11..15 run tp @s ^ ^ ^-0.1 + +# 突進開始アニメ + execute if score @s General.Mob.Tick matches 15 run function asset:mob/0372.tutankhamen/tick/skill/charge/start + +# 突進 + execute if score @s General.Mob.Tick matches 15..30 run function asset:mob/0372.tutankhamen/tick/skill/charge/move + +# ブレーキ + execute if score @s General.Mob.Tick matches 30 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash_end/tween {to_frame: 0, duration: 5} + +# ウソ慣性 + execute if score @s General.Mob.Tick matches 30..40 run tp @s ^ ^ ^0.5 + execute if score @s General.Mob.Tick matches 40..45 run tp @s ^ ^ ^0.3 + execute if score @s General.Mob.Tick matches 45..50 run tp @s ^ ^ ^0.1 + +# 終わり際のパーティクル + execute if score @s General.Mob.Tick matches 30..50 run particle dust 0 0.318 0.318 1 ~ ~1 ~ 0.5 0.5 0.5 0 10 + +# ニュートラルに戻る + execute if score @s General.Mob.Tick matches 50 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/tween {to_frame: 0, duration: 5} + execute if score @s General.Mob.Tick matches 50 run tp @s ~ ~ ~ ~ 0 + +# リセット + execute if score @s General.Mob.Tick matches 90.. run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/backstep.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/backstep.mcfunction new file mode 100644 index 0000000000..5cde3c77a1 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/backstep.mcfunction @@ -0,0 +1,14 @@ +#> asset:mob/0372.tutankhamen/tick/skill/charge/backstep +# +# バックステップ +# +# @within function asset:mob/0372.tutankhamen/tick/skill/charge/ + +# プレイヤーのほうを向く + execute facing entity @p[distance=..64] feet run tp @s ~ ~ ~ ~ 0 + +# アニメ開始 + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash_end/tween {to_frame: 3, duration: 3} + +# 演出 + playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 1 1 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction new file mode 100644 index 0000000000..ad117c0bb6 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction @@ -0,0 +1,37 @@ +#> asset:mob/0372.tutankhamen/tick/skill/charge/move +# +# 高速突進とダメージ +# +# @within function asset:mob/0372.tutankhamen/tick/skill/charge/ + +#> インターバルのスコアホルダー +# @private + #declare score_holder $Interval + +# 弱ホーミングダッシュ + execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-80 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1.5 ~ ~ + +# 実行時間を移す + scoreboard players operation $Interval Temporary = @s General.Mob.Tick + +# 数Tickごとにサウンド + scoreboard players operation $Interval Temporary %= $2 Const + execute if score $Interval Temporary matches 0 run playsound minecraft:entity.breeze.slide hostile @a ~ ~ ~ 2 1.5 + execute if score $Interval Temporary matches 0 run playsound minecraft:entity.blaze.shoot hostile @a ~ ~ ~ 0.5 0.5 + scoreboard players reset $Interval Temporary + +# パーティクル + particle soul_fire_flame ~ ~1 ~ 0.2 0.2 0.2 0.05 10 + particle dust 0 1 1 2 ~ ~1 ~ 0.5 0.5 0.5 0 10 + +# ダメージ判定 + data modify storage api: Argument.Damage set value 20f +# 属性 + data modify storage api: Argument.AttackType set value "Physical" + data modify storage api: Argument.ElementType set value "Fire" +# 補正functionを実行 + function api:damage/modifier +# 対象 + execute as @p[tag=!PlayerShouldInvulnerable,distance=..1] run function api:damage/ +# リセット + function api:damage/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/start.mcfunction new file mode 100644 index 0000000000..94cb7f5117 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/start.mcfunction @@ -0,0 +1,15 @@ +#> asset:mob/0372.tutankhamen/tick/skill/charge/start +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/charge/ + +# アニメ開始 + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 1} + +# 演出 + playsound ogg:mob.blaze.breathe2 hostile @a ~ ~ ~ 2 1 + playsound minecraft:entity.breeze.wind_burst hostile @a ~ ~ ~ 2 1 + playsound minecraft:entity.breeze.death hostile @a ~ ~ ~ 2 0.5 + particle minecraft:crit ~ ~ ~ 0 0 0 1 25 + particle minecraft:poof ~ ~ ~ 0 0 0 0.3 50 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index 5abeb204f7..f3542c23f6 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -19,3 +19,4 @@ tag @s remove AC.Coffin tag @s remove AC.DashSlash tag @s remove AC.ManyLaser + tag @s remove AC.Charge diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction index 64089cf6de..3f6222d48a 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction @@ -19,5 +19,8 @@ # ダッシュスラッシュ execute if entity @s[tag=AC.DashSlash] run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ +# ファラオ・ぶちかまし + execute if entity @s[tag=AC.Charge] run function asset:mob/0372.tutankhamen/tick/skill/charge/ + # 棺召喚 execute if entity @s[tag=AC.Coffin] run function asset:mob/0372.tutankhamen/tick/skill/coffin/ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index 7a6664d7bf..70775aa739 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -13,7 +13,7 @@ scoreboard players operation $Random Temporary %= $7 Const # デバッグのコマンド - scoreboard players set $Random Temporary 5 + scoreboard players set $Random Temporary 7 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser @@ -23,6 +23,7 @@ execute if score $Random Temporary matches 4 run tag @s add AC.Coffin execute if score $Random Temporary matches 5 run tag @s add AC.DashSlash execute if score $Random Temporary matches 6 run tag @s add AC.ManyLaser + execute if score $Random Temporary matches 7 run tag @s add AC.Charge # リセット scoreboard players reset $Random Temporary From 30a0399adc5c04739dfeada17987198dc10aea2d Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 03:24:56 +0900 Subject: [PATCH 045/103] =?UTF-8?q?=E7=AA=81=E9=80=B2=E6=94=BB=E6=92=83?= =?UTF-8?q?=E3=81=AE=E3=82=A2=E3=83=8B=E3=83=A1=E3=82=92=E3=81=B8=E3=82=93?= =?UTF-8?q?=E3=81=93=E3=81=86=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/0372.tutankhamen/_index.d.mcfunction | 10 +++------- .../0372.tutankhamen/tick/skill/charge/move.mcfunction | 2 ++ .../tick/skill/charge/start.mcfunction | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 9cfac82278..a6fad9b698 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -71,10 +71,6 @@ #declare function animated_java:tutankhamen/animations/dash_end/stop #declare function animated_java:tutankhamen/animations/attack_melee_1/tween #declare function animated_java:tutankhamen/animations/attack_dash_1/tween - - - - - - -# + #declare function animated_java:tutankhamen/animations/attack_dash_2/tween + #declare tag AC.ModelLocator.Body + #declare tag AC.ModelLocator.Weapon diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction index ad117c0bb6..d969608c5d 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction @@ -18,11 +18,13 @@ scoreboard players operation $Interval Temporary %= $2 Const execute if score $Interval Temporary matches 0 run playsound minecraft:entity.breeze.slide hostile @a ~ ~ ~ 2 1.5 execute if score $Interval Temporary matches 0 run playsound minecraft:entity.blaze.shoot hostile @a ~ ~ ~ 0.5 0.5 + execute if score $Interval Temporary matches 0 run playsound minecraft:entity.witch.throw hostile @a ~ ~ ~ 1 0.5 scoreboard players reset $Interval Temporary # パーティクル particle soul_fire_flame ~ ~1 ~ 0.2 0.2 0.2 0.05 10 particle dust 0 1 1 2 ~ ~1 ~ 0.5 0.5 0.5 0 10 + execute at @e[type=marker,tag=AC.ModelLocator.Weapon,distance=..16,limit=1] run particle dust 1 1 0 2 ~ ~1 ~ 0.1 0.1 0.1 0 5 # ダメージ判定 data modify storage api: Argument.Damage set value 20f diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/start.mcfunction index 94cb7f5117..fe00a3be90 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/start.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/start.mcfunction @@ -5,7 +5,7 @@ # @within function asset:mob/0372.tutankhamen/tick/skill/charge/ # アニメ開始 - execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 1} + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_dash_2/tween {to_frame: 0, duration: 1} # 演出 playsound ogg:mob.blaze.breathe2 hostile @a ~ ~ ~ 2 1 From c0bbb435ea51d9a6ccd11f6e574b84d8fc5c87dd Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 03:54:41 +0900 Subject: [PATCH 046/103] =?UTF-8?q?=E3=83=84=E3=82=BF=E3=83=B3=E3=82=AB?= =?UTF-8?q?=E3=83=BC=E3=83=A1=E3=83=B3=E3=81=AE=E6=AD=BB=E4=BA=A1=E6=BC=94?= =?UTF-8?q?=E5=87=BA=E3=82=92=E4=BD=9C=E3=81=A3=E3=81=A6=E3=81=8A=E3=81=84?= =?UTF-8?q?=E3=81=9F=E3=80=82=E6=A3=BA=E3=81=AF=E2=80=A6=E3=81=AA=E3=81=8F?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=84=E3=81=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/death/.mcfunction | 4 ++++ .../_index.d.mcfunction | 8 +++++++ .../2093.tutankhamen_death/init/.mcfunction | 12 ++++++++++ .../register.mcfunction | 20 +++++++++++++++++ .../2093.tutankhamen_death/summon/.mcfunction | 11 ++++++++++ .../summon/m.mcfunction | 8 +++++++ .../2093.tutankhamen_death/tick/.mcfunction | 22 +++++++++++++++++++ .../tick/end.mcfunction | 17 ++++++++++++++ .../object/alias/2093/init.mcfunction | 8 +++++++ .../object/alias/2093/register.mcfunction | 8 +++++++ .../object/alias/2093/summon.mcfunction | 8 +++++++ .../object/alias/2093/tick.mcfunction | 8 +++++++ 12 files changed, 134 insertions(+) create mode 100644 Asset/data/asset/functions/object/2093.tutankhamen_death/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/2093.tutankhamen_death/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/2093.tutankhamen_death/register.mcfunction create mode 100644 Asset/data/asset/functions/object/2093.tutankhamen_death/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/2093.tutankhamen_death/summon/m.mcfunction create mode 100644 Asset/data/asset/functions/object/2093.tutankhamen_death/tick/.mcfunction create mode 100644 Asset/data/asset/functions/object/2093.tutankhamen_death/tick/end.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2093/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2093/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2093/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2093/tick.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction index 680af67fb4..9b9a2f102e 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction @@ -16,3 +16,7 @@ # デバッグ用としてAJを消す execute as @e[type=item_display,tag=AC.AJ,distance=..100,sort=nearest,limit=1] run function animated_java:tutankhamen/remove/this #execute as @e[type=item_display,tag=AC.AJ,distance=..100,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/death/play + +# 撃破演出用オブジェクトを召喚 + data modify storage api: Argument.ID set value 2093 + execute facing entity @p[distance=..64] eyes run function api:object/summon diff --git a/Asset/data/asset/functions/object/2093.tutankhamen_death/_index.d.mcfunction b/Asset/data/asset/functions/object/2093.tutankhamen_death/_index.d.mcfunction new file mode 100644 index 0000000000..f2e88721be --- /dev/null +++ b/Asset/data/asset/functions/object/2093.tutankhamen_death/_index.d.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2093.tutankhamen_death/_index.d +# +# +# +# @within function asset:object/2093.tutankhamen_death/tick/ + #declare tag AC.ModelLocator.Body + #declare tag AC.ModelLocator.Weapon + #declare function animated_java:tutankhamen/remove/this diff --git a/Asset/data/asset/functions/object/2093.tutankhamen_death/init/.mcfunction b/Asset/data/asset/functions/object/2093.tutankhamen_death/init/.mcfunction new file mode 100644 index 0000000000..51aac69def --- /dev/null +++ b/Asset/data/asset/functions/object/2093.tutankhamen_death/init/.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/2093.tutankhamen_death/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2093/init + +# Animated Javaのリグを召喚する + execute at @s rotated ~ 0 run function animated_java:tutankhamen/summon {args: {animation: 'death', start_animation: true}} + +# 演出 + playsound minecraft:entity.wither_skeleton.death hostile @a ~ ~ ~ 1 0.8 + playsound minecraft:entity.breeze.idle_ground hostile @a ~ ~ ~ 1 0.5 diff --git a/Asset/data/asset/functions/object/2093.tutankhamen_death/register.mcfunction b/Asset/data/asset/functions/object/2093.tutankhamen_death/register.mcfunction new file mode 100644 index 0000000000..0299ccca8b --- /dev/null +++ b/Asset/data/asset/functions/object/2093.tutankhamen_death/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2093.tutankhamen_death/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2093/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 2093 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2093.tutankhamen_death/summon/.mcfunction b/Asset/data/asset/functions/object/2093.tutankhamen_death/summon/.mcfunction new file mode 100644 index 0000000000..2234974bac --- /dev/null +++ b/Asset/data/asset/functions/object/2093.tutankhamen_death/summon/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/2093.tutankhamen_death/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2093/summon + +# 元となるEntityを召喚する + execute as 0-0-0-0-0 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/2093.tutankhamen_death/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/2093.tutankhamen_death/summon/m.mcfunction b/Asset/data/asset/functions/object/2093.tutankhamen_death/summon/m.mcfunction new file mode 100644 index 0000000000..f1b436852d --- /dev/null +++ b/Asset/data/asset/functions/object/2093.tutankhamen_death/summon/m.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2093.tutankhamen_death/summon/m +# +# +# +# @within function asset:object/2093.tutankhamen_death/summon/ + +# 元となるEntityを召喚する + $summon marker ~ ~ ~ {Rotation:$(Rotation),Tags:["ObjectInit"]} diff --git a/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/.mcfunction b/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/.mcfunction new file mode 100644 index 0000000000..6c4417135e --- /dev/null +++ b/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/.mcfunction @@ -0,0 +1,22 @@ +#> asset:object/2093.tutankhamen_death/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2093/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# パーティクル + execute at @e[type=marker,tag=AC.ModelLocator.Body,distance=..8,limit=1] run particle minecraft:ash ~ ~ ~ 0.2 0.2 0.2 0 5 + execute at @e[type=marker,tag=AC.ModelLocator.Body,distance=..8,limit=1] run particle smoke ~ ~ ~ 0.2 0.5 0.2 0.01 1 + execute if score @s General.Object.Tick matches ..42 if predicate lib:random_pass_per/50 run particle soul ~ ~1 ~ 0.2 0.5 0.2 0.01 1 + +# サウンド + execute if score @s General.Object.Tick matches 25 run playsound minecraft:entity.item.break hostile @a ~ ~ ~ 1 1.0 + execute if score @s General.Object.Tick matches 33 run playsound minecraft:entity.item.break hostile @a ~ ~ ~ 1 1.5 + execute if score @s General.Object.Tick matches 42 run playsound minecraft:entity.breeze.inhale hostile @a ~ ~ ~ 1 0.5 + execute if score @s General.Object.Tick matches 80 run playsound minecraft:entity.breeze.inhale hostile @a ~ ~ ~ 1 0.7 + +# 消失 + execute if score @s General.Object.Tick matches 110 run function asset:object/2093.tutankhamen_death/tick/end diff --git a/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/end.mcfunction b/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/end.mcfunction new file mode 100644 index 0000000000..c2c3bbe29d --- /dev/null +++ b/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/end.mcfunction @@ -0,0 +1,17 @@ +#> asset:object/2093.tutankhamen_death/tick/end +# +# +# +# @within function asset:object/2093.tutankhamen_death/tick/ + +# パーティクル + execute at @e[type=marker,tag=AC.ModelLocator.Body,distance=..8,limit=1] run particle minecraft:large_smoke ~ ~ ~ 1 0.1 1 0.05 50 + +# サウンド + playsound minecraft:entity.breeze.death hostile @a ~ ~ ~ 1 1.5 + +# モデルを消す + execute as @e[type=item_display,tag=AC.AJ,distance=..8,limit=1] run function animated_java:tutankhamen/remove/this + +# 消失 + kill @s diff --git a/Asset/data/asset/functions/object/alias/2093/init.mcfunction b/Asset/data/asset/functions/object/alias/2093/init.mcfunction new file mode 100644 index 0000000000..e76ee534db --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2093/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2093/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/2093.tutankhamen_death/init/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2093/register.mcfunction b/Asset/data/asset/functions/object/alias/2093/register.mcfunction new file mode 100644 index 0000000000..57f50457cd --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2093/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2093/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2093.tutankhamen_death/register \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2093/summon.mcfunction b/Asset/data/asset/functions/object/alias/2093/summon.mcfunction new file mode 100644 index 0000000000..84c6fa749f --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2093/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2093/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2093.tutankhamen_death/summon/ \ No newline at end of file diff --git a/Asset/data/asset/functions/object/alias/2093/tick.mcfunction b/Asset/data/asset/functions/object/alias/2093/tick.mcfunction new file mode 100644 index 0000000000..d40c8a93ae --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2093/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2093/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2093.tutankhamen_death/tick/ \ No newline at end of file From 379e2378675a0b16860d2a53bea01f2e441dbae5 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 05:23:28 +0900 Subject: [PATCH 047/103] =?UTF-8?q?=E3=83=80=E3=83=83=E3=82=B7=E3=83=A5?= =?UTF-8?q?=E5=8B=95=E4=BD=9C=E3=82=92=E4=BD=9C=E3=81=A3=E3=81=9F=E3=80=82?= =?UTF-8?q?=E3=82=B9=E3=82=AD=E3=83=AB=E9=81=B8=E6=8A=9E=E5=89=8D=E3=81=AB?= =?UTF-8?q?=E5=8B=95=E3=81=8D=E5=9B=9E=E3=82=8B=E3=81=9E=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 10 ++++-- .../mob/0372.tutankhamen/init/.mcfunction | 1 + .../mob/0372.tutankhamen/load.mcfunction | 1 + .../mob/0372.tutankhamen/tick/.mcfunction | 5 ++- .../tick/dash_select.mcfunction | 34 +++++++++++++++++++ .../tick/skill/charge/.mcfunction | 2 +- .../tick/skill/charge/move.mcfunction | 2 +- .../tick/skill/dash/side/.mcfunction | 31 +++++++++++++++++ .../tick/skill/dash/side/move.mcfunction | 20 +++++++++++ .../tick/skill/dash/side/start.mcfunction | 13 +++++++ .../tick/skill/dash_slash/.mcfunction | 2 +- .../tick/skill/dash_slash/move.mcfunction | 2 +- .../tick/skill/reset.mcfunction | 8 +++++ .../tick/skill_branch.mcfunction | 14 ++++---- .../tick/skill_select.mcfunction | 18 +++++----- 15 files changed, 142 insertions(+), 21 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/dash_select.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index a6fad9b698..01078c1912 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -12,8 +12,15 @@ #declare tag AC.DashSlash.IsNearPlayer #declare tag AC.ManyLaser #declare tag AC.Charge - +#> ダッシュリスト + #declare tag AC.Dash.Left + #declare tag AC.Dash.Right + #declare tag AC.Dash.Side + #declare tag AC.Dash.Slash + #declare tag AC.Dash.Charge #>その他タグ + #declare tag AC.InAction + #declare tag AC.DashUsed #declare tag AC.LaserDisplay #declare tag AC.Coffin #declare tag AC.CoffinPoint @@ -28,7 +35,6 @@ #declare score_holder $Random #declare score_holder $Interval # - # #>Animated Java #declare function animated_java:tutankhamen/summon #declare function animated_java:tutankhamen/remove/this diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction index a0f7f18718..05781fc7e0 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/init/.mcfunction @@ -29,6 +29,7 @@ # スコア初期化 scoreboard players set @s General.Mob.Tick -1 + scoreboard players set @s AC.Count.Dash 0 # 召喚モーション用Tagを自身に付与 tag @s add AC.Opening diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction index db91536bf5..bbbcb47d48 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/load.mcfunction @@ -7,3 +7,4 @@ #> 定義類はここに # @within function asset:mob/0372.tutankhamen/** scoreboard objectives add AC.TargetID dummy + scoreboard objectives add AC.Count.Dash dummy diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction index c86b4858b4..783c6b9df5 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction @@ -14,7 +14,10 @@ execute at @s run tp @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] ~ ~ ~ ~ ~ # スキル選択 開幕は実行しない - execute if entity @s[tag=!AC.Opening,scores={General.Mob.Tick=0}] run function asset:mob/0372.tutankhamen/tick/skill_select + execute if entity @s[tag=AC.DashUsed,tag=!AC.InAction,tag=!AC.Opening,scores={General.Mob.Tick=0}] run function asset:mob/0372.tutankhamen/tick/skill_select + +# ダッシュ選択 開幕は実行しないし、スキル中も使用しない + execute if entity @s[tag=!AC.InAction,tag=!AC.Opening,scores={General.Mob.Tick=0,AC.Count.Dash=0}] run function asset:mob/0372.tutankhamen/tick/dash_select # スキル実行 execute if entity @s[scores={General.Mob.Tick=0..}] run function asset:mob/0372.tutankhamen/tick/skill_branch diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/dash_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/dash_select.mcfunction new file mode 100644 index 0000000000..09fb20d26c --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/dash_select.mcfunction @@ -0,0 +1,34 @@ +#> asset:mob/0372.tutankhamen/tick/dash_select +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/ + +#> private +# @private + #declare score_holder $Random + +# 行動中扱いにする + tag @s add AC.InAction + +# ダッシュ使ったことにする + tag @s add AC.DashUsed + +# 乱数によるスキル選択 + data modify storage lib: Args.key set value "0372.Skill" + data modify storage lib: Args.max set value 4 + data modify storage lib: Args.scarcity_history_size set value 3 + execute store result score $Random Temporary run function lib:random/with_biased/manual.m with storage lib: Args + +# デバッグのコマンド +# scoreboard players set $Random Temporary 2 + +# スキル選択 + execute if score $Random Temporary matches 0..1 run tag @s add AC.Dash.Side + execute if score $Random Temporary matches 0 run tag @s add AC.Dash.Left + execute if score $Random Temporary matches 1 run tag @s add AC.Dash.Right + execute if score $Random Temporary matches 2 run tag @s add AC.Dash.Slash + execute if score $Random Temporary matches 3 run tag @s add AC.Dash.Charge + +# リセット + scoreboard players reset $Random Temporary diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/.mcfunction index a579389683..c8e8453949 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/.mcfunction @@ -34,4 +34,4 @@ execute if score @s General.Mob.Tick matches 50 run tp @s ~ ~ ~ ~ 0 # リセット - execute if score @s General.Mob.Tick matches 90.. run function asset:mob/0372.tutankhamen/tick/skill/reset + execute if score @s General.Mob.Tick matches 50.. run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction index d969608c5d..319e5ffe97 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction @@ -9,7 +9,7 @@ #declare score_holder $Interval # 弱ホーミングダッシュ - execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-80 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1.5 ~ ~ + execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-80 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1.5 ~ 0 # 実行時間を移す scoreboard players operation $Interval Temporary = @s General.Mob.Tick diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction new file mode 100644 index 0000000000..3a194d7ba5 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction @@ -0,0 +1,31 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash/side/ +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill_branch + +# ダッシュ開始 + execute if score @s[tag=AC.Dash.Left] General.Mob.Tick matches 0 run tp @s ~ ~ ~ ~-90 0 + execute if score @s[tag=AC.Dash.Right] General.Mob.Tick matches 0 run tp @s ~ ~ ~ ~90 0 + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/side/start + +# プレイヤーの方へ誘導する + execute if score @s General.Mob.Tick matches ..15 run function asset:mob/0372.tutankhamen/tick/skill/dash/side/move + +# ブレーキ + execute if score @s General.Mob.Tick matches 15 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash_end/tween {to_frame: 0, duration: 5} + +# ブレーキかけつつプレイヤーの方を向く + execute if score @s General.Mob.Tick matches 15..30 facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^ ~ 0 + +# ウソ慣性 + execute if score @s General.Mob.Tick matches 15..20 run tp @s ^ ^ ^0.5 + execute if score @s General.Mob.Tick matches 20..25 run tp @s ^ ^ ^0.3 + execute if score @s General.Mob.Tick matches 25..30 run tp @s ^ ^ ^0.1 + +# ニュートラルに戻る + execute if score @s General.Mob.Tick matches 30 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/tween {to_frame: 0, duration: 5} + execute if score @s General.Mob.Tick matches 30 run tp @s ~ ~ ~ ~ 0 + +# リセット + execute if score @s General.Mob.Tick matches 30.. run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction new file mode 100644 index 0000000000..d68e91e8a1 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction @@ -0,0 +1,20 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash/side/move +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/side/ + +#> インターバルのスコアホルダー +# @private + #declare score_holder $Interval + +# 横に移動 + execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-150 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ 0 + +# 実行時間を移す + scoreboard players operation $Interval Temporary = @s General.Mob.Tick + +# 数Tickごとにサウンド + scoreboard players operation $Interval Temporary %= $2 Const + execute if score $Interval Temporary matches 0 run playsound minecraft:entity.breeze.slide hostile @a ~ ~ ~ 2 1.5 + scoreboard players reset $Interval Temporary diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction new file mode 100644 index 0000000000..3170942d6c --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction @@ -0,0 +1,13 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash/side/start +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/side/ + +# アニメ開始 + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 1} + +# 演出 + playsound minecraft:entity.breeze.wind_burst hostile @a ~ ~ ~ 2 0.5 + particle minecraft:crit ~ ~ ~ 0 0 0 1 25 + particle minecraft:poof ~ ~ ~ 0 0 0 0.3 50 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction index ed007ff1a6..02945e4751 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction @@ -31,4 +31,4 @@ execute if score @s General.Mob.Tick matches 107..110 run tp @s ^ ^ ^0.1 # リセット - execute if score @s General.Mob.Tick matches 150.. run function asset:mob/0372.tutankhamen/tick/skill/reset + execute if score @s General.Mob.Tick matches 140.. run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction index d63956eef2..874d6bfe7a 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction @@ -9,7 +9,7 @@ #declare score_holder $Interval # ホーミング - execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ 0 + execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ 0 run tp @s ^ ^ ^1 ~ 0 # 実行時間を移す scoreboard players operation $Interval Temporary = @s General.Mob.Tick diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index f3542c23f6..2d84886909 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -20,3 +20,11 @@ tag @s remove AC.DashSlash tag @s remove AC.ManyLaser tag @s remove AC.Charge + + tag @s remove AC.Dash.Left + tag @s remove AC.Dash.Right + tag @s remove AC.Dash.Side + tag @s remove AC.Dash.Slash + tag @s remove AC.Dash.Charge + + tag @s remove AC.InAction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction index 3f6222d48a..a4a6688575 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction @@ -16,11 +16,13 @@ # ハイパーレーザー execute if entity @s[tag=AC.HyperLaser] run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ -# ダッシュスラッシュ - execute if entity @s[tag=AC.DashSlash] run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ - -# ファラオ・ぶちかまし - execute if entity @s[tag=AC.Charge] run function asset:mob/0372.tutankhamen/tick/skill/charge/ - # 棺召喚 execute if entity @s[tag=AC.Coffin] run function asset:mob/0372.tutankhamen/tick/skill/coffin/ + +# ダッシュ + # サイドダッシュ + execute if entity @s[tag=AC.Dash.Side] run function asset:mob/0372.tutankhamen/tick/skill/dash/side/ + # ダッシュスラッシュ + execute if entity @s[tag=AC.Dash.Slash] run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ + # ファラオ・ぶちかまし + execute if entity @s[tag=AC.Dash.Charge] run function asset:mob/0372.tutankhamen/tick/skill/charge/ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index 70775aa739..4eb03e5130 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -8,22 +8,24 @@ # @private #declare score_holder $Random +# 行動中扱いにする + tag @s add AC.InAction + # 乱数取得 execute store result score $Random Temporary run function lib:random/ - scoreboard players operation $Random Temporary %= $7 Const + scoreboard players operation $Random Temporary %= $3 Const # デバッグのコマンド - scoreboard players set $Random Temporary 7 +# scoreboard players set $Random Temporary 0 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser execute if score $Random Temporary matches 1 run tag @s add AC.ManyShoot - execute if score $Random Temporary matches 2 run tag @s add AC.GiantSkull - execute if score $Random Temporary matches 3 run tag @s add AC.HyperLaser - execute if score $Random Temporary matches 4 run tag @s add AC.Coffin - execute if score $Random Temporary matches 5 run tag @s add AC.DashSlash - execute if score $Random Temporary matches 6 run tag @s add AC.ManyLaser - execute if score $Random Temporary matches 7 run tag @s add AC.Charge + execute if score $Random Temporary matches 2 run tag @s add AC.HyperLaser + execute if score $Random Temporary matches 3 run tag @s add AC.Coffin + execute if score $Random Temporary matches 4 run tag @s add AC.ManyLaser + execute if score $Random Temporary matches 5 run tag @s add AC.GiantSkull # リセット scoreboard players reset $Random Temporary + tag @s remove AC.DashUsed From 47c1313e46e0d19e0ce4c39731ee0762d88c098c Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 06:27:27 +0900 Subject: [PATCH 048/103] =?UTF-8?q?=E3=83=80=E3=83=83=E3=82=B7=E3=83=A5?= =?UTF-8?q?=E5=8B=95=E4=BD=9C=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/mob/0372.tutankhamen/_index.d.mcfunction | 4 ++++ .../mob/0372.tutankhamen/tick/dash_select.mcfunction | 4 ++-- .../tick/skill/dash/side/move.mcfunction | 2 +- .../mob/0372.tutankhamen/tick/skill_select.mcfunction | 10 ++++++---- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 01078c1912..a2733c4db7 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -58,6 +58,7 @@ #declare function animated_java:tutankhamen/animations/soul_shot/stop #declare function animated_java:tutankhamen/animations/beam_long/play #declare function animated_java:tutankhamen/animations/beam_long/stop + #declare function animated_java:tutankhamen/animations/beam_long/tween #declare function animated_java:tutankhamen/animations/beam_long_charge/play #declare function animated_java:tutankhamen/animations/beam_long_charge/stop #declare function animated_java:tutankhamen/animations/beam_long_shot/play @@ -78,5 +79,8 @@ #declare function animated_java:tutankhamen/animations/attack_melee_1/tween #declare function animated_java:tutankhamen/animations/attack_dash_1/tween #declare function animated_java:tutankhamen/animations/attack_dash_2/tween + #declare function animated_java:tutankhamen/animations/attack_laser_windup/tween + #declare function animated_java:tutankhamen/animations/attack_laser_loop/tween + #declare function animated_java:tutankhamen/animations/attack_laser_end/tween #declare tag AC.ModelLocator.Body #declare tag AC.ModelLocator.Weapon diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/dash_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/dash_select.mcfunction index 09fb20d26c..a9d8b2df97 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/dash_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/dash_select.mcfunction @@ -15,13 +15,13 @@ tag @s add AC.DashUsed # 乱数によるスキル選択 - data modify storage lib: Args.key set value "0372.Skill" + data modify storage lib: Args.key set value "0372.Dash" data modify storage lib: Args.max set value 4 data modify storage lib: Args.scarcity_history_size set value 3 execute store result score $Random Temporary run function lib:random/with_biased/manual.m with storage lib: Args # デバッグのコマンド -# scoreboard players set $Random Temporary 2 + scoreboard players set $Random Temporary 0 # スキル選択 execute if score $Random Temporary matches 0..1 run tag @s add AC.Dash.Side diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction index d68e91e8a1..dda8083eea 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction @@ -9,7 +9,7 @@ #declare score_holder $Interval # 横に移動 - execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-150 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ 0 + execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-150 facing entity @s feet positioned as @s rotated ~ 0 run tp @s ^ ^ ^1 ~ ~ # 実行時間を移す scoreboard players operation $Interval Temporary = @s General.Mob.Tick diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index 4eb03e5130..a1ebb8f863 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -11,12 +11,14 @@ # 行動中扱いにする tag @s add AC.InAction -# 乱数取得 - execute store result score $Random Temporary run function lib:random/ - scoreboard players operation $Random Temporary %= $3 Const +# 乱数によるスキル選択 + data modify storage lib: Args.key set value "0372.Skill" + data modify storage lib: Args.max set value 4 + data modify storage lib: Args.scarcity_history_size set value 3 + execute store result score $Random Temporary run function lib:random/with_biased/manual.m with storage lib: Args # デバッグのコマンド -# scoreboard players set $Random Temporary 0 + scoreboard players set $Random Temporary 2 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser From f0d189dcd3260dd954e9d4b94827c8fb28a76c6c Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 08:56:08 +0900 Subject: [PATCH 049/103] =?UTF-8?q?=E3=83=98=E3=83=AB=E3=82=B9=E5=8D=8A?= =?UTF-8?q?=E6=B8=9B=E6=99=82=E3=81=AE=E5=8B=95=E4=BD=9C=E3=82=92=E4=BD=9C?= =?UTF-8?q?=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 5 ++++ .../mob/0372.tutankhamen/hurt/.mcfunction | 16 +++++++++++++ .../hurt/active_50per.mcfunction | 23 +++++++++++++++++++ .../tick/phase_transition/.mcfunction | 14 +++++++++++ .../tick/phase_transition/restart.mcfunction | 16 +++++++++++++ 5 files changed, 74 insertions(+) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/hurt/active_50per.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/phase_transition/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/phase_transition/restart.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index a2733c4db7..9b4a2eb86a 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -18,6 +18,10 @@ #declare tag AC.Dash.Side #declare tag AC.Dash.Slash #declare tag AC.Dash.Charge +#> 状態タグ + #declare tag AC.Health.50Per +#> 動作タグ + #declare tag AC.Moveset.Transition #>その他タグ #declare tag AC.InAction #declare tag AC.DashUsed @@ -82,5 +86,6 @@ #declare function animated_java:tutankhamen/animations/attack_laser_windup/tween #declare function animated_java:tutankhamen/animations/attack_laser_loop/tween #declare function animated_java:tutankhamen/animations/attack_laser_end/tween + #declare function animated_java:tutankhamen/animations/damage/tween #declare tag AC.ModelLocator.Body #declare tag AC.ModelLocator.Weapon diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/.mcfunction index ba197b6e33..af87280bb8 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/.mcfunction @@ -4,5 +4,21 @@ # # @within function asset:mob/alias/372/hurt +#>ヘルス割合用のスコアホルダー +# @private + #declare score_holder $HealthPercent + +# HP割合を取得 + function api:mob/get_health_percent + +# 代入する + execute store result score $HealthPercent Temporary run data get storage api: Return.HealthPer 100 + +# HP50%以下時 + execute if entity @s[tag=!AC.Health.50Per] if score $HealthPercent Temporary matches ..50 run function asset:mob/0372.tutankhamen/hurt/active_50per + +# リセット + scoreboard players reset $HealthPercent Temporary + # super.hurt呼び出し function asset:mob/super.hurt diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/active_50per.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/active_50per.mcfunction new file mode 100644 index 0000000000..1cd9f7d6c1 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/hurt/active_50per.mcfunction @@ -0,0 +1,23 @@ +#> asset:mob/0372.tutankhamen/hurt/active_50per +# +# +# +# @within function asset:mob/0372.tutankhamen/hurt/ + +# フェイズ移行動作を実行 + tag @s add AC.Moveset.Transition + +# 無敵になる + data modify entity @s Invulnerable set value 1b + tag @s add Uninterferable + +# サウンド + playsound minecraft:entity.blaze.hurt hostile @a ~ ~ ~ 1.5 0.5 + playsound minecraft:entity.wither_skeleton.death hostile @a ~ ~ ~ 1.5 1.5 + playsound minecraft:entity.player.breath hostile @a ~ ~ ~ 1.5 0.8 + +# 全動作強制リセット + function asset:mob/0372.tutankhamen/tick/skill/reset + +# スコアリセット + scoreboard players set @s General.Mob.Tick -1 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/phase_transition/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/phase_transition/.mcfunction new file mode 100644 index 0000000000..15bee91c81 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/phase_transition/.mcfunction @@ -0,0 +1,14 @@ +#> asset:mob/0372.tutankhamen/tick/phase_transition/ +# +# フェイズ移行動作 +# +# @within function asset:mob/0372.tutankhamen/tick/ + +# のけぞる + execute if score @s General.Mob.Tick matches 0 as @e[type=item_display,tag=AC.AJ,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/damage/tween {duration:1, to_frame:0} + +# 立て直すまで煙を吹く + execute if score @s General.Mob.Tick matches 0..50 run particle large_smoke ~ ~1.5 ~ 0.1 0.1 0.1 0.1 2 + +# 行動再開 + execute if score @s General.Mob.Tick matches 65 run function asset:mob/0372.tutankhamen/tick/phase_transition/restart diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/phase_transition/restart.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/phase_transition/restart.mcfunction new file mode 100644 index 0000000000..3c008f03d6 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/phase_transition/restart.mcfunction @@ -0,0 +1,16 @@ +#> asset:mob/0372.tutankhamen/tick/phase_transition/restart +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/phase_transition/ + +# ベース動作を実行 + tag @s remove AC.Moveset.Transition + tag @s add AC.Health.50Per + +# スコアリセット + scoreboard players set @s General.Mob.Tick -20 + +# 無敵解除 + data modify entity @s Invulnerable set value 0b + tag @s remove Uninterferable From 118670175c576f964ab0ab9111a6fc833905705d Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 08:56:19 +0900 Subject: [PATCH 050/103] =?UTF-8?q?=E6=9C=AC=E6=B0=97=E6=99=82=E3=81=AE?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AF=E5=A4=9A=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/hyper_laser/.mcfunction | 40 +++++++------------ .../hyper_laser/summon_square.mcfunction | 7 +++- .../tick/skill/hyper_laser/windup.mcfunction | 8 ++++ 3 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction index 9e4bc3a26a..abc167b4a6 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction @@ -4,36 +4,26 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill_branch -# AJ -# 構え開始(21tick) - execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop - execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long/play +# 構え開始 + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/windup -# 構えループ(1ループ17tick) - execute if entity @s[scores={General.Mob.Tick=21}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_charge/play +# プレイヤーの方を向く + execute if score @s General.Mob.Tick matches 0..20 facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-40 facing entity @s feet positioned as @s rotated ~ 0 run tp @s ^ ^ ^ ~ ~ + +# ビームループ + execute if score @s General.Mob.Tick matches 26 as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_loop/tween {to_frame:0, duration:1} # 前方に魔法陣を召喚 - execute if entity @s[scores={General.Mob.Tick=14}] anchored eyes positioned ^ ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square - execute if entity @s[scores={General.Mob.Tick=24}] anchored eyes positioned ^7 ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square - execute if entity @s[scores={General.Mob.Tick=24}] anchored eyes positioned ^-7 ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + execute if score @s General.Mob.Tick matches 20 anchored eyes positioned ^ ^-0.5 ^2.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + execute if score @s General.Mob.Tick matches 25 anchored eyes positioned ^7 ^-0.5 ^2.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + execute if score @s General.Mob.Tick matches 25 anchored eyes positioned ^-7 ^-0.5 ^2.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + execute if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 30 anchored eyes positioned ^14 ^-0.5 ^2.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + execute if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 30 anchored eyes positioned ^-14 ^-0.5 ^2.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + execute if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 35 anchored eyes positioned ^21 ^-0.5 ^2.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square + execute if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 35 anchored eyes positioned ^-21 ^-0.5 ^2.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square # 発射モーション(32tick) - execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_charge/stop - execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_long_shot/play - -# 発射 - #execute if entity @s[scores={General.Mob.Tick=55}] anchored eyes positioned ^ ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot - #execute if entity @s[scores={General.Mob.Tick=55}] anchored eyes positioned ^7 ^-0.4 ^2.6 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot + execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_end/tween {to_frame:0, duration:1} # 共通リセット処理 execute if entity @s[scores={General.Mob.Tick=87..}] run function asset:mob/0372.tutankhamen/tick/skill/reset - - - - - - - - - -# diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square.mcfunction index 906bdea4e7..846af0d717 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square.mcfunction @@ -4,7 +4,10 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ -# - data modify storage api: Argument.ID set value 2091 +# データ指定 + execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID data modify storage api: Argument.FieldOverride.Rotation set from entity @s Rotation + +# 召喚 + data modify storage api: Argument.ID set value 2091 function api:object/summon diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction new file mode 100644 index 0000000000..91cefb2402 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/0372.tutankhamen/tick/skill/hyper_laser/windup +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ + +# アニメ再生 + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_windup/tween {to_frame:0, duration:10} From 9d6b59df39faa79f82206b66aace2770789ddf25 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 08:57:19 +0900 Subject: [PATCH 051/103] =?UTF-8?q?=E3=82=AA=E3=83=90=E3=82=B1=E5=BC=BE?= =?UTF-8?q?=E3=81=AE=E5=8F=AC=E5=96=9A=E5=87=A6=E7=90=86=E3=82=92=E3=81=84?= =?UTF-8?q?=E3=81=98=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/2092.ghost_bullet/summon/.mcfunction | 5 ++++- .../2092.ghost_bullet/summon/{.m.mcfunction => m.mcfunction} | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) rename Asset/data/asset/functions/object/2092.ghost_bullet/summon/{.m.mcfunction => m.mcfunction} (89%) diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.mcfunction index 572e933e41..937a724712 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.mcfunction @@ -5,4 +5,7 @@ # @within asset:object/alias/2092/summon # 元となるEntityを召喚する - function asset:object/2092.ghost_bullet/summon/.m with storage asset:context this + execute as 0-0-0-0-0 positioned as @s run tp @s ~ ~ ~ ~ ~ + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + function asset:object/2092.ghost_bullet/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.m.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/m.mcfunction similarity index 89% rename from Asset/data/asset/functions/object/2092.ghost_bullet/summon/.m.mcfunction rename to Asset/data/asset/functions/object/2092.ghost_bullet/summon/m.mcfunction index 693812ffd5..a9a7f7391e 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/summon/.m.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/summon/m.mcfunction @@ -1,4 +1,4 @@ -#> asset:object/2092.ghost_bullet/summon/.m +#> asset:object/2092.ghost_bullet/summon/m # # # From b22bd3d2cafc5b65ca3092189147e9e8516ef460 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 11:17:55 +0900 Subject: [PATCH 052/103] =?UTF-8?q?=E3=83=80=E3=83=83=E3=82=B7=E3=83=A5?= =?UTF-8?q?=E3=81=AE=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88=E3=83=AA?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/{ => dash}/charge/.mcfunction | 14 +++++++------- .../skill/{ => dash}/charge/backstep.mcfunction | 4 ++-- .../skill/{ => dash}/charge/move.mcfunction | 6 +++--- .../skill/{ => dash}/charge/start.mcfunction | 4 ++-- .../skill/{ => dash}/dash_slash/.mcfunction | 12 ++++++------ .../skill/{ => dash}/dash_slash/move.mcfunction | 6 +++--- .../dash_slash/slash/damage.mcfunction | 4 ++-- .../dash_slash/slash/windup.mcfunction | 6 +++--- .../dash_slash/slash/windup_2.mcfunction | 4 ++-- .../{ => dash}/dash_slash/start.mcfunction | 4 ++-- .../tick/skill/dash/side/.mcfunction | 10 +++++++--- .../tick/skill/dash/side/move.mcfunction | 10 +++------- .../tick/skill/dash/side/shoot/.mcfunction | 17 +++++++++++++++++ .../skill/dash/side/shoot/summon.mcfunction | 16 ++++++++++++++++ .../tick/skill/dash/side/start.mcfunction | 4 ++-- .../tick/skill/reset.mcfunction | 7 +++---- 16 files changed, 80 insertions(+), 48 deletions(-) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/{ => dash}/charge/.mcfunction (75%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/{ => dash}/charge/backstep.mcfunction (75%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/{ => dash}/charge/move.mcfunction (89%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/{ => dash}/charge/start.mcfunction (79%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/{ => dash}/dash_slash/.mcfunction (77%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/{ => dash}/dash_slash/move.mcfunction (59%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/{ => dash}/dash_slash/slash/damage.mcfunction (88%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/{ => dash}/dash_slash/slash/windup.mcfunction (77%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/{ => dash}/dash_slash/slash/windup_2.mcfunction (58%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/{ => dash}/dash_slash/start.mcfunction (75%) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/summon.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/.mcfunction similarity index 75% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/.mcfunction index c8e8453949..8cb28f7636 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/.mcfunction @@ -1,22 +1,22 @@ -#> asset:mob/0372.tutankhamen/tick/skill/charge/ +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/ # # 「チャージ」と言っても力を溜めることではなく、突進のことである # # @within function asset:mob/0372.tutankhamen/tick/skill_branch # バックステップアニメ - execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/charge/backstep + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/backstep # 後ろに下がる - execute if score @s General.Mob.Tick matches 0..5 run tp @s ^ ^ ^-0.5 - execute if score @s General.Mob.Tick matches 6..10 run tp @s ^ ^ ^-0.3 - execute if score @s General.Mob.Tick matches 11..15 run tp @s ^ ^ ^-0.1 + execute if score @s General.Mob.Tick matches 0..5 rotated ~ 0 run tp @s ^ ^ ^-0.5 + execute if score @s General.Mob.Tick matches 6..10 rotated ~ 0 run tp @s ^ ^ ^-0.3 + execute if score @s General.Mob.Tick matches 11..15 rotated ~ 0 run tp @s ^ ^ ^-0.1 # 突進開始アニメ - execute if score @s General.Mob.Tick matches 15 run function asset:mob/0372.tutankhamen/tick/skill/charge/start + execute if score @s General.Mob.Tick matches 15 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/start # 突進 - execute if score @s General.Mob.Tick matches 15..30 run function asset:mob/0372.tutankhamen/tick/skill/charge/move + execute if score @s General.Mob.Tick matches 15..30 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/move # ブレーキ execute if score @s General.Mob.Tick matches 30 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash_end/tween {to_frame: 0, duration: 5} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/backstep.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/backstep.mcfunction similarity index 75% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/backstep.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/backstep.mcfunction index 5cde3c77a1..5752ede1eb 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/backstep.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/backstep.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0372.tutankhamen/tick/skill/charge/backstep +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/backstep # # バックステップ # -# @within function asset:mob/0372.tutankhamen/tick/skill/charge/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/ # プレイヤーのほうを向く execute facing entity @p[distance=..64] feet run tp @s ~ ~ ~ ~ 0 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction similarity index 89% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction index 319e5ffe97..d4b3d0b779 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction @@ -1,15 +1,15 @@ -#> asset:mob/0372.tutankhamen/tick/skill/charge/move +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/move # # 高速突進とダメージ # -# @within function asset:mob/0372.tutankhamen/tick/skill/charge/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/ #> インターバルのスコアホルダー # @private #declare score_holder $Interval # 弱ホーミングダッシュ - execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-80 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1.5 ~ 0 + execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-80 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1.5 ~ ~ # 実行時間を移す scoreboard players operation $Interval Temporary = @s General.Mob.Tick diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/start.mcfunction similarity index 79% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/start.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/start.mcfunction index fe00a3be90..41a843328a 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/charge/start.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/start.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0372.tutankhamen/tick/skill/charge/start +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/start # # # -# @within function asset:mob/0372.tutankhamen/tick/skill/charge/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/ # アニメ開始 execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_dash_2/tween {to_frame: 0, duration: 1} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction similarity index 77% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction index 02945e4751..cc1bd515fd 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction @@ -1,26 +1,26 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash_slash/ +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash/ # # # # @within function asset:mob/0372.tutankhamen/tick/skill_branch # ダッシュ開始 - execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/start + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash/start # プレイヤーの方へ誘導する - execute if score @s General.Mob.Tick matches ..99 run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/move + execute if score @s General.Mob.Tick matches ..99 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash/move # プレイヤーが前方の範囲にいたらスコアを変える execute if score @s General.Mob.Tick matches ..99 at @s positioned ^ ^ ^2 if entity @p[gamemode=!spectator,distance=..4] run scoreboard players set @s General.Mob.Tick 100 # 斬撃の構え - execute if score @s General.Mob.Tick matches 100 run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup + execute if score @s General.Mob.Tick matches 100 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash/slash/windup # 構えその2 - execute if score @s General.Mob.Tick matches 115 run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup_2 + execute if score @s General.Mob.Tick matches 115 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash/slash/windup_2 # そして斬撃のダメージ - execute if score @s General.Mob.Tick matches 118 run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/slash/damage + execute if score @s General.Mob.Tick matches 118 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash/slash/damage # ニュートラルに戻る execute if score @s General.Mob.Tick matches 140 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/tween {to_frame: 0, duration: 5} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction similarity index 59% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction index 874d6bfe7a..44a4f0df09 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction @@ -1,15 +1,15 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash_slash/move +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slashmove # # 移動処理 # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash #> インターバルのスコアホルダー # @private #declare score_holder $Interval # ホーミング - execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ 0 run tp @s ^ ^ ^1 ~ 0 + execute facing entity @p[gamemode=!spectator,distance=..64] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ ~ # 実行時間を移す scoreboard players operation $Interval Temporary = @s General.Mob.Tick diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/damage.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction similarity index 88% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/damage.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction index f116eeabde..31ac317ef9 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/damage.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash_slash/slash/damage +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slashslash/damage # # 発動、ってかダメージ部分 # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash # 演出 playsound minecraft:entity.witch.throw player @a ~ ~ ~ 1.5 0.7 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction similarity index 77% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction index 4ad2113709..b8ffb49919 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction @@ -1,14 +1,14 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slashslash/windup # # 斬撃前には構えるものだ # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash # アニメ execute as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_dash_1/tween {to_frame: 0, duration: 5} # プレイヤーのほうを向く - execute facing entity @p[distance=..16] feet run tp @s ~ ~ ~ ~ 0 + execute facing entity @p[distance=..16] feet run tp @s ~ ~ ~ ~ ~ # 演出 playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 1 1 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup_2.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction similarity index 58% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup_2.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction index 1eda482855..27fa679773 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup_2.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash_slash/slash/windup_2 +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slashslash/windup_2 # # 予告その2 # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash # 演出 playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 1 2 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction similarity index 75% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/start.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction index 0bb124ff75..6c0091fcca 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash_slash/start.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash_slash/start +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slashstart # # ダッシュ開始 # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash # アニメ開始 execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 1} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction index 3a194d7ba5..c98aa657bf 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction @@ -1,16 +1,20 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/side/ +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/ # # # # @within function asset:mob/0372.tutankhamen/tick/skill_branch + # ダッシュ開始 execute if score @s[tag=AC.Dash.Left] General.Mob.Tick matches 0 run tp @s ~ ~ ~ ~-90 0 execute if score @s[tag=AC.Dash.Right] General.Mob.Tick matches 0 run tp @s ~ ~ ~ ~90 0 - execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/side/start + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/start + +# ヘルス半減時はダッシュしながら弾を撒いてくる + execute if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 0..15 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/shoot/ # プレイヤーの方へ誘導する - execute if score @s General.Mob.Tick matches ..15 run function asset:mob/0372.tutankhamen/tick/skill/dash/side/move + execute if score @s General.Mob.Tick matches ..15 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/move # ブレーキ execute if score @s General.Mob.Tick matches 15 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash_end/tween {to_frame: 0, duration: 5} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction index dda8083eea..89102663f3 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction @@ -1,15 +1,11 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/side/move +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/move # # # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/side/ - -#> インターバルのスコアホルダー -# @private - #declare score_holder $Interval +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/ # 横に移動 - execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-150 facing entity @s feet positioned as @s rotated ~ 0 run tp @s ^ ^ ^1 ~ ~ + execute facing entity @p[gamemode=!spectator,distance=..64] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-150 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ ~ # 実行時間を移す scoreboard players operation $Interval Temporary = @s General.Mob.Tick diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/.mcfunction new file mode 100644 index 0000000000..864bc6d821 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/.mcfunction @@ -0,0 +1,17 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/shoot/ +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/ + +#> 攻撃のインターバルのスコアホルダー +# @private + #declare score_holder $AttackInterval + +# 実行時間を移す + scoreboard players operation $AttackInterval Temporary = @s General.Mob.Tick + +# 数Tickごとにサウンド + scoreboard players operation $AttackInterval Temporary %= $2 Const + execute if score $AttackInterval Temporary matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/shoot/summon + scoreboard players reset $AttackInterval Temporary diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/summon.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/summon.mcfunction new file mode 100644 index 0000000000..fde8466a3a --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/summon.mcfunction @@ -0,0 +1,16 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/shoot/summon +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/shoot/ + +# データ設定 + execute store result storage api: Argument.FieldOverride.Damage int 1 run data get storage asset:context this.Damage.ManyShoot + data modify storage api: Argument.FieldOverride.StartDelay set value 40 + execute store result storage api: Argument.FieldOverride.MobUUID int 1 run scoreboard players get @s MobUUID + execute store result storage api: Argument.FieldOverride.TargetID int 1 run scoreboard players get @r[distance=..64] UserID + +# 召喚 + data modify storage api: Argument.ID set value 2092 + execute positioned ~ ~2 ~ run function api:object/summon + execute positioned ~ ~2 ~ run particle soul_fire_flame ~ ~ ~ 0.1 0.1 0.1 0.05 10 force @a[distance=..32] diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction index 3170942d6c..15329483d9 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/side/start +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/start # # # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/side/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/ # アニメ開始 execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 1} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index 2d84886909..a7ce44be6d 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -2,14 +2,13 @@ # # # -# @within function asset:mob/0372.tutankhamen/tick/skill/** +# @within function +# asset:mob/0372.tutankhamen/tick/skill/** +# asset:mob/0372.tutankhamen/hurt/active_50per # スコアをセット scoreboard players set @s General.Mob.Tick -10 -# アニメーションを元に戻す - execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/tween {to_frame: 0, duration: 5} - # Tagを削除 tag @s remove AC.Opening tag @s remove AC.Laser From a0a838e8e1ab6c93c291267c0936fb9bde46f750 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 11:24:39 +0900 Subject: [PATCH 053/103] =?UTF-8?q?=E3=83=80=E3=83=83=E3=82=B7=E3=83=A5?= =?UTF-8?q?=E3=81=AE=E3=83=87=E3=82=A3=E3=83=AC=E3=82=AF=E3=83=88=E3=83=AA?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=82=92=E5=A4=B1=E6=95=97=E3=81=97=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skill/dash/dash_slash/move.mcfunction | 20 -------------- .../tick/skill/dash/side/.mcfunction | 8 +++--- .../tick/skill/dash/side/move.mcfunction | 4 +-- .../tick/skill/dash/side/shoot/.mcfunction | 6 ++--- .../skill/dash/side/shoot/summon.mcfunction | 4 +-- .../tick/skill/dash/side/start.mcfunction | 4 +-- .../dash/{dash_slash => slash}/.mcfunction | 12 ++++----- .../tick/skill/dash/slash/move.mcfunction | 27 +++++++++++++++++++ .../slash/damage.mcfunction | 2 +- .../slash/windup.mcfunction | 2 +- .../slash/windup_2.mcfunction | 2 +- .../{dash_slash => slash}/start.mcfunction | 2 +- 12 files changed, 50 insertions(+), 43 deletions(-) delete mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/{dash_slash => slash}/.mcfunction (77%) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/move.mcfunction rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/{dash_slash => slash}/slash/damage.mcfunction (94%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/{dash_slash => slash}/slash/windup.mcfunction (88%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/{dash_slash => slash}/slash/windup_2.mcfunction (79%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/{dash_slash => slash}/start.mcfunction (86%) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction deleted file mode 100644 index 44a4f0df09..0000000000 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slashmove -# -# 移動処理 -# -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash - -#> インターバルのスコアホルダー -# @private - #declare score_holder $Interval - -# ホーミング - execute facing entity @p[gamemode=!spectator,distance=..64] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ ~ - -# 実行時間を移す - scoreboard players operation $Interval Temporary = @s General.Mob.Tick - -# 数Tickごとにサウンド - scoreboard players operation $Interval Temporary %= $2 Const - execute if score $Interval Temporary matches 0 run playsound minecraft:entity.breeze.slide hostile @a ~ ~ ~ 2 1.5 - scoreboard players reset $Interval Temporary diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction index c98aa657bf..18cefd0f12 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/ +#> asset:mob/0372.tutankhamen/tick/skill/dash/side/ # # # @@ -8,13 +8,13 @@ # ダッシュ開始 execute if score @s[tag=AC.Dash.Left] General.Mob.Tick matches 0 run tp @s ~ ~ ~ ~-90 0 execute if score @s[tag=AC.Dash.Right] General.Mob.Tick matches 0 run tp @s ~ ~ ~ ~90 0 - execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/start + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/side/start # ヘルス半減時はダッシュしながら弾を撒いてくる - execute if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 0..15 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/shoot/ + execute if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 0..15 run function asset:mob/0372.tutankhamen/tick/skill/dash/side/shoot/ # プレイヤーの方へ誘導する - execute if score @s General.Mob.Tick matches ..15 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/move + execute if score @s General.Mob.Tick matches ..15 run function asset:mob/0372.tutankhamen/tick/skill/dash/side/move # ブレーキ execute if score @s General.Mob.Tick matches 15 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash_end/tween {to_frame: 0, duration: 5} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction index 89102663f3..8ea3a97623 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/move +#> asset:mob/0372.tutankhamen/tick/skill/dash/side/move # # # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/side/ # 横に移動 execute facing entity @p[gamemode=!spectator,distance=..64] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-150 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ ~ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/.mcfunction index 864bc6d821..456ed8c2c8 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/shoot/ +#> asset:mob/0372.tutankhamen/tick/skill/dash/side/shoot/ # # # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/side/ #> 攻撃のインターバルのスコアホルダー # @private @@ -13,5 +13,5 @@ # 数Tickごとにサウンド scoreboard players operation $AttackInterval Temporary %= $2 Const - execute if score $AttackInterval Temporary matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/shoot/summon + execute if score $AttackInterval Temporary matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/side/shoot/summon scoreboard players reset $AttackInterval Temporary diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/summon.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/summon.mcfunction index fde8466a3a..082ad59cf2 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/summon.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/summon.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/shoot/summon +#> asset:mob/0372.tutankhamen/tick/skill/dash/side/shoot/summon # # # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/shoot/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/side/shoot/ # データ設定 execute store result storage api: Argument.FieldOverride.Damage int 1 run data get storage asset:context this.Damage.ManyShoot diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction index 15329483d9..3170942d6c 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/start +#> asset:mob/0372.tutankhamen/tick/skill/dash/side/start # # # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/side/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/side/ # アニメ開始 execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 1} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/.mcfunction similarity index 77% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/.mcfunction index cc1bd515fd..bd6817b222 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/.mcfunction @@ -1,26 +1,26 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash/ +#> asset:mob/0372.tutankhamen/tick/skill/dash/slash/ # # # # @within function asset:mob/0372.tutankhamen/tick/skill_branch # ダッシュ開始 - execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash/start + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/slash/start # プレイヤーの方へ誘導する - execute if score @s General.Mob.Tick matches ..99 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash/move + execute if score @s General.Mob.Tick matches ..99 run function asset:mob/0372.tutankhamen/tick/skill/dash/slash/move # プレイヤーが前方の範囲にいたらスコアを変える execute if score @s General.Mob.Tick matches ..99 at @s positioned ^ ^ ^2 if entity @p[gamemode=!spectator,distance=..4] run scoreboard players set @s General.Mob.Tick 100 # 斬撃の構え - execute if score @s General.Mob.Tick matches 100 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash/slash/windup + execute if score @s General.Mob.Tick matches 100 run function asset:mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup # 構えその2 - execute if score @s General.Mob.Tick matches 115 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash/slash/windup_2 + execute if score @s General.Mob.Tick matches 115 run function asset:mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup_2 # そして斬撃のダメージ - execute if score @s General.Mob.Tick matches 118 run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash/slash/damage + execute if score @s General.Mob.Tick matches 118 run function asset:mob/0372.tutankhamen/tick/skill/dash/slash/slash/damage # ニュートラルに戻る execute if score @s General.Mob.Tick matches 140 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/tween {to_frame: 0, duration: 5} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/move.mcfunction new file mode 100644 index 0000000000..f6baaad1c8 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/move.mcfunction @@ -0,0 +1,27 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slashmove +# +# 移動処理 +# +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/ + +#> インターバルのスコアホルダー +# @private + #declare score_holder $Interval + +# ホーミング +# execute facing entity @p[gamemode=!spectator,distance=..64] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ ~ + +# 速さ + data modify storage lib: Argument.VectorMagnitude set value 0.15 + +# 飛ぶのに使う + execute if data entity @s {HurtTime:0s} at @s anchored eyes rotated as @e[type=area_effect_cloud,tag=21.Rotater,sort=nearest,limit=1] run function lib:motion/ + data remove storage lib: Argument + +# 実行時間を移す + scoreboard players operation $Interval Temporary = @s General.Mob.Tick + +# 数Tickごとにサウンド + scoreboard players operation $Interval Temporary %= $2 Const + execute if score $Interval Temporary matches 0 run playsound minecraft:entity.breeze.slide hostile @a ~ ~ ~ 2 1.5 + scoreboard players reset $Interval Temporary diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/damage.mcfunction similarity index 94% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/damage.mcfunction index 31ac317ef9..c2b7e0237c 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/damage.mcfunction @@ -2,7 +2,7 @@ # # 発動、ってかダメージ部分 # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/ # 演出 playsound minecraft:entity.witch.throw player @a ~ ~ ~ 1.5 0.7 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup.mcfunction similarity index 88% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup.mcfunction index b8ffb49919..43a408fe42 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup.mcfunction @@ -2,7 +2,7 @@ # # 斬撃前には構えるものだ # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/ # アニメ execute as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_dash_1/tween {to_frame: 0, duration: 5} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup_2.mcfunction similarity index 79% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup_2.mcfunction index 27fa679773..2132b84f54 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup_2.mcfunction @@ -2,7 +2,7 @@ # # 予告その2 # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/ # 演出 playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 1 2 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/start.mcfunction similarity index 86% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/start.mcfunction index 6c0091fcca..ddb72dfc49 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/start.mcfunction @@ -2,7 +2,7 @@ # # ダッシュ開始 # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slash +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/slash/ # アニメ開始 execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 1} From 76362cf3ef26d59ec8ea28c0724a5575e5956770 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 11:28:59 +0900 Subject: [PATCH 054/103] =?UTF-8?q?=E3=83=AA=E3=83=8D=E3=83=BC=E3=83=A0?= =?UTF-8?q?=E3=81=AB=E3=81=BE=E3=81=A0=E3=81=BE=E3=81=A0=E5=A4=B1=E6=95=97?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=81=9F=E3=81=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skill/dash/{slash => dash_slash}/.mcfunction | 12 ++++++------ .../skill/dash/{slash => dash_slash}/move.mcfunction | 6 +++++- .../{slash => dash_slash}/slash/damage.mcfunction | 2 +- .../{slash => dash_slash}/slash/windup.mcfunction | 2 +- .../{slash => dash_slash}/slash/windup_2.mcfunction | 2 +- .../dash/{slash => dash_slash}/start.mcfunction | 4 ++-- 6 files changed, 16 insertions(+), 12 deletions(-) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/{slash => dash_slash}/.mcfunction (78%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/{slash => dash_slash}/move.mcfunction (78%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/{slash => dash_slash}/slash/damage.mcfunction (94%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/{slash => dash_slash}/slash/windup.mcfunction (89%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/{slash => dash_slash}/slash/windup_2.mcfunction (79%) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/{slash => dash_slash}/start.mcfunction (76%) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction similarity index 78% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction index bd6817b222..c54cb36850 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction @@ -1,26 +1,26 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/slash/ +#> asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/ # # # # @within function asset:mob/0372.tutankhamen/tick/skill_branch # ダッシュ開始 - execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/slash/start + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/start # プレイヤーの方へ誘導する - execute if score @s General.Mob.Tick matches ..99 run function asset:mob/0372.tutankhamen/tick/skill/dash/slash/move + execute if score @s General.Mob.Tick matches ..99 run function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/move # プレイヤーが前方の範囲にいたらスコアを変える execute if score @s General.Mob.Tick matches ..99 at @s positioned ^ ^ ^2 if entity @p[gamemode=!spectator,distance=..4] run scoreboard players set @s General.Mob.Tick 100 # 斬撃の構え - execute if score @s General.Mob.Tick matches 100 run function asset:mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup + execute if score @s General.Mob.Tick matches 100 run function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup # 構えその2 - execute if score @s General.Mob.Tick matches 115 run function asset:mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup_2 + execute if score @s General.Mob.Tick matches 115 run function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2 # そして斬撃のダメージ - execute if score @s General.Mob.Tick matches 118 run function asset:mob/0372.tutankhamen/tick/skill/dash/slash/slash/damage + execute if score @s General.Mob.Tick matches 118 run function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage # ニュートラルに戻る execute if score @s General.Mob.Tick matches 140 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/tween {to_frame: 0, duration: 5} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction similarity index 78% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/move.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction index f6baaad1c8..00e8fc4ebc 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slashmove +#> asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/move # # 移動処理 # @@ -11,6 +11,10 @@ # ホーミング # execute facing entity @p[gamemode=!spectator,distance=..64] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ ~ +# 飛ぶのに使う + execute if data entity @s {HurtTime:0s} at @s anchored eyes rotated as @e[type=area_effect_cloud,tag=21.Rotater,sort=nearest,limit=1] run function lib:motion/ + data remove storage lib: Argument + # 速さ data modify storage lib: Argument.VectorMagnitude set value 0.15 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/damage.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction similarity index 94% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/damage.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction index c2b7e0237c..e771eee03e 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/damage.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slashslash/damage +#> asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage # # 発動、ってかダメージ部分 # diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction similarity index 89% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction index 43a408fe42..6560ad35ed 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slashslash/windup +#> asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup # # 斬撃前には構えるものだ # diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup_2.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction similarity index 79% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup_2.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction index 2132b84f54..548af4c0cb 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/slash/windup_2.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slashslash/windup_2 +#> asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2 # # 予告その2 # diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction similarity index 76% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/start.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction index ddb72dfc49..de81dc9e70 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/slash/start.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction @@ -1,8 +1,8 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/charge/dash_slashstart +#> asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/start # # ダッシュ開始 # -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/slash/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/ # アニメ開始 execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 1} From 920c9f85ae30bb0b2306503c417cd1226359bf26 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 11:59:50 +0900 Subject: [PATCH 055/103] =?UTF-8?q?=E3=83=99=E3=83=BC=E3=82=B9=E3=83=A0?= =?UTF-8?q?=E3=83=BC=E3=83=96=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/tick/.mcfunction | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction index 783c6b9df5..0747a7f085 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction @@ -8,19 +8,25 @@ scoreboard players add @s General.Mob.Tick 1 # AJモデルとの紐づけ - tag @e[type=item_display,tag=AC.AJ,distance=..0.01,sort=nearest,limit=1] add AC.AJLink + execute at @s run tag @e[type=item_display,tag=AC.AJ,distance=..16,sort=nearest,limit=1] add AC.AJLink -# モデルを追従？ +# モデルを追従 execute at @s run tp @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] ~ ~ ~ ~ ~ +# フェイズ移行動作 + execute if entity @s[tag=AC.Moveset.Transition] run function asset:mob/0372.tutankhamen/tick/phase_transition/ + # スキル選択 開幕は実行しない - execute if entity @s[tag=AC.DashUsed,tag=!AC.InAction,tag=!AC.Opening,scores={General.Mob.Tick=0}] run function asset:mob/0372.tutankhamen/tick/skill_select + execute if entity @s[tag=AC.DashUsed,tag=!AC.Moveset.Transition,tag=!AC.InAction,tag=!AC.Opening] if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill_select # ダッシュ選択 開幕は実行しないし、スキル中も使用しない - execute if entity @s[tag=!AC.InAction,tag=!AC.Opening,scores={General.Mob.Tick=0,AC.Count.Dash=0}] run function asset:mob/0372.tutankhamen/tick/dash_select + execute if entity @s[tag=!AC.InAction,tag=!AC.Moveset.Transition,tag=!AC.Opening] if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/dash_select # スキル実行 - execute if entity @s[scores={General.Mob.Tick=0..}] run function asset:mob/0372.tutankhamen/tick/skill_branch + execute if entity @s[tag=!AC.Moveset.Transition] if score @s General.Mob.Tick matches 0.. run function asset:mob/0372.tutankhamen/tick/skill_branch + +# 足元に何もなければ + execute if block ~ ~-0.5 ~ #lib:no_collision run particle minecraft:enchant ~ ~ ~ 0.4 0 0.4 0 10 # AJモデルとの紐づけ解除 execute at @s run tag @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] remove AC.AJLink From c1f75e314ec157cc6a93b2b2b9d9e03712cf5c41 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 12:00:26 +0900 Subject: [PATCH 056/103] =?UTF-8?q?=E3=83=80=E3=83=83=E3=82=B7=E3=83=A5?= =?UTF-8?q?=E3=81=AE=E6=99=82=E3=81=AB=E4=BD=BF=E3=81=86=E6=BF=80=E7=AA=81?= =?UTF-8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E5=87=A6=E7=90=86=E4=BD=9C?= =?UTF-8?q?=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/dash/check_collide.mcfunction | 8 ++++++++ .../tick/skill/dash/dash_slash/move.mcfunction | 17 +++++------------ .../dash/dash_slash/slash/damage.mcfunction | 1 - 3 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/check_collide.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/check_collide.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/check_collide.mcfunction new file mode 100644 index 0000000000..e55a9ae759 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/check_collide.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash/check_collide +# +# 壁に激突してるかどうかのチェック +# +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/** + +execute unless block ^ ^ ^1 #lib:no_collision run return 1 +execute anchored eyes unless block ^ ^ ^1 #lib:no_collision run return 1 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction index 00e8fc4ebc..43f06e420a 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/move.mcfunction @@ -8,19 +8,12 @@ # @private #declare score_holder $Interval -# ホーミング -# execute facing entity @p[gamemode=!spectator,distance=..64] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ ~ - -# 飛ぶのに使う - execute if data entity @s {HurtTime:0s} at @s anchored eyes rotated as @e[type=area_effect_cloud,tag=21.Rotater,sort=nearest,limit=1] run function lib:motion/ - data remove storage lib: Argument +# 壁チェック + execute at @s if function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ~ ~ ~ ~ 0 + execute at @s if function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run scoreboard players set @s General.Mob.Tick 100 -# 速さ - data modify storage lib: Argument.VectorMagnitude set value 0.15 - -# 飛ぶのに使う - execute if data entity @s {HurtTime:0s} at @s anchored eyes rotated as @e[type=area_effect_cloud,tag=21.Rotater,sort=nearest,limit=1] run function lib:motion/ - data remove storage lib: Argument +# ホーミング + execute facing entity @p[gamemode=!spectator,distance=..64] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ ~ # 実行時間を移す scoreboard players operation $Interval Temporary = @s General.Mob.Tick diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction index e771eee03e..95182d2131 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage.mcfunction @@ -8,7 +8,6 @@ playsound minecraft:entity.witch.throw player @a ~ ~ ~ 1.5 0.7 playsound minecraft:item.trident.throw player @a ~ ~ ~ 1.5 0.7 playsound minecraft:item.axe.scrape player @a ~ ~ ~ 1 1.0 - # 斬撃オブジェクトを出す data modify storage api: Argument.FieldOverride set value {Item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:0}}},Color:16760576,Frames:[20353,20354,20355],Scale:[7f,7f,0.1f],Transformation:{left_rotation:[0.478f,0.521f,0.596f,-0.38f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f]}} data modify storage api: Argument.ID set value 2001 From 85eaa87ca6d27f643586f344307605d0599c9d4a Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 12:03:52 +0900 Subject: [PATCH 057/103] =?UTF-8?q?=E4=BB=96=E3=81=AE=E3=83=80=E3=83=83?= =?UTF-8?q?=E3=82=B7=E3=83=A5=E5=8B=95=E4=BD=9C=E3=81=AB=E3=82=82=E6=BF=80?= =?UTF-8?q?=E7=AA=81=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=81=8C=E3=81=A4?= =?UTF-8?q?=E3=81=84=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/tick/skill/dash/charge/.mcfunction | 6 +++--- .../0372.tutankhamen/tick/skill/dash/charge/move.mcfunction | 4 ++++ .../0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction | 6 +++--- .../mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction | 6 +++--- .../0372.tutankhamen/tick/skill/dash/side/move.mcfunction | 4 ++++ 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/.mcfunction index 8cb28f7636..0a767a33d2 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/.mcfunction @@ -22,9 +22,9 @@ execute if score @s General.Mob.Tick matches 30 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash_end/tween {to_frame: 0, duration: 5} # ウソ慣性 - execute if score @s General.Mob.Tick matches 30..40 run tp @s ^ ^ ^0.5 - execute if score @s General.Mob.Tick matches 40..45 run tp @s ^ ^ ^0.3 - execute if score @s General.Mob.Tick matches 45..50 run tp @s ^ ^ ^0.1 + execute if score @s General.Mob.Tick matches 30..40 unless function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ^ ^ ^0.5 + execute if score @s General.Mob.Tick matches 40..45 unless function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ^ ^ ^0.3 + execute if score @s General.Mob.Tick matches 45..50 unless function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ^ ^ ^0.1 # 終わり際のパーティクル execute if score @s General.Mob.Tick matches 30..50 run particle dust 0 0.318 0.318 1 ~ ~1 ~ 0.5 0.5 0.5 0 10 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction index d4b3d0b779..67a140bcd1 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction @@ -8,6 +8,10 @@ # @private #declare score_holder $Interval +# 壁チェック + execute at @s if function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ~ ~ ~ ~ 0 + execute at @s if function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run scoreboard players set @s General.Mob.Tick 30 + # 弱ホーミングダッシュ execute facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-80 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1.5 ~ ~ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction index c54cb36850..7c062d6635 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction @@ -26,9 +26,9 @@ execute if score @s General.Mob.Tick matches 140 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/tween {to_frame: 0, duration: 5} execute if score @s General.Mob.Tick matches 140 run tp @s ~ ~ ~ ~ 0 # ウソ慣性 - execute if score @s General.Mob.Tick matches 100..105 run tp @s ^ ^ ^0.5 - execute if score @s General.Mob.Tick matches 106 run tp @s ^ ^ ^0.3 - execute if score @s General.Mob.Tick matches 107..110 run tp @s ^ ^ ^0.1 + execute if score @s General.Mob.Tick matches 100..105 unless function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ^ ^ ^0.5 + execute if score @s General.Mob.Tick matches 106 unless function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ^ ^ ^0.3 + execute if score @s General.Mob.Tick matches 107..110 unless function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ^ ^ ^0.1 # リセット execute if score @s General.Mob.Tick matches 140.. run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction index 18cefd0f12..59bf054d66 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction @@ -23,9 +23,9 @@ execute if score @s General.Mob.Tick matches 15..30 facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^ ~ 0 # ウソ慣性 - execute if score @s General.Mob.Tick matches 15..20 run tp @s ^ ^ ^0.5 - execute if score @s General.Mob.Tick matches 20..25 run tp @s ^ ^ ^0.3 - execute if score @s General.Mob.Tick matches 25..30 run tp @s ^ ^ ^0.1 + execute if score @s General.Mob.Tick matches 15..20 unless function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ^ ^ ^0.5 + execute if score @s General.Mob.Tick matches 20..25 unless function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ^ ^ ^0.3 + execute if score @s General.Mob.Tick matches 25..30 unless function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ^ ^ ^0.1 # ニュートラルに戻る execute if score @s General.Mob.Tick matches 30 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/tween {to_frame: 0, duration: 5} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction index 8ea3a97623..8067abc540 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/move.mcfunction @@ -4,6 +4,10 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill/dash/side/ +# 壁チェック + execute at @s if function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ~ ~ ~ ~ 0 + execute at @s if function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run scoreboard players set @s General.Mob.Tick 30 + # 横に移動 execute facing entity @p[gamemode=!spectator,distance=..64] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-150 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^1 ~ ~ From 426864abd22731e27ccfdcc342663114a1b7746d Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 25 Dec 2024 12:18:08 +0900 Subject: [PATCH 058/103] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=87=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=82=B9=E3=81=AF=E3=81=93=E3=81=86=E3=81=A7=E3=81=84?= =?UTF-8?q?=E3=81=84=E3=81=AE=E3=81=8B=E3=81=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 159 +++++++++--------- 1 file changed, 79 insertions(+), 80 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 9b4a2eb86a..2ddc3994f4 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -4,88 +4,87 @@ #> tag # @within function asset:mob/0372.tutankhamen/** #>スキルリスト - #declare tag AC.Laser - #declare tag AC.ManyShoot - #declare tag AC.GiantSkull - #declare tag AC.HyperLaser - #declare tag AC.DashSlash - #declare tag AC.DashSlash.IsNearPlayer - #declare tag AC.ManyLaser - #declare tag AC.Charge +#declare tag AC.Laser +#declare tag AC.ManyShoot +#declare tag AC.GiantSkull +#declare tag AC.HyperLaser +#declare tag AC.DashSlash +#declare tag AC.DashSlash.IsNearPlayer +#declare tag AC.ManyLaser +#declare tag AC.Charge #> ダッシュリスト - #declare tag AC.Dash.Left - #declare tag AC.Dash.Right - #declare tag AC.Dash.Side - #declare tag AC.Dash.Slash - #declare tag AC.Dash.Charge +#declare tag AC.Dash.Left +#declare tag AC.Dash.Right +#declare tag AC.Dash.Side +#declare tag AC.Dash.Slash +#declare tag AC.Dash.Charge #> 状態タグ - #declare tag AC.Health.50Per +#declare tag AC.Health.50Per #> 動作タグ - #declare tag AC.Moveset.Transition +#declare tag AC.Moveset.Transition #>その他タグ - #declare tag AC.InAction - #declare tag AC.DashUsed - #declare tag AC.LaserDisplay - #declare tag AC.Coffin - #declare tag AC.CoffinPoint - #declare tag AC.SpawnMarker - #declare tag AC.AJ - #declare tag AC.AJLink - #declare tag AC.Opening - #declare tag AC.Hit - #declare tag AC.RotationMarker - #declare tag Target - #declare score_holder $Recursive - #declare score_holder $Random - #declare score_holder $Interval - # +#declare tag AC.InAction +#declare tag AC.DashUsed +#declare tag AC.LaserDisplay +#declare tag AC.Coffin +#declare tag AC.CoffinPoint +#declare tag AC.SpawnMarker +#declare tag AC.AJ +#declare tag AC.AJLink +#declare tag AC.Opening +#declare tag AC.Hit +#declare tag AC.RotationMarker +#declare tag Target +#declare score_holder $Recursive +#declare score_holder $Random +#declare score_holder $Interval #>Animated Java - #declare function animated_java:tutankhamen/summon - #declare function animated_java:tutankhamen/remove/this - #declare function animated_java:tutankhamen/summon - #declare function animated_java:tutankhamen/animations/neutral/play - #declare function animated_java:tutankhamen/animations/neutral/tween - #declare function animated_java:tutankhamen/animations/neutral/stop - #declare function animated_java:tutankhamen/animations/spawn/play - #declare function animated_java:tutankhamen/animations/spawn/stop - #declare function animated_java:tutankhamen/animations/death/play - #declare function animated_java:tutankhamen/animations/death/stop - #declare function animated_java:tutankhamen/animations/beam_start/play - #declare function animated_java:tutankhamen/animations/beam_start/stop - #declare function animated_java:tutankhamen/animations/beam_shot/play - #declare function animated_java:tutankhamen/animations/beam_shot/stop - #declare function animated_java:tutankhamen/animations/beam_wait/play - #declare function animated_java:tutankhamen/animations/beam_wait/stop - #declare function animated_java:tutankhamen/animations/beam_end/play - #declare function animated_java:tutankhamen/animations/beam_end/stop - #declare function animated_java:tutankhamen/animations/soul_shot/play - #declare function animated_java:tutankhamen/animations/soul_shot/stop - #declare function animated_java:tutankhamen/animations/beam_long/play - #declare function animated_java:tutankhamen/animations/beam_long/stop - #declare function animated_java:tutankhamen/animations/beam_long/tween - #declare function animated_java:tutankhamen/animations/beam_long_charge/play - #declare function animated_java:tutankhamen/animations/beam_long_charge/stop - #declare function animated_java:tutankhamen/animations/beam_long_shot/play - #declare function animated_java:tutankhamen/animations/beam_long_shot/stop - #declare function animated_java:tutankhamen/animations/rod_ground/play - #declare function animated_java:tutankhamen/animations/rod_ground/stop - #declare function animated_java:tutankhamen/animations/rod_ground_end/play - #declare function animated_java:tutankhamen/animations/rod_ground_end/stop - #declare function animated_java:tutankhamen/animations/dash/play - #declare function animated_java:tutankhamen/animations/dash/tween - #declare function animated_java:tutankhamen/animations/dash/stop - #declare function animated_java:tutankhamen/animations/dash_slash/play - #declare function animated_java:tutankhamen/animations/dash_slash/tween - #declare function animated_java:tutankhamen/animations/dash_slash/stop - #declare function animated_java:tutankhamen/animations/dash_end/play - #declare function animated_java:tutankhamen/animations/dash_end/tween - #declare function animated_java:tutankhamen/animations/dash_end/stop - #declare function animated_java:tutankhamen/animations/attack_melee_1/tween - #declare function animated_java:tutankhamen/animations/attack_dash_1/tween - #declare function animated_java:tutankhamen/animations/attack_dash_2/tween - #declare function animated_java:tutankhamen/animations/attack_laser_windup/tween - #declare function animated_java:tutankhamen/animations/attack_laser_loop/tween - #declare function animated_java:tutankhamen/animations/attack_laser_end/tween - #declare function animated_java:tutankhamen/animations/damage/tween - #declare tag AC.ModelLocator.Body - #declare tag AC.ModelLocator.Weapon +#declare function animated_java:tutankhamen/summon +#declare function animated_java:tutankhamen/remove/this +#declare function animated_java:tutankhamen/summon +#declare function animated_java:tutankhamen/animations/neutral/play +#declare function animated_java:tutankhamen/animations/neutral/tween +#declare function animated_java:tutankhamen/animations/neutral/stop +#declare function animated_java:tutankhamen/animations/spawn/play +#declare function animated_java:tutankhamen/animations/spawn/stop +#declare function animated_java:tutankhamen/animations/death/play +#declare function animated_java:tutankhamen/animations/death/stop +#declare function animated_java:tutankhamen/animations/beam_start/play +#declare function animated_java:tutankhamen/animations/beam_start/stop +#declare function animated_java:tutankhamen/animations/beam_shot/play +#declare function animated_java:tutankhamen/animations/beam_shot/stop +#declare function animated_java:tutankhamen/animations/beam_wait/play +#declare function animated_java:tutankhamen/animations/beam_wait/stop +#declare function animated_java:tutankhamen/animations/beam_end/play +#declare function animated_java:tutankhamen/animations/beam_end/stop +#declare function animated_java:tutankhamen/animations/soul_shot/play +#declare function animated_java:tutankhamen/animations/soul_shot/stop +#declare function animated_java:tutankhamen/animations/beam_long/play +#declare function animated_java:tutankhamen/animations/beam_long/stop +#declare function animated_java:tutankhamen/animations/beam_long/tween +#declare function animated_java:tutankhamen/animations/beam_long_charge/play +#declare function animated_java:tutankhamen/animations/beam_long_charge/stop +#declare function animated_java:tutankhamen/animations/beam_long_shot/play +#declare function animated_java:tutankhamen/animations/beam_long_shot/stop +#declare function animated_java:tutankhamen/animations/rod_ground/play +#declare function animated_java:tutankhamen/animations/rod_ground/stop +#declare function animated_java:tutankhamen/animations/rod_ground_end/play +#declare function animated_java:tutankhamen/animations/rod_ground_end/stop +#declare function animated_java:tutankhamen/animations/dash/play +#declare function animated_java:tutankhamen/animations/dash/tween +#declare function animated_java:tutankhamen/animations/dash/stop +#declare function animated_java:tutankhamen/animations/dash_slash/play +#declare function animated_java:tutankhamen/animations/dash_slash/tween +#declare function animated_java:tutankhamen/animations/dash_slash/stop +#declare function animated_java:tutankhamen/animations/dash_end/play +#declare function animated_java:tutankhamen/animations/dash_end/tween +#declare function animated_java:tutankhamen/animations/dash_end/stop +#declare function animated_java:tutankhamen/animations/attack_melee_1/tween +#declare function animated_java:tutankhamen/animations/attack_dash_1/tween +#declare function animated_java:tutankhamen/animations/attack_dash_2/tween +#declare function animated_java:tutankhamen/animations/attack_laser_windup/tween +#declare function animated_java:tutankhamen/animations/attack_laser_loop/tween +#declare function animated_java:tutankhamen/animations/attack_laser_end/tween +#declare function animated_java:tutankhamen/animations/damage/tween +#declare tag AC.ModelLocator.Body +#declare tag AC.ModelLocator.Weapon From 7ec7af2c896b5050f4d72ca42ff82624f57a8252 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Thu, 26 Dec 2024 01:21:35 +0900 Subject: [PATCH 059/103] =?UTF-8?q?=E3=82=BD=E3=82=A6=E3=83=AB=E5=BC=BE?= =?UTF-8?q?=E9=80=A3=E5=B0=84=E6=94=BB=E6=92=83=E3=81=AE=E6=BC=94=E5=87=BA?= =?UTF-8?q?=E3=81=A1=E3=82=87=E3=81=A3=E3=81=A8=E3=81=84=E3=81=98=E3=81=A3?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/many_shoot/.mcfunction | 22 ++++++++++++------- .../tick/skill/many_shoot/start.mcfunction | 8 +++++++ 2 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/start.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction index 50d0bb7d91..88e7e5651c 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction @@ -5,16 +5,22 @@ # @within function asset:mob/0372.tutankhamen/tick/skill_branch # AJ - execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop - execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/soul_shot/play + execute if score @s General.Mob.Tick matches 0 as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/soul_shot/tween {to_frame:5 ,duration:5} + +# 実行時間を移す + scoreboard players operation $Interval Temporary = @s General.Mob.Tick # 演出 - #xecute if entity @s[scores={General.Mob.Tick=15}] run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 1 0.8 0 - #execute if entity @s[scores={General.Mob.Tick=25}] run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 1 1.0 0 - #execute if entity @s[scores={General.Mob.Tick=35}] run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 1 1.2 0 + execute if score @s General.Mob.Tick matches 15..35 run particle dust 0 0.7 0.7 1 ~ ~3 ~ 1 0 1 0 5 + execute if score @s General.Mob.Tick matches 15 run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 2 0.8 + execute if score @s General.Mob.Tick matches 25 run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 2 1.0 + execute if score @s General.Mob.Tick matches 35 run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 2 1.2 + +# 攻撃開始 + execute if score @s General.Mob.Tick matches 60 run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/start # ターゲット選定 - function asset:mob/0372.tutankhamen/tick/skill/common/select_taget + function asset:mob/0372.tutankhamen/tick/skill/common/select_target # ターゲットの方を向き続ける execute at @a[distance=..100] if score @s AC.TargetID = @p UserID run tag @p add Target @@ -25,8 +31,8 @@ # 一定間隔で拡散して召喚 scoreboard players operation $Interval Temporary = @s General.Mob.Tick scoreboard players operation $Interval Temporary %= $4 Const - execute if entity @s[scores={General.Mob.Tick=15..59}] if score $Interval Temporary matches 0 rotated ~ 0 positioned ^ ^3 ^ summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/spread + execute if score @s General.Mob.Tick matches 15..59 if score $Interval Temporary matches 0 rotated ~ 0 positioned ^ ^3 ^ summon marker run function asset:mob/0372.tutankhamen/tick/skill/many_shoot/spread scoreboard players reset $Interval Temporary # 共通リセット処理 - execute if entity @s[scores={General.Mob.Tick=128..}] run function asset:mob/0372.tutankhamen/tick/skill/reset + execute if score @s General.Mob.Tick matches 80 run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/start.mcfunction new file mode 100644 index 0000000000..20a83fc8e9 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/start.mcfunction @@ -0,0 +1,8 @@ +#> asset:mob/0372.tutankhamen/tick/skill/many_shoot/start +# +# 攻撃開始 +# +# @within function asset:mob/0372.tutankhamen/tick/skill/many_shoot/ + +playsound item.trident.throw hostile @a ~ ~3 ~ 2 0.7 +execute at @e[type=marker,tag=AC.ModelLocator.Weapon] run particle crit ~ ~ ~ 0 0 0 0.5 25 From 24fc9a6d912a08cf0187068226a54fbea3b17c0b Mon Sep 17 00:00:00 2001 From: Chuzume Date: Thu, 26 Dec 2024 01:21:47 +0900 Subject: [PATCH 060/103] =?UTF-8?q?=E3=82=BD=E3=82=A6=E3=83=AB=E5=BC=BE?= =?UTF-8?q?=E3=81=AE=E3=83=91=E3=83=BC=E3=83=86=E3=82=A3=E3=82=AF=E3=83=AB?= =?UTF-8?q?=E3=81=AA=E3=81=A9=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/2092.ghost_bullet/init/.mcfunction | 6 +++--- .../object/2092.ghost_bullet/recursive/.mcfunction | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction index 82bcfc5f58..889ebc073d 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction @@ -5,9 +5,9 @@ # @within asset:object/alias/2092/init # 演出 - particle soul ~ ~ ~ 0 0 0 0.05 20 normal @a - playsound block.sculk_sensor.clicking hostile @a ~ ~ ~ 0.8 0 0 - playsound block.fire.ambient hostile @a ~ ~ ~ 1.5 0.8 0 + particle soul_fire_flame ~ ~ ~ 0.2 0.2 0.2 0.03 20 + playsound block.sculk_sensor.clicking neutral @a ~ ~ ~ 2 0 + playsound block.fire.ambient neutral @a ~ ~ ~ 2 0.8 # StartDelay execute store result score @s General.Object.Tick run data get storage asset:context this.StartDelay -1 diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/recursive/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/recursive/.mcfunction index fb116b40b0..a8e308d158 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/recursive/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/recursive/.mcfunction @@ -5,4 +5,5 @@ # @within asset:object/alias/2092/recursive # 演出 - particle soul ~ ~-0.1 ~ 0.15 0.15 0.15 0 1 normal @a + particle dust 0 0.7 0.7 1 ~ ~-0.1 ~ 0.15 0.15 0.15 0 1 + execute if predicate lib:random_pass_per/50 run particle soul_fire_flame ~ ~-0.1 ~ 0.15 0.15 0.15 0.02 1 From e853f84a45e8383ae883bc0dba3a2ea224a68e7a Mon Sep 17 00:00:00 2001 From: Chuzume Date: Thu, 26 Dec 2024 01:32:17 +0900 Subject: [PATCH 061/103] =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E3=81=A4=E3=81=91=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2091.hyper_laser_manager/init/.mcfunction | 3 +++ .../2091.hyper_laser_manager/tick/.mcfunction | 16 ++++++------ .../tick/shoot.mcfunction | 26 +++++++++++++++++-- 3 files changed, 35 insertions(+), 10 deletions(-) diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/init/.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/init/.mcfunction index 4c4b358aac..cb8b24163e 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/init/.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/init/.mcfunction @@ -3,3 +3,6 @@ # Objectのinit時の処理 # # @within asset:object/alias/2091/init + +# TargetID + execute store result score @s 2092.TargetID run data get storage asset:context this.TargetID diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction index f832de0cc4..589b133aec 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction @@ -20,14 +20,14 @@ # 一定間隔での演出 scoreboard players operation $Interval Temporary = @s General.Object.Tick scoreboard players operation $Interval Temporary %= $3 Const - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=1..5}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.2 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=6..10}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.3 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=11..15}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.4 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=16..20}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.5 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=21..25}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.7 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=26..30}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.8 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=31..35}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 1.9 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=36..}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 1 2.0 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=1..5}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.2 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=6..10}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.3 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=11..15}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.4 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=16..20}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.5 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=21..25}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.7 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=26..30}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.8 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=31..35}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.9 + execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=36..}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 2.0 scoreboard players reset $Interval Temporary # 演出 diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction index c20746d014..4a5d44c095 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction @@ -6,9 +6,31 @@ # vfx function asset:object/2091.hyper_laser_manager/tick/vfx - execute as @a[distance=..30] at @s facing entity @e[type=marker,tag=this,distance=..30] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 1.8 - execute as @a[distance=..30] at @s facing entity @e[type=marker,tag=this,distance=..30] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 1.6 + execute as @a[distance=..32] at @s facing entity @e[type=marker,tag=this,distance=..30] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 1.8 + execute as @a[distance=..32] at @s facing entity @e[type=marker,tag=this,distance=..30] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 1.6 # 発射 function asset:object/2091.hyper_laser_manager/tick/recursive scoreboard players reset $Recursive Temporary + +# 立方体範囲内のプレイヤーにtag付け + data modify storage lib: args.dx set value 2.5 + data modify storage lib: args.dy set value 2.5 + data modify storage lib: args.dz set value 30.0 + data modify storage lib: args.selector set value "@a[tag=!PlayerShouldInvulnerable,distance=..64]" + execute positioned ^ ^ ^15 run function lib:rotatable_dxyz/m with storage lib: args + +# ダメージを与える + # データ設定 + data modify storage api: Argument.Damage set value 45.0f + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "Fire" + # tag付けされたプレイヤーにダメージを与える + function api:damage/modifier + execute as @a[tag=DXYZ,distance=..64] run function api:damage/ + +# リセット + function api:damage/reset + +# tagリセット + tag @a[tag=DXYZ,distance=..64] remove DXYZ From 3bf498be629d0f9a72847cb77e461830c4e565ee Mon Sep 17 00:00:00 2001 From: Chuzume Date: Thu, 26 Dec 2024 16:18:04 +0900 Subject: [PATCH 062/103] =?UTF-8?q?=E3=82=B9=E3=82=B4=E3=82=A4=E3=83=BB?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AB=E3=82=A2=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=8C=E3=81=A4=E3=81=84=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2091.hyper_laser_manager/tick/.mcfunction | 37 ++++++++++--------- .../tick/alert.mcfunction | 15 ++++++++ 2 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/alert.mcfunction diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction index 589b133aec..2d149d91d3 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction @@ -7,33 +7,34 @@ # Tick加算 scoreboard players add @s General.Object.Tick 1 +# アラート + execute if score @s General.Object.Tick matches 1 positioned ~ ~-1.5 ~ run function asset:object/2091.hyper_laser_manager/tick/alert + # 前方に魔法陣を召喚 - execute if entity @s[scores={General.Object.Tick=1}] run data modify storage api: Argument.FieldOverride set value {Scale:[4.2f,4.2f,0.01f],Color:5436415} - execute if entity @s[scores={General.Object.Tick=1}] anchored eyes positioned ^ ^ ^ run function asset:object/2091.hyper_laser_manager/tick/summon_square + execute if score @s General.Object.Tick matches 1 run data modify storage api: Argument.FieldOverride set value {Scale:[4.2f,4.2f,0.01f],Color:5436415} + execute if score @s General.Object.Tick matches 1 anchored eyes positioned ^ ^ ^ run function asset:object/2091.hyper_laser_manager/tick/summon_square - execute if entity @s[scores={General.Object.Tick=2}] run data modify storage api: Argument.FieldOverride set value {Scale:[2.8f,2.8f,0.01f],CMD:20444,Color:5436415,LeftRotate:true} - execute if entity @s[scores={General.Object.Tick=2}] anchored eyes positioned ^ ^ ^0.2 run function asset:object/2091.hyper_laser_manager/tick/summon_square + execute if score @s General.Object.Tick matches 2 run data modify storage api: Argument.FieldOverride set value {Scale:[2.8f,2.8f,0.01f],CMD:20444,Color:5436415,LeftRotate:true} + execute if score @s General.Object.Tick matches 2 anchored eyes positioned ^ ^ ^0.2 run function asset:object/2091.hyper_laser_manager/tick/summon_square - execute if entity @s[scores={General.Object.Tick=3}] run data modify storage api: Argument.FieldOverride set value {Scale:[1.4f,1.4f,0.01f],CMD:20444,Color:5436415} - execute if entity @s[scores={General.Object.Tick=3}] anchored eyes positioned ^ ^ ^0.4 run function asset:object/2091.hyper_laser_manager/tick/summon_square + execute if score @s General.Object.Tick matches 3 run data modify storage api: Argument.FieldOverride set value {Scale:[1.4f,1.4f,0.01f],CMD:20444,Color:5436415} + execute if score @s General.Object.Tick matches 3 anchored eyes positioned ^ ^ ^0.4 run function asset:object/2091.hyper_laser_manager/tick/summon_square # 一定間隔での演出 scoreboard players operation $Interval Temporary = @s General.Object.Tick scoreboard players operation $Interval Temporary %= $3 Const - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=1..5}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.2 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=6..10}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.3 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=11..15}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.4 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=16..20}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.5 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=21..25}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.7 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=26..30}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.8 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=31..35}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.9 - execute if score $Interval Temporary matches 0 if entity @s[scores={General.Object.Tick=36..}] run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 2.0 + execute if score $Interval Temporary matches 0 if score @s General.Object.Tick matches 1..5 run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.2 + execute if score $Interval Temporary matches 0 if score @s General.Object.Tick matches 6..10 run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.3 + execute if score $Interval Temporary matches 0 if score @s General.Object.Tick matches 11..15 run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.4 + execute if score $Interval Temporary matches 0 if score @s General.Object.Tick matches 16..20 run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.5 + execute if score $Interval Temporary matches 0 if score @s General.Object.Tick matches 21..25 run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.7 + execute if score $Interval Temporary matches 0 if score @s General.Object.Tick matches 26..30 run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.8 + execute if score $Interval Temporary matches 0 if score @s General.Object.Tick matches 31..35 run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 1.9 + execute if score $Interval Temporary matches 0 if score @s General.Object.Tick matches 35.. run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 2.0 scoreboard players reset $Interval Temporary -# 演出 - # 発射 - execute if entity @s[scores={General.Object.Tick=42}] anchored eyes positioned ^ ^ ^ run function asset:object/2091.hyper_laser_manager/tick/shoot + execute if score @s General.Object.Tick matches 42 anchored eyes positioned ^ ^ ^ run function asset:object/2091.hyper_laser_manager/tick/shoot # 消滅処理 - kill @s[scores={General.Object.Tick=42..}] + execute if score @s General.Object.Tick matches 42 run kill @s diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/alert.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/alert.mcfunction new file mode 100644 index 0000000000..7145ead124 --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/alert.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/2091.hyper_laser_manager/tick/alert +# +# +# +# @within function asset:object/2091.hyper_laser_manager/tick/ + +# データ設定 + data modify storage api: Argument.FieldOverride set value {Color:5436415,Interpolation:60,Tick:40,Scale:[5f,60.0f]} + +# 見てる方向へRotationXを設定 + data modify storage api: Argument.FieldOverride.RotationX set from entity @s Rotation[0] + +# 召喚 + data modify storage api: Argument.ID set value 2113 + function api:object/summon From 513ded861b2493236098519f008abb210fd44bd0 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Thu, 26 Dec 2024 16:27:00 +0900 Subject: [PATCH 063/103] =?UTF-8?q?=E3=82=B9=E3=82=B4=E3=83=AC=E3=83=BC?= =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=AE=E6=BC=94=E5=87=BA=E3=81=AA=E3=81=A9?= =?UTF-8?q?=E3=81=AE=E8=AA=BF=E6=95=B4=E3=80=82=E5=9C=B0=E9=9D=A2=E3=81=AB?= =?UTF-8?q?=E9=99=8D=E3=82=8A=E3=81=A6=E3=81=8B=E3=82=89=E6=92=83=E3=81=A4?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/hyper_laser/.mcfunction | 16 +++++++++++++--- .../skill/hyper_laser/check_ground.mcfunction | 11 +++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction index abc167b4a6..9f1284bcc3 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction @@ -7,13 +7,20 @@ # 構え開始 execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/windup +# 杖振り下ろしたときの演出 + execute if score @s General.Mob.Tick matches 23 run playsound item.trident.throw hostile @a ~ ~3 ~ 2 0.7 + execute if score @s General.Mob.Tick matches 23 at @e[type=marker,tag=AC.ModelLocator.Weapon] run particle crit ~ ~ ~ 0 0 0 0.5 25 + +# 降りる + execute if score @s General.Mob.Tick matches 0..20 if block ~ ~-1 ~ #lib:no_collision if function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground run tp @s ~ ~-0.25 ~ + # プレイヤーの方を向く execute if score @s General.Mob.Tick matches 0..20 facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-40 facing entity @s feet positioned as @s rotated ~ 0 run tp @s ^ ^ ^ ~ ~ # ビームループ execute if score @s General.Mob.Tick matches 26 as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_loop/tween {to_frame:0, duration:1} -# 前方に魔法陣を召喚 +# 前方に魔法陣を召喚、体力半減で増える execute if score @s General.Mob.Tick matches 20 anchored eyes positioned ^ ^-0.5 ^2.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square execute if score @s General.Mob.Tick matches 25 anchored eyes positioned ^7 ^-0.5 ^2.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square execute if score @s General.Mob.Tick matches 25 anchored eyes positioned ^-7 ^-0.5 ^2.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square @@ -23,7 +30,10 @@ execute if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 35 anchored eyes positioned ^-21 ^-0.5 ^2.5 run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/summon_square # 発射モーション(32tick) - execute if entity @s[scores={General.Mob.Tick=55}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_end/tween {to_frame:0, duration:1} + execute if score @s General.Mob.Tick matches 55 as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_end/tween {to_frame:0, duration:1} + +# 杖解除演出 + execute if score @s General.Mob.Tick matches 55 run playsound item.trident.throw hostile @a ~ ~3 ~ 2 1 # 共通リセット処理 - execute if entity @s[scores={General.Mob.Tick=87..}] run function asset:mob/0372.tutankhamen/tick/skill/reset + execute if score @s General.Mob.Tick matches 87 run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground.mcfunction new file mode 100644 index 0000000000..abfe58084b --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground.mcfunction @@ -0,0 +1,11 @@ +#> asset:mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground +# +# 地面チェック +# +# @within function +# asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ +# asset:mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground + +execute unless entity @s[distance=..10] run return fail +execute unless block ~ ~ ~ #lib:no_collision run return 1 +execute if block ~ ~ ~ #lib:no_collision positioned ~ ~-1 ~ run return run function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground From 53216faf7a3837a85f330e086e22b0192f2c9cb2 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Thu, 26 Dec 2024 16:27:21 +0900 Subject: [PATCH 064/103] =?UTF-8?q?=E7=AA=81=E9=80=B2=E3=83=80=E3=83=83?= =?UTF-8?q?=E3=82=B7=E3=83=A5=E3=81=AE=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0372.tutankhamen/tick/skill/dash/charge/move.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction index 67a140bcd1..6cfd030f64 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction @@ -9,7 +9,7 @@ #declare score_holder $Interval # 壁チェック - execute at @s if function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ~ ~ ~ ~ 0 + execute at @s if function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ~ ~0.5 ~ ~ 0 execute at @s if function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run scoreboard players set @s General.Mob.Tick 30 # 弱ホーミングダッシュ @@ -22,7 +22,7 @@ scoreboard players operation $Interval Temporary %= $2 Const execute if score $Interval Temporary matches 0 run playsound minecraft:entity.breeze.slide hostile @a ~ ~ ~ 2 1.5 execute if score $Interval Temporary matches 0 run playsound minecraft:entity.blaze.shoot hostile @a ~ ~ ~ 0.5 0.5 - execute if score $Interval Temporary matches 0 run playsound minecraft:entity.witch.throw hostile @a ~ ~ ~ 1 0.5 + execute if score $Interval Temporary matches 0 run playsound minecraft:item.trident.riptide_1 hostile @a ~ ~3 ~ 2 1.2 scoreboard players reset $Interval Temporary # パーティクル From 9d50e4d091540e0f7c8c018caaffdb2c7ea30b02 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Thu, 26 Dec 2024 16:28:11 +0900 Subject: [PATCH 065/103] =?UTF-8?q?Typo=E3=82=92=E8=A6=8B=E3=81=9F?= =?UTF-8?q?=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{select_taget.mcfunction => select_target.mcfunction} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/{select_taget.mcfunction => select_target.mcfunction} (86%) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/select_taget.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/select_target.mcfunction similarity index 86% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/select_taget.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/select_target.mcfunction index 0367a52134..2281e80d41 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/select_taget.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/select_target.mcfunction @@ -1,4 +1,4 @@ -#> asset:mob/0372.tutankhamen/tick/skill/common/select_taget +#> asset:mob/0372.tutankhamen/tick/skill/common/select_target # # ターゲット選定 # From 63e4af5dba7e4c62a62cafc11b265a4c1b647b8b Mon Sep 17 00:00:00 2001 From: Chuzume Date: Thu, 26 Dec 2024 16:28:35 +0900 Subject: [PATCH 066/103] =?UTF-8?q?=E6=B5=AE=E3=81=84=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AB=E7=A9=BA=E4=B8=AD=E3=81=AB?= =?UTF-8?q?=E7=AB=8B=E3=81=A3=E3=81=A6=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E8=A6=8B=E3=81=88=E3=82=8B=E3=82=88=E3=81=86=E3=81=AA=E6=BC=94?= =?UTF-8?q?=E5=87=BA=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 --- .../data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction index 0747a7f085..db657dd518 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction @@ -26,7 +26,7 @@ execute if entity @s[tag=!AC.Moveset.Transition] if score @s General.Mob.Tick matches 0.. run function asset:mob/0372.tutankhamen/tick/skill_branch # 足元に何もなければ - execute if block ~ ~-0.5 ~ #lib:no_collision run particle minecraft:enchant ~ ~ ~ 0.4 0 0.4 0 10 + execute if block ~ ~-0.2 ~ #lib:no_collision run particle minecraft:enchant ~ ~ ~ 0.4 0 0.4 0 10 # AJモデルとの紐づけ解除 execute at @s run tag @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] remove AC.AJLink From 2c9deffef7ce063b4b6dd85eba35c49438c30b81 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Thu, 26 Dec 2024 16:29:13 +0900 Subject: [PATCH 067/103] =?UTF-8?q?=E3=81=93=E3=82=8C=E3=82=89=EF=BC=92?= =?UTF-8?q?=E3=81=A4=E3=81=8C=E3=82=B9=E3=82=AD=E3=83=AB=E3=81=A7=E3=81=AF?= =?UTF-8?q?=E3=81=AA=E3=81=84=E5=A0=B4=E6=89=80=E3=81=AB=E7=BD=AE=E3=81=8B?= =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B=E3=81=AE=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/tick/skill_branch.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction index a4a6688575..5579895a6e 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_branch.mcfunction @@ -23,6 +23,6 @@ # サイドダッシュ execute if entity @s[tag=AC.Dash.Side] run function asset:mob/0372.tutankhamen/tick/skill/dash/side/ # ダッシュスラッシュ - execute if entity @s[tag=AC.Dash.Slash] run function asset:mob/0372.tutankhamen/tick/skill/dash_slash/ + execute if entity @s[tag=AC.Dash.Slash] run function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/ # ファラオ・ぶちかまし - execute if entity @s[tag=AC.Dash.Charge] run function asset:mob/0372.tutankhamen/tick/skill/charge/ + execute if entity @s[tag=AC.Dash.Charge] run function asset:mob/0372.tutankhamen/tick/skill/dash/charge/ From 7aea152a4f0fd7af2d08af065171efcc5f999c3f Mon Sep 17 00:00:00 2001 From: Chuzume Date: Thu, 26 Dec 2024 16:36:56 +0900 Subject: [PATCH 068/103] =?UTF-8?q?=E3=82=B9=E3=82=B4=E3=83=AC=E3=83=BC?= =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=AA=E3=81=A9=E3=81=AB=E4=BD=BF=E3=81=86?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AE=E3=82=AA=E3=83=96?= =?UTF-8?q?=E3=82=B8=E3=82=A7=E3=82=AF=E3=83=88=E3=81=A4=E3=81=8F=E3=81=A3?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2168.general_long_laser/init/.mcfunction | 5 +++++ .../register.mcfunction | 20 +++++++++++++++++++ .../summon/.mcfunction | 8 ++++++++ .../summon/debug.mcfunction | 10 ++++++++++ .../2168.general_long_laser/tick/.mcfunction | 11 ++++++++++ 5 files changed, 54 insertions(+) create mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction create mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction create mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction create mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/summon/debug.mcfunction create mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction new file mode 100644 index 0000000000..aa200643e8 --- /dev/null +++ b/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction @@ -0,0 +1,5 @@ +#> asset:object/2168.general_long_laser/init/ +# +# Objectのinit時の処理 +# +# @within asset:object/alias/2168/init diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction new file mode 100644 index 0000000000..fa1c3db371 --- /dev/null +++ b/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction @@ -0,0 +1,20 @@ +#> asset:object/2168.general_long_laser/register +# +# Objectのデータを指定 +# +# @within function asset:object/alias/2168/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 2168 +# フィールド(オプション) + # data modify storage asset:object Field.myValue set value diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction new file mode 100644 index 0000000000..6d459b15d8 --- /dev/null +++ b/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2168.general_long_laser/summon/ +# +# Object召喚処理の呼び出し時に実行されるfunction +# +# @within asset:object/alias/2168/summon + +# 元となるEntityを召喚する + summon item_display ~ ~ ~ {Tags:["ObjectInit"]} diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/summon/debug.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/summon/debug.mcfunction new file mode 100644 index 0000000000..7dd48a3264 --- /dev/null +++ b/Asset/data/asset/functions/object/2168.general_long_laser/summon/debug.mcfunction @@ -0,0 +1,10 @@ +#> asset:object/2168.general_long_laser/summon/debug +# +# 動作チェック用の召喚処理 使い終わったら消してもいいかも +# +# @user +# @private + +# 召喚 + data modify storage api: Argument.ID set value 2168 + function api:object/summon diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction new file mode 100644 index 0000000000..8ac8c8e690 --- /dev/null +++ b/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/2168.general_long_laser/tick/ +# +# Objectのtick時の処理 +# +# @within asset:object/alias/2168/tick + +# Tick加算 + scoreboard players add @s General.Object.Tick 1 + +# 消滅処理 + kill @s[scores={General.Object.Tick=1000..}] From a93b24929f4448ca9f45b803ddd8d7c3664a0fb0 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 05:33:06 +0900 Subject: [PATCH 069/103] =?UTF-8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88?= =?UTF-8?q?=E3=81=9A=E3=81=93=E3=81=93=E3=81=BE=E3=81=A7=E3=80=82=E3=83=93?= =?UTF-8?q?=E3=83=BC=E3=83=A0=E3=81=8C=E4=BC=B8=E3=81=B3=E3=82=8B=E3=81=8C?= =?UTF-8?q?=E3=80=81=E5=90=91=E3=81=8D=E3=81=AB=E9=96=A2=E3=81=99=E3=82=8B?= =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=8C=E3=81=AA=E3=81=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_index.d.mcfunction | 7 +++++ .../2168.general_long_laser/init/.mcfunction | 15 +++++++++ .../2168.general_long_laser/init/m.mcfunction | 8 +++++ .../2168.general_long_laser/load.mcfunction | 9 ++++++ .../register.mcfunction | 7 ++++- .../summon/.mcfunction | 2 +- .../2168.general_long_laser/tick/.mcfunction | 31 +++++++++++++++++++ .../tick/transform.mcfunction | 15 +++++++++ 8 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/init/m.mcfunction create mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/load.mcfunction create mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/tick/transform.mcfunction diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/_index.d.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/_index.d.mcfunction new file mode 100644 index 0000000000..4f634f8713 --- /dev/null +++ b/Asset/data/asset/functions/object/2168.general_long_laser/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:object/2168.general_long_laser/_index.d +# @private + +#> tag +# @within function asset:object/2168.general_long_laser/** + #declare tag 2168.Marker.Rotate + #declare tag 2168.Marker.Init diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction index aa200643e8..5a0e7c4f86 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction @@ -3,3 +3,18 @@ # Objectのinit時の処理 # # @within asset:object/alias/2168/init + +# 消失までの時間を指定 + execute store result score @s 2168.LifeTime run data get storage asset:context this.Tick + + +# 向き担当のマーカーを召喚して上に乗っけておく + execute as 0-0-0-0-0 positioned as @s run tp @s ~ ~ ~ ~ ~ + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + function asset:object/2168.general_long_laser/init/m with storage asset:temp Args + ride @e[type=marker,tag=2168.Marker.Init,limit=1] mount @s + execute on passengers run tag @s remove 2168.Marker.Init + data remove storage asset:temp Args + +# 向き担当のマーカーを召喚して上に乗っけておく + summon marker ~ ~ ~ {Tags:["2168.Marker.Rotate","2168.Marker.Init"]} diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/init/m.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/init/m.mcfunction new file mode 100644 index 0000000000..98ea25261e --- /dev/null +++ b/Asset/data/asset/functions/object/2168.general_long_laser/init/m.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2168.general_long_laser/init/m +# +# +# +# @within function asset:object/2168.general_long_laser/init/ + +# 上に乗せるマーカーを召喚 + $summon marker ~ ~ ~ {Rotation:$(Rotation),Tags:["2168.Marker.Rotate","2168.Marker.Init"]} diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/load.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/load.mcfunction new file mode 100644 index 0000000000..00d4da915e --- /dev/null +++ b/Asset/data/asset/functions/object/2168.general_long_laser/load.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/2168.general_long_laser/load +# +# Objectに利用するスコアボード等の初期化処理 +# +# @within tag/function asset:object/load + +#> 定義類はここに +# @within function asset:object/2168.general_long_laser/** + scoreboard objectives add 2168.LifeTime dummy diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction index fa1c3db371..3e2a989350 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction @@ -17,4 +17,9 @@ # ID (int) data modify storage asset:object ID set value 2168 # フィールド(オプション) - # data modify storage asset:object Field.myValue set value + data modify storage asset:object Field.LeftRotation set value {axis:[1f,0f,0f],angle:0} + data modify storage asset:object Field.RightRotation set value {axis:[0f,-1f,0f],angle:0} + data modify storage asset:object Field.Length set value 20f + data modify storage asset:object Field.Interpolation set value 1 + data modify storage asset:object Field.Tick set value 5 + diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction index 6d459b15d8..489c9f7496 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/2168/summon # 元となるEntityを召喚する - summon item_display ~ ~ ~ {Tags:["ObjectInit"]} + summon item_display ~ ~ ~ {Tags:["ObjectInit"],brightness:{sky:15,block:15},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[1f,0f,1f]},item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:16777215},CustomModelData:20381}}} diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction index 8ac8c8e690..08d9d90883 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction @@ -4,8 +4,39 @@ # # @within asset:object/alias/2168/tick +# ストレージ用意 + data modify storage asset:context this.LeftRotation set value {axis:[1f,0f,0f],angle:0} + data modify storage asset:context this.RightRotation set value {axis:[0f,-1f,0f],angle:0} + +# 一時エンティティ召喚 + summon marker ~ ~ ~ {Tags:["rot2trans_temp"]} + +# 向き変更…？ + execute as @e[tag=rot2trans_temp,sort=nearest,limit=1] at @s rotated as @e[tag=Test,sort=nearest,limit=1] run tp @s ~ ~ ~ ~ ~ + execute rotated as @e[tag=Test,sort=nearest,limit=1] positioned 0.0 0.0 0.0 run tp @e[tag=rot2trans_temp,limit=1] ^1 ^ ^ ~ ~ + data modify storage asset:context this.LeftRotation.axis set from entity @e[tag=rot2trans_temp,limit=1] Pos + execute store result storage asset:context this.RightRotation.angle float 0.000001745 run data get entity @e[tag=rot2trans_temp,limit=1] Rotation[0] 10000 + +# execute幾何学で、縦角度[-90~90]⇒横角度[0~180]に変換 + execute rotated as @e[tag=Test,sort=nearest,limit=1] rotated -90 ~ positioned 0.0 0.0 0.0 positioned ^ ^ ^1 rotated ~180 ~ positioned ^ ^ ^-1 rotated ~-90 ~ positioned ^ ^1 ^ rotated ~180 ~ positioned ^ ^-1 ^ facing 0.0 0.0 0.0 run tp @e[tag=rot2trans_temp,limit=1] 0.0 0.0 0.0 ~ ~ + execute store result storage asset:context this.LeftRotation.angle float 0.000001745 run data get entity @e[tag=rot2trans_temp,limit=1] Rotation[0] 10000 + +# 一時エンティティ削除 + kill @e[tag=rot2trans_temp,sort=nearest,limit=1] + +# 変形反映 + data modify entity @s transformation.left_rotation set from storage asset:context this.LeftRotation + data modify entity @s transformation.right_rotation set from storage asset:context this.RightRotation + #data modify entity @s transformation.scale set value [1f,100f,1f] + +# アニメの速さを設定 + data modify entity @s start_interpolation set value 0 + # Tick加算 scoreboard players add @s General.Object.Tick 1 +# 変形 + execute if score @s General.Object.Tick matches 3.. run function asset:object/2168.general_long_laser/tick/transform + # 消滅処理 kill @s[scores={General.Object.Tick=1000..}] diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform.mcfunction new file mode 100644 index 0000000000..280edcef0f --- /dev/null +++ b/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform.mcfunction @@ -0,0 +1,15 @@ +#> asset:object/2168.general_long_laser/tick/transform +# +# +# +# @within function asset:object/2168.general_long_laser/tick/ + + +# 指定されたinterpolation_durationに設定 + data modify entity @s interpolation_duration set from storage asset:context this.Interpolation + +# translationZ +# data modify entity @s transformation.translation[2] set from storage asset:context this.TranslationZ + +# Lengthぶんのびる + data modify entity @s transformation.scale[1] set from storage asset:context this.Length From ce0638eae8bb3515a024ae7e27282eea40740926 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 05:52:19 +0900 Subject: [PATCH 070/103] =?UTF-8?q?=E6=B1=8E=E7=94=A8=E3=83=AC=E3=83=BC?= =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=8C=E3=81=82=E3=82=8B=E7=A8=8B=E5=BA=A6?= =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=81=A6=E3=81=8D=E3=81=9F=E3=80=82=E3=81=82?= =?UTF-8?q?=E3=81=A8=E3=81=AF=E4=B8=80=E7=9E=AC=E3=81=B5=E3=81=8F=E3=82=89?= =?UTF-8?q?=E3=82=80=E5=87=A6=E7=90=86=E3=81=A8=E3=81=8B=E3=81=8C=E5=BF=85?= =?UTF-8?q?=E8=A6=81=E3=81=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_index.d.mcfunction | 2 ++ .../2168.general_long_laser/init/.mcfunction | 16 +++++------- .../2168.general_long_laser/init/m.mcfunction | 8 ------ .../summon/.mcfunction | 7 +++-- .../summon/m.mcfunction | 8 ++++++ .../2168.general_long_laser/tick/.mcfunction | 26 +++++++++++++------ .../object/alias/2168/init.mcfunction | 8 ++++++ .../object/alias/2168/register.mcfunction | 8 ++++++ .../object/alias/2168/summon.mcfunction | 8 ++++++ .../object/alias/2168/tick.mcfunction | 8 ++++++ 10 files changed, 71 insertions(+), 28 deletions(-) delete mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/init/m.mcfunction create mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/summon/m.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2168/init.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2168/register.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2168/summon.mcfunction create mode 100644 Asset/data/asset/functions/object/alias/2168/tick.mcfunction diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/_index.d.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/_index.d.mcfunction index 4f634f8713..1016e820b0 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/_index.d.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/_index.d.mcfunction @@ -5,3 +5,5 @@ # @within function asset:object/2168.general_long_laser/** #declare tag 2168.Marker.Rotate #declare tag 2168.Marker.Init + #declare tag 2168.Marker.Temp + #declare tag 2168.Target diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction index 5a0e7c4f86..82531f28e1 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction @@ -7,14 +7,10 @@ # 消失までの時間を指定 execute store result score @s 2168.LifeTime run data get storage asset:context this.Tick - -# 向き担当のマーカーを召喚して上に乗っけておく - execute as 0-0-0-0-0 positioned as @s run tp @s ~ ~ ~ ~ ~ - data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation - function asset:object/2168.general_long_laser/init/m with storage asset:temp Args - ride @e[type=marker,tag=2168.Marker.Init,limit=1] mount @s - execute on passengers run tag @s remove 2168.Marker.Init - data remove storage asset:temp Args - # 向き担当のマーカーを召喚して上に乗っけておく - summon marker ~ ~ ~ {Tags:["2168.Marker.Rotate","2168.Marker.Init"]} +# execute as 0-0-0-0-0 positioned as @s run tp @s ~ ~ ~ ~ ~ +# data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation +# function asset:object/2168.general_long_laser/init/m with storage asset:temp Args +# ride @e[type=marker,tag=2168.Marker.Init,limit=1] mount @s +# execute on passengers run tag @s remove 2168.Marker.Init +# data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/init/m.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/init/m.mcfunction deleted file mode 100644 index 98ea25261e..0000000000 --- a/Asset/data/asset/functions/object/2168.general_long_laser/init/m.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/2168.general_long_laser/init/m -# -# -# -# @within function asset:object/2168.general_long_laser/init/ - -# 上に乗せるマーカーを召喚 - $summon marker ~ ~ ~ {Rotation:$(Rotation),Tags:["2168.Marker.Rotate","2168.Marker.Init"]} diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction index 489c9f7496..371fc190b1 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction @@ -4,5 +4,8 @@ # # @within asset:object/alias/2168/summon -# 元となるEntityを召喚する - summon item_display ~ ~ ~ {Tags:["ObjectInit"],brightness:{sky:15,block:15},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[1f,0f,1f]},item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:16777215},CustomModelData:20381}}} +# 元となるエンティティを召喚 + execute as 0-0-0-0-0 positioned as @s run tp @s ~ ~ ~ ~ ~ + data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation + function asset:object/2168.general_long_laser/summon/m with storage asset:temp Args + data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/summon/m.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/summon/m.mcfunction new file mode 100644 index 0000000000..a2d40775f6 --- /dev/null +++ b/Asset/data/asset/functions/object/2168.general_long_laser/summon/m.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/2168.general_long_laser/summon/m +# +# +# +# @within function asset:object/2168.general_long_laser/summon/ + +# 元となるオブジェクトを召喚: ややこしいが、item_displayの上に乗っているmarkerの向きをマクロで変えている + $summon item_display ~ ~ ~ {Tags:["ObjectInit"],Passengers:[{id:"minecraft:marker",Rotation:$(Rotation),Tags:["2168.Marker.Rotate"]}],brightness:{sky:15,block:15},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[1f,0f,1f]},item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:16777215},CustomModelData:20381}}} diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction index 08d9d90883..d71dfc97fe 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction @@ -8,21 +8,31 @@ data modify storage asset:context this.LeftRotation set value {axis:[1f,0f,0f],angle:0} data modify storage asset:context this.RightRotation set value {axis:[0f,-1f,0f],angle:0} +# 上に乗ってるマーカーを指定 + execute on passengers run tag @s add 2168.Target + # 一時エンティティ召喚 - summon marker ~ ~ ~ {Tags:["rot2trans_temp"]} + summon marker ~ ~ ~ {Tags:["2168.Marker.Temp"]} # 向き変更…？ - execute as @e[tag=rot2trans_temp,sort=nearest,limit=1] at @s rotated as @e[tag=Test,sort=nearest,limit=1] run tp @s ~ ~ ~ ~ ~ - execute rotated as @e[tag=Test,sort=nearest,limit=1] positioned 0.0 0.0 0.0 run tp @e[tag=rot2trans_temp,limit=1] ^1 ^ ^ ~ ~ - data modify storage asset:context this.LeftRotation.axis set from entity @e[tag=rot2trans_temp,limit=1] Pos - execute store result storage asset:context this.RightRotation.angle float 0.000001745 run data get entity @e[tag=rot2trans_temp,limit=1] Rotation[0] 10000 + execute as @e[type=marker,tag=2168.Marker.Temp,sort=nearest,limit=1] at @s rotated as @e[type=marker,tag=2168.Target,limit=1] run tp @s ~ ~ ~ ~ ~ + execute rotated as @e[type=marker,tag=2168.Target,limit=1] positioned 0.0 0.0 0.0 run tp @e[type=marker,tag=2168.Marker.Temp,limit=1] ^1 ^ ^ ~ ~ + data modify storage asset:context this.LeftRotation.axis set from entity @e[type=marker,tag=2168.Marker.Temp,limit=1] Pos + execute store result storage asset:context this.RightRotation.angle float 0.000001745 run data get entity @e[type=marker,tag=2168.Marker.Temp,limit=1] Rotation[0] 10000 # execute幾何学で、縦角度[-90~90]⇒横角度[0~180]に変換 - execute rotated as @e[tag=Test,sort=nearest,limit=1] rotated -90 ~ positioned 0.0 0.0 0.0 positioned ^ ^ ^1 rotated ~180 ~ positioned ^ ^ ^-1 rotated ~-90 ~ positioned ^ ^1 ^ rotated ~180 ~ positioned ^ ^-1 ^ facing 0.0 0.0 0.0 run tp @e[tag=rot2trans_temp,limit=1] 0.0 0.0 0.0 ~ ~ - execute store result storage asset:context this.LeftRotation.angle float 0.000001745 run data get entity @e[tag=rot2trans_temp,limit=1] Rotation[0] 10000 + execute rotated as @e[type=marker,tag=2168.Target,limit=1] rotated -90 ~ positioned 0.0 0.0 0.0 positioned ^ ^ ^1 rotated ~180 ~ positioned ^ ^ ^-1 rotated ~-90 ~ positioned ^ ^1 ^ rotated ~180 ~ positioned ^ ^-1 ^ facing 0.0 0.0 0.0 run tp @e[type=marker,tag=2168.Marker.Temp,limit=1] 0.0 0.0 0.0 ~ ~ + execute store result storage asset:context this.LeftRotation.angle float 0.000001745 run data get entity @e[type=marker,tag=2168.Marker.Temp,limit=1] Rotation[0] 10000 # 一時エンティティ削除 - kill @e[tag=rot2trans_temp,sort=nearest,limit=1] + kill @e[type=marker,tag=2168.Marker.Temp,sort=nearest,limit=1] + + +# 一時エンティティ削除: 0 0 0に飛んでるのでdistanceは付けられないかもしれない + kill @e[tag=2168.Marker.Temp,limit=1] + +# ターゲット解除 + execute on passengers run tag @s remove 2168.Target # 変形反映 data modify entity @s transformation.left_rotation set from storage asset:context this.LeftRotation diff --git a/Asset/data/asset/functions/object/alias/2168/init.mcfunction b/Asset/data/asset/functions/object/alias/2168/init.mcfunction new file mode 100644 index 0000000000..f9c1b69fa2 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2168/init.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2168/init +# +# Init処理のエイリアス +# +# @within asset_manager:object/init/init.m + +# 元のInit処理を呼び出す + function asset:object/2168.general_long_laser/init/ diff --git a/Asset/data/asset/functions/object/alias/2168/register.mcfunction b/Asset/data/asset/functions/object/alias/2168/register.mcfunction new file mode 100644 index 0000000000..0015072704 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2168/register.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2168/register +# +# Objectのデータ指定処理のエイリアス +# +# @within asset_manager:object/summon/register.m + +# 元の登録処理を呼び出す + function asset:object/2168.general_long_laser/register diff --git a/Asset/data/asset/functions/object/alias/2168/summon.mcfunction b/Asset/data/asset/functions/object/alias/2168/summon.mcfunction new file mode 100644 index 0000000000..157f0a66bc --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2168/summon.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2168/summon +# +# Object召喚処理のエイリアス +# +# @within asset_manager:object/summon/summon.m + +# 元の召喚処理を呼び出す + function asset:object/2168.general_long_laser/summon/ diff --git a/Asset/data/asset/functions/object/alias/2168/tick.mcfunction b/Asset/data/asset/functions/object/alias/2168/tick.mcfunction new file mode 100644 index 0000000000..071fbea228 --- /dev/null +++ b/Asset/data/asset/functions/object/alias/2168/tick.mcfunction @@ -0,0 +1,8 @@ +#> asset:object/alias/2168/tick +# +# Tick時処理のエイリアス +# +# @within asset_manager:object/tick/tick.m + +# 元のTick処理を呼び出す + function asset:object/2168.general_long_laser/tick/ From 51c8808ba699927ed027c0f204a6a2cc87328a60 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 06:30:56 +0900 Subject: [PATCH 071/103] =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E3=81=AB=E5=A4=A7=E9=87=8F=E3=81=AE=E8=A8=AD=E5=AE=9A=E7=94=A8?= =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E3=81=8C=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2168.general_long_laser/init/.mcfunction | 2 +- .../register.mcfunction | 21 +++++++++++++------ .../summon/.mcfunction | 1 + .../summon/m.mcfunction | 2 +- .../2168.general_long_laser/tick/.mcfunction | 7 +++++-- .../tick/transform/appear.mcfunction | 11 ++++++++++ .../tick/transform/disappear.mcfunction | 12 +++++++++++ .../asset/tags/functions/object/load.json | 3 ++- 8 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/tick/transform/appear.mcfunction create mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/tick/transform/disappear.mcfunction diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction index 82531f28e1..6349aa7fe1 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction @@ -5,7 +5,7 @@ # @within asset:object/alias/2168/init # 消失までの時間を指定 - execute store result score @s 2168.LifeTime run data get storage asset:context this.Tick + execute store result score @s 2168.LifeTime run data get storage asset:context this.LifeTime # 向き担当のマーカーを召喚して上に乗っけておく # execute as 0-0-0-0-0 positioned as @s run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction index 3e2a989350..166b88af88 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction @@ -17,9 +17,18 @@ # ID (int) data modify storage asset:object ID set value 2168 # フィールド(オプション) - data modify storage asset:object Field.LeftRotation set value {axis:[1f,0f,0f],angle:0} - data modify storage asset:object Field.RightRotation set value {axis:[0f,-1f,0f],angle:0} - data modify storage asset:object Field.Length set value 20f - data modify storage asset:object Field.Interpolation set value 1 - data modify storage asset:object Field.Tick set value 5 - + # 変えるべからず + data modify storage asset:object Field.LeftRotation set value {axis:[1f,0f,0f],angle:0} + data modify storage asset:object Field.RightRotation set value {axis:[0f,-1f,0f],angle:0} + # サイズ(横の太さ、長さ、縦の太さ) + data modify storage asset:object Field.Scale set value [3f,40f,3f] + # 出現にかかる時間 + data modify storage asset:object Field.AppearInterpolation set value 1 + # 何Tick後に消失に向かうか + data modify storage asset:object Field.DisappearTick set value 2 + # 縮小にかかる時間 + data modify storage asset:object Field.DisappearInterpolation set value 2 + # 存在時間(上記とは別、こちらは単純に指定されたTick分だけ残る) + data modify storage asset:object Field.LifeTime set value 20 + # 色(10進数) + data modify storage asset:object Field.Color set value 16777215 diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction index 371fc190b1..779bcca7fd 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction @@ -6,6 +6,7 @@ # 元となるエンティティを召喚 execute as 0-0-0-0-0 positioned as @s run tp @s ~ ~ ~ ~ ~ + data modify storage asset:temp Args.Color set from storage asset:context this.Color data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation function asset:object/2168.general_long_laser/summon/m with storage asset:temp Args data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/summon/m.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/summon/m.mcfunction index a2d40775f6..c78765488d 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/summon/m.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/summon/m.mcfunction @@ -5,4 +5,4 @@ # @within function asset:object/2168.general_long_laser/summon/ # 元となるオブジェクトを召喚: ややこしいが、item_displayの上に乗っているmarkerの向きをマクロで変えている - $summon item_display ~ ~ ~ {Tags:["ObjectInit"],Passengers:[{id:"minecraft:marker",Rotation:$(Rotation),Tags:["2168.Marker.Rotate"]}],brightness:{sky:15,block:15},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[1f,0f,1f]},item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:16777215},CustomModelData:20381}}} + $summon item_display ~ ~ ~ {Tags:["ObjectInit"],Passengers:[{id:"minecraft:marker",Rotation:$(Rotation),Tags:["2168.Marker.Rotate"]}],brightness:{sky:15,block:15},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0f,0f,0f]},item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:$(Color)},CustomModelData:20381}}} diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction index d71dfc97fe..019455bcf9 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction @@ -46,7 +46,10 @@ scoreboard players add @s General.Object.Tick 1 # 変形 - execute if score @s General.Object.Tick matches 3.. run function asset:object/2168.general_long_laser/tick/transform + execute if score @s General.Object.Tick matches 3 run function asset:object/2168.general_long_laser/tick/transform/appear + +# 縮む + execute if score @s General.Object.Tick matches 5 run function asset:object/2168.general_long_laser/tick/transform/disappear # 消滅処理 - kill @s[scores={General.Object.Tick=1000..}] + execute if score @s General.Object.Tick > @s 2168.LifeTime run kill @s diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform/appear.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform/appear.mcfunction new file mode 100644 index 0000000000..31c0bb4f20 --- /dev/null +++ b/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform/appear.mcfunction @@ -0,0 +1,11 @@ +#> asset:object/2168.general_long_laser/tick/transform/appear +# +# +# +# @within function asset:object/2168.general_long_laser/tick/ + +# 指定されたinterpolation_durationに設定 + data modify entity @s interpolation_duration set from storage asset:context this.Interpolation + +# Scaleの値を放り込む + data modify entity @s transformation.scale set from storage asset:context this.Scale diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform/disappear.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform/disappear.mcfunction new file mode 100644 index 0000000000..709f5444d5 --- /dev/null +++ b/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform/disappear.mcfunction @@ -0,0 +1,12 @@ +#> asset:object/2168.general_long_laser/tick/transform/disappear +# +# +# +# @within function asset:object/2168.general_long_laser/tick/ + +# 指定されたinterpolation_durationに設定 + data modify entity @s interpolation_duration set from storage asset:context this.DisappearInterpolation + +# Y以外が小さくなっていく + data modify entity @s transformation.scale[0] set value 0.0f + data modify entity @s transformation.scale[2] set value 0.0f diff --git a/Asset/data/asset/tags/functions/object/load.json b/Asset/data/asset/tags/functions/object/load.json index fffc441342..24d6e4111b 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/2168.general_long_laser/load", "asset:object/2092.ghost_bullet/load", "asset:object/2090.magic_square/load", "asset:object/2113.rectangle_announce/load", @@ -21,4 +22,4 @@ "asset:object/1059.book_of_hero/load", "asset:object/2031.giant_pumpkin/load" ] -} +} \ No newline at end of file From 0337c53e4a54ce29cd5891dbe2bd355d1101688d Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 06:48:15 +0900 Subject: [PATCH 072/103] =?UTF-8?q?=E6=B1=8E=E7=94=A8=E3=83=AC=E3=83=BC?= =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=AF=E3=81=93=E3=82=8C=E3=81=A7=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E3=81=A0=E3=82=8D=E3=81=86=E2=80=A6=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2168.general_long_laser/init/.mcfunction | 18 ++++++++++-------- .../2168.general_long_laser/load.mcfunction | 1 + .../register.mcfunction | 2 +- .../2168.general_long_laser/tick/.mcfunction | 4 ++-- .../tick/transform/appear.mcfunction | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction index 6349aa7fe1..924979b01f 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/init/.mcfunction @@ -4,13 +4,15 @@ # # @within asset:object/alias/2168/init -# 消失までの時間を指定 +#> Temp +# @private +#declare score_holder $Temporary + +# フィールドのTickデータをスコアボードに移す execute store result score @s 2168.LifeTime run data get storage asset:context this.LifeTime -# 向き担当のマーカーを召喚して上に乗っけておく -# execute as 0-0-0-0-0 positioned as @s run tp @s ~ ~ ~ ~ ~ -# data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation -# function asset:object/2168.general_long_laser/init/m with storage asset:temp Args -# ride @e[type=marker,tag=2168.Marker.Init,limit=1] mount @s -# execute on passengers run tag @s remove 2168.Marker.Init -# data remove storage asset:temp Args +# 出現には少し時間をおく都合で、DisapperTickに数値をプラスしないといけない + execute store result score $Temporary Temporary run data get storage asset:context this.DisappearTick + scoreboard players operation $Temporary Temporary += $2 Const + scoreboard players operation @s 2168.DisppearTick = $Temporary Temporary + scoreboard players reset $Temporary diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/load.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/load.mcfunction index 00d4da915e..485bb29b6e 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/load.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/load.mcfunction @@ -7,3 +7,4 @@ #> 定義類はここに # @within function asset:object/2168.general_long_laser/** scoreboard objectives add 2168.LifeTime dummy + scoreboard objectives add 2168.DisppearTick dummy diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction index 166b88af88..0a18f9ad89 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction @@ -23,7 +23,7 @@ # サイズ(横の太さ、長さ、縦の太さ) data modify storage asset:object Field.Scale set value [3f,40f,3f] # 出現にかかる時間 - data modify storage asset:object Field.AppearInterpolation set value 1 + data modify storage asset:object Field.AppearInterpolation set value 2 # 何Tick後に消失に向かうか data modify storage asset:object Field.DisappearTick set value 2 # 縮小にかかる時間 diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction index 019455bcf9..2479c5c8e1 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/tick/.mcfunction @@ -46,10 +46,10 @@ scoreboard players add @s General.Object.Tick 1 # 変形 - execute if score @s General.Object.Tick matches 3 run function asset:object/2168.general_long_laser/tick/transform/appear + execute if score @s General.Object.Tick matches 2 run function asset:object/2168.general_long_laser/tick/transform/appear # 縮む - execute if score @s General.Object.Tick matches 5 run function asset:object/2168.general_long_laser/tick/transform/disappear + execute if score @s General.Object.Tick = @s 2168.DisppearTick run function asset:object/2168.general_long_laser/tick/transform/disappear # 消滅処理 execute if score @s General.Object.Tick > @s 2168.LifeTime run kill @s diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform/appear.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform/appear.mcfunction index 31c0bb4f20..56368f8ca5 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform/appear.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform/appear.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/2168.general_long_laser/tick/ # 指定されたinterpolation_durationに設定 - data modify entity @s interpolation_duration set from storage asset:context this.Interpolation + data modify entity @s interpolation_duration set from storage asset:context this.AppearInterpolation # Scaleの値を放り込む data modify entity @s transformation.scale set from storage asset:context this.Scale From ffdd76d1ef8c5fdf9c28d1a566d236dc6f5a5d24 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 07:00:47 +0900 Subject: [PATCH 073/103] =?UTF-8?q?=E6=B1=8E=E7=94=A8=E3=81=AA=E3=81=8C?= =?UTF-8?q?=EF=BD=9E=E3=81=84=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AF?= =?UTF-8?q?=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=A0=E3=83=A2=E3=83=87=E3=83=AB?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E3=81=AE=E6=8C=87=E5=AE=9A=E3=82=82?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=82=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/2168.general_long_laser/register.mcfunction | 6 ++++-- .../object/2168.general_long_laser/summon/.mcfunction | 1 + .../object/2168.general_long_laser/summon/m.mcfunction | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction index 0a18f9ad89..37355698a5 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/register.mcfunction @@ -20,6 +20,10 @@ # 変えるべからず data modify storage asset:object Field.LeftRotation set value {axis:[1f,0f,0f],angle:0} data modify storage asset:object Field.RightRotation set value {axis:[0f,-1f,0f],angle:0} + # 見た目に使うCustomModelData(革の馬鎧。また、使うモデルはなんでもいいわけではない) + data modify storage asset:object Field.CustomModelData set value 20381 + # 色(10進数) + data modify storage asset:object Field.Color set value 16777215 # サイズ(横の太さ、長さ、縦の太さ) data modify storage asset:object Field.Scale set value [3f,40f,3f] # 出現にかかる時間 @@ -30,5 +34,3 @@ data modify storage asset:object Field.DisappearInterpolation set value 2 # 存在時間(上記とは別、こちらは単純に指定されたTick分だけ残る) data modify storage asset:object Field.LifeTime set value 20 - # 色(10進数) - data modify storage asset:object Field.Color set value 16777215 diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction index 779bcca7fd..53dec11d89 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/summon/.mcfunction @@ -6,6 +6,7 @@ # 元となるエンティティを召喚 execute as 0-0-0-0-0 positioned as @s run tp @s ~ ~ ~ ~ ~ + data modify storage asset:temp Args.CustomModelData set from storage asset:context this.CustomModelData data modify storage asset:temp Args.Color set from storage asset:context this.Color data modify storage asset:temp Args.Rotation set from entity 0-0-0-0-0 Rotation function asset:object/2168.general_long_laser/summon/m with storage asset:temp Args diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/summon/m.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/summon/m.mcfunction index c78765488d..4ca03f9ede 100644 --- a/Asset/data/asset/functions/object/2168.general_long_laser/summon/m.mcfunction +++ b/Asset/data/asset/functions/object/2168.general_long_laser/summon/m.mcfunction @@ -5,4 +5,4 @@ # @within function asset:object/2168.general_long_laser/summon/ # 元となるオブジェクトを召喚: ややこしいが、item_displayの上に乗っているmarkerの向きをマクロで変えている - $summon item_display ~ ~ ~ {Tags:["ObjectInit"],Passengers:[{id:"minecraft:marker",Rotation:$(Rotation),Tags:["2168.Marker.Rotate"]}],brightness:{sky:15,block:15},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0f,0f,0f]},item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:$(Color)},CustomModelData:20381}}} + $summon item_display ~ ~ ~ {Tags:["ObjectInit"],Passengers:[{id:"minecraft:marker",Rotation:$(Rotation),Tags:["2168.Marker.Rotate"]}],brightness:{sky:15,block:15},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0f,0f,0f]},item:{id:"minecraft:leather_horse_armor",Count:1b,tag:{display:{color:$(Color)},CustomModelData:$(CustomModelData)}}} From d8296a6b860d05d6139e63246a502a0d0279fe84 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 07:07:47 +0900 Subject: [PATCH 074/103] =?UTF-8?q?=E3=83=93=E3=83=BC=E3=83=A0=E7=99=BA?= =?UTF-8?q?=E5=B0=84=E6=99=82=E3=81=AB=E5=9C=B0=E9=9D=A2=E3=81=AB=E9=99=8D?= =?UTF-8?q?=E3=82=8A=E3=82=8B=E5=87=A6=E7=90=86=E3=81=AB=E3=81=A6=E3=80=81?= =?UTF-8?q?=E7=B4=B0=E3=81=8B=E3=81=8F=E5=9C=B0=E9=9D=A2=E3=83=81=E3=82=A7?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?UTF-8?q?=E3=81=AA=E3=81=A3=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction index 9f1284bcc3..dee8587273 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/.mcfunction @@ -1,6 +1,6 @@ #> asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ # -# ハイパーレーザー +# ハイパーレーザー。「ソウルストリーム」って名前付けたら怒られるかな？ # # @within function asset:mob/0372.tutankhamen/tick/skill_branch @@ -12,7 +12,7 @@ execute if score @s General.Mob.Tick matches 23 at @e[type=marker,tag=AC.ModelLocator.Weapon] run particle crit ~ ~ ~ 0 0 0 0.5 25 # 降りる - execute if score @s General.Mob.Tick matches 0..20 if block ~ ~-1 ~ #lib:no_collision if function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground run tp @s ~ ~-0.25 ~ + execute if score @s General.Mob.Tick matches 0..20 if block ~ ~-0.1 ~ #lib:no_collision if function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/check_ground run tp @s ~ ~-0.1 ~ # プレイヤーの方を向く execute if score @s General.Mob.Tick matches 0..20 facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-40 facing entity @s feet positioned as @s rotated ~ 0 run tp @s ^ ^ ^ ~ ~ From 3585d1dafccf2e2f256809acb5c5c0875c48698a Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 07:40:02 +0900 Subject: [PATCH 075/103] =?UTF-8?q?=E9=AD=94=E6=B3=95=E9=99=A3=E3=81=8C?= =?UTF-8?q?=E3=83=91=E3=83=83=E3=81=A8=E6=B6=88=E3=81=88=E3=82=8B=E3=81=AE?= =?UTF-8?q?=E3=81=8C=E6=B0=97=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E7=B8=AE=E5=B0=8F=E3=81=97=E3=81=AA=E3=81=8C=E3=82=89?= =?UTF-8?q?=E6=B6=88=E3=81=88=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=BF=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/2090.magic_square/tick/.mcfunction | 3 +++ .../object/2090.magic_square/tick/transdorm.mcfunction | 9 +++++++++ 2 files changed, 12 insertions(+) create mode 100644 Asset/data/asset/functions/object/2090.magic_square/tick/transdorm.mcfunction diff --git a/Asset/data/asset/functions/object/2090.magic_square/tick/.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/tick/.mcfunction index efec0e674d..2ecf70c70e 100644 --- a/Asset/data/asset/functions/object/2090.magic_square/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2090.magic_square/tick/.mcfunction @@ -22,5 +22,8 @@ # Tick加算 scoreboard players add @s General.Object.Tick 1 +# 消失時にはぬるりと消えていく + execute if score @s General.Object.Tick matches 95 run function asset:object/2090.magic_square/tick/transdorm + # 消滅処理 kill @s[scores={General.Object.Tick=100..}] diff --git a/Asset/data/asset/functions/object/2090.magic_square/tick/transdorm.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/tick/transdorm.mcfunction new file mode 100644 index 0000000000..d92041c896 --- /dev/null +++ b/Asset/data/asset/functions/object/2090.magic_square/tick/transdorm.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/2090.magic_square/tick/transdorm +# +# 消える +# +# @within function asset:object/2090.magic_square/tick/ + +data modify entity @s start_interpolation set value 0 +data modify entity @s interpolation_duration set value 5 +data modify entity @s transformation.scale set value [0.0f,0.0f,0.0f] From fa1d641ab89d75f578b390ecfa48b0fe10b255c5 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 07:40:13 +0900 Subject: [PATCH 076/103] =?UTF-8?q?=E3=83=8F=E3=82=A4=E3=83=91=E3=83=BC?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC=E3=81=AE=E6=BC=94=E5=87=BA?= =?UTF-8?q?=E5=91=A8=E3=82=8A=E3=81=AE=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/2091.hyper_laser_manager/tick/.mcfunction | 5 +++-- .../2091.hyper_laser_manager/tick/alert.mcfunction | 2 +- .../tick/recursive.mcfunction | 8 ++++---- .../2091.hyper_laser_manager/tick/shoot.mcfunction | 12 +++++++----- .../tick/summon_laser.mcfunction | 9 +++++++++ 5 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/summon_laser.mcfunction diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction index 2d149d91d3..d6f0bece1c 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/.mcfunction @@ -13,10 +13,8 @@ # 前方に魔法陣を召喚 execute if score @s General.Object.Tick matches 1 run data modify storage api: Argument.FieldOverride set value {Scale:[4.2f,4.2f,0.01f],Color:5436415} execute if score @s General.Object.Tick matches 1 anchored eyes positioned ^ ^ ^ run function asset:object/2091.hyper_laser_manager/tick/summon_square - execute if score @s General.Object.Tick matches 2 run data modify storage api: Argument.FieldOverride set value {Scale:[2.8f,2.8f,0.01f],CMD:20444,Color:5436415,LeftRotate:true} execute if score @s General.Object.Tick matches 2 anchored eyes positioned ^ ^ ^0.2 run function asset:object/2091.hyper_laser_manager/tick/summon_square - execute if score @s General.Object.Tick matches 3 run data modify storage api: Argument.FieldOverride set value {Scale:[1.4f,1.4f,0.01f],CMD:20444,Color:5436415} execute if score @s General.Object.Tick matches 3 anchored eyes positioned ^ ^ ^0.4 run function asset:object/2091.hyper_laser_manager/tick/summon_square @@ -33,6 +31,9 @@ execute if score $Interval Temporary matches 0 if score @s General.Object.Tick matches 35.. run playsound entity.zombie_villager.converted hostile @a ~ ~ ~ 0.5 2.0 scoreboard players reset $Interval Temporary +# ビーム！ + execute if score @s General.Object.Tick matches 42 run function asset:object/2091.hyper_laser_manager/tick/summon_laser + # 発射 execute if score @s General.Object.Tick matches 42 anchored eyes positioned ^ ^ ^ run function asset:object/2091.hyper_laser_manager/tick/shoot diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/alert.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/alert.mcfunction index 7145ead124..95562a1510 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/alert.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/alert.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/2091.hyper_laser_manager/tick/ # データ設定 - data modify storage api: Argument.FieldOverride set value {Color:5436415,Interpolation:60,Tick:40,Scale:[5f,60.0f]} + data modify storage api: Argument.FieldOverride set value {Color:5436415,Interpolation:15,Tick:40,Scale:[5f,30.0f]} # 見てる方向へRotationXを設定 data modify storage api: Argument.FieldOverride.RotationX set from entity @s Rotation[0] diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/recursive.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/recursive.mcfunction index 8ed019a00f..7edf890aea 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/recursive.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/recursive.mcfunction @@ -7,14 +7,14 @@ # asset:object/2091.hyper_laser_manager/tick/recursive # 演出 - particle soul_fire_flame ~ ~ ~ 0.1 0.1 0.1 0.08 2 normal @a - particle soul_fire_flame ^ ^ ^0.25 0.1 0.1 0.1 0.08 2 normal @a - particle soul ~ ~ ~ 0 0 0 0.25 3 normal @a + execute if predicate lib:random_pass_per/75 run particle soul_fire_flame ~ ~ ~ 0.1 0.1 0.1 0.08 1 normal @a + execute if predicate lib:random_pass_per/75 run particle soul_fire_flame ^ ^ ^0.25 0.1 0.1 0.1 0.08 1 normal @a + execute if predicate lib:random_pass_per/50 run particle soul ~ ~ ~ 0.5 .5 0.5 0.25 1 normal @a # 一定間隔での演出 scoreboard players operation $Interval Temporary = $Recursive Temporary scoreboard players operation $Interval Temporary %= $5 Const - execute if score $Interval Temporary matches 0 run particle sonic_boom ~ ~ ~ 0 0 0 0 1 +# execute if score $Interval Temporary matches 0 run particle sonic_boom ~ ~ ~ 0 0 0 0 1 scoreboard players reset $Interval Temporary # 再帰スコア diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction index 4a5d44c095..d83c12519c 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction @@ -4,12 +4,14 @@ # # @within function asset:object/2091.hyper_laser_manager/tick/ -# vfx +# サウンドと図形での演出 + particle minecraft:dust 0 1 1 2 ~ ~ ~ 0.7 0.7 0.7 0 100 function asset:object/2091.hyper_laser_manager/tick/vfx - execute as @a[distance=..32] at @s facing entity @e[type=marker,tag=this,distance=..30] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 1.8 - execute as @a[distance=..32] at @s facing entity @e[type=marker,tag=this,distance=..30] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 1.6 + execute as @a[distance=..32] at @s facing entity @e[type=marker,tag=this,distance=..30] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 0.7 1.8 + execute as @a[distance=..32] at @s facing entity @e[type=marker,tag=this,distance=..30] eyes positioned ^ ^ ^1 run playsound ogg:block.respawn_anchor.deplete2 hostile @a ~ ~ ~ 0.7 1 + execute as @a[distance=..32] at @s facing entity @e[type=marker,tag=this,distance=..30] eyes positioned ^ ^ ^1 run playsound minecraft:entity.breeze.death hostile @a ~ ~ ~ 0.7 0.7 -# 発射 +# 再帰パーティクル演出 function asset:object/2091.hyper_laser_manager/tick/recursive scoreboard players reset $Recursive Temporary @@ -22,7 +24,7 @@ # ダメージを与える # データ設定 - data modify storage api: Argument.Damage set value 45.0f + data modify storage api: Argument.Damage set value 50.0f data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Fire" # tag付けされたプレイヤーにダメージを与える diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/summon_laser.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/summon_laser.mcfunction new file mode 100644 index 0000000000..2586989e56 --- /dev/null +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/summon_laser.mcfunction @@ -0,0 +1,9 @@ +#> asset:object/2091.hyper_laser_manager/tick/summon_laser +# +# +# +# @within function asset:object/2091.hyper_laser_manager/tick/ + +data modify storage api: Argument.ID set value 2168 +data modify storage api: Argument.FieldOverride set value {Scale:[7f,60f,7f],Color:9763071,DisappearInterpolation:3,LifeTime:15} +function api:object/summon From 418cd4c7b4cc9623025fb64e23311a466d2b4fe5 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 07:40:24 +0900 Subject: [PATCH 077/103] =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E6=A7=8B=E3=81=88=E3=82=8B=E6=99=82=E3=81=AB=E9=9F=B3=E3=81=A4?= =?UTF-8?q?=E3=81=91=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/hyper_laser/windup.mcfunction | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction index 91cefb2402..d16bb9f106 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction @@ -6,3 +6,8 @@ # アニメ再生 execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_windup/tween {to_frame:0, duration:10} + +# 演出 + playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 1 1 + playsound minecraft:block.grindstone.use hostile @a ~ ~ ~ 1 1.5 + playsound minecraft:item.trident.return hostile @a ~ ~ ~ 1 2 From 6f3aa57d5a280e6d35f6bc26a7d513c7f763a6e2 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 07:40:32 +0900 Subject: [PATCH 078/103] =?UTF-8?q?=E2=80=A6=E6=9C=AA=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E3=82=88=E3=81=AA=E3=80=81=E3=81=93=E3=82=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/hyper_laser/recursive.mcfunction | 8 -------- .../tick/skill/hyper_laser/shoot.mcfunction | 6 ------ 2 files changed, 14 deletions(-) delete mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/recursive.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/recursive.mcfunction deleted file mode 100644 index 7761a4263e..0000000000 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/recursive.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:mob/0372.tutankhamen/tick/skill/hyper_laser/recursive -# -# -# -# @within function -# asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot -# asset:mob/0372.tutankhamen/tick/skill/hyper_laser/recursive - diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction deleted file mode 100644 index 9431d248de..0000000000 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/shoot.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:mob/0372.tutankhamen/tick/skill/hyper_laser/shoot -# -# -# -# @within function asset:mob/0372.tutankhamen/tick/skill/hyper_laser/ - From 92c9e10f360eec7241e1fa3c327881632addd699 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 08:01:03 +0900 Subject: [PATCH 079/103] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=99=82=E3=81=AE?= =?UTF-8?q?=E6=96=B9=E3=82=82=E8=B6=B3=E5=A0=B4=E3=81=A3=E3=81=BD=E3=81=84?= =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=82=92=E5=87=BA=E3=81=99=E3=82=88=E3=81=86?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/2093.tutankhamen_death/tick/.mcfunction | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/.mcfunction b/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/.mcfunction index 6c4417135e..9859ecae8d 100644 --- a/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/.mcfunction +++ b/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/.mcfunction @@ -20,3 +20,6 @@ # 消失 execute if score @s General.Object.Tick matches 110 run function asset:object/2093.tutankhamen_death/tick/end + +# 足元に何もなければ + execute if block ~ ~-0.2 ~ #lib:no_collision run particle minecraft:enchant ~ ~ ~ 0.4 0 0.4 0 10 From d3ce9174dc7a75e931d45f04249a67471905e0fe Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 08:01:24 +0900 Subject: [PATCH 080/103] =?UTF-8?q?=E6=9C=AC=E6=B0=97=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=82=8B=E3=81=A8=E9=80=A3=E9=8E=96=E3=83=80=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=A5=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=80=82=E9=81=BF=E3=81=91=E3=82=8C=E3=82=8B?= =?UTF-8?q?=E3=81=AE=E3=81=8B=E3=81=AA=E3=81=93=E3=82=8C=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/dash_select.mcfunction | 2 +- .../tick/skill/dash/chain_dash.mcfunction | 40 +++++++++++++++++++ .../tick/skill/dash/charge/.mcfunction | 6 +++ .../tick/skill/dash/dash_slash/.mcfunction | 6 +++ .../tick/skill/dash/side/.mcfunction | 12 ++++-- .../tick/skill/dash/side/shoot/.mcfunction | 2 +- .../tick/skill/reset.mcfunction | 3 ++ 7 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/chain_dash.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/dash_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/dash_select.mcfunction index a9d8b2df97..f1d65bbeb0 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/dash_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/dash_select.mcfunction @@ -21,7 +21,7 @@ execute store result score $Random Temporary run function lib:random/with_biased/manual.m with storage lib: Args # デバッグのコマンド - scoreboard players set $Random Temporary 0 +# scoreboard players set $Random Temporary 3 # スキル選択 execute if score $Random Temporary matches 0..1 run tag @s add AC.Dash.Side diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/chain_dash.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/chain_dash.mcfunction new file mode 100644 index 0000000000..40fd0d7adb --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/chain_dash.mcfunction @@ -0,0 +1,40 @@ +#> asset:mob/0372.tutankhamen/tick/skill/dash/chain_dash +# +# ダッシュからダッシュへ +# +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/** + +# スコアをセット + scoreboard players set @s General.Mob.Tick -1 + +# 即座に付近のプレイヤーを見る + execute facing entity @p[distance=..64] feet run tp @s ~ ~ ~ ~ ~ + +# Tagを削除 + tag @s remove AC.Dash.Left + tag @s remove AC.Dash.Right + tag @s remove AC.Dash.Side + tag @s remove AC.Dash.Slash + tag @s remove AC.Dash.Charge + +# カウント増やす + scoreboard players add @s AC.Count.Dash 1 + +# 乱数によるスキル選択 + data modify storage lib: Args.key set value "0372.Dash" + data modify storage lib: Args.max set value 4 + data modify storage lib: Args.scarcity_history_size set value 3 + execute store result score $Random Temporary run function lib:random/with_biased/manual.m with storage lib: Args + +# デバッグのコマンド +# scoreboard players set $Random Temporary 2 + +# スキル選択 + execute if score $Random Temporary matches 0..1 run tag @s add AC.Dash.Side + execute if score $Random Temporary matches 0 run tag @s add AC.Dash.Left + execute if score $Random Temporary matches 1 run tag @s add AC.Dash.Right + execute if score $Random Temporary matches 2 run tag @s add AC.Dash.Slash + execute if score $Random Temporary matches 3 run tag @s add AC.Dash.Charge + +# リセット + scoreboard players reset $Random Temporary diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/.mcfunction index 0a767a33d2..56f7552b31 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/.mcfunction @@ -21,6 +21,12 @@ # ブレーキ execute if score @s General.Mob.Tick matches 30 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash_end/tween {to_frame: 0, duration: 5} +# 本気時は謎キャンセルでダッシュにチェインする + # ノーマルモード + execute unless predicate api:global_vars/difficulty/min/hard if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 50 unless score @s AC.Count.Dash matches 0.. run function asset:mob/0372.tutankhamen/tick/skill/dash/chain_dash + # ハードモード + execute if predicate api:global_vars/difficulty/min/hard if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 40 unless score @s AC.Count.Dash matches 0.. run function asset:mob/0372.tutankhamen/tick/skill/dash/chain_dash + # ウソ慣性 execute if score @s General.Mob.Tick matches 30..40 unless function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ^ ^ ^0.5 execute if score @s General.Mob.Tick matches 40..45 unless function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ^ ^ ^0.3 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction index 7c062d6635..df29dcb4b0 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction @@ -22,6 +22,12 @@ # そして斬撃のダメージ execute if score @s General.Mob.Tick matches 118 run function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/damage +# 本気時は謎キャンセルでダッシュにチェインする + # ノーマルモード + execute unless predicate api:global_vars/difficulty/min/hard if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 140 unless score @s AC.Count.Dash matches 0.. run function asset:mob/0372.tutankhamen/tick/skill/dash/chain_dash + # ハードモード + execute if predicate api:global_vars/difficulty/min/hard if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 120 unless score @s AC.Count.Dash matches 0.. run function asset:mob/0372.tutankhamen/tick/skill/dash/chain_dash + # ニュートラルに戻る execute if score @s General.Mob.Tick matches 140 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/tween {to_frame: 0, duration: 5} execute if score @s General.Mob.Tick matches 140 run tp @s ~ ~ ~ ~ 0 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction index 59bf054d66..b10d153f88 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction @@ -6,8 +6,8 @@ # ダッシュ開始 - execute if score @s[tag=AC.Dash.Left] General.Mob.Tick matches 0 run tp @s ~ ~ ~ ~-90 0 - execute if score @s[tag=AC.Dash.Right] General.Mob.Tick matches 0 run tp @s ~ ~ ~ ~90 0 + execute if score @s[tag=AC.Dash.Left] General.Mob.Tick matches 0 run tp @s ~ ~ ~ ~-75 ~ + execute if score @s[tag=AC.Dash.Right] General.Mob.Tick matches 0 run tp @s ~ ~ ~ ~75 ~ execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/side/start # ヘルス半減時はダッシュしながら弾を撒いてくる @@ -19,8 +19,14 @@ # ブレーキ execute if score @s General.Mob.Tick matches 15 as @e[type=item_display,tag=AC.AJLink,distance=..16,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash_end/tween {to_frame: 0, duration: 5} +# 本気時は謎キャンセルでダッシュにチェインする + # ノーマルモード + execute unless predicate api:global_vars/difficulty/min/hard if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 25 unless score @s AC.Count.Dash matches 0.. run function asset:mob/0372.tutankhamen/tick/skill/dash/chain_dash + # ハードモード + execute if predicate api:global_vars/difficulty/min/hard if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 15 unless score @s AC.Count.Dash matches 0.. run function asset:mob/0372.tutankhamen/tick/skill/dash/chain_dash + # ブレーキかけつつプレイヤーの方を向く - execute if score @s General.Mob.Tick matches 15..30 facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^ ~ 0 + execute if score @s General.Mob.Tick matches 15..30 facing entity @p[gamemode=!spectator] feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-20 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^ ~ ~ # ウソ慣性 execute if score @s General.Mob.Tick matches 15..20 unless function asset:mob/0372.tutankhamen/tick/skill/dash/check_collide run tp @s ^ ^ ^0.5 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/.mcfunction index 456ed8c2c8..3d189860bb 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/shoot/.mcfunction @@ -12,6 +12,6 @@ scoreboard players operation $AttackInterval Temporary = @s General.Mob.Tick # 数Tickごとにサウンド - scoreboard players operation $AttackInterval Temporary %= $2 Const + scoreboard players operation $AttackInterval Temporary %= $4 Const execute if score $AttackInterval Temporary matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/side/shoot/summon scoreboard players reset $AttackInterval Temporary diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index a7ce44be6d..35bf51e448 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -9,6 +9,9 @@ # スコアをセット scoreboard players set @s General.Mob.Tick -10 +# リセット + scoreboard players reset @s AC.Count.Dash + # Tagを削除 tag @s remove AC.Opening tag @s remove AC.Laser From 33057fe61da00022cfa81945ce38f46456e7846e Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 16:56:11 +0900 Subject: [PATCH 081/103] =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E6=94=BB=E6=92=83=E3=82=92=E3=83=AA=E3=83=AF=E3=83=BC=E3=82=AF?= =?UTF-8?q?=E3=80=82=E7=91=A0=E7=92=83=E3=81=8C=E3=81=AA=E3=82=93=E3=81=A8?= =?UTF-8?q?=E3=81=84=E3=81=86=E3=81=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/laser/.mcfunction | 67 +++++++++---------- .../tick/skill/laser/alert.mcfunction | 15 +++++ .../skill/laser/facing_target.m.mcfunction | 14 +--- .../tick/skill/laser/shoot/.mcfunction | 27 ++++++++ .../tick/skill/laser/shoot/summon.mcfunction | 36 ++++++++++ .../tick/skill/laser/windup.mcfunction | 12 ++++ 6 files changed, 124 insertions(+), 47 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/alert.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot/.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot/summon.mcfunction create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/windup.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction index 92618c6c52..18a23a15dc 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -1,43 +1,40 @@ #> asset:mob/0372.tutankhamen/tick/skill/laser/ # -# +# こっちにエイムを合わせながらのレーザー連射 # # @within function asset:mob/0372.tutankhamen/tick/skill_branch # AJの開始アニメーション - execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop - execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_start/play - execute if entity @s[scores={General.Mob.Tick=11}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_wait/play - -# 狙うプレイヤーを決定しフィールドに放り込む - execute if entity @s[scores={General.Mob.Tick=0}] as @r[distance=..30] run function lib:get_name/ - execute if entity @s[scores={General.Mob.Tick=0}] run data modify storage asset:context this.TargetName set from storage lib: Return.Name - -# 警告音 - execute if entity @s[scores={General.Mob.Tick=20..45}] as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound block.note_block.bit hostile @s ~ ~ ~ 0.4 1 1 - execute if entity @s[scores={General.Mob.Tick=55..65}] as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound block.note_block.bit hostile @s ~ ~ ~ 0.4 1 1 - execute if entity @s[scores={General.Mob.Tick=75..85}] as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound block.note_block.bit hostile @s ~ ~ ~ 0.4 1 1 - -# Rotationをフィールドに入れてからdisplayを前方に召喚 - execute if entity @s[scores={General.Mob.Tick=20}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=20}] at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this - execute if entity @s[scores={General.Mob.Tick=55}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=55}] at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this - execute if entity @s[scores={General.Mob.Tick=75}] at @s run data modify storage asset:context this.Rotation set from entity @s Rotation - execute if entity @s[scores={General.Mob.Tick=75}] at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run function asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m with storage asset:context this - -# ターゲットの方を向く - execute if entity @s[scores={General.Mob.Tick=0..35}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this - execute if entity @s[scores={General.Mob.Tick=55}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this - execute if entity @s[scores={General.Mob.Tick=75}] run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this - -# レーザー発射 - execute if entity @s[scores={General.Mob.Tick=45}] at @s anchored eyes positioned ^0.2 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot - execute if entity @s[scores={General.Mob.Tick=65}] at @s anchored eyes positioned ^0.2 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot - execute if entity @s[scores={General.Mob.Tick=85}] at @s anchored eyes positioned ^0.2 ^-0.5 ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot - -# ビーム終了アニメ - execute if entity @s[scores={General.Mob.Tick=105}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_end/play + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/laser/windup + +# 演出 + execute if score @s General.Mob.Tick matches 4 run playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 2 0.7 + execute if score @s General.Mob.Tick matches 8 run playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 2 1 + +# ビーム開始 + execute if score @s General.Mob.Tick matches 23 as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_2_loop/tween {to_frame:0, duration:1} + +# 対象に対して追従 + execute if score @s General.Mob.Tick matches 0..100 run function asset:mob/0372.tutankhamen/tick/skill/laser/facing_target.m with storage asset:context this + +# 予告 + execute if score @s General.Mob.Tick matches 23..63 at @e[type=marker,tag=AC.ModelLocator.Weapon,distance=..8,sort=nearest,limit=1] rotated as @s run function asset:mob/0372.tutankhamen/tick/skill/laser/alert + +# 数Tickごとにレーザー + scoreboard players operation $Interval Temporary = @s General.Mob.Tick + scoreboard players operation $Interval Temporary %= $3 Const + execute if score $Interval Temporary matches 0 if score @s General.Mob.Tick matches 63..100 at @e[type=marker,tag=AC.ModelLocator.Weapon,distance=..8,sort=nearest,limit=1] rotated as @s positioned ^ ^ ^-2 run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot/ + +# ビーム終了アニメ、ついでにまっすぐ前を向く + execute if score @s General.Mob.Tick matches 100 run tp @s ~ ~ ~ ~ 0 + execute if score @s General.Mob.Tick matches 100 as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_2_end/tween {to_frame:0, duration:1} + +# 演出 + execute if score @s General.Mob.Tick matches 105 run playsound item.trident.riptide_1 hostile @a ~ ~ ~ 2 1 + execute if score @s General.Mob.Tick matches 110 run playsound item.trident.riptide_1 hostile @a ~ ~ ~ 2 1.5 + +# ニュートラルポーズへと + execute if score @s General.Mob.Tick matches 120 as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/tween {to_frame:0, duration:10} # リセット - execute if entity @s[scores={General.Mob.Tick=120..}] run function asset:mob/0372.tutankhamen/tick/skill/reset + execute if score @s General.Mob.Tick matches 140 run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/alert.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/alert.mcfunction new file mode 100644 index 0000000000..78e5088f3f --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/alert.mcfunction @@ -0,0 +1,15 @@ +#> asset:mob/0372.tutankhamen/tick/skill/laser/alert +# +# +# +# @within function +# asset:mob/0372.tutankhamen/tick/skill/laser/ +# asset:mob/0372.tutankhamen/tick/skill/laser/alert + +# パーティクル + particle minecraft:dust 0 1 1 0.5 ^ ^ ^ 0 0 0 0 1 force @a[distance=..32] + particle minecraft:dust 0.3 1 1 0.5 ^ ^ ^0.5 0 0 0 0 1 force @a[distance=..32] + particle minecraft:dust 0.7 1 1 0.5 ^ ^ ^-0.5 0 0 0 0 1 force @a[distance=..32] + +# 壁がなければ再帰 + execute if entity @s[distance=..32] positioned ^ ^ ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/alert diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction index 2847225c2b..a1f00399b6 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/facing_target.m.mcfunction @@ -6,15 +6,5 @@ # TargetName : String # @within function asset:mob/0372.tutankhamen/tick/skill/laser/ -# ターゲットの方を向く - $execute anchored eyes facing entity $(TargetName) eyes anchored feet positioned ^ ^ ^ run tp @s ~ ~ ~ ~ ~-3 - -# AJも一緒に回転 - execute at @s run tp @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] ~ ~ ~ ~ 0 - -# さらにdisplayも一緒に回転 -# markerを召喚し、displayにそれを向かせる - execute at @s rotated ~ 0 anchored eyes positioned ^0.2 ^-0.5 ^1.5 run summon marker ~ ~ ~ {Tags:["AC.RotationMarker"]} - execute at @s anchored eyes positioned ^0.2 ^-0.5 ^18 run tp @e[type=item_display,tag=AC.LaserDisplay,distance=..50,limit=1] ~ ~ ~ ~ ~ - execute at @s as @e[type=item_display,tag=AC.LaserDisplay,distance=..30,limit=1] at @s facing entity @e[type=marker,tag=AC.RotationMarker,distance=..50,limit=1] feet facing ^ ^ ^-1 run tp @s ~ ~ ~ ~ ~ - kill @e[type=marker,tag=AC.RotationMarker,distance=..30] +# ホーミング + $execute facing entity $(TargetName) feet positioned ^ ^ ^-10 rotated as @s positioned ^ ^ ^-60 facing entity @s feet positioned as @s rotated ~ ~ run tp @s ^ ^ ^ ~ ~ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot/.mcfunction new file mode 100644 index 0000000000..397c47d7ba --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot/.mcfunction @@ -0,0 +1,27 @@ +#> asset:mob/0372.tutankhamen/tick/skill/laser/shoot/ +# +# 拡散レーザー部分 +# +# @within function asset:mob/0372.tutankhamen/tick/skill/laser/ + +#> SpreadLib +# @private +#declare tag SpreadMarker + +# 演出 + execute positioned ^ ^ ^1 run playsound ogg:block.respawn_anchor.deplete1 player @a ~ ~ ~ 1.5 2 + execute positioned ^ ^ ^1 run playsound tsb_sounds:blaster1 player @a ~ ~ ~ 1.5 2 + #execute positioned ^ ^ ^1 run playsound minecraft:entity.allay.hurt player @a ~ ~ ~ 1 2 + +# 拡散させて、前方のランダムな位置からレーザーが飛ぶ。ブレイブロッド。 + # 拡散させるEntityを召喚する + summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + # ステータス設定 + data modify storage lib: Argument.Distance set value 1.0 + data modify storage lib: Argument.Spread set value 1.0 + # 拡散 + execute as @e[type=marker,tag=SpreadMarker,limit=1] run function lib:forward_spreader/circle + # その位置から実行 + execute at @e[type=marker,tag=SpreadMarker,limit=1] rotated as @s run function asset:mob/0372.tutankhamen/tick/skill/laser/shoot/summon + # リセット + kill @e[type=marker,tag=SpreadMarker] diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot/summon.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot/summon.mcfunction new file mode 100644 index 0000000000..529172f830 --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot/summon.mcfunction @@ -0,0 +1,36 @@ +#> asset:mob/0372.tutankhamen/tick/skill/laser/shoot/summon +# +# オブジェクト召喚部分 +# +# @within function asset:mob/0372.tutankhamen/tick/skill/laser/shoot/ + +# オブジェクト召喚 + data modify storage api: Argument.ID set value 2168 + data modify storage api: Argument.FieldOverride set value {Scale:[0.25f,60f,0.25f],Color:65535,DisappearInterpolation:2,LifeTime:10} + function api:object/summon + +# パーティクル + particle dust 0 1 1 1 ~ ~ ~ 0.1 0.1 0.1 1 10 + particle soul_fire_flame ~ ~ ~ 0.1 0.1 0.1 0.05 1 + +# 立方体範囲内のプレイヤーにtag付け + data modify storage lib: args.dx set value 0.5 + data modify storage lib: args.dy set value 1.5 + data modify storage lib: args.dz set value 60.0 + data modify storage lib: args.selector set value "@a[tag=!PlayerShouldInvulnerable,distance=..64]" + execute positioned ^ ^-1 ^30 run function lib:rotatable_dxyz/m with storage lib: args + +# ダメージを与える + # データ設定 + data modify storage api: Argument.Damage set value 10.0f + data modify storage api: Argument.AttackType set value "Magic" + data modify storage api: Argument.ElementType set value "None" + # tag付けされたプレイヤーにダメージを与える + function api:damage/modifier + execute as @a[tag=DXYZ,distance=..64] run function api:damage/ + +# リセット + function api:damage/reset + +# tagリセット + tag @a[tag=DXYZ,distance=..64] remove DXYZ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/windup.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/windup.mcfunction new file mode 100644 index 0000000000..60925de68a --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/windup.mcfunction @@ -0,0 +1,12 @@ +#> asset:mob/0372.tutankhamen/tick/skill/laser/windup +# +# 予備動作とか +# +# @within function asset:mob/0372.tutankhamen/tick/skill/laser/ + +# AJの開始アニメーション + execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_2_windup/tween {to_frame:0, duration:5} + +# 狙うプレイヤーを決定しフィールドに放り込む + execute as @r[distance=..32] run function lib:get_name/ + data modify storage asset:context this.TargetName set from storage lib: Return.Name From f721f57fdf7dbcc119897a1eb1935bfc093d93d5 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 16:57:13 +0900 Subject: [PATCH 082/103] =?UTF-8?q?=E3=82=82=E3=81=86=E4=BD=BF=E3=82=8F?= =?UTF-8?q?=E3=81=AA=E3=81=95=E3=81=9D=E3=81=86=E3=81=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/common/tp.mcfunction | 7 - .../tick/skill/laser/recursive.mcfunction | 24 --- .../tick/skill/laser/shoot.mcfunction | 39 ----- .../tick/skill/laser/vfx.mcfunction | 160 ------------------ 4 files changed, 230 deletions(-) delete mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/tp.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/tp.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/tp.mcfunction deleted file mode 100644 index f1dd43e960..0000000000 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/tp.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:mob/0372.tutankhamen/tick/skill/common/tp -# -# 移動する -# -# @within function asset:mob/0372.tutankhamen/tick/skill/** - -# AJも一緒に動かす diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction deleted file mode 100644 index 76aad2f1e3..0000000000 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/recursive.mcfunction +++ /dev/null @@ -1,24 +0,0 @@ -#> asset:mob/0372.tutankhamen/tick/skill/laser/recursive -# -# -# -# @within function -# asset:mob/0372.tutankhamen/tick/skill/laser/shoot -# asset:mob/0372.tutankhamen/tick/skill/laser/recursive - -# 演出 - particle soul_fire_flame ~ ~ ~ 0 0 0 0 1 normal @a - particle soul_fire_flame ^ ^ ^0.25 0 0 0 0 1 normal @a - particle soul ~ ~ ~ 0 0 0 0.25 3 normal @a - -# 一定間隔での演出 - scoreboard players operation $Interval Temporary = $Recursive Temporary - scoreboard players operation $Interval Temporary %= $5 Const - execute if score $Interval Temporary matches 0 run particle sonic_boom ~ ~ ~ 0 0 0 0 1 - scoreboard players reset $Interval Temporary - -# 再帰スコア - scoreboard players add $Recursive Temporary 1 - -# 再帰 - execute if score $Recursive Temporary matches ..60 positioned ^ ^ ^0.5 run function asset:mob/0372.tutankhamen/tick/skill/laser/recursive diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction deleted file mode 100644 index a16fc197b9..0000000000 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot.mcfunction +++ /dev/null @@ -1,39 +0,0 @@ -#> asset:mob/0372.tutankhamen/tick/skill/laser/shoot -# -# -# -# @within function asset:mob/0372.tutankhamen/tick/skill/laser/ - -# 演出 - execute as @a[distance=..30] at @s facing entity @e[type=wither_skeleton,tag=this,distance=..30,limit=1] eyes positioned ^ ^ ^1 run playsound minecraft:entity.warden.sonic_boom hostile @s ~ ~ ~ 1 2 - function asset:mob/0372.tutankhamen/tick/skill/laser/vfx - -# 再帰発射 - function asset:mob/0372.tutankhamen/tick/skill/laser/recursive - scoreboard players reset $Recursive Temporary - -# displayを消す - kill @e[type=item_display,tag=AC.LaserDisplay,distance=..30] - -# 発射アニメーション - execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_shot/play - -# 回転するxyzLibを使ってヒット判定を行う -# x,yは半径0.75に+0.3して判定する - data modify storage lib: args.dx set value 1.05 - data modify storage lib: args.dy set value 1.05 - data modify storage lib: args.dz set value 15.3 - data modify storage lib: args.selector set value "@a[tag=!PlayerShouldInvulnerable,distance=..40]" - execute at @s positioned ^ ^ ^16 run function lib:rotatable_dxyz/m with storage lib: args - -# ダメージ - data modify storage api: Argument.Damage set value 45.0d - data modify storage api: Argument.AttackType set value "Magic" - data modify storage api: Argument.ElementType set value "Fire" - #data modify storage api: Argument.DeathMessage append value '{"translate": "%1$sは%2$sによって","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}' - function api:damage/modifier - execute as @a[tag=DXYZ,distance=..40] run function api:damage/ - function api:damage/reset - -# DXYZタグを削除 - tag @a[tag=DXYZ] remove DXYZ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction deleted file mode 100644 index 1432245982..0000000000 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/vfx.mcfunction +++ /dev/null @@ -1,160 +0,0 @@ -#> asset:mob/0372.tutankhamen/tick/skill/laser/vfx -# -# -# -# @within function asset:mob/0372.tutankhamen/tick/skill/laser/shoot - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iJQAdPQE1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1YkAukA_3 -# 円 1 -particle soul_fire_flame ^0 ^-1.5 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^1.5 ^0 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^1.46239 ^0.33378 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^1.35145 ^0.65083 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^1.17275 ^0.93523 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^0.93523 ^1.17275 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^0.65083 ^1.35145 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^0.33378 ^1.46239 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^0 ^1.5 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-0.33378 ^1.46239 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-0.65083 ^1.35145 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-0.93523 ^1.17275 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-1.17275 ^0.93523 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-1.35145 ^0.65083 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-1.46239 ^0.33378 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-1.5 ^0 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.0000005 0 normal @a -particle soul_fire_flame ^-0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.0000005 0 normal @a - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iJQAdPQE1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1YkAukA_3 -# 円 1 -particle soul_fire_flame ^0 ^-1.5 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^1.5 ^0 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^1.46239 ^0.33378 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^1.35145 ^0.65083 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^1.17275 ^0.93523 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^0.93523 ^1.17275 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^0.65083 ^1.35145 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^0.33378 ^1.46239 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^0 ^1.5 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-0.33378 ^1.46239 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-0.65083 ^1.35145 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-0.93523 ^1.17275 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-1.17275 ^0.93523 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-1.35145 ^0.65083 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-1.46239 ^0.33378 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-1.5 ^0 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.000001 0 normal @a -particle soul_fire_flame ^-0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.000001 0 normal @a - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iJQAdPQE1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1YkAukA_3 -# 円 1 -particle soul_fire_flame ^0 ^-1.5 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^1.5 ^0 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^1.46239 ^0.33378 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^1.35145 ^0.65083 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^1.17275 ^0.93523 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^0.93523 ^1.17275 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^0.65083 ^1.35145 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^0.33378 ^1.46239 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^0 ^1.5 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-0.33378 ^1.46239 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-0.65083 ^1.35145 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-0.93523 ^1.17275 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-1.17275 ^0.93523 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-1.35145 ^0.65083 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-1.46239 ^0.33378 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-1.5 ^0 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.0000015 0 normal @a -particle soul_fire_flame ^-0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.0000015 0 normal @a - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iJQAdPQE1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1YkAukA_3 -# 円 1 -particle soul_fire_flame ^0 ^-1.5 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^1.5 ^0 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^1.46239 ^0.33378 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^1.35145 ^0.65083 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^1.17275 ^0.93523 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^0.93523 ^1.17275 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^0.65083 ^1.35145 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^0.33378 ^1.46239 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^0 ^1.5 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-0.33378 ^1.46239 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-0.65083 ^1.35145 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-0.93523 ^1.17275 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-1.17275 ^0.93523 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-1.35145 ^0.65083 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-1.46239 ^0.33378 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-1.5 ^0 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.000002 0 normal @a -particle soul_fire_flame ^-0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.000002 0 normal @a - -# [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgCuhaAJkmAIwAcAbAKz0CG1ADALSUBG9A7OwBZeAMwHsAnClZiUpJrXH04KLtNpgCAOyYBbBMkBhigAJKGsDCYZdAZyTgUAe0KaISAEzUCKOC7gY7YABuTNiE+uAAHkisBFDRAL7xBFakaIS2iJQAdPQE1hCWrogxYHDY2Ggw1vqUrCUYDgUQ+iVo1gCi5ZXV7QCOhCHYUADKFt7kiMIh1YkAukA_3 -# 円 1 -particle soul_fire_flame ^0 ^-1.5 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^1.5 ^0 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^1.46239 ^0.33378 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^1.35145 ^0.65083 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^1.17275 ^0.93523 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^0.93523 ^1.17275 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^0.65083 ^1.35145 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^0.33378 ^1.46239 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^0 ^1.5 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-0.33378 ^1.46239 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-0.65083 ^1.35145 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-0.93523 ^1.17275 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-1.17275 ^0.93523 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-1.35145 ^0.65083 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-1.46239 ^0.33378 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-1.5 ^0 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-1.46239 ^-0.33378 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-1.35145 ^-0.65083 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-1.17275 ^-0.93523 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-0.93523 ^-1.17275 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-0.65083 ^-1.35145 ^ ^ ^ ^1000000 0.0000025 0 normal @a -particle soul_fire_flame ^-0.33378 ^-1.46239 ^ ^ ^ ^1000000 0.0000025 0 normal @a From 5e8dd8ac9ea4841bb87bcb150329c70505115cd3 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 17:14:16 +0900 Subject: [PATCH 083/103] =?UTF-8?q?=E6=A3=BA=E3=81=AE=E3=83=91=E3=83=BC?= =?UTF-8?q?=E3=83=86=E3=82=A3=E3=82=AF=E3=83=AB=E3=82=92=E4=B8=80=E9=83=A8?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/mob/0374.gray_coffin/init/.mcfunction | 4 ++-- .../mob/0374.gray_coffin/tick/penalty_explode.mcfunction | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/init/.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/init/.mcfunction index 949b557b1f..b4ee1b620c 100644 --- a/Asset/data/asset/functions/mob/0374.gray_coffin/init/.mcfunction +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/init/.mcfunction @@ -5,5 +5,5 @@ # @within asset:mob/alias/374/init # 演出 - particle soul ^ ^1 ^0.5 0.4 0.4 0.4 0.05 60 normal @a - particle soul ^ ^1 ^-0.5 0.4 0.4 0.4 0.05 60 normal @a + particle poof ^ ^1 ^0.5 0.4 0.4 0.4 0.05 60 normal @a + particle poof ^ ^1 ^-0.5 0.4 0.4 0.4 0.05 60 normal @a diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/tick/penalty_explode.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/penalty_explode.mcfunction index 48e8d6b5da..0a7d79de1f 100644 --- a/Asset/data/asset/functions/mob/0374.gray_coffin/tick/penalty_explode.mcfunction +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/tick/penalty_explode.mcfunction @@ -5,7 +5,7 @@ # @within function asset:mob/0374.gray_coffin/tick/penalty_ready # 演出 - particle soul ~ ~1 ~ 0.2 0.3 0.2 0.2 300 normal @a + particle explosion_emitter ~ ~1 ~ 0.2 0.3 0.2 1 1 normal @a particle soul_fire_flame ~ ~1 ~ 0.2 0.3 0.2 0.3 100 normal @a playsound entity.generic.explode hostile @a ~ ~ ~ 1 0.5 0 playsound block.sculk_shrieker.shriek hostile @a ~ ~ ~ 1 0.8 0 From 48e265578437fbf7264debb5f00ba12a61610708 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 17:14:31 +0900 Subject: [PATCH 084/103] =?UTF-8?q?=E5=B9=BD=E9=9C=8A=E5=BC=BE=E3=81=AE?= =?UTF-8?q?=E3=83=92=E3=83=83=E3=83=88=E6=99=82=E3=81=AE=E6=BC=94=E5=87=BA?= =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/object/2092.ghost_bullet/kill/.mcfunction | 1 - 1 file changed, 1 deletion(-) diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/kill/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/kill/.mcfunction index 85a0a06ee8..019d1825fb 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/kill/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/kill/.mcfunction @@ -5,7 +5,6 @@ # @within asset:object/alias/2092/kill # 演出 - particle soul ~ ~ ~ 0.2 0.2 0.2 0.2 30 normal @a playsound ogg:mob.vex.idle1 hostile @a ~ ~ ~ 0.8 0.5 0 # ダメージ From 23edba1d6801a62a3a5d10dc367d1cf38d069efd Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 17:14:43 +0900 Subject: [PATCH 085/103] =?UTF-8?q?=E3=81=93=E3=81=93=E5=A4=9A=E5=88=86?= =?UTF-8?q?=EF=BC=92=E3=81=A4=E3=81=AF=E3=81=84=E3=82=89=E3=81=AA=E3=81=84?= =?UTF-8?q?=E2=80=A6=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction | 3 --- 1 file changed, 3 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction index 88e7e5651c..54b3cb9593 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/.mcfunction @@ -7,9 +7,6 @@ # AJ execute if score @s General.Mob.Tick matches 0 as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/soul_shot/tween {to_frame:5 ,duration:5} -# 実行時間を移す - scoreboard players operation $Interval Temporary = @s General.Mob.Tick - # 演出 execute if score @s General.Mob.Tick matches 15..35 run particle dust 0 0.7 0.7 1 ~ ~3 ~ 1 0 1 0 5 execute if score @s General.Mob.Tick matches 15 run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 2 0.8 From a6d45760da0c93a58a8013b2805c4973211a417b Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 17:14:56 +0900 Subject: [PATCH 086/103] =?UTF-8?q?=E6=A3=BA=E5=8F=AC=E5=96=9A=E3=81=AE?= =?UTF-8?q?=E5=8B=95=E4=BD=9C=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/coffin/.mcfunction | 28 +++++++++++++------ .../tick/skill/coffin/vfx_start.mcfunction | 10 +++++++ 2 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/vfx_start.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/.mcfunction index 4bab2477ce..1c6833421b 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/.mcfunction @@ -4,15 +4,17 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill_branch -# AJ - execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop - execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/rod_ground/play - execute if entity @s[scores={General.Mob.Tick=34}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/rod_ground/stop - execute if entity @s[scores={General.Mob.Tick=34}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/rod_ground_end/play +# アニメ再生 + execute if score @s General.Mob.Tick matches 0 as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/rod_ground/tween {to_frame:0 ,duration:5} -# 演出 - execute if entity @s[scores={General.Mob.Tick=29}] rotated ~ 0 positioned ^ ^0.2 ^0.4 run particle soul ~ ~ ~ 0 0 0 0.2 100 - execute if entity @s[scores={General.Mob.Tick=29}] rotated ~ 0 positioned ^ ^0.2 ^0.4 run particle soul ~ ~ ~ 0 0 0 0.4 100 +# 攻撃前の演出 + execute if score @s General.Mob.Tick matches 10..20 run particle dust 1 1 0 2 ~ ~2.5 ~ 1 0 1 0 5 + execute if score @s General.Mob.Tick matches 10 run playsound item.trident.riptide_1 hostile @a ~ ~2.5 ~ 2 0.8 + execute if score @s General.Mob.Tick matches 15 run playsound item.trident.riptide_1 hostile @a ~ ~2.5 ~ 2 1.0 + execute if score @s General.Mob.Tick matches 20 run playsound item.trident.riptide_1 hostile @a ~ ~2.5 ~ 2 1.2 + +# 攻撃開始の演出 + execute if score @s General.Mob.Tick matches 30 run function asset:mob/0372.tutankhamen/tick/skill/coffin/vfx_start # 棺召喚 # 難易度比例で召喚数を変える @@ -20,5 +22,13 @@ execute if entity @s[scores={General.Mob.Tick=38}] if predicate api:global_vars/difficulty/min/normal at @e[type=marker,tag=AC.SpawnMarker,distance=..100] run function asset:mob/0372.tutankhamen/tick/skill/coffin/summon execute if entity @s[scores={General.Mob.Tick=46}] if predicate api:global_vars/difficulty/min/hard at @e[type=marker,tag=AC.SpawnMarker,distance=..100] run function asset:mob/0372.tutankhamen/tick/skill/coffin/summon +# アニメ再生 + execute if score @s General.Mob.Tick matches 60 as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/rod_ground_end/tween {to_frame:0 ,duration:1} + +# 攻撃後の演出 + execute if score @s General.Mob.Tick matches 64 run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 2 1.2 + execute if score @s General.Mob.Tick matches 69 run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 2 1.0 + execute if score @s General.Mob.Tick matches 74 run playsound item.trident.riptide_1 hostile @a ~ ~3 ~ 2 0.8 + # 共通リセット処理 - execute if entity @s[scores={General.Mob.Tick=67..}] run function asset:mob/0372.tutankhamen/tick/skill/reset + execute if score @s General.Mob.Tick matches 90 run function asset:mob/0372.tutankhamen/tick/skill/reset diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/vfx_start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/vfx_start.mcfunction new file mode 100644 index 0000000000..67aed5309e --- /dev/null +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/coffin/vfx_start.mcfunction @@ -0,0 +1,10 @@ +#> asset:mob/0372.tutankhamen/tick/skill/coffin/vfx_start +# +# +# +# @within function asset:mob/0372.tutankhamen/tick/skill/coffin/ + +playsound minecraft:item.trident.return hostile @a ~ ~ ~ 2 1.6 +playsound minecraft:item.trident.return hostile @a ~ ~ ~ 2 1.8 +playsound minecraft:item.trident.return hostile @a ~ ~ ~ 2 2 +particle witch ~ ~ ~ 0.5 0 0.5 1 50 From c49f9024b20cffe21a073df04f3134a88fd4dd54 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 17:15:29 +0900 Subject: [PATCH 087/103] =?UTF-8?q?=E6=9C=AC=E6=B0=97=E3=82=92=E5=87=BA?= =?UTF-8?q?=E3=81=99=E3=81=A8=E3=83=91=E3=83=BC=E3=83=86=E3=82=A3=E3=82=AF?= =?UTF-8?q?=E3=83=AB=E3=82=92=E5=87=BA=E3=81=97=E3=81=9F=E3=82=8A=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/mob/0372.tutankhamen/tick/.mcfunction | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction index db657dd518..a91fb5fb3e 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/.mcfunction @@ -25,8 +25,15 @@ # スキル実行 execute if entity @s[tag=!AC.Moveset.Transition] if score @s General.Mob.Tick matches 0.. run function asset:mob/0372.tutankhamen/tick/skill_branch +# 本気のパーティクル + execute if entity @s[tag=AC.Health.50Per,tag=!AC.Moveset.Transition] if predicate lib:random_pass_per/50 run particle soul_fire_flame ~ ~1 ~ 0.3 0.5 0.3 0.02 1 force @a[distance=..64] + execute if entity @s[tag=AC.Health.50Per,tag=!AC.Moveset.Transition] if predicate lib:random_pass_per/50 run particle dust 0 1 1 1 ~ ~1 ~ 0.3 0.5 0.3 0.02 1 force @a[distance=..64] + # 足元に何もなければ execute if block ~ ~-0.2 ~ #lib:no_collision run particle minecraft:enchant ~ ~ ~ 0.4 0 0.4 0 10 +# 足元が埋まっている間は上にちょっとずつ登る + execute unless block ~ ~ ~ #lib:no_collision run tp @s ~ ~0.1 ~ + # AJモデルとの紐づけ解除 execute at @s run tag @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] remove AC.AJLink From 77ff80f932e2645ccfd64e834b11c25d1f1a17a7 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 17:15:44 +0900 Subject: [PATCH 088/103] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=87=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=82=B9=E3=81=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 2ddc3994f4..50e500333e 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -49,13 +49,8 @@ #declare function animated_java:tutankhamen/animations/spawn/stop #declare function animated_java:tutankhamen/animations/death/play #declare function animated_java:tutankhamen/animations/death/stop -#declare function animated_java:tutankhamen/animations/beam_start/play -#declare function animated_java:tutankhamen/animations/beam_start/stop #declare function animated_java:tutankhamen/animations/beam_shot/play #declare function animated_java:tutankhamen/animations/beam_shot/stop -#declare function animated_java:tutankhamen/animations/beam_wait/play -#declare function animated_java:tutankhamen/animations/beam_wait/stop -#declare function animated_java:tutankhamen/animations/beam_end/play #declare function animated_java:tutankhamen/animations/beam_end/stop #declare function animated_java:tutankhamen/animations/soul_shot/play #declare function animated_java:tutankhamen/animations/soul_shot/stop @@ -66,10 +61,8 @@ #declare function animated_java:tutankhamen/animations/beam_long_charge/stop #declare function animated_java:tutankhamen/animations/beam_long_shot/play #declare function animated_java:tutankhamen/animations/beam_long_shot/stop -#declare function animated_java:tutankhamen/animations/rod_ground/play -#declare function animated_java:tutankhamen/animations/rod_ground/stop -#declare function animated_java:tutankhamen/animations/rod_ground_end/play -#declare function animated_java:tutankhamen/animations/rod_ground_end/stop +#declare function animated_java:tutankhamen/animations/rod_ground/tween +#declare function animated_java:tutankhamen/animations/rod_ground_end/tween #declare function animated_java:tutankhamen/animations/dash/play #declare function animated_java:tutankhamen/animations/dash/tween #declare function animated_java:tutankhamen/animations/dash/stop @@ -86,5 +79,10 @@ #declare function animated_java:tutankhamen/animations/attack_laser_loop/tween #declare function animated_java:tutankhamen/animations/attack_laser_end/tween #declare function animated_java:tutankhamen/animations/damage/tween +#declare function animated_java:tutankhamen/animations/soul_shot/tween +#declare function animated_java:tutankhamen/animations/attack_laser_2_windup/tween +#declare function animated_java:tutankhamen/animations/attack_laser_2_loop/tween +#declare function animated_java:tutankhamen/animations/attack_laser_2_end/tween + #declare tag AC.ModelLocator.Body #declare tag AC.ModelLocator.Weapon From cadfb89c79964219e34b7d1f05b32afa6e062465 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 17:18:22 +0900 Subject: [PATCH 089/103] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=99=82=E3=81=AB?= =?UTF-8?q?=E6=A3=BA=E3=82=92=E7=89=87=E4=BB=98=E3=81=91=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/0372.tutankhamen/death/.mcfunction | 10 ++++++---- .../functions/mob/0372.tutankhamen/register.mcfunction | 6 +++--- .../mob/0372.tutankhamen/tick/skill_select.mcfunction | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction index 9b9a2f102e..5e8eaf8e5d 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/death/.mcfunction @@ -8,14 +8,16 @@ function asset:mob/super.death # SpawnMarkerを削除 - kill @e[type=marker,tag=AC.SpawnMarker] + kill @e[type=marker,tag=AC.SpawnMarker,distance=..128] # CoffinPointを削除 - kill @e[type=marker,tag=AC.CoffinPoint] + kill @e[type=marker,tag=AC.CoffinPoint,distance=..128] -# デバッグ用としてAJを消す +# 付近の棺を全部片付ける + execute as @e[type=polar_bear,scores={MobID=374},distance=..128] run function api:mob/kill + +# 自分のモデルを片付ける execute as @e[type=item_display,tag=AC.AJ,distance=..100,sort=nearest,limit=1] run function animated_java:tutankhamen/remove/this - #execute as @e[type=item_display,tag=AC.AJ,distance=..100,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/death/play # 撃破演出用オブジェクトを召喚 data modify storage api: Argument.ID set value 2093 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction index 9e1d67e602..fa3c851041 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction @@ -41,15 +41,15 @@ # 防具ドロップ率 ([float, float]) (オプション) # data modify storage asset:mob ArmorDropChances set value # 体力 (double) (オプション) - data modify storage asset:mob Health set value 100 + data modify storage asset:mob Health set value 800 # 攻撃力 (double) (オプション) - # data modify storage asset:mob AttackDamage set value + data modify storage asset:mob AttackDamage set value 0.0d # 防御力 (double) (オプション) // 被ダメージがある程度大きい場合1ptにつき0.8%カット、小さい場合1ptにつき約4%カット 20pt以上は頭打ち # data modify storage asset:mob Defense set value # 特殊防御力 (double) (オプション) // 4pointにつきダメージを大きく減らす # data modify storage asset:mob SpecialDefense set value # 移動速度 (double) (オプション) - # data modify storage asset:mob Speed set value + data modify storage asset:mob Speed set value 0.0d # 索敵範囲 (double) (オプション) # data modify storage asset:mob FollowRange set value # ノックバック耐性 (double) (オプション) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index a1ebb8f863..4a3136d625 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -18,7 +18,7 @@ execute store result score $Random Temporary run function lib:random/with_biased/manual.m with storage lib: Args # デバッグのコマンド - scoreboard players set $Random Temporary 2 + scoreboard players set $Random Temporary 3 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser From 0e95aaf5e3b9d1a2bc0fe7b44daa33babc0b0b96 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 17:18:50 +0900 Subject: [PATCH 090/103] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0?= =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=E3=82=92=E6=B6=88=E3=81=97?= =?UTF-8?q?=E5=BF=98=E3=82=8C=E3=81=A6=E3=81=84=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/0372.tutankhamen/tick/skill_select.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index 4a3136d625..c94a436290 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -18,7 +18,7 @@ execute store result score $Random Temporary run function lib:random/with_biased/manual.m with storage lib: Args # デバッグのコマンド - scoreboard players set $Random Temporary 3 +# scoreboard players set $Random Temporary 3 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add AC.Laser From ad492761674fafd86e995ab36b7af48f2c4ce7c8 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 17:28:57 +0900 Subject: [PATCH 091/103] =?UTF-8?q?=E4=BD=93=E5=8A=9B=E3=83=87=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E3=81=AA=E3=81=A9=E3=82=92=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/mob/0372.tutankhamen/register.mcfunction | 6 +++--- .../functions/mob/0374.gray_coffin/register.mcfunction | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction index fa3c851041..be5adb13a3 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction @@ -19,9 +19,9 @@ # 干渉可能か否か (boolean) data modify storage asset:mob Interferable set value true # 名前 (TextComponentString) (オプション) - data modify storage asset:mob Name set value '{"text":"ツタンカーメン"}' + data modify storage asset:mob Name set value '{"text":"ツタンカーメン","color":"#13b3aa"}' # Mobの説明文 (TextComponentString[]) (オプション) - # data modify storage asset:mob Lore set value + data modify storage asset:mob Lore set value ['{"text":"その名は有名なファラオを彷彿とさせるが、","color":"white"}','{"text":"この天使は、様々な歴史や、人々の持つイメージなどを元に作り上げられた存在でしかない。","color":"white"}','{"text":"一体どんなイメージが紛れ込んだのか、この天使は魔術と剣術、両方に秀でている。","color":"white"}'] # 武器 # メインハンド (Compound(Item)) (オプション) # data modify storage asset:mob Weapon.Mainhand set value @@ -41,7 +41,7 @@ # 防具ドロップ率 ([float, float]) (オプション) # data modify storage asset:mob ArmorDropChances set value # 体力 (double) (オプション) - data modify storage asset:mob Health set value 800 + data modify storage asset:mob Health set value 350000d # 攻撃力 (double) (オプション) data modify storage asset:mob AttackDamage set value 0.0d # 防御力 (double) (オプション) // 被ダメージがある程度大きい場合1ptにつき0.8%カット、小さい場合1ptにつき約4%カット 20pt以上は頭打ち diff --git a/Asset/data/asset/functions/mob/0374.gray_coffin/register.mcfunction b/Asset/data/asset/functions/mob/0374.gray_coffin/register.mcfunction index 0d867bc487..93bf29bf0b 100644 --- a/Asset/data/asset/functions/mob/0374.gray_coffin/register.mcfunction +++ b/Asset/data/asset/functions/mob/0374.gray_coffin/register.mcfunction @@ -37,7 +37,7 @@ # 防具ドロップ率 ([float, float]) (オプション) # data modify storage asset:mob ArmorDropChances set value # 体力 (double) (オプション) - # data modify storage asset:mob Health set value + data modify storage asset:mob Health set value 2400d # 攻撃力 (double) (オプション) # data modify storage asset:mob AttackDamage set value # 防御力 (double) (オプション) // 被ダメージがある程度大きい場合1ptにつき0.8%カット、小さい場合1ptにつき約4%カット 20pt以上は頭打ち From 0462485e2404a6a504c42e80e1ab8c8e5af81723 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 17:30:51 +0900 Subject: [PATCH 092/103] =?UTF-8?q?=E3=83=80=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4=E3=80=82=E5=8D=81=E5=88=86=E3=81=8B?= =?UTF-8?q?=E3=81=AF=E3=82=8F=E3=81=8B=E3=82=89=E3=81=AA=E3=81=84=E3=81=8C?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../asset/functions/mob/0372.tutankhamen/register.mcfunction | 2 +- .../mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction | 2 +- .../0372.tutankhamen/tick/skill/laser/shoot/summon.mcfunction | 2 +- .../object/2091.hyper_laser_manager/tick/shoot.mcfunction | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction index be5adb13a3..a01a963cc4 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/register.mcfunction @@ -66,4 +66,4 @@ # 雷倍率 (float) (オプション) # data modify storage asset:mob Resist.Thunder set value # フィールド - data modify storage asset:mob Field.Damage.ManyShoot set value 40f + data modify storage asset:mob Field.Damage.ManyShoot set value 25f diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction index 6cfd030f64..c6356b6fbc 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/move.mcfunction @@ -31,7 +31,7 @@ execute at @e[type=marker,tag=AC.ModelLocator.Weapon,distance=..16,limit=1] run particle dust 1 1 0 2 ~ ~1 ~ 0.1 0.1 0.1 0 5 # ダメージ判定 - data modify storage api: Argument.Damage set value 20f + data modify storage api: Argument.Damage set value 50f # 属性 data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot/summon.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot/summon.mcfunction index 529172f830..671a79b7bb 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot/summon.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/shoot/summon.mcfunction @@ -22,7 +22,7 @@ # ダメージを与える # データ設定 - data modify storage api: Argument.Damage set value 10.0f + data modify storage api: Argument.Damage set value 20.0f data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "None" # tag付けされたプレイヤーにダメージを与える diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction index d83c12519c..c903b6282c 100644 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction +++ b/Asset/data/asset/functions/object/2091.hyper_laser_manager/tick/shoot.mcfunction @@ -24,7 +24,7 @@ # ダメージを与える # データ設定 - data modify storage api: Argument.Damage set value 50.0f + data modify storage api: Argument.Damage set value 55.0f data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Fire" # tag付けされたプレイヤーにダメージを与える From ab3007fe3990ebde2de8ec766450eba0f64bcf78 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Fri, 27 Dec 2024 17:34:34 +0900 Subject: [PATCH 093/103] =?UTF-8?q?=E3=83=8F=E3=82=A4=E3=83=91=E3=83=BC?= =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC=E6=8B=85=E5=BD=93=E3=81=AE?= =?UTF-8?q?init=E3=81=AF=E3=81=84=E3=82=89=E3=81=AA=E3=81=95=E3=81=9D?= =?UTF-8?q?=E3=81=86=E3=81=A0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/2091.hyper_laser_manager/init/.mcfunction | 8 -------- .../asset/functions/object/alias/2091/init.mcfunction | 8 -------- 2 files changed, 16 deletions(-) delete mode 100644 Asset/data/asset/functions/object/2091.hyper_laser_manager/init/.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/2091/init.mcfunction diff --git a/Asset/data/asset/functions/object/2091.hyper_laser_manager/init/.mcfunction b/Asset/data/asset/functions/object/2091.hyper_laser_manager/init/.mcfunction deleted file mode 100644 index cb8b24163e..0000000000 --- a/Asset/data/asset/functions/object/2091.hyper_laser_manager/init/.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/2091.hyper_laser_manager/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/2091/init - -# TargetID - execute store result score @s 2092.TargetID run data get storage asset:context this.TargetID diff --git a/Asset/data/asset/functions/object/alias/2091/init.mcfunction b/Asset/data/asset/functions/object/alias/2091/init.mcfunction deleted file mode 100644 index 9801d03d0e..0000000000 --- a/Asset/data/asset/functions/object/alias/2091/init.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/2091/init -# -# Init処理のエイリアス -# -# @within asset_manager:object/init/init.m - -# 元のInit処理を呼び出す - function asset:object/2091.hyper_laser_manager/init/ \ No newline at end of file From 7f040ff8b5787f014da42c54dfd22e496ab50cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Tue, 31 Dec 2024 01:43:48 +0900 Subject: [PATCH 094/103] :rotating_light: [regenerate cache] From 1e274ceb4e5b8ba978b302fdfb274dde2dbc304d Mon Sep 17 00:00:00 2001 From: Chuzume Date: Tue, 31 Dec 2024 04:34:21 +0900 Subject: [PATCH 095/103] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=81=A8=E3=82=84=E3=81=A3=E3=81=A6=E3=82=8B=E3=81=93=E3=81=A8?= =?UTF-8?q?=E3=81=8C=E5=99=9B=E3=81=BF=E5=90=88=E3=81=A3=E3=81=A6=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/tick/skill/laser/alert.mcfunction | 2 +- .../0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/alert.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/alert.mcfunction index 78e5088f3f..413bb65a89 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/alert.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/alert.mcfunction @@ -11,5 +11,5 @@ particle minecraft:dust 0.3 1 1 0.5 ^ ^ ^0.5 0 0 0 0 1 force @a[distance=..32] particle minecraft:dust 0.7 1 1 0.5 ^ ^ ^-0.5 0 0 0 0 1 force @a[distance=..32] -# 壁がなければ再帰 +# 自身が範囲内なら再帰。壁貫通攻撃である。 execute if entity @s[distance=..32] positioned ^ ^ ^1 run function asset:mob/0372.tutankhamen/tick/skill/laser/alert diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction index 56f9f9cc3c..2c4a3a25b5 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_shoot/summon.mcfunction @@ -11,7 +11,7 @@ # プレイヤーの方を向く tp @s ~ ~ ~ facing entity @p[distance=..100] eyes -# StartDelayを59にする +# StartDelayを調整 scoreboard players set $StartDelay Temporary 49 # 発射タイミングをある程度一定にする From 0bd9582a704f901c29c3d8afbbbdde2b37917771 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Tue, 31 Dec 2024 04:34:38 +0900 Subject: [PATCH 096/103] =?UTF-8?q?=E8=AB=B8=E3=80=85=E3=81=AE=E6=9C=AA?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=AE=E3=82=82=E3=81=AE=E3=82=92=E7=89=87?= =?UTF-8?q?=E4=BB=98=E3=81=91=E3=81=9F=E3=80=82=E7=91=A0=E7=92=83=E3=81=AB?= =?UTF-8?q?=E6=80=92=E3=82=89=E3=82=8C=E3=81=9F=E3=82=89=E3=81=94=E3=82=81?= =?UTF-8?q?=E3=82=93=E3=81=AA=E3=81=95=E3=81=84=E3=81=97=E3=82=88=E3=81=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/_index.d.mcfunction | 24 ++++++------------- .../common/summon_laser_display.m.mcfunction | 10 -------- .../tick/skill/many_laser/.mcfunction | 10 -------- .../skill/many_laser/summon_square.mcfunction | 5 ---- .../tick/skill/reset.mcfunction | 4 ---- .../tick/skill_select.mcfunction | 2 -- .../_index.d.mcfunction | 1 - 7 files changed, 7 insertions(+), 49 deletions(-) delete mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/.mcfunction delete mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/summon_square.mcfunction diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction index 50e500333e..3a3d2f038f 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/_index.d.mcfunction @@ -3,42 +3,34 @@ #> tag # @within function asset:mob/0372.tutankhamen/** -#>スキルリスト +# スキルリスト +#declare tag AC.Coddin #declare tag AC.Laser #declare tag AC.ManyShoot -#declare tag AC.GiantSkull #declare tag AC.HyperLaser -#declare tag AC.DashSlash -#declare tag AC.DashSlash.IsNearPlayer -#declare tag AC.ManyLaser -#declare tag AC.Charge -#> ダッシュリスト +# ダッシュリスト #declare tag AC.Dash.Left #declare tag AC.Dash.Right #declare tag AC.Dash.Side #declare tag AC.Dash.Slash #declare tag AC.Dash.Charge -#> 状態タグ +## 状態タグ #declare tag AC.Health.50Per -#> 動作タグ +# 動作タグ #declare tag AC.Moveset.Transition -#>その他タグ +# その他タグ #declare tag AC.InAction #declare tag AC.DashUsed -#declare tag AC.LaserDisplay #declare tag AC.Coffin #declare tag AC.CoffinPoint #declare tag AC.SpawnMarker #declare tag AC.AJ #declare tag AC.AJLink #declare tag AC.Opening -#declare tag AC.Hit -#declare tag AC.RotationMarker #declare tag Target -#declare score_holder $Recursive #declare score_holder $Random #declare score_holder $Interval -#>Animated Java +# Animated Java #declare function animated_java:tutankhamen/summon #declare function animated_java:tutankhamen/remove/this #declare function animated_java:tutankhamen/summon @@ -83,6 +75,4 @@ #declare function animated_java:tutankhamen/animations/attack_laser_2_windup/tween #declare function animated_java:tutankhamen/animations/attack_laser_2_loop/tween #declare function animated_java:tutankhamen/animations/attack_laser_2_end/tween - -#declare tag AC.ModelLocator.Body #declare tag AC.ModelLocator.Weapon diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction deleted file mode 100644 index c91e84a384..0000000000 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:mob/0372.tutankhamen/tick/skill/common/summon_laser_display.m -# -# レーザー用displayを召喚 -# -# @input args: -# Rotation : double @ 2 -# @within function asset:mob/0372.tutankhamen/tick/skill/** - -# 召喚 - $summon item_display ~ ~ ~ {Rotation:$(Rotation),teleport_duration:1,brightness:{sky:15,block:15},Tags:["AC.LaserDisplay"],item:{id:"cyan_stained_glass",Count:1b},transformation:{left_rotation:[0f,0f,0f,1f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f],scale:[0.05f,0.05f,36f]}} diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/.mcfunction deleted file mode 100644 index b1d086b43c..0000000000 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:mob/0372.tutankhamen/tick/skill/many_laser/ -# -# -# -# @within function asset:mob/0372.tutankhamen/tick/skill_branch - -# AJの開始アニメーション - execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/neutral/stop - execute if entity @s[scores={General.Mob.Tick=0}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_start/play - execute if entity @s[scores={General.Mob.Tick=11}] as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/beam_wait/play diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/summon_square.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/summon_square.mcfunction deleted file mode 100644 index 54514a7b40..0000000000 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/many_laser/summon_square.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> asset:mob/0372.tutankhamen/tick/skill/many_laser/summon_square -# -# -# -# @within function asset:mob/0372.tutankhamen/tick/skill/many_laser/ \ No newline at end of file diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction index 35bf51e448..65f12b4b8b 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/reset.mcfunction @@ -16,12 +16,8 @@ tag @s remove AC.Opening tag @s remove AC.Laser tag @s remove AC.ManyShoot - tag @s remove AC.GiantSkull tag @s remove AC.HyperLaser tag @s remove AC.Coffin - tag @s remove AC.DashSlash - tag @s remove AC.ManyLaser - tag @s remove AC.Charge tag @s remove AC.Dash.Left tag @s remove AC.Dash.Right diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction index c94a436290..77e21a0c37 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill_select.mcfunction @@ -25,8 +25,6 @@ execute if score $Random Temporary matches 1 run tag @s add AC.ManyShoot execute if score $Random Temporary matches 2 run tag @s add AC.HyperLaser execute if score $Random Temporary matches 3 run tag @s add AC.Coffin - execute if score $Random Temporary matches 4 run tag @s add AC.ManyLaser - execute if score $Random Temporary matches 5 run tag @s add AC.GiantSkull # リセット scoreboard players reset $Random Temporary diff --git a/Asset/data/asset/functions/object/2093.tutankhamen_death/_index.d.mcfunction b/Asset/data/asset/functions/object/2093.tutankhamen_death/_index.d.mcfunction index f2e88721be..0dce39e189 100644 --- a/Asset/data/asset/functions/object/2093.tutankhamen_death/_index.d.mcfunction +++ b/Asset/data/asset/functions/object/2093.tutankhamen_death/_index.d.mcfunction @@ -4,5 +4,4 @@ # # @within function asset:object/2093.tutankhamen_death/tick/ #declare tag AC.ModelLocator.Body - #declare tag AC.ModelLocator.Weapon #declare function animated_java:tutankhamen/remove/this From bc8ffae8fbcc390970a4afde3df80d19515dc613 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Tue, 31 Dec 2024 04:38:18 +0900 Subject: [PATCH 097/103] =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=E3=81=AA?= =?UTF-8?q?=E3=82=82=E3=81=AE=E3=82=92=E6=9B=B4=E3=81=AB=E6=8E=83=E9=99=A4?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/2090.magic_square/_index.d.mcfunction | 6 ------ .../object/2090.magic_square/init/.mcfunction | 5 ----- .../tick/transform.mcfunction | 15 --------------- .../functions/object/alias/2090/init.mcfunction | 8 -------- 4 files changed, 34 deletions(-) delete mode 100644 Asset/data/asset/functions/object/2090.magic_square/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/object/2090.magic_square/init/.mcfunction delete mode 100644 Asset/data/asset/functions/object/2168.general_long_laser/tick/transform.mcfunction delete mode 100644 Asset/data/asset/functions/object/alias/2090/init.mcfunction diff --git a/Asset/data/asset/functions/object/2090.magic_square/_index.d.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/_index.d.mcfunction deleted file mode 100644 index f4381195aa..0000000000 --- a/Asset/data/asset/functions/object/2090.magic_square/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:object/2090.magic_square/_index.d -# @private - -#> tag -# @within function asset:object/2090.magic_square/** - #declare \ No newline at end of file diff --git a/Asset/data/asset/functions/object/2090.magic_square/init/.mcfunction b/Asset/data/asset/functions/object/2090.magic_square/init/.mcfunction deleted file mode 100644 index 59ae3b9892..0000000000 --- a/Asset/data/asset/functions/object/2090.magic_square/init/.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> asset:object/2090.magic_square/init/ -# -# Objectのinit時の処理 -# -# @within asset:object/alias/2090/init diff --git a/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform.mcfunction b/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform.mcfunction deleted file mode 100644 index 280edcef0f..0000000000 --- a/Asset/data/asset/functions/object/2168.general_long_laser/tick/transform.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:object/2168.general_long_laser/tick/transform -# -# -# -# @within function asset:object/2168.general_long_laser/tick/ - - -# 指定されたinterpolation_durationに設定 - data modify entity @s interpolation_duration set from storage asset:context this.Interpolation - -# translationZ -# data modify entity @s transformation.translation[2] set from storage asset:context this.TranslationZ - -# Lengthぶんのびる - data modify entity @s transformation.scale[1] set from storage asset:context this.Length diff --git a/Asset/data/asset/functions/object/alias/2090/init.mcfunction b/Asset/data/asset/functions/object/alias/2090/init.mcfunction deleted file mode 100644 index 85e457b2a2..0000000000 --- a/Asset/data/asset/functions/object/alias/2090/init.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:object/alias/2090/init -# -# Init処理のエイリアス -# -# @within asset_manager:object/init/init.m - -# 元のInit処理を呼び出す - function asset:object/2090.magic_square/init/ \ No newline at end of file From 6d8ff142a618666965db508869f8db9b92740ef4 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Tue, 31 Dec 2024 04:49:35 +0900 Subject: [PATCH 098/103] =?UTF-8?q?=E3=83=80=E3=83=83=E3=82=B7=E3=83=A5?= =?UTF-8?q?=E9=96=8B=E5=A7=8B=E3=81=AE=E5=87=A6=E7=90=86=E3=81=8C=EF=BC=92?= =?UTF-8?q?=E3=81=A4=E3=81=82=E3=81=A3=E3=81=A6=E3=81=A9=E3=81=A3=E3=81=A1?= =?UTF-8?q?=E3=82=82=E5=86=85=E5=AE=B9=E5=90=8C=E3=81=98=E3=81=A0=E3=81=A3?= =?UTF-8?q?=E3=81=9F=E3=81=AE=E3=81=A7=E5=85=B1=E9=80=9A=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=81=AB=E3=80=82=E3=82=B5=E3=82=A6=E3=83=B3=E3=83=89=E5=A4=89?= =?UTF-8?q?=E3=81=88=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/dash/dash_slash/.mcfunction | 2 +- .../tick/skill/dash/dash_slash/start.mcfunction | 14 -------------- .../tick/skill/dash/side/.mcfunction | 3 +-- .../tick/skill/dash/{side => }/start.mcfunction | 9 +++++---- 4 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction rename Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/{side => }/start.mcfunction (50%) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction index df29dcb4b0..2a1b1c27bc 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/.mcfunction @@ -5,7 +5,7 @@ # @within function asset:mob/0372.tutankhamen/tick/skill_branch # ダッシュ開始 - execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/start + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/start # プレイヤーの方へ誘導する execute if score @s General.Mob.Tick matches ..99 run function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/move diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction deleted file mode 100644 index de81dc9e70..0000000000 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/start.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/start -# -# ダッシュ開始 -# -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/ - -# アニメ開始 - execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 1} - -# 演出 -# playsound minecraft:entity.wither.shoot hostile @a ~ ~ ~ 1 2 - playsound minecraft:entity.breeze.wind_burst hostile @a ~ ~ ~ 2 0.5 - particle minecraft:crit ~ ~ ~ 0 0 0 1 25 - particle minecraft:poof ~ ~ ~ 0 0 0 0.3 50 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction index b10d153f88..631bf782bf 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/.mcfunction @@ -4,11 +4,10 @@ # # @within function asset:mob/0372.tutankhamen/tick/skill_branch - # ダッシュ開始 execute if score @s[tag=AC.Dash.Left] General.Mob.Tick matches 0 run tp @s ~ ~ ~ ~-75 ~ execute if score @s[tag=AC.Dash.Right] General.Mob.Tick matches 0 run tp @s ~ ~ ~ ~75 ~ - execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/side/start + execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/dash/start # ヘルス半減時はダッシュしながら弾を撒いてくる execute if score @s[tag=AC.Health.50Per] General.Mob.Tick matches 0..15 run function asset:mob/0372.tutankhamen/tick/skill/dash/side/shoot/ diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/start.mcfunction similarity index 50% rename from Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction rename to Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/start.mcfunction index 3170942d6c..7ef21ceed5 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/side/start.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/start.mcfunction @@ -1,13 +1,14 @@ -#> asset:mob/0372.tutankhamen/tick/skill/dash/side/start +#> asset:mob/0372.tutankhamen/tick/skill/dash/start # +# 共通ダッシュ開始モーション # -# -# @within function asset:mob/0372.tutankhamen/tick/skill/dash/side/ +# @within function asset:mob/0372.tutankhamen/tick/skill/dash/** # アニメ開始 execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash/tween {to_frame: 0, duration: 1} # 演出 - playsound minecraft:entity.breeze.wind_burst hostile @a ~ ~ ~ 2 0.5 + playsound minecraft:entity.wither.shoot hostile @a ~ ~ ~ 1 1.7 + playsound minecraft:entity.breeze.shoot hostile @a ~ ~ ~ 2 1 particle minecraft:crit ~ ~ ~ 0 0 0 1 25 particle minecraft:poof ~ ~ ~ 0 0 0 0.3 50 From ac290c9b0e62954fb28591f26a241a8c65dda969 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Tue, 31 Dec 2024 04:55:26 +0900 Subject: [PATCH 099/103] =?UTF-8?q?Linter=E3=81=8C=E3=81=94=E3=81=8D?= =?UTF-8?q?=E3=81=92=E3=82=93=E3=83=8A=E3=83=8A=E3=83=A1=E3=81=AA=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E6=BC=94=E5=87=BA=E3=82=92=E6=9B=B4=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=E3=80=82=E6=82=AA=E3=81=8F=E3=81=AA=E3=81=84=E3=82=93?= =?UTF-8?q?=E3=81=98=E3=82=83=E3=81=AA=E3=81=84=E3=81=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tick/skill/dash/charge/backstep.mcfunction | 3 ++- .../tick/skill/dash/dash_slash/slash/windup.mcfunction | 3 ++- .../tick/skill/dash/dash_slash/slash/windup_2.mcfunction | 2 +- .../0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction | 3 ++- .../mob/0372.tutankhamen/tick/skill/laser/.mcfunction | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/backstep.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/backstep.mcfunction index 5752ede1eb..ae89e7cda5 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/backstep.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/backstep.mcfunction @@ -11,4 +11,5 @@ execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/dash_end/tween {to_frame: 3, duration: 3} # 演出 - playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 1 1 + playsound minecraft:item.trident.return hostile @a ~ ~ ~ 1 2 + playsound minecraft:entity.player.breath hostile @a ~ ~ ~ 1 1 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction index 6560ad35ed..0bac403f68 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup.mcfunction @@ -11,6 +11,7 @@ execute facing entity @p[distance=..16] feet run tp @s ~ ~ ~ ~ ~ # 演出 - playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 1 1 + playsound minecraft:item.trident.return hostile @a ~ ~ ~ 1 2 + playsound minecraft:entity.player.breath hostile @a ~ ~ ~ 1 1.5 playsound minecraft:block.grindstone.use hostile @a ~ ~ ~ 1 1.5 playsound minecraft:item.trident.return hostile @a ~ ~ ~ 1 2 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction index 548af4c0cb..e8db94bf39 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/dash_slash/slash/windup_2.mcfunction @@ -5,6 +5,6 @@ # @within function asset:mob/0372.tutankhamen/tick/skill/dash/dash_slash/ # 演出 - playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 1 2 + playsound minecraft:item.trident.return hostile @a ~ ~ ~ 1 2 playsound minecraft:block.grindstone.use hostile @a ~ ~ ~ 1 2 playsound minecraft:item.trident.return hostile @a ~ ~ ~ 1 2 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction index d16bb9f106..7b534f554c 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/hyper_laser/windup.mcfunction @@ -8,6 +8,7 @@ execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_windup/tween {to_frame:0, duration:10} # 演出 - playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 1 1 + playsound minecraft:item.trident.return hostile @a ~ ~ ~ 1 2 + playsound minecraft:entity.player.breath hostile @a ~ ~ ~ 1 1 playsound minecraft:block.grindstone.use hostile @a ~ ~ ~ 1 1.5 playsound minecraft:item.trident.return hostile @a ~ ~ ~ 1 2 diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction index 18a23a15dc..ae187886dc 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/.mcfunction @@ -8,8 +8,8 @@ execute if score @s General.Mob.Tick matches 0 run function asset:mob/0372.tutankhamen/tick/skill/laser/windup # 演出 - execute if score @s General.Mob.Tick matches 4 run playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 2 0.7 - execute if score @s General.Mob.Tick matches 8 run playsound minecraft:entity.breeze.charge hostile @a ~ ~ ~ 2 1 + execute if score @s General.Mob.Tick matches 4 run playsound minecraft:item.trident.return hostile @a ~ ~ ~ 2 0.7 + execute if score @s General.Mob.Tick matches 8 run playsound minecraft:item.trident.return hostile @a ~ ~ ~ 2 1 # ビーム開始 execute if score @s General.Mob.Tick matches 23 as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_2_loop/tween {to_frame:0, duration:1} From 6523f3e6b56a5a408a996a620c7f72d9ade2f690 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Tue, 31 Dec 2024 04:57:21 +0900 Subject: [PATCH 100/103] =?UTF-8?q?=E3=81=BE=E3=81=A0=E4=BD=BF=E3=81=A3?= =?UTF-8?q?=E3=81=A1=E3=82=83=E3=81=84=E3=81=91=E3=81=AA=E3=81=84=E3=82=B5?= =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=83=89=E3=81=AE=E3=81=93=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=82=84=E3=82=93=E3=81=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0372.tutankhamen/tick/skill/dash/charge/start.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/start.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/start.mcfunction index 41a843328a..220e4468f2 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/start.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/dash/charge/start.mcfunction @@ -9,7 +9,7 @@ # 演出 playsound ogg:mob.blaze.breathe2 hostile @a ~ ~ ~ 2 1 - playsound minecraft:entity.breeze.wind_burst hostile @a ~ ~ ~ 2 1 playsound minecraft:entity.breeze.death hostile @a ~ ~ ~ 2 0.5 + playsound minecraft:entity.wither.shoot hostile @a ~ ~ ~ 1 1.7 particle minecraft:crit ~ ~ ~ 0 0 0 1 25 particle minecraft:poof ~ ~ ~ 0 0 0 0.3 50 From 904662888b1f7370f0ddee4a22e0ce82a0ded174 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 1 Jan 2025 17:16:23 +0900 Subject: [PATCH 101/103] =?UTF-8?q?=E3=83=9C=E3=82=B9=E3=83=89=E3=83=AD?= =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../object/2093.tutankhamen_death/tick/end.mcfunction | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/end.mcfunction b/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/end.mcfunction index c2c3bbe29d..16831d494b 100644 --- a/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/end.mcfunction +++ b/Asset/data/asset/functions/object/2093.tutankhamen_death/tick/end.mcfunction @@ -13,5 +13,10 @@ # モデルを消す execute as @e[type=item_display,tag=AC.AJ,distance=..8,limit=1] run function animated_java:tutankhamen/remove/this +# ボスドロ + data modify storage api: Argument.ID set value 928 + data modify storage api: Argument.Important set value true + function api:artifact/spawn/from_id + # 消失 kill @s From 62430d00ea0e138389fcf35d8e7b76858dceba51 Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 1 Jan 2025 17:18:34 +0900 Subject: [PATCH 102/103] =?UTF-8?q?=E3=82=AA=E3=83=90=E3=82=B1=E5=BC=BE?= =?UTF-8?q?=E3=81=AERange=E9=95=B7=E3=81=99=E3=81=8E=E3=82=8B=E3=81=AE?= =?UTF-8?q?=E3=81=A7=E8=AA=BF=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../functions/object/2092.ghost_bullet/init/.mcfunction | 5 ----- .../functions/object/2092.ghost_bullet/register.mcfunction | 4 +++- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction index 889ebc073d..ad616e8f0a 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/init/.mcfunction @@ -15,10 +15,5 @@ # TargetID execute store result score @s 2092.TargetID run data get storage asset:context this.TargetID -# スピード設定 - data modify storage asset:context this.Speed set value 2 - data modify storage asset:context this.Range set value 300 - data modify storage asset:context this.MovePerStep set value 0.4 - # 継承 function asset:object/super.init diff --git a/Asset/data/asset/functions/object/2092.ghost_bullet/register.mcfunction b/Asset/data/asset/functions/object/2092.ghost_bullet/register.mcfunction index ec9bab7be9..1d1bc7685b 100644 --- a/Asset/data/asset/functions/object/2092.ghost_bullet/register.mcfunction +++ b/Asset/data/asset/functions/object/2092.ghost_bullet/register.mcfunction @@ -15,4 +15,6 @@ # ID (int) data modify storage asset:object ID set value 2092 # フィールド(オプション) - # data modify storage asset:object Field.myValue set value + data modify storage asset:object Field.Speed set value 2 + data modify storage asset:object Field.Range set value 100 + data modify storage asset:object Field.MovePerStep set value 0.4 From 3438ef9a15f36015d0d85645d306a82c3fe2464e Mon Sep 17 00:00:00 2001 From: Chuzume Date: Wed, 1 Jan 2025 17:28:14 +0900 Subject: [PATCH 103/103] =?UTF-8?q?=E3=83=AC=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E3=82=A8=E3=82=A4=E3=83=A0=E6=99=82=E3=80=81=E3=82=B9?= =?UTF-8?q?=E3=83=9A=E3=82=AF=E3=83=86=E3=82=A4=E3=82=BF=E3=83=BC=E3=82=92?= =?UTF-8?q?=E9=99=A4=E5=A4=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mob/0372.tutankhamen/tick/skill/laser/windup.mcfunction | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/windup.mcfunction b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/windup.mcfunction index 60925de68a..3aca912bc3 100644 --- a/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/windup.mcfunction +++ b/Asset/data/asset/functions/mob/0372.tutankhamen/tick/skill/laser/windup.mcfunction @@ -8,5 +8,5 @@ execute as @e[type=item_display,tag=AC.AJLink,distance=..0.01,sort=nearest,limit=1] run function animated_java:tutankhamen/animations/attack_laser_2_windup/tween {to_frame:0, duration:5} # 狙うプレイヤーを決定しフィールドに放り込む - execute as @r[distance=..32] run function lib:get_name/ + execute as @r[gamemode=!spectator,distance=..32] run function lib:get_name/ data modify storage asset:context this.TargetName set from storage lib: Return.Name