Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⚖ [Artifact 368, 371, 374] スペル系神器が最も近い敵をターゲットにするように #1046

Merged
merged 6 commits into from
Mar 27, 2025
Merged

⚖ [Artifact 368, 371, 374] スペル系神器が最も近い敵をターゲットにするように #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d05e17
[Artifact 368] ファイアスペルが最寄りの敵を攻撃するように
Lapis-LJA Mar 5, 2025
2a99a6c
[Artifact 371] ウォータースペル
Lapis-LJA Mar 5, 2025
ac65b7d
[Artifact 374] サンダースペルの処理を諸共修正
Lapis-LJA Mar 5, 2025
5a7d4e8
サンダースペルの処理を修正
Lapis-LJA Mar 13, 2025
f7594bb
一部Tagを神器内全体で使えるように
Lapis-LJA Mar 13, 2025
3e53ec3
Merge branch 'master' into fix/lapis_artifact_spell
Lapis-LJA Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion Asset/data/asset/functions/artifact/0368.fire_spell/trigger/3.main.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,18 @@

# ここから先は神器側の効果の処理を書く

#> Private
# @private
#declare tag Target

# 前方の敵にTagをつける
execute positioned ^ ^ ^4 run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4] add Target

# 敵が居ない場合
execute positioned ^ ^ ^4 unless entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4] run function asset:artifact/0368.fire_spell/trigger/attack

# 前方に敵が居た場合
execute positioned ^ ^ ^4 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4] at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4,sort=nearest,limit=1] run function asset:artifact/0368.fire_spell/trigger/attack
execute positioned ^ ^ ^4 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4] at @s at @e[type=#lib:living,type=!player,tag=Target,distance=..10,sort=nearest,limit=1] run function asset:artifact/0368.fire_spell/trigger/attack

# Tagを削除
execute positioned ^ ^ ^4 run tag @e[type=#lib:living,tag=Target,distance=..4] remove Target
12 changes: 11 additions & 1 deletion Asset/data/asset/functions/artifact/0371.water_spell/trigger/3.main.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,18 @@

# ここから先は神器側の効果の処理を書く

#> Private
# @private
#declare tag Target

# 前方の敵にTagをつける
execute positioned ^ ^ ^4 run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4] add Target

# 敵が居ない場合
execute positioned ^ ^ ^4 unless entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4] run function asset:artifact/0371.water_spell/trigger/attack

# 前方に敵が居た場合
execute positioned ^ ^ ^4 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4] at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4,sort=nearest,limit=1] run function asset:artifact/0371.water_spell/trigger/attack
execute positioned ^ ^ ^4 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4] at @s at @e[type=#lib:living,type=!player,tag=Target,distance=..10,sort=nearest,limit=1] run function asset:artifact/0371.water_spell/trigger/attack

# Tagを削除
execute positioned ^ ^ ^4 run tag @e[type=#lib:living,tag=Target,distance=..4] remove Target
9 changes: 6 additions & 3 deletions Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/3.main.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@
playsound minecraft:entity.evoker.cast_spell player @a ~ ~ ~ 1 2
playsound minecraft:entity.generic.explode player @a ~ ~ ~ 0.4 2

# 弾丸飛ばす
execute positioned ~ ~1 ~ positioned ^ ^ ^4 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4] facing entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4,sort=nearest,limit=1] feet run function asset:artifact/0374.thunder_spell/trigger/line
# 敵が周囲にいるなら方向転換
execute if entity @e[type=#lib:living,type=!player,tag=Enemy,distance=..8] run function asset:artifact/0374.thunder_spell/trigger/turn_to_enemy

# タグ消し
# リセット
tag @s remove AE.Check
tag @e[type=#lib:living,type=!player,tag=Target,distance=..8] remove Target
tag @e[type=#lib:living,type=!player,tag=NearestTarget,distance=..8] remove NearestTarget
scoreboard players reset $RecursiveCount Temporary
9 changes: 5 additions & 4 deletions Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/_index.d.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#> asset:artifact/0374.thunder_spell/trigger/_index.d
#
# @private

#> Temp
#
#> tag
# @within function asset:artifact/0374.thunder_spell/trigger/**
#declare tag AE.Check
#declare tag AE.Check
#declare tag Target
#declare tag NearestTarget
#declare score_holder $RecursiveCount
2 changes: 1 addition & 1 deletion Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/attack.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
data modify storage api: Argument.AttackType set value "Magic"
data modify storage api: Argument.ElementType set value "Thunder"
function api:damage/modifier
execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..1,sort=nearest,limit=1] run function api:damage/
execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function api:damage/
function api:damage/reset
9 changes: 5 additions & 4 deletions Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/line.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
# 神器のメイン処理部
#
# @within function
# asset:artifact/0374.thunder_spell/trigger/3.main
# asset:artifact/0374.thunder_spell/trigger/turn_to_enemy
# asset:artifact/0374.thunder_spell/trigger/line

# 演出
particle dust 1 1 0 1 ~ ~ ~ 0.1 0 0.1 0 5

# ダメージ
execute if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..1,sort=nearest,limit=1] run function asset:artifact/0374.thunder_spell/trigger/attack
execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=NearestTarget,dx=0,sort=nearest,limit=1] positioned ~0.5 ~0.5 ~0.5 run function asset:artifact/0374.thunder_spell/trigger/attack

# 再起
execute if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] unless entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..1] unless entity @s[tag=AE.Check] positioned ^ ^ ^0.5 run function asset:artifact/0374.thunder_spell/trigger/line
# 再帰
scoreboard players add $RecursiveCount Temporary 1
execute unless entity @s[tag=AE.Check] if score $RecursiveCount Temporary matches ..8 positioned ^ ^ ^0.5 run function asset:artifact/0374.thunder_spell/trigger/line
12 changes: 12 additions & 0 deletions Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/turn_to_enemy.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#> asset:artifact/0374.thunder_spell/trigger/turn_to_enemy
#
#
#
# @within function asset:artifact/0374.thunder_spell/trigger/3.main

# ターゲット選定
execute if entity @e[type=#lib:living,tag=Enemy] positioned ^ ^ ^4 run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4] add Target
tag @e[type=#lib:living,type=!player,tag=Target,distance=..8,sort=nearest,limit=1] add NearestTarget

# 最も近い敵を狙って方向転換
execute positioned ~ ~1 ~ positioned ^ ^ ^4 if entity @e[type=#lib:living,type=!player,tag=NearestTarget,distance=..4] facing entity @e[type=#lib:living,type=!player,tag=NearestTarget,distance=..4,sort=nearest,limit=1] eyes run function asset:artifact/0374.thunder_spell/trigger/line