From 8e4ede257f4673d535665d77be117dcaf3cfe821 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Sun, 21 Dec 2025 17:56:37 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=80=E6=8B=AC=E7=BD=AE=E6=8F=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trigger/3.main.mcfunction | 2 +- .../trigger/3.1.2.damage.mcfunction | 2 +- .../0017.harmful_books/trigger/3.main.mcfunction | 2 +- .../0022.amen_ra_rod/trigger/3.main.mcfunction | 8 ++++---- .../0064.kenpo_scroll/trigger/3.main.mcfunction | 4 ++-- .../0073.suzuran_charm/trigger/3.main.mcfunction | 6 +++--- .../trigger/2.check_condition.mcfunction | 4 ++-- .../trigger/2.check_condition.mcfunction | 2 +- .../trigger/3.main.mcfunction | 8 ++++---- .../0103.necronomicon/trigger/3.main.mcfunction | 2 +- .../trigger/3.main.mcfunction | 2 +- .../trigger/2.check_condition.mcfunction | 8 ++++---- .../0122.lunatic_lay/trigger/3.main.mcfunction | 4 ++-- .../0125.storm_bow/trigger/3.main.mcfunction | 16 ++++++++-------- .../trigger/3.1.bullet.mcfunction | 4 ++-- .../0219.abyss_sword/trigger/3.main.mcfunction | 4 ++-- .../trigger/3.1.weak_hit.mcfunction | 2 +- .../trigger/3.2.strong_hit.mcfunction | 4 ++-- .../trigger/3.3.hyper_hit.mcfunction | 4 ++-- .../0246.magical_cane/trigger/3.main.mcfunction | 2 +- .../trigger/3.main.mcfunction | 4 ++-- .../0273.tonbo_gaeri/trigger/3.main.mcfunction | 2 +- .../trigger/3.main.mcfunction | 4 ++-- .../0292.craving_sword/melee/3.main.mcfunction | 6 +++--- .../0312.fire_sword/trigger/3.main.mcfunction | 6 +++--- .../trigger/3.main.mcfunction | 4 ++-- .../trigger/3.main.mcfunction | 8 ++++---- .../0315.water_sword/trigger/3.main.mcfunction | 4 ++-- .../0316.rapids_sword/trigger/3.main.mcfunction | 4 ++-- .../trigger/3.main.mcfunction | 4 ++-- .../0318.thunder_sword/trigger/3.main.mcfunction | 4 ++-- .../trigger/3.main.mcfunction | 6 +++--- .../trigger/3.main.mcfunction | 4 ++-- .../0333.koukisin/trigger/3.main.mcfunction | 4 ++-- .../trigger/3.main.mcfunction | 2 +- .../0355.barrel/trigger/3.main.mcfunction | 2 +- .../trigger/2.check_condition.mcfunction | 2 +- .../main_attack/combo/level_1/damage.mcfunction | 10 +++++----- .../main_attack/combo/level_2/damage.mcfunction | 10 +++++----- .../main_attack/combo/level_3/damage.mcfunction | 10 +++++----- .../0368.fire_spell/trigger/3.main.mcfunction | 6 +++--- .../0368.fire_spell/trigger/attack.mcfunction | 2 +- .../0371.water_spell/trigger/3.main.mcfunction | 6 +++--- .../0371.water_spell/trigger/attack.mcfunction | 2 +- .../0373.ice_sorcery/trigger/3.3.beam.mcfunction | 6 +++--- .../0373.ice_sorcery/trigger/3.4.hit.mcfunction | 4 ++-- .../0374.thunder_spell/trigger/3.main.mcfunction | 6 +++--- .../0374.thunder_spell/trigger/attack.mcfunction | 2 +- .../0374.thunder_spell/trigger/line.mcfunction | 2 +- .../trigger/turn_to_enemy.mcfunction | 6 +++--- .../0375.thunder_magic/trigger/3.main.mcfunction | 2 +- .../0375.thunder_magic/trigger/damage.mcfunction | 2 +- .../trigger/3.1.shoot.mcfunction | 2 +- .../trigger/3.2.damage.mcfunction | 4 ++-- .../0382.haru_urara/trigger/3.main.mcfunction | 6 +++--- .../trigger/3.main.mcfunction | 6 +++--- .../trigger/3.main.mcfunction | 4 ++-- .../trigger/message/.mcfunction | 4 ++-- .../trigger/3.1.check_critical.mcfunction | 4 ++-- .../trigger/3.main.mcfunction | 4 ++-- .../trigger/3.main.mcfunction | 4 ++-- .../0605.ambition/trigger/3.main.mcfunction | 4 ++-- .../trigger/3.1.bullet.mcfunction | 6 +++--- .../trigger/find_target_entity.mcfunction | 2 +- .../0615.censored/trigger/3.main.mcfunction | 6 +++--- .../trigger/execution/boss.mcfunction | 2 +- .../trigger/execution/mob.mcfunction | 2 +- .../attack_melee/3.main.mcfunction | 4 ++-- .../damage_entity/3.main.mcfunction | 2 +- .../trigger/3.main.mcfunction | 4 ++-- .../0724.oblivious_snow/attack/3.main.mcfunction | 8 ++++---- .../trigger/3.main.mcfunction | 4 ++-- .../trigger/5.knockback.mcfunction | 2 +- .../0756.sakura_hubuki/trigger/3.main.mcfunction | 4 ++-- .../trigger/4.range_attack.mcfunction | 4 ++-- .../0796.log4shell/trigger/3.1.shell.mcfunction | 6 +++--- .../trigger/3.main.mcfunction | 4 ++-- .../artifact/0876.uni/trigger/bullet.mcfunction | 6 +++--- .../trigger/3.main.mcfunction | 10 +++++----- .../trigger/3.main.mcfunction | 10 +++++----- .../trigger/3.main.mcfunction | 10 +++++----- .../trigger/damage.mcfunction | 2 +- .../0910.ignite/trigger/3.main.mcfunction | 8 ++++---- .../trigger/3.1.explosion.mcfunction | 2 +- .../trigger/3.1.explosion.mcfunction | 2 +- .../trigger/3.1.explosion.mcfunction | 2 +- .../trigger/3.1.explosion.mcfunction | 2 +- .../0927.lexiel_s_oath/trigger/3.main.mcfunction | 8 ++++---- .../0948.ft_139_rifle/trigger/bullet.mcfunction | 6 +++--- .../trigger/4.recursive.mcfunction | 4 ++-- .../0971.laser_eye_helmet/shot/bullet.mcfunction | 4 ++-- .../0976.brave_sword/trigger/damage.mcfunction | 10 +++++----- .../0983.icicle_blade/trigger/damage.mcfunction | 10 +++++----- .../trigger/damage.mcfunction | 10 +++++----- .../trigger/4.damage.mcfunction | 6 +++--- .../trigger/5.damage2.mcfunction | 6 +++--- .../1034.eiya/trigger/5.damage2.mcfunction | 6 +++--- .../attack_melee/damage.m.mcfunction | 2 +- .../click/shot/recursive.m.mcfunction | 2 +- .../trigger/bullet.mcfunction | 4 ++-- .../1163.rail_shooter/trigger/damage.mcfunction | 4 ++-- .../trigger/damage_full.mcfunction | 4 ++-- .../1163.rail_shooter/trigger/shoot.mcfunction | 4 ++-- .../1175.rubber_mallet/trigger/3.main.mcfunction | 4 ++-- .../trigger/search_target.mcfunction | 2 +- .../trigger/3.main.mcfunction | 4 ++-- .../1193.firebrand/trigger/3.main.mcfunction | 4 ++-- .../trigger/3.main.mcfunction | 8 ++++---- .../trigger/summon_laser.mcfunction | 2 +- .../trigger/3.main.mcfunction | 8 ++++---- .../trigger/recursive.mcfunction | 2 +- .../trigger/search_target.mcfunction | 2 +- .../1257.thor_staff/trigger/recursive.mcfunction | 2 +- .../trigger/recursive.mcfunction | 2 +- .../trigger/recursive.mcfunction | 2 +- .../trigger/3.main.mcfunction | 4 ++-- .../1269.apocalypse/trigger/3.main.mcfunction | 4 ++-- .../trigger/2.check_condition.mcfunction | 2 +- .../trigger/3.main.mcfunction | 4 ++-- .../1282.ice_axe/trigger/3.main.mcfunction | 4 ++-- .../0316.aurora_slash/tick/slash/1.mcfunction | 6 +++--- .../0316.aurora_slash/tick/slash/2.mcfunction | 6 +++--- .../0316.aurora_slash/tick/slash/3.mcfunction | 6 +++--- .../end/charge_shot/landing.mcfunction | 6 +++--- .../end/shot/landing.mcfunction | 4 ++-- .../tick/slash/damage/1_4.mcfunction | 6 +++--- .../tick/slash/damage/5.mcfunction | 6 +++--- .../mob/0234.walleye/tick/2.3.explode.mcfunction | 2 +- .../0274.death_saw_jiki/tick/3.damage.mcfunction | 2 +- .../register.mcfunction | 2 +- .../1002.malleus_maleficarum/tick/hit.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../1006.terra_shot/hit_entity/.mcfunction | 2 +- .../detect_hit_entity/from_player.mcfunction | 2 +- .../hit_entity/from_player/.mcfunction | 8 ++++---- .../detect_hit_entity/.mcfunction | 2 +- .../object/1010.fire_magic/kill/.mcfunction | 2 +- .../object/1012.traffic_sign/tick/.mcfunction | 2 +- .../object/1014.lunar_flare/kill/.mcfunction | 4 ++-- .../detect_hit_entity/.mcfunction | 2 +- .../object/1019.voltage_bullet/kill/.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../1021.sina_tk_bullet/hit_entity/.mcfunction | 2 +- .../functions/object/1023.star/kill/.mcfunction | 4 ++-- .../1041.grand_flame/tick/landing.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../object/1043.mini_black_hole/tick/.mcfunction | 2 +- .../1043.mini_black_hole/tick/damage/.mcfunction | 4 ++-- .../tick/damage/search_target.m.mcfunction | 2 +- .../1046.magic_bullet/hit_entity/.mcfunction | 2 +- .../kill/deal_damage.m.mcfunction | 2 +- .../object/1051.time_laser/tick/.mcfunction | 6 +++--- .../object/1054.ride_missile/kill/.mcfunction | 2 +- .../tick/turn/search.m.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../object/1064.fire_of_rebirth/kill/.mcfunction | 2 +- .../1065.hex_sting/kill/deal_damage.m.mcfunction | 2 +- .../1070.arrow_of_vinderre/pre_hit/.mcfunction | 4 ++-- .../1072.arrow_of_phoenix/pre_hit/.mcfunction | 2 +- .../1078.gun/tick/shot/bullet_rec.mcfunction | 4 ++-- .../1081.barrel/detect_hit_entity/.mcfunction | 2 +- .../object/1081.barrel/hit_entity/.mcfunction | 6 +++--- .../detect_hit_entity/.mcfunction | 2 +- .../1091.flame_boomerang/hit_entity/.mcfunction | 4 ++-- .../1093.miracle_magic/tick/damage.mcfunction | 4 ++-- .../1093.miracle_magic/tick/shoot.mcfunction | 4 ++-- .../1094.aa_missile/tick/damage.mcfunction | 4 ++-- .../object/1096.was_laser/tick/shoot/.mcfunction | 6 +++--- .../detect_hit_entity/.mcfunction | 2 +- .../1097.celestial_star/hit_entity/.mcfunction | 2 +- .../object/1097.celestial_star/tick/.mcfunction | 6 +++--- .../1098.alchemy_laser/tick/shot.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../object/1101.tnt/tick/damage/.mcfunction | 6 +++--- .../tick/damage/deal_damage.m.mcfunction | 4 ++-- .../object/1101.tnt/tick/on_vehicle.mcfunction | 8 ++++---- .../1102.turret/tick/shot/bullet_rec.mcfunction | 4 ++-- .../1103.light_ball/tick/track.m.mcfunction | 2 +- .../1104.poison_flowgun/pre_hit/.mcfunction | 2 +- .../pre_hit/.mcfunction | 2 +- .../object/1111.archer_fish/tick/.mcfunction | 6 +++--- .../1112.school_of_fish/tick/summon.mcfunction | 2 +- .../1113.soulfire_sword/tick/explode.mcfunction | 2 +- .../tick/5/damage/.mcfunction | 6 +++--- .../tick/5/damage/find_target_line.mcfunction | 2 +- .../object/1126.freeze_trap/tick/.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../1130.thunder_stiletto/hit_entity/.mcfunction | 2 +- .../1139.simple_grenade/tick/boom.mcfunction | 6 +++--- .../1140.arrow_of_honey_bee/pre_hit/.mcfunction | 8 ++++---- .../1143.arrow_of_hekireki/pre_hit/.mcfunction | 4 ++-- .../tick/attack/do.mcfunction | 8 ++++---- .../tick/attack/.mcfunction | 8 ++++---- .../tick/attack/recursive.m.mcfunction | 2 +- .../tick/check_owner.mcfunction | 2 +- 195 files changed, 402 insertions(+), 402 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/3.main.mcfunction index c19bf20f2f..f410c70a7e 100644 --- a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/3.main.mcfunction @@ -14,7 +14,7 @@ playsound minecraft:entity.ender_eye.death player @a ~ ~ ~ 2 1 # 敵のステータス表示処理 - execute unless entity @s[x_rotation=75..90] as @e[type=#lib:living,type=!player,tag=01.Target,distance=..30,limit=1] run function asset:artifact/0001.book_of_all-seeing/trigger/see_enemy/ + execute unless entity @s[x_rotation=75..90] as @e[type=#lib:living_without_player,tag=01.Target,distance=..30,limit=1] run function asset:artifact/0001.book_of_all-seeing/trigger/see_enemy/ execute unless entity @s[x_rotation=75..90] as @p[tag=01.Target,distance=..30,limit=1] run function asset:artifact/0001.book_of_all-seeing/trigger/see_player/ # 自身のステータス表示処理 diff --git a/Asset/data/asset/functions/artifact/0005.musket_matchlock/trigger/3.1.2.damage.mcfunction b/Asset/data/asset/functions/artifact/0005.musket_matchlock/trigger/3.1.2.damage.mcfunction index f420c0e38b..34ace86d62 100644 --- a/Asset/data/asset/functions/artifact/0005.musket_matchlock/trigger/3.1.2.damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0005.musket_matchlock/trigger/3.1.2.damage.mcfunction @@ -36,7 +36,7 @@ execute as @e[type=area_effect_cloud,tag=5.HitPosition,distance=..1,limit=1] anchored eyes at @s positioned ^ ^ ^6.4 run tp @e[type=area_effect_cloud,tag=5.BlockChecker,distance=..0.1,x=0.0,y=0.0,z=0.0] ~ ~ ~ # MatchlockIndicatorの前方かつ、MatchlockIndicatorの視線の直線上かつブロック検知用のdummyの手前にいる敵にダメージ - execute as @e[type=#lib:living,type=!player,distance=..6] anchored eyes positioned as @s positioned ^ ^ ^1000 facing entity @e[type=area_effect_cloud,tag=5.HitPosition] eyes positioned ^ ^ ^1000 positioned ~-0.5 ~-0.5 ~-0.5 if entity @s[dx=0,dy=0,dz=0] run tag @s add 5.BulletHit + execute as @e[type=#lib:living_without_player,distance=..6] anchored eyes positioned as @s positioned ^ ^ ^1000 facing entity @e[type=area_effect_cloud,tag=5.HitPosition] eyes positioned ^ ^ ^1000 positioned ~-0.5 ~-0.5 ~-0.5 if entity @s[dx=0,dy=0,dz=0] run tag @s add 5.BulletHit execute as @e[type=#lib:living,tag=5.BulletHit,distance=..6] positioned as @s positioned ^ ^ ^-5 if entity @e[type=area_effect_cloud,tag=5.BlockChecker,distance=..4] run tag @s remove 5.BulletHit execute as @p[tag=5.Owner] run function api:damage/modifier execute as @e[type=#lib:living,tag=5.BulletHit,distance=..6,sort=nearest,limit=1] run function api:damage/ diff --git a/Asset/data/asset/functions/artifact/0017.harmful_books/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0017.harmful_books/trigger/3.main.mcfunction index 220a2501e2..3db130531c 100644 --- a/Asset/data/asset/functions/artifact/0017.harmful_books/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0017.harmful_books/trigger/3.main.mcfunction @@ -17,5 +17,5 @@ data modify storage api: Argument.ID set value 328 data modify storage api: Argument.FieldOverride.Damage set value 11 execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID - execute positioned ^ ^ ^2.5 as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..2.5] run function api:entity/mob/effect/give + execute positioned ^ ^ ^2.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2.5] run function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/0022.amen_ra_rod/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0022.amen_ra_rod/trigger/3.main.mcfunction index 5d6341a6ab..f271583bcb 100644 --- a/Asset/data/asset/functions/artifact/0022.amen_ra_rod/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0022.amen_ra_rod/trigger/3.main.mcfunction @@ -10,8 +10,8 @@ # ここから先は神器側の効果の処理を書く # 光玉を召喚 - execute if predicate lib:is_sneaking as @e[type=#lib:living,type=!player,tag=!ExtendedCollision,tag=!Uninterferable,distance=..15] run function asset:artifact/0022.amen_ra_rod/trigger/summon_1 - execute if predicate lib:is_sneaking as @e[type=#lib:living,type=!player,tag= ExtendedCollision,distance=..15] run function api:mob/apply_to_forward_target/with_non-idempotent.m {CB:"asset:artifact/0022.amen_ra_rod/trigger/summon_1",Key:"asset:artifact/0022.amen_ra_rod/trigger/3.main",IsForwardedOnly:true} - execute unless predicate lib:is_sneaking as @e[type=#lib:living,type=!player,tag=!ExtendedCollision,tag=!Uninterferable,distance=..15] run function asset:artifact/0022.amen_ra_rod/trigger/summon_2 - execute unless predicate lib:is_sneaking as @e[type=#lib:living,type=!player,tag= ExtendedCollision,distance=..15] run function api:mob/apply_to_forward_target/with_non-idempotent.m {CB:"asset:artifact/0022.amen_ra_rod/trigger/summon_2",Key:"asset:artifact/0022.amen_ra_rod/trigger/3.main",IsForwardedOnly:true} + execute if predicate lib:is_sneaking as @e[type=#lib:living_without_player,tag=!ExtendedCollision,tag=!Uninterferable,distance=..15] run function asset:artifact/0022.amen_ra_rod/trigger/summon_1 + execute if predicate lib:is_sneaking as @e[type=#lib:living_without_player,tag= ExtendedCollision,distance=..15] run function api:mob/apply_to_forward_target/with_non-idempotent.m {CB:"asset:artifact/0022.amen_ra_rod/trigger/summon_1",Key:"asset:artifact/0022.amen_ra_rod/trigger/3.main",IsForwardedOnly:true} + execute unless predicate lib:is_sneaking as @e[type=#lib:living_without_player,tag=!ExtendedCollision,tag=!Uninterferable,distance=..15] run function asset:artifact/0022.amen_ra_rod/trigger/summon_2 + execute unless predicate lib:is_sneaking as @e[type=#lib:living_without_player,tag= ExtendedCollision,distance=..15] run function api:mob/apply_to_forward_target/with_non-idempotent.m {CB:"asset:artifact/0022.amen_ra_rod/trigger/summon_2",Key:"asset:artifact/0022.amen_ra_rod/trigger/3.main",IsForwardedOnly:true} function api:mob/apply_to_forward_target/reset_initial_apply.m {Key:"asset:artifact/0022.amen_ra_rod/trigger/3.main"} diff --git a/Asset/data/asset/functions/artifact/0064.kenpo_scroll/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0064.kenpo_scroll/trigger/3.main.mcfunction index 7aaf5ba13f..d0f8d4aa5f 100644 --- a/Asset/data/asset/functions/artifact/0064.kenpo_scroll/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0064.kenpo_scroll/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:crit ~ ~ ~ 0.5 0.5 0.5 1 50 force @a[distance=..10] + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle minecraft:crit ~ ~ ~ 0.5 0.5 0.5 1 50 force @a[distance=..10] playsound minecraft:entity.firework_rocket.blast player @s ~ ~ ~ 1 2 # 軽減貫通ダメージを与える @@ -25,6 +25,6 @@ # 補正functionを実行 function api:damage/modifier # ダメージを与える - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0073.suzuran_charm/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0073.suzuran_charm/trigger/3.main.mcfunction index a0d0acf1ba..e4bd2b7dd1 100644 --- a/Asset/data/asset/functions/artifact/0073.suzuran_charm/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0073.suzuran_charm/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle minecraft:smoke ~ ~ ~ 1 1 1 0.0001 500 normal @a[distance=..30] + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run particle minecraft:smoke ~ ~ ~ 1 1 1 0.0001 500 normal @a[distance=..30] playsound minecraft:entity.splash_potion.break player @a[distance=..30] ~ ~ ~ 1 0.5 # 物理無属性ダメージ @@ -18,7 +18,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "None" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ # リセット function api:damage/reset @@ -26,5 +26,5 @@ data modify storage api: Argument.ID set value 205 data modify storage api: Argument.FieldOverride.Damage set value 25 execute store result storage api: Argument.FieldOverride.AppliedFrom int 1 run scoreboard players get @s UserID - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:entity/mob/effect/give + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/0075.whirlpool_wand/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0075.whirlpool_wand/trigger/2.check_condition.mcfunction index 3c36849a0c..43d49c086f 100644 --- a/Asset/data/asset/functions/artifact/0075.whirlpool_wand/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0075.whirlpool_wand/trigger/2.check_condition.mcfunction @@ -7,7 +7,7 @@ # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く mainhand/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/mainhand # 他にアイテム等確認する場合はここに書く - execute if entity @s[tag=CanUsed] unless entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..5,limit=1] run playsound minecraft:block.dispenser.fail player @a ~ ~ ~ 1 1 - execute unless entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..5,limit=1] run tag @s remove CanUsed + execute if entity @s[tag=CanUsed] unless entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..5,limit=1] run playsound minecraft:block.dispenser.fail player @a ~ ~ ~ 1 1 + execute unless entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..5,limit=1] run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/0075.whirlpool_wand/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/trigger/2.check_condition.mcfunction index f013a2332a..fd559573f7 100644 --- a/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/trigger/2.check_condition.mcfunction @@ -7,6 +7,6 @@ # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く mainhand/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/mainhand # 他にアイテム等確認する場合はここに書く - execute unless entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..10] run tag @s remove CanUsed + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/0079.shoot_down_a_flying_dragon/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/trigger/3.main.mcfunction index de85027a4f..53df69ecf6 100644 --- a/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/trigger/3.main.mcfunction @@ -26,16 +26,16 @@ # 対象を設定 # 前提として近い1体はHit確定 - tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] add Hit + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] add Hit # 自身が水の近くにいた場合($AroundWater=1..)、「r=..10にいる、周囲に水がある敵」も対象となる # //要するに自分も相手も水の近くにいたら範囲攻撃！！ # MobのTemporaryはMob周囲の水の数に設定(ちょっと広めに判定をとる) - execute if score $AroundWater Temporary matches 1.. as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..10] at @s store result score @s Temporary run clone ~-1 ~-0.5 ~-1 ~1 ~0.5 ~1 ~-1 ~-0.5 ~-1 filtered water force + execute if score $AroundWater Temporary matches 1.. as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] at @s store result score @s Temporary run clone ~-1 ~-0.5 ~-1 ~1 ~0.5 ~1 ~-1 ~-0.5 ~-1 filtered water force # as Mob：@s のTemporaryが1..ならHitする - execute if score $AroundWater Temporary matches 1.. as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..10] if score @s Temporary matches 1.. run tag @s add Hit + execute if score $AroundWater Temporary matches 1.. as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] if score @s Temporary matches 1.. run tag @s add Hit # プレイヤーへの誤Hit処理 HitしたMobの近くにいると自分にもあたる やっぱPKしたいじゃぁん？ - execute at @e[type=#lib:living,type=!player,tag=Hit,distance=..10] as @a[distance=..0.10] run tag @s add Hit + execute at @e[type=#lib:living_without_player,tag=Hit,distance=..10] as @a[distance=..0.10] run tag @s add Hit # ダメージを設定 diff --git a/Asset/data/asset/functions/artifact/0103.necronomicon/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0103.necronomicon/trigger/3.main.mcfunction index 0ad526c187..8cd97fdb1e 100644 --- a/Asset/data/asset/functions/artifact/0103.necronomicon/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0103.necronomicon/trigger/3.main.mcfunction @@ -24,6 +24,6 @@ data modify storage api: Argument.AttackType set value "Magic" # ダメージを与える function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..10] run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0106.stone_cutter_blade/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0106.stone_cutter_blade/trigger/3.main.mcfunction index 6b4a1188d4..90966bf59a 100644 --- a/Asset/data/asset/functions/artifact/0106.stone_cutter_blade/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0106.stone_cutter_blade/trigger/3.main.mcfunction @@ -9,4 +9,4 @@ # ここから先は神器側の効果の処理を書く # 攻撃先のエンティティで実行 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..15] at @s run function asset:artifact/0106.stone_cutter_blade/trigger/3.1.entity.main \ No newline at end of file + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..15] at @s run function asset:artifact/0106.stone_cutter_blade/trigger/3.1.entity.main diff --git a/Asset/data/asset/functions/artifact/0122.lunatic_lay/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0122.lunatic_lay/trigger/2.check_condition.mcfunction index 519a5e8e9f..a3a7f33f8f 100644 --- a/Asset/data/asset/functions/artifact/0122.lunatic_lay/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0122.lunatic_lay/trigger/2.check_condition.mcfunction @@ -7,11 +7,11 @@ # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く mainhand/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/mainhand # 他にアイテム等確認する場合はここに書く - execute if entity @s[tag=CanUsed] anchored eyes positioned ^ ^ ^ as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..5,sort=random] run function asset:artifact/0122.lunatic_lay/trigger/find_through_target/ - execute if entity @s[tag=CanUsed] unless entity @e[type=#lib:living,type=!player,tag=3E.Hit,distance=..5] run playsound minecraft:block.dispenser.fail player @a ~ ~ ~ 1 1 - execute if entity @s[tag=CanUsed] unless entity @e[type=#lib:living,type=!player,tag=3E.Hit,distance=..5] run tag @s remove CanUsed + execute if entity @s[tag=CanUsed] anchored eyes positioned ^ ^ ^ as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..5,sort=random] run function asset:artifact/0122.lunatic_lay/trigger/find_through_target/ + execute if entity @s[tag=CanUsed] unless entity @e[type=#lib:living_without_player,tag=3E.Hit,distance=..5] run playsound minecraft:block.dispenser.fail player @a ~ ~ ~ 1 1 + execute if entity @s[tag=CanUsed] unless entity @e[type=#lib:living_without_player,tag=3E.Hit,distance=..5] run tag @s remove CanUsed data remove storage asset:temp IsTargetEntityFound # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/0122.lunatic_lay/trigger/3.main # リセット - tag @e[type=#lib:living,type=!player,tag=3E.Hit,distance=..5] remove 3E.Hit + tag @e[type=#lib:living_without_player,tag=3E.Hit,distance=..5] remove 3E.Hit diff --git a/Asset/data/asset/functions/artifact/0122.lunatic_lay/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0122.lunatic_lay/trigger/3.main.mcfunction index 872e8ebea9..ec18b183be 100644 --- a/Asset/data/asset/functions/artifact/0122.lunatic_lay/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0122.lunatic_lay/trigger/3.main.mcfunction @@ -9,13 +9,13 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute at @e[type=#lib:living,type=!player,tag=3E.Hit,distance=..5] run function asset:artifact/0122.lunatic_lay/trigger/vfx + execute at @e[type=#lib:living_without_player,tag=3E.Hit,distance=..5] run function asset:artifact/0122.lunatic_lay/trigger/vfx playsound entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 # ダメージ data modify storage api: Argument.Damage set value 110.0f 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=3E.Hit,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=3E.Hit,distance=..5] run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0125.storm_bow/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0125.storm_bow/trigger/3.main.mcfunction index 879d01ab32..40587b51c3 100644 --- a/Asset/data/asset/functions/artifact/0125.storm_bow/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0125.storm_bow/trigger/3.main.mcfunction @@ -10,9 +10,9 @@ # ここから先は神器側の効果の処理を書く # 不発処理 - execute unless entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10,limit=1] run playsound minecraft:block.dispenser.fail player @a ~ ~ ~ 1 2 - execute unless entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10,limit=1] run particle minecraft:smoke ~ ~1 ~ 0 0 0 0.1 30 - execute unless entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10,limit=1] run return fail + execute unless entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..10,limit=1] run playsound minecraft:block.dispenser.fail player @a ~ ~ ~ 1 2 + execute unless entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..10,limit=1] run particle minecraft:smoke ~ ~1 ~ 0 0 0 0.1 30 + execute unless entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..10,limit=1] run return fail # 成功時の処理 clear @s minecraft:arrow 1 @@ -20,16 +20,16 @@ # 矢を降らす execute as 0-0-0-0-0 at @s run function asset:artifact/0125.storm_bow/trigger/random_rotate/m {Mode:"",YawMin:0,YawMax:359,PitchMin:-88,PitchMax:-73} - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10,sort=random,limit=1] at @s rotated as 0-0-0-0-0 positioned ^ ^ ^16 run function asset:artifact/0125.storm_bow/trigger/summon_arrow.m + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..10,sort=random,limit=1] at @s rotated as 0-0-0-0-0 positioned ^ ^ ^16 run function asset:artifact/0125.storm_bow/trigger/summon_arrow.m # 2回目 execute as 0-0-0-0-0 at @s run function asset:artifact/0125.storm_bow/trigger/random_rotate/m {Mode:"",YawMin:0,YawMax:359,PitchMin:-88,PitchMax:-73} - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10,sort=random,limit=1] at @s rotated as 0-0-0-0-0 positioned ^ ^ ^16 run function asset:artifact/0125.storm_bow/trigger/summon_arrow.m + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..10,sort=random,limit=1] at @s rotated as 0-0-0-0-0 positioned ^ ^ ^16 run function asset:artifact/0125.storm_bow/trigger/summon_arrow.m # 3回目 execute as 0-0-0-0-0 at @s run function asset:artifact/0125.storm_bow/trigger/random_rotate/m {Mode:"",YawMin:0,YawMax:359,PitchMin:-88,PitchMax:-73} - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10,sort=random,limit=1] at @s rotated as 0-0-0-0-0 positioned ^ ^ ^16 run function asset:artifact/0125.storm_bow/trigger/summon_arrow.m + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..10,sort=random,limit=1] at @s rotated as 0-0-0-0-0 positioned ^ ^ ^16 run function asset:artifact/0125.storm_bow/trigger/summon_arrow.m # 4回目 execute as 0-0-0-0-0 at @s run function asset:artifact/0125.storm_bow/trigger/random_rotate/m {Mode:"",YawMin:0,YawMax:359,PitchMin:-88,PitchMax:-73} - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10,sort=random,limit=1] at @s rotated as 0-0-0-0-0 positioned ^ ^ ^16 run function asset:artifact/0125.storm_bow/trigger/summon_arrow.m + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..10,sort=random,limit=1] at @s rotated as 0-0-0-0-0 positioned ^ ^ ^16 run function asset:artifact/0125.storm_bow/trigger/summon_arrow.m # 5回目 execute as 0-0-0-0-0 at @s run function asset:artifact/0125.storm_bow/trigger/random_rotate/m {Mode:"",YawMin:0,YawMax:359,PitchMin:-88,PitchMax:-73} - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10,sort=random,limit=1] at @s rotated as 0-0-0-0-0 positioned ^ ^ ^16 run function asset:artifact/0125.storm_bow/trigger/summon_arrow.m + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..10,sort=random,limit=1] at @s rotated as 0-0-0-0-0 positioned ^ ^ ^16 run function asset:artifact/0125.storm_bow/trigger/summon_arrow.m diff --git a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/trigger/3.1.bullet.mcfunction b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/trigger/3.1.bullet.mcfunction index 7f9a801609..b4aaa722a2 100644 --- a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/trigger/3.1.bullet.mcfunction +++ b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/trigger/3.1.bullet.mcfunction @@ -7,7 +7,7 @@ # asset:artifact/0212.anti_materiel_rifle/trigger/3.1.bullet # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @s add Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # 演出 @@ -17,7 +17,7 @@ # 着弾 execute if entity @s[tag=Landing] run function asset:artifact/0212.anti_materiel_rifle/trigger/3.2.bullet_landed - execute if entity @s[tag=Landing] positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] at @s run function asset:artifact/0212.anti_materiel_rifle/trigger/3.2.bullet_damage + execute if entity @s[tag=Landing] positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] at @s run function asset:artifact/0212.anti_materiel_rifle/trigger/3.2.bullet_damage # 再起 execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..40] run function asset:artifact/0212.anti_materiel_rifle/trigger/3.1.bullet diff --git a/Asset/data/asset/functions/artifact/0219.abyss_sword/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0219.abyss_sword/trigger/3.main.mcfunction index fcf0c6f51b..b6e96e601e 100644 --- a/Asset/data/asset/functions/artifact/0219.abyss_sword/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0219.abyss_sword/trigger/3.main.mcfunction @@ -10,8 +10,8 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Immovable,distance=..10] at @s run particle minecraft:witch ~ ~ ~ 0.5 0.5 0.5 2 50 force @a[distance=..10] + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Immovable,distance=..10] at @s run particle minecraft:witch ~ ~ ~ 0.5 0.5 0.5 2 50 force @a[distance=..10] playsound minecraft:entity.enderman.teleport player @s ~ ~ ~ 1 1 # テレポート処理 - execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Immovable,distance=..10] at @s run tp ~ ~-1 ~ + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Immovable,distance=..10] at @s run tp ~ ~-1 ~ diff --git a/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.1.weak_hit.mcfunction b/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.1.weak_hit.mcfunction index 246e60727c..d35d3b9fca 100644 --- a/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.1.weak_hit.mcfunction +++ b/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.1.weak_hit.mcfunction @@ -11,4 +11,4 @@ playsound minecraft:block.note_block.xylophone player @a ~ ~ ~ 2 0 # 付近のヒットさせた敵によわそ～なパーティクルを出す - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle crit ~ ~1 ~ 0 0 0 0.5 10 \ No newline at end of file + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle crit ~ ~1 ~ 0 0 0 0.5 10 diff --git a/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.2.strong_hit.mcfunction b/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.2.strong_hit.mcfunction index 1c6fec64f9..371c1f48cd 100644 --- a/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.2.strong_hit.mcfunction +++ b/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.2.strong_hit.mcfunction @@ -9,5 +9,5 @@ playsound minecraft:block.respawn_anchor.deplete player @a ~ ~ ~ 1.5 2 # 付近のヒットさせた敵にパーティクルを出す - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle enchanted_hit ~ ~1 ~ 0 0 0 0.5 20 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:dust 0.5 0.75 1 1 ~ ~2 ~ 0.1 1 0.1 0 50 \ No newline at end of file + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle enchanted_hit ~ ~1 ~ 0 0 0 0.5 20 + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle minecraft:dust 0.5 0.75 1 1 ~ ~2 ~ 0.1 1 0.1 0 50 diff --git a/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.3.hyper_hit.mcfunction b/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.3.hyper_hit.mcfunction index 8f9895c7bf..2b665a383e 100644 --- a/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.3.hyper_hit.mcfunction +++ b/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.3.hyper_hit.mcfunction @@ -11,5 +11,5 @@ # 付近のヒットさせた敵にパーティクルを出す - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle firework ~ ~1 ~ 0 0 0 0.2 20 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:end_rod ~ ~2 ~ 0.1 1 0.1 0.01 50 \ No newline at end of file + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle firework ~ ~1 ~ 0 0 0 0.2 20 + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle minecraft:end_rod ~ ~2 ~ 0.1 1 0.1 0.01 50 diff --git a/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.main.mcfunction index 1dfa394503..eed7034056 100644 --- a/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0246.magical_cane/trigger/3.main.mcfunction @@ -25,7 +25,7 @@ function api:damage/modifier # ダメージを受けろ！ - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/use/mainhand diff --git a/Asset/data/asset/functions/artifact/0252.void_transaction/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0252.void_transaction/trigger/3.main.mcfunction index 687de3df52..a1006e4912 100644 --- a/Asset/data/asset/functions/artifact/0252.void_transaction/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0252.void_transaction/trigger/3.main.mcfunction @@ -22,7 +22,7 @@ # 一旦、クソ神器にする # 周囲のモブ(天使を除く）をremoveする - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Enemy.Boss,tag=!Uninterferable,distance=..30] run function api:mob/remove - execute as @e[type=#lib:living,type=!player,tag=Friend,tag=!Uninterferable,distance=..30] run function api:mob/remove + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Enemy.Boss,tag=!Uninterferable,distance=..30] run function api:mob/remove + execute as @e[type=#lib:living_without_player,tag=Friend,tag=!Uninterferable,distance=..30] run function api:mob/remove # プレイヤーを奈落に突き落とす execute as @a[tag=!PlayerShouldInvulnerable,distance=..30] run tp ~ ~-9999 ~ diff --git a/Asset/data/asset/functions/artifact/0273.tonbo_gaeri/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0273.tonbo_gaeri/trigger/3.main.mcfunction index fe1106853d..25c132b82f 100644 --- a/Asset/data/asset/functions/artifact/0273.tonbo_gaeri/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0273.tonbo_gaeri/trigger/3.main.mcfunction @@ -18,7 +18,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "None" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..150] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..150] run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0288.lamentation_sword/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0288.lamentation_sword/trigger/3.main.mcfunction index d445ede66e..8b88f8a111 100644 --- a/Asset/data/asset/functions/artifact/0288.lamentation_sword/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0288.lamentation_sword/trigger/3.main.mcfunction @@ -15,7 +15,7 @@ # 演出 playsound minecraft:entity.ghast.hurt player @a ~ ~ ~ 0.3 1.6 playsound minecraft:entity.enderman.death player @a ~ ~ ~ 0.4 2 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:soul ~ ~1 ~ 0.1 0.1 0.1 0.02 10 + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle minecraft:soul ~ ~1 ~ 0.1 0.1 0.1 0.02 10 # ダメージ設定 # 与えるダメージ @@ -25,6 +25,6 @@ # ダメージ function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0292.craving_sword/melee/3.main.mcfunction b/Asset/data/asset/functions/artifact/0292.craving_sword/melee/3.main.mcfunction index fb1b87f978..97d7ea42ac 100644 --- a/Asset/data/asset/functions/artifact/0292.craving_sword/melee/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0292.craving_sword/melee/3.main.mcfunction @@ -12,8 +12,8 @@ # 演出 playsound entity.player.attack.sweep player @a ~ ~ ~ 0.8 0.9 playsound entity.spider.step player @a ~ ~ ~ 0.6 0.9 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle dust 0.65 0.1 0.3 1 ~ ~1.2 ~ 0.5 0.5 0.5 0 40 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle block redstone_block ~ ~1.2 ~ 0.2 0.2 0.2 0 30 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run particle dust 0.65 0.1 0.3 1 ~ ~1.2 ~ 0.5 0.5 0.5 0 40 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run particle block redstone_block ~ ~1.2 ~ 0.2 0.2 0.2 0 30 # MetaData設定 data modify storage api: Argument.Metadata set value "84.CravingSword" @@ -23,5 +23,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "None" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0312.fire_sword/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0312.fire_sword/trigger/3.main.mcfunction index 33b9f0e578..9228889db5 100644 --- a/Asset/data/asset/functions/artifact/0312.fire_sword/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0312.fire_sword/trigger/3.main.mcfunction @@ -10,8 +10,8 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:flame ~ ~1 ~ 0 0 0 0.05 10 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:flame ~ ~1 ~ 0 0 0 0.05 10 + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle minecraft:flame ~ ~1 ~ 0 0 0 0.05 10 + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle minecraft:flame ~ ~1 ~ 0 0 0 0.05 10 playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1 1 playsound minecraft:block.fire.ambient player @a ~ ~ ~ 1 1.5 @@ -21,5 +21,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0313.raging_fire_sword/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0313.raging_fire_sword/trigger/3.main.mcfunction index 5e43336a9b..ff899e31c3 100644 --- a/Asset/data/asset/functions/artifact/0313.raging_fire_sword/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0313.raging_fire_sword/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:lava ~ ~0.5 ~ 0 0.5 0 0.1 20 + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle minecraft:lava ~ ~0.5 ~ 0 0.5 0 0.1 20 playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1 0.8 playsound minecraft:block.fire.ambient player @a ~ ~ ~ 1 1.3 @@ -19,5 +19,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/trigger/3.main.mcfunction index 15d98bfd96..a8c5276c13 100644 --- a/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/trigger/3.main.mcfunction @@ -10,9 +10,9 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle minecraft:lava ~ ~ ~ 0 0 0 1 20 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1 0.6 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run playsound minecraft:block.fire.ambient player @a ~ ~ ~ 1 1 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run particle minecraft:lava ~ ~ ~ 0 0 0 1 20 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1 0.6 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run playsound minecraft:block.fire.ambient player @a ~ ~ ~ 1 1 playsound minecraft:item.trident.throw player @a ~ ~ ~ 1 0.5 # ダメージ @@ -20,5 +20,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0315.water_sword/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0315.water_sword/trigger/3.main.mcfunction index 3d59a56f09..947924d5eb 100644 --- a/Asset/data/asset/functions/artifact/0315.water_sword/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0315.water_sword/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:rain ~ ~1 ~ 0.2 0.2 0.2 0 200 + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle minecraft:rain ~ ~1 ~ 0.2 0.2 0.2 0 200 playsound minecraft:entity.dolphin.jump player @a ~ ~ ~ 1 2 playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 1 1 @@ -19,5 +19,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0316.rapids_sword/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0316.rapids_sword/trigger/3.main.mcfunction index 02d9eefce9..dc0a7e2660 100644 --- a/Asset/data/asset/functions/artifact/0316.rapids_sword/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0316.rapids_sword/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:block blue_ice ~ ~1 ~ 0.5 0.5 0.5 2 50 + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle minecraft:block blue_ice ~ ~1 ~ 0.5 0.5 0.5 2 50 playsound minecraft:item.trident.throw player @a ~ ~ ~ 1 1 playsound minecraft:entity.player.swim player @a ~ ~ ~ 1 1.5 playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 1 1 @@ -20,5 +20,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0317.sea_storm_sword/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0317.sea_storm_sword/trigger/3.main.mcfunction index 5b3b11a8ab..e21cc0ae1f 100644 --- a/Asset/data/asset/functions/artifact/0317.sea_storm_sword/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0317.sea_storm_sword/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function asset:artifact/0317.sea_storm_sword/trigger/vfx + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function asset:artifact/0317.sea_storm_sword/trigger/vfx playsound item.trident.throw player @a ~ ~ ~ 0.8 0.7 # ダメージ @@ -18,5 +18,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0318.thunder_sword/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0318.thunder_sword/trigger/3.main.mcfunction index 4b0415e9b2..af2df18085 100644 --- a/Asset/data/asset/functions/artifact/0318.thunder_sword/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0318.thunder_sword/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle dust 1 1 0 1 ~ ~2 ~ 0 2.5 0 0 100 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run particle dust 1 1 0 1 ~ ~2 ~ 0 2.5 0 0 100 playsound minecraft:entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 # ダメージ @@ -18,5 +18,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Thunder" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0319.thunderbolt_sword/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0319.thunderbolt_sword/trigger/3.main.mcfunction index c7730d12d9..f4043f84c2 100644 --- a/Asset/data/asset/functions/artifact/0319.thunderbolt_sword/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0319.thunderbolt_sword/trigger/3.main.mcfunction @@ -11,8 +11,8 @@ # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle dust 0.867 0.667 0.161 1 ~ ~2 ~ 0 2.5 0 0 100 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle minecraft:poof ~ ~ ~ 0.7 0.1 0.7 0.1 10 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run particle dust 0.867 0.667 0.161 1 ~ ~2 ~ 0 2.5 0 0 100 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run particle minecraft:poof ~ ~ ~ 0.7 0.1 0.7 0.1 10 playsound minecraft:entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 playsound minecraft:entity.zombie.break_wooden_door player @a ~ ~ ~ 1 1.5 @@ -21,5 +21,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Thunder" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/trigger/3.main.mcfunction index e0fb9b0637..924e344853 100644 --- a/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] rotated ~ 0 run function asset:artifact/0320.divine_thunder_sword/trigger/3.1.particle + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] rotated ~ 0 run function asset:artifact/0320.divine_thunder_sword/trigger/3.1.particle playsound item.trident.throw player @a ~ ~ ~ 1 1 # ダメージ @@ -18,5 +18,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Thunder" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0333.koukisin/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0333.koukisin/trigger/3.main.mcfunction index 3559709605..b25e9b1387 100644 --- a/Asset/data/asset/functions/artifact/0333.koukisin/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0333.koukisin/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle minecraft:crit ~ ~1 ~ 0.2 0.8 0.2 0 80 normal @a + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run particle minecraft:crit ~ ~1 ~ 0.2 0.8 0.2 0 80 normal @a playsound minecraft:block.anvil.place player @a ~ ~ ~ 0.8 2 # 耐性貫通ダメージ @@ -18,5 +18,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.FixedDamage set value true function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..10,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..10,limit=1] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0349.passion_pickaxe/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0349.passion_pickaxe/trigger/3.main.mcfunction index 5904fbee3c..ae10128337 100644 --- a/Asset/data/asset/functions/artifact/0349.passion_pickaxe/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0349.passion_pickaxe/trigger/3.main.mcfunction @@ -14,7 +14,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset # 自身にマインソウル(ID:291)を付与 diff --git a/Asset/data/asset/functions/artifact/0355.barrel/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0355.barrel/trigger/3.main.mcfunction index 8eba1d7431..b7991c2653 100644 --- a/Asset/data/asset/functions/artifact/0355.barrel/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0355.barrel/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 樽召喚 - execute at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..8] run function asset:artifact/0355.barrel/trigger/summon_barrel + execute at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..8] run function asset:artifact/0355.barrel/trigger/summon_barrel # 演出 particle happy_villager ~ ~ ~ 0.5 0.5 0.5 1 30 diff --git a/Asset/data/asset/functions/artifact/0361.rainbow_crystal/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0361.rainbow_crystal/trigger/2.check_condition.mcfunction index b15bb92d85..fba95358bd 100644 --- a/Asset/data/asset/functions/artifact/0361.rainbow_crystal/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0361.rainbow_crystal/trigger/2.check_condition.mcfunction @@ -7,6 +7,6 @@ # 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く mainhand/feet/legs/chest/head/mainhand/offhandを記載してね function asset:artifact/common/check_condition/mainhand # 他にアイテム等確認する場合はここに書く - execute unless entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..30] run tag @s remove CanUsed + execute unless entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..30] run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/0361.rainbow_crystal/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/main_attack/combo/level_1/damage.mcfunction b/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/main_attack/combo/level_1/damage.mcfunction index 620c1c99e5..32950ff02c 100644 --- a/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/main_attack/combo/level_1/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/main_attack/combo/level_1/damage.mcfunction @@ -10,8 +10,8 @@ # 想定ダメージはまぁ…フィニッシュのショットを当てないときのブレイブソードくらい。レベル4弱神器くらいです。 # タグ付与 - execute positioned ^ ^ ^1 run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..3] add A4.Hit - execute as @e[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..3] positioned ^ ^ ^-100 run tag @s[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..100] remove A4.Hit + execute positioned ^ ^ ^1 run tag @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..3] add A4.Hit + execute as @e[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..3] positioned ^ ^ ^-100 run tag @s[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..100] remove A4.Hit # 引数の設定 # ダメージ値設定 @@ -23,13 +23,13 @@ # 補正functionを実行 execute as @p[tag=this] run function api:damage/modifier # ダメージ実行 - execute as @e[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..3,sort=random] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..3,sort=random] run function api:damage/ # ノクバ耐性を考慮して吹っ飛ばす data modify storage lib: Argument.VectorMagnitude set value -0.7 data modify storage lib: Argument.KnockbackResist set value true - execute as @e[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..3] at @s facing entity @p[tag=this] feet rotated ~ ~5 run function lib:motion/ + execute as @e[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..3] at @s facing entity @p[tag=this] feet rotated ~ ~5 run function lib:motion/ # リセット - tag @e[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..3] remove A4.Hit + tag @e[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..3] remove A4.Hit function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/main_attack/combo/level_2/damage.mcfunction b/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/main_attack/combo/level_2/damage.mcfunction index 69b7e30d8e..df6242b317 100644 --- a/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/main_attack/combo/level_2/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/main_attack/combo/level_2/damage.mcfunction @@ -9,8 +9,8 @@ # ただ、MP消費がないのでそこら辺は要調整かも。強神器とかよか、少し弱めでもいいかも。 # タグ付与 - execute positioned ^ ^ ^1 run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..3.5] add A4.Hit - execute as @e[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..3.5] positioned ^ ^ ^-100 run tag @s[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..100] remove A4.Hit + execute positioned ^ ^ ^1 run tag @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..3.5] add A4.Hit + execute as @e[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..3.5] positioned ^ ^ ^-100 run tag @s[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..100] remove A4.Hit # 引数の設定 # ダメージ値設定 @@ -22,13 +22,13 @@ # 補正functionを実行 execute as @p[tag=this] run function api:damage/modifier # ダメージ実行 - execute as @e[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..3.5,sort=random] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..3.5,sort=random] run function api:damage/ # ノクバ耐性を考慮して吹っ飛ばす data modify storage lib: Argument.VectorMagnitude set value -1.2 data modify storage lib: Argument.KnockbackResist set value true - execute as @e[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..3.5] at @s facing entity @p[tag=this] feet rotated ~ ~5 run function lib:motion/ + execute as @e[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..3.5] at @s facing entity @p[tag=this] feet rotated ~ ~5 run function lib:motion/ # リセット - tag @e[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..3.5] remove A4.Hit + tag @e[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..3.5] remove A4.Hit function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/main_attack/combo/level_3/damage.mcfunction b/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/main_attack/combo/level_3/damage.mcfunction index 46cd528013..269bf87962 100644 --- a/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/main_attack/combo/level_3/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0364.red_knights_sword/trigger/main_attack/combo/level_3/damage.mcfunction @@ -11,8 +11,8 @@ # レベル4の敵相手にHP33%以下をキープするのは危険なので、ある程度攻撃が強いと嬉しいですが、任せます。 # ターゲット指定 - execute positioned ^ ^ ^1 run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..4] add A4.Hit - execute as @e[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..4] positioned ^ ^ ^-100 run tag @s[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..100] remove A4.Hit + execute positioned ^ ^ ^1 run tag @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..4] add A4.Hit + execute as @e[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..4] positioned ^ ^ ^-100 run tag @s[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..100] remove A4.Hit # 引数の設定 # ダメージ値設定 @@ -24,13 +24,13 @@ # 補正functionを実行 execute as @p[tag=this] run function api:damage/modifier # ダメージ実行 - execute as @e[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..4,sort=random] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..4,sort=random] run function api:damage/ # ノクバ耐性を考慮して吹っ飛ばす data modify storage lib: Argument.VectorMagnitude set value -2 data modify storage lib: Argument.KnockbackResist set value true - execute as @e[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..4] at @s facing entity @p[tag=this] feet rotated ~ ~5 run function lib:motion/ + execute as @e[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..4] at @s facing entity @p[tag=this] feet rotated ~ ~5 run function lib:motion/ # リセット - tag @e[type=#lib:living,type=!player,tag=A4.Hit,tag=!Uninterferable,distance=..4] remove A4.Hit + tag @e[type=#lib:living_without_player,tag=A4.Hit,tag=!Uninterferable,distance=..4] remove A4.Hit function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0368.fire_spell/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0368.fire_spell/trigger/3.main.mcfunction index b32997d864..efd9b36f15 100644 --- a/Asset/data/asset/functions/artifact/0368.fire_spell/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0368.fire_spell/trigger/3.main.mcfunction @@ -14,13 +14,13 @@ #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 run tag @e[type=#lib:living_without_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 unless entity @e[type=#lib:living_without_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 @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 + execute positioned ^ ^ ^4 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] at @s at @e[type=#lib:living_without_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 diff --git a/Asset/data/asset/functions/artifact/0368.fire_spell/trigger/attack.mcfunction b/Asset/data/asset/functions/artifact/0368.fire_spell/trigger/attack.mcfunction index c80b95d2a3..f359c30da5 100644 --- a/Asset/data/asset/functions/artifact/0368.fire_spell/trigger/attack.mcfunction +++ b/Asset/data/asset/functions/artifact/0368.fire_spell/trigger/attack.mcfunction @@ -14,5 +14,5 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..1,sort=nearest,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..1,sort=nearest,limit=1] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0371.water_spell/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0371.water_spell/trigger/3.main.mcfunction index 851adcef91..3909ac860b 100644 --- a/Asset/data/asset/functions/artifact/0371.water_spell/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0371.water_spell/trigger/3.main.mcfunction @@ -14,13 +14,13 @@ #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 run tag @e[type=#lib:living_without_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 unless entity @e[type=#lib:living_without_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 @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 + execute positioned ^ ^ ^4 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] at @s at @e[type=#lib:living_without_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 diff --git a/Asset/data/asset/functions/artifact/0371.water_spell/trigger/attack.mcfunction b/Asset/data/asset/functions/artifact/0371.water_spell/trigger/attack.mcfunction index 58085e5a3a..f15d839642 100644 --- a/Asset/data/asset/functions/artifact/0371.water_spell/trigger/attack.mcfunction +++ b/Asset/data/asset/functions/artifact/0371.water_spell/trigger/attack.mcfunction @@ -17,5 +17,5 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..1,sort=nearest,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..1,sort=nearest,limit=1] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0373.ice_sorcery/trigger/3.3.beam.mcfunction b/Asset/data/asset/functions/artifact/0373.ice_sorcery/trigger/3.3.beam.mcfunction index c0c3d46441..9fe70b8561 100644 --- a/Asset/data/asset/functions/artifact/0373.ice_sorcery/trigger/3.3.beam.mcfunction +++ b/Asset/data/asset/functions/artifact/0373.ice_sorcery/trigger/3.3.beam.mcfunction @@ -8,11 +8,11 @@ # ここから先は神器側の効果の処理を書く # 着弾検知 - execute if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] run tag @s add AD.Hit + execute if entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2] run tag @s add AD.Hit execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add AD.Hit # ターゲットにタグ付与 - execute if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2,limit=1] add AD.HitTarget + execute if entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2] run tag @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2,limit=1] add AD.HitTarget # 演出 particle minecraft:block blue_ice ~ ~ ~ 0 0 0 2 1 force @@ -23,4 +23,4 @@ execute if entity @s[tag=AD.Hit] run function asset:artifact/0373.ice_sorcery/trigger/3.4.hit # 再起 - execute positioned ^ ^ ^0.5 if entity @s[tag=!AD.Hit,distance=..30] run function asset:artifact/0373.ice_sorcery/trigger/3.3.beam \ No newline at end of file + execute positioned ^ ^ ^0.5 if entity @s[tag=!AD.Hit,distance=..30] run function asset:artifact/0373.ice_sorcery/trigger/3.3.beam diff --git a/Asset/data/asset/functions/artifact/0373.ice_sorcery/trigger/3.4.hit.mcfunction b/Asset/data/asset/functions/artifact/0373.ice_sorcery/trigger/3.4.hit.mcfunction index 6730a864a6..e00074a889 100644 --- a/Asset/data/asset/functions/artifact/0373.ice_sorcery/trigger/3.4.hit.mcfunction +++ b/Asset/data/asset/functions/artifact/0373.ice_sorcery/trigger/3.4.hit.mcfunction @@ -20,9 +20,9 @@ data modify storage api: Argument.AdditionalMPHeal set value 4.8f # ダメージ function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=AD.HitTarget,tag=!Uninterferable,distance=..50,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=AD.HitTarget,tag=!Uninterferable,distance=..50,limit=1] run function api:damage/ # リセット function api:damage/reset # 着弾タグを消す - tag @e[type=#lib:living,type=!player,tag=AD.HitTarget,tag=!Uninterferable,distance=..50,limit=1] remove AD.HitTarget + tag @e[type=#lib:living_without_player,tag=AD.HitTarget,tag=!Uninterferable,distance=..50,limit=1] remove AD.HitTarget diff --git a/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/3.main.mcfunction index ab965f756a..6501e3165f 100644 --- a/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/3.main.mcfunction @@ -21,10 +21,10 @@ playsound minecraft:entity.generic.explode player @a ~ ~ ~ 0.4 2 # 敵が周囲にいるなら方向転換 - execute if entity @e[type=#lib:living,type=!player,tag=Enemy,distance=..8] run function asset:artifact/0374.thunder_spell/trigger/turn_to_enemy + execute if entity @e[type=#lib:living_without_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 + tag @e[type=#lib:living_without_player,tag=Target,distance=..8] remove Target + tag @e[type=#lib:living_without_player,tag=NearestTarget,distance=..8] remove NearestTarget scoreboard players reset $RecursiveCount Temporary diff --git a/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/attack.mcfunction b/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/attack.mcfunction index f49b6e9280..2053d102b3 100644 --- a/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/attack.mcfunction +++ b/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/attack.mcfunction @@ -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 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/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/line.mcfunction b/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/line.mcfunction index 8b1edd0d48..c91f189ac2 100644 --- a/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/line.mcfunction +++ b/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/line.mcfunction @@ -10,7 +10,7 @@ particle dust 1 1 0 1 ~ ~ ~ 0.1 0 0.1 0 5 # ダメージ - 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 positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_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 # 再帰 scoreboard players add $RecursiveCount Temporary 1 diff --git a/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/turn_to_enemy.mcfunction b/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/turn_to_enemy.mcfunction index 5f32848352..8937f6108d 100644 --- a/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/turn_to_enemy.mcfunction +++ b/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/turn_to_enemy.mcfunction @@ -5,8 +5,8 @@ # @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 if entity @e[type=#lib:living,tag=Enemy] positioned ^ ^ ^4 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] add Target + tag @e[type=#lib:living_without_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 + execute positioned ~ ~1 ~ positioned ^ ^ ^4 if entity @e[type=#lib:living_without_player,tag=NearestTarget,distance=..4] facing entity @e[type=#lib:living_without_player,tag=NearestTarget,distance=..4,sort=nearest,limit=1] eyes run function asset:artifact/0374.thunder_spell/trigger/line diff --git a/Asset/data/asset/functions/artifact/0375.thunder_magic/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0375.thunder_magic/trigger/3.main.mcfunction index cf88cb45f5..bb270a96b2 100644 --- a/Asset/data/asset/functions/artifact/0375.thunder_magic/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0375.thunder_magic/trigger/3.main.mcfunction @@ -14,7 +14,7 @@ #declare tag Target # 前方の敵にTagをつける - execute positioned ^ ^ ^7 run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..7] add Target + execute positioned ^ ^ ^7 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7] add Target # 敵が居ない場合 execute positioned ^ ^ ^7 unless entity @e[type=#lib:living,tag=Target,distance=..7] run function asset:artifact/0375.thunder_magic/trigger/damage diff --git a/Asset/data/asset/functions/artifact/0375.thunder_magic/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/0375.thunder_magic/trigger/damage.mcfunction index 0d6022fcd3..f4ac3db7f1 100644 --- a/Asset/data/asset/functions/artifact/0375.thunder_magic/trigger/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0375.thunder_magic/trigger/damage.mcfunction @@ -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=!Uninterferable,distance=..1.8,sort=nearest] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..1.8,sort=nearest] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0376.ray_sorcery/trigger/3.1.shoot.mcfunction b/Asset/data/asset/functions/artifact/0376.ray_sorcery/trigger/3.1.shoot.mcfunction index f63aef501f..1cbd9e8473 100644 --- a/Asset/data/asset/functions/artifact/0376.ray_sorcery/trigger/3.1.shoot.mcfunction +++ b/Asset/data/asset/functions/artifact/0376.ray_sorcery/trigger/3.1.shoot.mcfunction @@ -8,7 +8,7 @@ # ここから先は神器側の効果の処理を書く # 着弾検知 - execute if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] run tag @s add Landing + execute if entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # 演出 diff --git a/Asset/data/asset/functions/artifact/0376.ray_sorcery/trigger/3.2.damage.mcfunction b/Asset/data/asset/functions/artifact/0376.ray_sorcery/trigger/3.2.damage.mcfunction index eccc57e335..f980328f30 100644 --- a/Asset/data/asset/functions/artifact/0376.ray_sorcery/trigger/3.2.damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0376.ray_sorcery/trigger/3.2.damage.mcfunction @@ -22,8 +22,8 @@ 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=..2.2] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2.2] run function api:damage/ function api:damage/reset # 着弾タグを消す - tag @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..50,limit=1] remove LandingTarget + tag @e[type=#lib:living_without_player,tag=LandingTarget,tag=!Uninterferable,distance=..50,limit=1] remove LandingTarget diff --git a/Asset/data/asset/functions/artifact/0382.haru_urara/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0382.haru_urara/trigger/3.main.mcfunction index a8ddae7dcd..5b26793024 100644 --- a/Asset/data/asset/functions/artifact/0382.haru_urara/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0382.haru_urara/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle dust 0.965 0.745 0.973 1 ~ ~0.3 ~ 0.4 8 0.4 0 400 force @a[distance=..30] + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle dust 0.965 0.745 0.973 1 ~ ~0.3 ~ 0.4 8 0.4 0 400 force @a[distance=..30] playsound minecraft:entity.ender_dragon.flap player @a[distance=..15] ~ ~ ~ 1 1 # ダメージ @@ -25,7 +25,7 @@ # 補正functionを実行 function api:damage/modifier # 攻撃した対象に実行 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ # リセット function api:damage/reset @@ -34,5 +34,5 @@ data modify storage api: Argument.ID set value 125 data modify storage api: Argument.Stack set value 31 data modify storage api: Argument.Duration set value 20 - execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Immovable,distance=..10] run function api:entity/mob/effect/give + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Immovable,distance=..10] run function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/artifact/0383.i_scream_ice_cream/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0383.i_scream_ice_cream/trigger/3.main.mcfunction index 84ea0bac9b..ef75d97fc4 100644 --- a/Asset/data/asset/functions/artifact/0383.i_scream_ice_cream/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0383.i_scream_ice_cream/trigger/3.main.mcfunction @@ -24,13 +24,13 @@ # 移動速度低下付与 # 天使に対しては効果が落ちる - effect give @e[type=#lib:living,type=!player,tag=!Enemy.Boss,tag=!Uninterferable,distance=..5] slowness 30 4 - effect give @e[type=#lib:living,type=!player,tag=Enemy.Boss,tag=!Uninterferable,distance=..5] slowness 4 1 + effect give @e[type=#lib:living_without_player,tag=!Enemy.Boss,tag=!Uninterferable,distance=..5] slowness 30 4 + effect give @e[type=#lib:living_without_player,tag=Enemy.Boss,tag=!Uninterferable,distance=..5] slowness 4 1 # ダメージ data modify storage api: Argument.Damage set value 32f data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..5] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0441.awaited_opportunity/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0441.awaited_opportunity/trigger/3.main.mcfunction index 3752ce332d..8fab30203c 100644 --- a/Asset/data/asset/functions/artifact/0441.awaited_opportunity/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0441.awaited_opportunity/trigger/3.main.mcfunction @@ -20,11 +20,11 @@ execute if predicate lib:random_pass_per/30 run function asset:artifact/0441.awaited_opportunity/trigger/message/ # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run particle minecraft:block redstone_block ~ ~1 ~ 0.1 0.1 0.1 1 10 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..6] run particle minecraft:block redstone_block ~ ~1 ~ 0.1 0.1 0.1 1 10 # ダメージ data modify storage api: Argument.Damage set value 9.0f data modify storage api: Argument.AttackType set value "Physical" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..6] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0441.awaited_opportunity/trigger/message/.mcfunction b/Asset/data/asset/functions/artifact/0441.awaited_opportunity/trigger/message/.mcfunction index ec3aa3c6a4..f5c4e3d840 100644 --- a/Asset/data/asset/functions/artifact/0441.awaited_opportunity/trigger/message/.mcfunction +++ b/Asset/data/asset/functions/artifact/0441.awaited_opportunity/trigger/message/.mcfunction @@ -30,7 +30,7 @@ execute if score $Random Temporary matches 8 run tellraw @a[distance=..30] [{"text":"<","color":"white"},{"selector":"@s"},{"text":"> "},{"text":"おぉ！上等だよ！てめーら上等だってんだよ！！"}] execute if score $Random Temporary matches 9 run tellraw @a[distance=..30] [{"text":"<","color":"white"},{"selector":"@s"},{"text":"> "},{"text":"今夜で“オワリ”にしてやるよ！"}] execute if score $Random Temporary matches 10 run tellraw @a[distance=..30] [{"text":"<","color":"white"},{"selector":"@s"},{"text":"> "},{"text":"冥府に送っちまえってよォ！！"}] - execute if score $Random Temporary matches 11 as @e[type=#lib:living,type=!player,tag=Victim,distance=..150] run tellraw @a [{"text":"<","color":"white"},{"selector":"@s"},{"text":"> "},{"text":"“事故”る奴は････“不運”と“踊”っちまったんだよ････"}] + execute if score $Random Temporary matches 11 as @e[type=#lib:living_without_player,tag=Victim,distance=..150] run tellraw @a [{"text":"<","color":"white"},{"selector":"@s"},{"text":"> "},{"text":"“事故”る奴は････“不運”と“踊”っちまったんだよ････"}] execute if score $Random Temporary matches 12 run tellraw @a[distance=..30] [{"text":"<","color":"white"},{"selector":"@s"},{"text":"> "},{"text":"てめェの臓物ブチまけてやる････！！"}] execute if score $Random Temporary matches 13 run tellraw @a[distance=..30] [{"text":"<","color":"white"},{"selector":"@s"},{"text":"> "},{"text":"俺が手に入れてやる･･･！その領域･･！“スピードの向こう側”を･･！！"}] execute if score $Random Temporary matches 14 run tellraw @a[distance=..30] [{"text":"<","color":"white"},{"selector":"@s"},{"text":"> "},{"text":"疼くんだよゥ････"}] @@ -43,7 +43,7 @@ execute if score $Random Temporary matches 11 run function asset:artifact/0441.awaited_opportunity/trigger/message/hardluck # "不運"と"踊"ってないときは敵の位置にマガジンマーク召喚 - execute unless score $Random Temporary matches 11 at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] anchored eyes positioned ^1.0 ^ ^ run function asset:artifact/0441.awaited_opportunity/trigger/message/magazine_mark + execute unless score $Random Temporary matches 11 at @e[type=#lib:living_without_player,tag=Victim,distance=..6] anchored eyes positioned ^1.0 ^ ^ run function asset:artifact/0441.awaited_opportunity/trigger/message/magazine_mark # スピードの向こう側 execute if score $Random Temporary matches 13 run function asset:artifact/0441.awaited_opportunity/trigger/message/beyond_the_speed diff --git a/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/trigger/3.1.check_critical.mcfunction b/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/trigger/3.1.check_critical.mcfunction index 42a735ebc1..fc288cb4fa 100644 --- a/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/trigger/3.1.check_critical.mcfunction +++ b/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/trigger/3.1.check_critical.mcfunction @@ -8,10 +8,10 @@ # asset:artifact/0471.stone_cutter_chainsaw/trigger/3.2.entity # タグつける - tag @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] add D3.Critical + tag @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] add D3.Critical # 加算 scoreboard players add $7n.Count Temporary 1 # 3.5マスまで再帰 - execute unless entity @e[type=#lib:living,type=!player,tag=D3.Critical,tag=!Uninterferable,dx=0] if score $7n.Count Temporary matches ..35 positioned ^ ^ ^0.1 run function asset:artifact/0471.stone_cutter_chainsaw/trigger/3.1.check_critical \ No newline at end of file + execute unless entity @e[type=#lib:living_without_player,tag=D3.Critical,tag=!Uninterferable,dx=0] if score $7n.Count Temporary matches ..35 positioned ^ ^ ^0.1 run function asset:artifact/0471.stone_cutter_chainsaw/trigger/3.1.check_critical diff --git a/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/trigger/3.main.mcfunction index d1f71594c6..f0c3dbb1bd 100644 --- a/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/trigger/3.main.mcfunction @@ -23,8 +23,8 @@ # ヒット function api:damage/single_damage_session/open - execute positioned ^ ^ ^2 as @e[type=#lib:living,type=!player,tag= D3.Critical,tag=!Uninterferable,distance=..2] at @s if entity @p[tag=this, distance=..4] run function asset:artifact/0471.stone_cutter_chainsaw/trigger/3.2.entity - execute positioned ^ ^ ^2 as @e[type=#lib:living,type=!player,tag=!D3.Critical,tag=!Uninterferable,distance=..2] at @s if entity @p[tag=this, distance=..4] run function asset:artifact/0471.stone_cutter_chainsaw/trigger/3.2.entity + execute positioned ^ ^ ^2 as @e[type=#lib:living_without_player,tag= D3.Critical,tag=!Uninterferable,distance=..2] at @s if entity @p[tag=this, distance=..4] run function asset:artifact/0471.stone_cutter_chainsaw/trigger/3.2.entity + execute positioned ^ ^ ^2 as @e[type=#lib:living_without_player,tag=!D3.Critical,tag=!Uninterferable,distance=..2] at @s if entity @p[tag=this, distance=..4] run function asset:artifact/0471.stone_cutter_chainsaw/trigger/3.2.entity function api:damage/single_damage_session/close # 開放 diff --git a/Asset/data/asset/functions/artifact/0534.all_night_helmet/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0534.all_night_helmet/trigger/3.main.mcfunction index 5fd7096ef9..7eee7141ca 100644 --- a/Asset/data/asset/functions/artifact/0534.all_night_helmet/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0534.all_night_helmet/trigger/3.main.mcfunction @@ -11,13 +11,13 @@ # 演出 playsound minecraft:entity.drowned.death_water player @a ~ ~ ~ 1 0.8 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle minecraft:squid_ink ~ ~1 ~ 0.4 0.4 0.4 0.03 30 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run particle minecraft:squid_ink ~ ~1 ~ 0.4 0.4 0.4 0.03 30 # ダメージ data modify storage api: Argument.Damage set value 15.0f data modify storage api: Argument.AttackType set value "Magic" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ function api:damage/reset # 回復 diff --git a/Asset/data/asset/functions/artifact/0605.ambition/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0605.ambition/trigger/3.main.mcfunction index a4ce1fb404..8f40ae7b3e 100644 --- a/Asset/data/asset/functions/artifact/0605.ambition/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0605.ambition/trigger/3.main.mcfunction @@ -20,14 +20,14 @@ scoreboard players operation @s Temporary < $MaxDamage Temporary # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] positioned ~ ~1 ~ summon marker run function asset:artifact/0605.ambition/trigger/vfx/ + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..6] positioned ~ ~1 ~ summon marker run function asset:artifact/0605.ambition/trigger/vfx/ # ダメージ execute store result storage api: Argument.Damage float 1 run scoreboard players get @s Temporary data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "None" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/artifact/0607.u_and_w_06/trigger/3.1.bullet.mcfunction b/Asset/data/asset/functions/artifact/0607.u_and_w_06/trigger/3.1.bullet.mcfunction index 0546691475..f783e6cbf7 100644 --- a/Asset/data/asset/functions/artifact/0607.u_and_w_06/trigger/3.1.bullet.mcfunction +++ b/Asset/data/asset/functions/artifact/0607.u_and_w_06/trigger/3.1.bullet.mcfunction @@ -10,11 +10,11 @@ # ここから先は神器側の効果の処理を書く # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @s add Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # ターゲットにタグ付与 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] add LandingTarget + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] add LandingTarget # 演出 particle dust 0.161 0.161 0.161 1 ~ ~ ~ 0 0 0 0 0 @@ -23,4 +23,4 @@ execute if entity @s[tag=Landing] run function asset:artifact/0607.u_and_w_06/trigger/3.2.hit # 再起 - execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:artifact/0607.u_and_w_06/trigger/3.1.bullet \ No newline at end of file + execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:artifact/0607.u_and_w_06/trigger/3.1.bullet diff --git a/Asset/data/asset/functions/artifact/0609.lunar_flare/trigger/find_target_entity.mcfunction b/Asset/data/asset/functions/artifact/0609.lunar_flare/trigger/find_target_entity.mcfunction index 3fc34e5e70..27f64d63ae 100644 --- a/Asset/data/asset/functions/artifact/0609.lunar_flare/trigger/find_target_entity.mcfunction +++ b/Asset/data/asset/functions/artifact/0609.lunar_flare/trigger/find_target_entity.mcfunction @@ -13,7 +13,7 @@ execute unless entity @s[tag=GX.RecursiveEnd] unless entity @s[distance=..20] run function asset:artifact/0609.lunar_flare/trigger/summon_laser_pos # 敵にぶつかったとき - execute unless entity @s[tag=GX.RecursiveEnd] positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living,type=!player,tag=!Object,tag=!Uninterferable,tag=!Projectile,tag=!Npc,dx=0,limit=1] run function asset:artifact/0609.lunar_flare/trigger/summon_laser_pos + execute unless entity @s[tag=GX.RecursiveEnd] positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living_without_player,tag=!Object,tag=!Uninterferable,tag=!Projectile,tag=!Npc,dx=0,limit=1] run function asset:artifact/0609.lunar_flare/trigger/summon_laser_pos # 再帰 execute unless entity @s[tag=GX.RecursiveEnd] positioned ^ ^ ^0.15 if entity @s[distance=..25] if block ~ ~ ~ #lib:no_collision run function asset:artifact/0609.lunar_flare/trigger/find_target_entity diff --git a/Asset/data/asset/functions/artifact/0615.censored/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0615.censored/trigger/3.main.mcfunction index 0ca7c494b9..a1cf578a10 100644 --- a/Asset/data/asset/functions/artifact/0615.censored/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0615.censored/trigger/3.main.mcfunction @@ -17,10 +17,10 @@ # 疑似乱数取得 execute store result score $Random Temporary run random value 0..4 # 処刑 - execute if score $Random Temporary matches 0 at @e[type=#lib:living,type=!player,tag=Victim,tag=!Enemy.Boss,tag=!Uninterferable] run function asset:artifact/0615.censored/trigger/execution/mob + execute if score $Random Temporary matches 0 at @e[type=#lib:living_without_player,tag=Victim,tag=!Enemy.Boss,tag=!Uninterferable] run function asset:artifact/0615.censored/trigger/execution/mob # ボス級の処刑 - execute if score $Random Temporary matches 0 at @e[type=#lib:living,type=!player,tag=Victim,tag=Enemy.Boss,tag=!Uninterferable] run function asset:artifact/0615.censored/trigger/execution/boss + execute if score $Random Temporary matches 0 at @e[type=#lib:living_without_player,tag=Victim,tag=Enemy.Boss,tag=!Uninterferable] run function asset:artifact/0615.censored/trigger/execution/boss # 通常攻撃 - execute if score $Random Temporary matches 1..4 at @e[type=#lib:living,type=!player,tag=Victim] run function asset:artifact/0615.censored/trigger/attack + execute if score $Random Temporary matches 1..4 at @e[type=#lib:living_without_player,tag=Victim] run function asset:artifact/0615.censored/trigger/attack # リセット scoreboard players reset $Random Temporary diff --git a/Asset/data/asset/functions/artifact/0615.censored/trigger/execution/boss.mcfunction b/Asset/data/asset/functions/artifact/0615.censored/trigger/execution/boss.mcfunction index 8130f7f1a8..d56c3e5473 100644 --- a/Asset/data/asset/functions/artifact/0615.censored/trigger/execution/boss.mcfunction +++ b/Asset/data/asset/functions/artifact/0615.censored/trigger/execution/boss.mcfunction @@ -23,5 +23,5 @@ data modify storage api: Argument.Damage set value 250.0f data modify storage api: Argument.AttackType set value "Physical" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=!Victim,tag=!Uninterferable,distance=..6] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=!Victim,tag=!Uninterferable,distance=..6] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0615.censored/trigger/execution/mob.mcfunction b/Asset/data/asset/functions/artifact/0615.censored/trigger/execution/mob.mcfunction index 1a9e625b90..1b4dd52e89 100644 --- a/Asset/data/asset/functions/artifact/0615.censored/trigger/execution/mob.mcfunction +++ b/Asset/data/asset/functions/artifact/0615.censored/trigger/execution/mob.mcfunction @@ -17,5 +17,5 @@ data modify storage api: Argument.Damage set value 250.0f data modify storage api: Argument.AttackType set value "Physical" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=!Victim,tag=!Uninterferable,distance=..6] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=!Victim,tag=!Uninterferable,distance=..6] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0642.raimei_helmet/attack_melee/3.main.mcfunction b/Asset/data/asset/functions/artifact/0642.raimei_helmet/attack_melee/3.main.mcfunction index 8a39bf1373..44144be7f8 100644 --- a/Asset/data/asset/functions/artifact/0642.raimei_helmet/attack_melee/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0642.raimei_helmet/attack_melee/3.main.mcfunction @@ -9,12 +9,12 @@ # 演出 playsound minecraft:block.respawn_anchor.deplete player @a ~ ~ ~ 1 1 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,sort=nearest,limit=1] run particle dust 0.867 0.667 0.161 1 ~ ~1 ~ 0 1 0 0 100 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,sort=nearest,limit=1] run particle dust 0.867 0.667 0.161 1 ~ ~1 ~ 0 1 0 0 100 # ダメージ data modify storage api: Argument.Damage set value 40.0f data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Thunder" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10,sort=nearest,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10,sort=nearest,limit=1] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0646.thorn_helm/damage_entity/3.main.mcfunction b/Asset/data/asset/functions/artifact/0646.thorn_helm/damage_entity/3.main.mcfunction index d73baf2f05..38b4c97377 100644 --- a/Asset/data/asset/functions/artifact/0646.thorn_helm/damage_entity/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0646.thorn_helm/damage_entity/3.main.mcfunction @@ -24,5 +24,5 @@ data modify storage api: Argument.Damage set value 75.0f data modify storage api: Argument.AttackType set value "Physical" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Attacker,distance=..50] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Attacker,distance=..50] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/trigger/3.main.mcfunction index 6b781c14b0..4e800ca5f7 100644 --- a/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0719.sword_of_divine_sound/trigger/3.main.mcfunction @@ -14,14 +14,14 @@ #declare score_holder $201 # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] positioned ~ ~0.3 ~ run function asset:artifact/0719.sword_of_divine_sound/trigger/vfx/ + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..6] positioned ~ ~0.3 ~ run function asset:artifact/0719.sword_of_divine_sound/trigger/vfx/ # 設定 execute store result storage api: Argument.Damage int 1.0 run random value 1450..1550 data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Thunder" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..6] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/artifact/0724.oblivious_snow/attack/3.main.mcfunction b/Asset/data/asset/functions/artifact/0724.oblivious_snow/attack/3.main.mcfunction index ee31b28747..e5793398a1 100644 --- a/Asset/data/asset/functions/artifact/0724.oblivious_snow/attack/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0724.oblivious_snow/attack/3.main.mcfunction @@ -8,14 +8,14 @@ function asset:artifact/common/use/head # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64,sort=nearest,limit=1] run particle snowflake ~ ~1.2 ~ 0.5 0.5 0.5 0.1 50 normal @a - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64,sort=nearest,limit=1] run playsound minecraft:block.powder_snow.step player @a ~ ~ ~ 1 0.5 0 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..64,sort=nearest,limit=1] run playsound minecraft:block.powder_snow.step player @a ~ ~ ~ 1 0.25 0 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..64,sort=nearest,limit=1] run particle snowflake ~ ~1.2 ~ 0.5 0.5 0.5 0.1 50 normal @a + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..64,sort=nearest,limit=1] run playsound minecraft:block.powder_snow.step player @a ~ ~ ~ 1 0.5 0 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..64,sort=nearest,limit=1] run playsound minecraft:block.powder_snow.step player @a ~ ~ ~ 1 0.25 0 # ダメージ設定 data modify storage api: Argument.Damage set value 100.0f data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..64,sort=nearest,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..64,sort=nearest,limit=1] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0745.blade_of_whirlwind/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0745.blade_of_whirlwind/trigger/3.main.mcfunction index d7e264186d..15b8ffe00a 100644 --- a/Asset/data/asset/functions/artifact/0745.blade_of_whirlwind/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0745.blade_of_whirlwind/trigger/3.main.mcfunction @@ -15,7 +15,7 @@ #declare score_holder $Damage # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function asset:artifact/0745.blade_of_whirlwind/trigger/4.vfx + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..6] run function asset:artifact/0745.blade_of_whirlwind/trigger/4.vfx # 移動速度を取得する execute store result score $Speed Temporary run attribute @s generic.movement_speed get 100000 @@ -32,7 +32,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..6] run function api:damage/ # 自身の移動速度が 100% 以上の時に実行 execute if score $Speed Temporary matches 1.. run function asset:artifact/0745.blade_of_whirlwind/trigger/5.knockback diff --git a/Asset/data/asset/functions/artifact/0745.blade_of_whirlwind/trigger/5.knockback.mcfunction b/Asset/data/asset/functions/artifact/0745.blade_of_whirlwind/trigger/5.knockback.mcfunction index 965ad4528c..81f3d4f96f 100644 --- a/Asset/data/asset/functions/artifact/0745.blade_of_whirlwind/trigger/5.knockback.mcfunction +++ b/Asset/data/asset/functions/artifact/0745.blade_of_whirlwind/trigger/5.knockback.mcfunction @@ -19,7 +19,7 @@ scoreboard players operation $VectorMagnitude Temporary < $5000 Const data modify storage lib: Argument.KnockbackResist set value 1b # 攻撃対象のMobをプレイヤーの向いてる方向にmotionで吹き飛ばす - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..6] at @s rotated as @p[tag=this,distance=..6] rotated ~ ~-15 run function lib:motion/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..6] at @s rotated as @p[tag=this,distance=..6] rotated ~ ~-15 run function lib:motion/ # リセット scoreboard players reset $VectorMagnitude Temporary diff --git a/Asset/data/asset/functions/artifact/0756.sakura_hubuki/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0756.sakura_hubuki/trigger/3.main.mcfunction index 71e05584a1..b3ecf13e28 100644 --- a/Asset/data/asset/functions/artifact/0756.sakura_hubuki/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0756.sakura_hubuki/trigger/3.main.mcfunction @@ -28,14 +28,14 @@ execute store result score $RandomDamage Temporary run random value 150..220 # スコアが6ならVictimにダメージを与える前に範囲攻撃を行う - execute if score $Random Temporary matches 6 at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function asset:artifact/0756.sakura_hubuki/trigger/4.range_attack + execute if score $Random Temporary matches 6 at @e[type=#lib:living_without_player,tag=Victim,distance=..6] run function asset:artifact/0756.sakura_hubuki/trigger/4.range_attack # メイン対象へダメージ execute store result storage api: Argument.Damage float 1.0 run scoreboard players get $RandomDamage Temporary data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..6] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/artifact/0756.sakura_hubuki/trigger/4.range_attack.mcfunction b/Asset/data/asset/functions/artifact/0756.sakura_hubuki/trigger/4.range_attack.mcfunction index ad38b6c71b..996d63320c 100644 --- a/Asset/data/asset/functions/artifact/0756.sakura_hubuki/trigger/4.range_attack.mcfunction +++ b/Asset/data/asset/functions/artifact/0756.sakura_hubuki/trigger/4.range_attack.mcfunction @@ -16,7 +16,7 @@ execute positioned ~ ~0.3 ~ rotated as @s rotated ~180 0 run function asset:artifact/0756.sakura_hubuki/trigger/vfx/ice_cherry_blossom # 鈍足を付与 - effect give @e[type=#lib:living,type=!player,tag=!Friend,tag=!Uninterferable,tag=!Object,distance=..3] slowness 1 3 true + effect give @e[type=#lib:living_without_player,tag=!Friend,tag=!Uninterferable,tag=!Object,distance=..3] slowness 1 3 true # 範囲でのダメージ(Victimに与えるダメージの0.7倍) execute store result storage api: Argument.Damage float 0.7 run scoreboard players get $RandomDamage Temporary @@ -26,7 +26,7 @@ # 補正 function api:damage/modifier # ダメージ - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] as @e[type=#lib:living,type=!player,tag=!Victim,tag=!Friend,tag=!Uninterferable,tag=!Object,distance=..3] at @s run function api:damage/ + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..6] as @e[type=#lib:living_without_player,tag=!Victim,tag=!Friend,tag=!Uninterferable,tag=!Object,distance=..3] at @s run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0796.log4shell/trigger/3.1.shell.mcfunction b/Asset/data/asset/functions/artifact/0796.log4shell/trigger/3.1.shell.mcfunction index b82e0eb79d..97f33ad021 100644 --- a/Asset/data/asset/functions/artifact/0796.log4shell/trigger/3.1.shell.mcfunction +++ b/Asset/data/asset/functions/artifact/0796.log4shell/trigger/3.1.shell.mcfunction @@ -10,11 +10,11 @@ # ここから先は神器側の効果の処理を書く # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @s add M4.Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @s add M4.Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add M4.Landing # ターゲットにタグ付与 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] add M4.LandingTarget + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] add M4.LandingTarget # 演出 particle dust 0.478 0.329 0.188 1 ~ ~ ~ 0 0 0 0 0 @@ -23,4 +23,4 @@ execute if entity @s[tag=M4.Landing] run function asset:artifact/0796.log4shell/trigger/3.2.hit # 再起 - execute positioned ^ ^ ^0.5 if entity @s[tag=!M4.Landing,distance=..30] run function asset:artifact/0796.log4shell/trigger/3.1.shell \ No newline at end of file + execute positioned ^ ^ ^0.5 if entity @s[tag=!M4.Landing,distance=..30] run function asset:artifact/0796.log4shell/trigger/3.1.shell diff --git a/Asset/data/asset/functions/artifact/0840.honey_bee_stick/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0840.honey_bee_stick/trigger/3.main.mcfunction index 120ab4d4ed..426bb11380 100644 --- a/Asset/data/asset/functions/artifact/0840.honey_bee_stick/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0840.honey_bee_stick/trigger/3.main.mcfunction @@ -27,8 +27,8 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ function api:damage/reset # 鈍足付与 - effect give @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] slowness 2 2 true + effect give @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] slowness 2 2 true diff --git a/Asset/data/asset/functions/artifact/0876.uni/trigger/bullet.mcfunction b/Asset/data/asset/functions/artifact/0876.uni/trigger/bullet.mcfunction index 60f6c895d7..aa5451cb66 100644 --- a/Asset/data/asset/functions/artifact/0876.uni/trigger/bullet.mcfunction +++ b/Asset/data/asset/functions/artifact/0876.uni/trigger/bullet.mcfunction @@ -9,11 +9,11 @@ # ここから先は神器側の効果の処理を書く # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @s add Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # ターゲットにタグ付与 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] add LandingTarget + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] add LandingTarget # 演出 particle dust 0.161 0.161 0.161 0.5 ~ ~ ~ 0 0 0 0 0 @@ -25,4 +25,4 @@ execute if entity @s[tag=Landing] run function asset:artifact/0876.uni/trigger/hit # 再起 - execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..10] run function asset:artifact/0876.uni/trigger/bullet \ No newline at end of file + execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..10] run function asset:artifact/0876.uni/trigger/bullet diff --git a/Asset/data/asset/functions/artifact/0902.fire_heart_accessories/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0902.fire_heart_accessories/trigger/3.main.mcfunction index b3cc16975e..82c32f90bf 100644 --- a/Asset/data/asset/functions/artifact/0902.fire_heart_accessories/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0902.fire_heart_accessories/trigger/3.main.mcfunction @@ -14,10 +14,10 @@ #declare score_holder $P2.MaxHP # VFX - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] run particle flame ~ ~1.2 ~ 0.3 0.3 0.3 0.05 30 normal @a[distance=..16] - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] run particle dust 100000000 1 100000000 1 ~ ~1.5 ~ 0.5 0.5 0.5 0 50 normal @a[distance=..16] - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] run playsound entity.blaze.shoot player @a[distance=..16] ~ ~ ~ 1 1.2 0 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] run playsound block.beacon.activate player @a[distance=..16] ~ ~ ~ 0.8 2 0 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] run particle flame ~ ~1.2 ~ 0.3 0.3 0.3 0.05 30 normal @a[distance=..16] + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] run particle dust 100000000 1 100000000 1 ~ ~1.5 ~ 0.5 0.5 0.5 0 50 normal @a[distance=..16] + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] run playsound entity.blaze.shoot player @a[distance=..16] ~ ~ ~ 1 1.2 0 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] run playsound block.beacon.activate player @a[distance=..16] ~ ~ ~ 0.8 2 0 # 個数を取得 execute store result score $P2.Count Temporary if data storage asset:context Items.hotbar[{tag:{TSB:{ID:902}}}] @@ -40,7 +40,7 @@ data modify storage api: Argument.ElementType set value "Fire" # ダメージ function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] at @s run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] at @s run function api:damage/ # リセット scoreboard players reset $P2.MaxHP Temporary diff --git a/Asset/data/asset/functions/artifact/0903.magic_water_accessories/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0903.magic_water_accessories/trigger/3.main.mcfunction index f0b969a379..92df2f7d0d 100644 --- a/Asset/data/asset/functions/artifact/0903.magic_water_accessories/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0903.magic_water_accessories/trigger/3.main.mcfunction @@ -14,10 +14,10 @@ #declare score_holder $P3.MaxMP # VFX - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] run particle rain ~ ~1.2 ~ 0.3 0.3 0.3 0.05 30 normal @a[distance=..16] - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] run particle dust 1 100000000 100000000 1 ~ ~1.5 ~ 0.5 0.5 0.5 0 50 normal @a[distance=..16] - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] run playsound entity.dolphin.splash player @a[distance=..16] ~ ~ ~ 1 1.2 0 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] run playsound block.beacon.activate player @a[distance=..16] ~ ~ ~ 0.8 2 0 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] run particle rain ~ ~1.2 ~ 0.3 0.3 0.3 0.05 30 normal @a[distance=..16] + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] run particle dust 1 100000000 100000000 1 ~ ~1.5 ~ 0.5 0.5 0.5 0 50 normal @a[distance=..16] + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] run playsound entity.dolphin.splash player @a[distance=..16] ~ ~ ~ 1 1.2 0 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] run playsound block.beacon.activate player @a[distance=..16] ~ ~ ~ 0.8 2 0 # 個数を取得 execute store result score $P3.Count Temporary if data storage asset:context Items.hotbar[{tag:{TSB:{ID:903}}}] @@ -40,7 +40,7 @@ data modify storage api: Argument.ElementType set value "Water" # ダメージ function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] at @s run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] at @s run function api:damage/ # リセット scoreboard players reset $P3.MaxMP Temporary diff --git a/Asset/data/asset/functions/artifact/0904.shield_thunder_accessories/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0904.shield_thunder_accessories/trigger/3.main.mcfunction index 8b1b8bc8c2..b1bbca9f63 100644 --- a/Asset/data/asset/functions/artifact/0904.shield_thunder_accessories/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0904.shield_thunder_accessories/trigger/3.main.mcfunction @@ -15,10 +15,10 @@ #declare score_holder $BonusDefense # VFX - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] run particle electric_spark ~ ~1.2 ~ 0.3 0.3 0.3 0.05 30 normal @a[distance=..16] - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] run particle dust 100000000 100000000 1 1 ~ ~1.5 ~ 0.5 0.5 0.5 0 50 normal @a[distance=..16] - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] run playsound entity.lightning_bolt.impact player @a[distance=..16] ~ ~ ~ 1 1.2 0 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] run playsound block.beacon.activate player @a[distance=..16] ~ ~ ~ 0.8 2 0 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] run particle electric_spark ~ ~1.2 ~ 0.3 0.3 0.3 0.05 30 normal @a[distance=..16] + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] run particle dust 100000000 100000000 1 1 ~ ~1.5 ~ 0.5 0.5 0.5 0 50 normal @a[distance=..16] + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] run playsound entity.lightning_bolt.impact player @a[distance=..16] ~ ~ ~ 1 1.2 0 + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] run playsound block.beacon.activate player @a[distance=..16] ~ ~ ~ 0.8 2 0 # 個数を取得 execute store result score $P4.Count Temporary if data storage asset:context Items.hotbar[{tag:{TSB:{ID:904}}}] @@ -42,7 +42,7 @@ data modify storage api: Argument.ElementType set value "Thunder" # ダメージ function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10,limit=1] at @s run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10,limit=1] at @s run function api:damage/ # リセット scoreboard players reset $P4.Defense Temporary diff --git a/Asset/data/asset/functions/artifact/0908.spear_of_butterfly/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/0908.spear_of_butterfly/trigger/damage.mcfunction index 788217fbfa..faac6b0b51 100644 --- a/Asset/data/asset/functions/artifact/0908.spear_of_butterfly/trigger/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0908.spear_of_butterfly/trigger/damage.mcfunction @@ -41,7 +41,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..6] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..6] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/artifact/0910.ignite/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0910.ignite/trigger/3.main.mcfunction index a201659e30..aef312b7fc 100644 --- a/Asset/data/asset/functions/artifact/0910.ignite/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0910.ignite/trigger/3.main.mcfunction @@ -36,19 +36,19 @@ execute positioned ~ ~1 ~ positioned ^ ^ ^2.5 run function asset:artifact/0910.ignite/trigger/particle # 殴った相手以外にタグを付ける - execute positioned ^ ^ ^1.5 run tag @e[type=#lib:living,type=!player,tag=!Victim,tag=!Uninterferable,distance=..3] add PA.SlashHit - execute positioned ^ ^ ^2.5 run tag @e[type=#lib:living,type=!player,tag=!Victim,tag=!Uninterferable,distance=..3] add PA.SlashHit + execute positioned ^ ^ ^1.5 run tag @e[type=#lib:living_without_player,tag=!Victim,tag=!Uninterferable,distance=..3] add PA.SlashHit + execute positioned ^ ^ ^2.5 run tag @e[type=#lib:living_without_player,tag=!Victim,tag=!Uninterferable,distance=..3] add PA.SlashHit # 近接で殴った相手以外に500ダメ data modify storage api: Argument.Damage set value 250.0f data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=PA.SlashHit,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=PA.SlashHit,distance=..10] run function api:damage/ function api:damage/reset # SDS close function api:damage/single_damage_session/close # リセット - tag @e[type=#lib:living,type=!player,tag=PA.SlashHit,distance=..10] remove PA.SlashHit + tag @e[type=#lib:living_without_player,tag=PA.SlashHit,distance=..10] remove PA.SlashHit diff --git a/Asset/data/asset/functions/artifact/0911.reactive_armor_head/trigger/3.1.explosion.mcfunction b/Asset/data/asset/functions/artifact/0911.reactive_armor_head/trigger/3.1.explosion.mcfunction index 6a007204ca..efb0297da8 100644 --- a/Asset/data/asset/functions/artifact/0911.reactive_armor_head/trigger/3.1.explosion.mcfunction +++ b/Asset/data/asset/functions/artifact/0911.reactive_armor_head/trigger/3.1.explosion.mcfunction @@ -9,7 +9,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,distance=..3] run function api:damage/ + execute as @e[type=#lib:living_without_player,distance=..3] run function api:damage/ function api:damage/reset # プレイヤーへのダメージ diff --git a/Asset/data/asset/functions/artifact/0912.reactive_armor_chest/trigger/3.1.explosion.mcfunction b/Asset/data/asset/functions/artifact/0912.reactive_armor_chest/trigger/3.1.explosion.mcfunction index 4567a6e49e..32a1d8de1a 100644 --- a/Asset/data/asset/functions/artifact/0912.reactive_armor_chest/trigger/3.1.explosion.mcfunction +++ b/Asset/data/asset/functions/artifact/0912.reactive_armor_chest/trigger/3.1.explosion.mcfunction @@ -9,7 +9,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,distance=..3] run function api:damage/ + execute as @e[type=#lib:living_without_player,distance=..3] run function api:damage/ function api:damage/reset # プレイヤーへのダメージ diff --git a/Asset/data/asset/functions/artifact/0913.reactive_armor_legs/trigger/3.1.explosion.mcfunction b/Asset/data/asset/functions/artifact/0913.reactive_armor_legs/trigger/3.1.explosion.mcfunction index a2cf9119ec..b28d6f0073 100644 --- a/Asset/data/asset/functions/artifact/0913.reactive_armor_legs/trigger/3.1.explosion.mcfunction +++ b/Asset/data/asset/functions/artifact/0913.reactive_armor_legs/trigger/3.1.explosion.mcfunction @@ -9,7 +9,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,distance=..3] run function api:damage/ + execute as @e[type=#lib:living_without_player,distance=..3] run function api:damage/ function api:damage/reset # プレイヤーへのダメージ diff --git a/Asset/data/asset/functions/artifact/0914.reactive_armor_feet/trigger/3.1.explosion.mcfunction b/Asset/data/asset/functions/artifact/0914.reactive_armor_feet/trigger/3.1.explosion.mcfunction index 78091bdfa4..90a10b6a3c 100644 --- a/Asset/data/asset/functions/artifact/0914.reactive_armor_feet/trigger/3.1.explosion.mcfunction +++ b/Asset/data/asset/functions/artifact/0914.reactive_armor_feet/trigger/3.1.explosion.mcfunction @@ -9,7 +9,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,distance=..3] run function api:damage/ + execute as @e[type=#lib:living_without_player,distance=..3] run function api:damage/ function api:damage/reset # プレイヤーへのダメージ diff --git a/Asset/data/asset/functions/artifact/0927.lexiel_s_oath/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0927.lexiel_s_oath/trigger/3.main.mcfunction index 473977b83e..981a352f33 100644 --- a/Asset/data/asset/functions/artifact/0927.lexiel_s_oath/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0927.lexiel_s_oath/trigger/3.main.mcfunction @@ -14,9 +14,9 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle sweep_attack ~ ~1 ~ 0 0 0 1 20 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle end_rod ~ ~1 ~ 0 0 0 0.1 20 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:large_smoke ~ ~1 ~ 0 0 0 0.4 10 + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle sweep_attack ~ ~1 ~ 0 0 0 1 20 + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle end_rod ~ ~1 ~ 0 0 0 0.1 20 + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] at @s run particle minecraft:large_smoke ~ ~1 ~ 0 0 0 0.4 10 playsound minecraft:item.trident.return player @a ~ ~ ~ 1 2 playsound minecraft:item.trident.throw player @a ~ ~ ~ 1 0.5 @@ -36,7 +36,7 @@ # 補正functionを実行 function api:damage/modifier # ダメージを与える - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0948.ft_139_rifle/trigger/bullet.mcfunction b/Asset/data/asset/functions/artifact/0948.ft_139_rifle/trigger/bullet.mcfunction index db96dc99fc..e0854d593b 100644 --- a/Asset/data/asset/functions/artifact/0948.ft_139_rifle/trigger/bullet.mcfunction +++ b/Asset/data/asset/functions/artifact/0948.ft_139_rifle/trigger/bullet.mcfunction @@ -7,11 +7,11 @@ # asset:artifact/0948.ft_139_rifle/trigger/bullet # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @s add Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # ターゲットにタグ付与 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] add LandingTarget + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] add LandingTarget # 演出 particle dust 0 0.733 1 0.5 ~ ~ ~ 0 0 0 0 6 @@ -23,4 +23,4 @@ execute if entity @s[tag=Landing] run function asset:artifact/0948.ft_139_rifle/trigger/hit # 再起 - execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:artifact/0948.ft_139_rifle/trigger/bullet \ No newline at end of file + execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:artifact/0948.ft_139_rifle/trigger/bullet diff --git a/Asset/data/asset/functions/artifact/0952.lunatic_rod/trigger/4.recursive.mcfunction b/Asset/data/asset/functions/artifact/0952.lunatic_rod/trigger/4.recursive.mcfunction index e83064e8fc..1f4cdc8881 100644 --- a/Asset/data/asset/functions/artifact/0952.lunatic_rod/trigger/4.recursive.mcfunction +++ b/Asset/data/asset/functions/artifact/0952.lunatic_rod/trigger/4.recursive.mcfunction @@ -16,8 +16,8 @@ execute if score $Interval Temporary matches 5.. run scoreboard players reset $Interval Temporary # ヒット - tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,tag=!Object,distance=..2] add Hit - execute if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,tag=!Object,distance=..2] run tag @s add Landing + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,tag=!Object,distance=..2] add Hit + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,tag=!Object,distance=..2] run tag @s add Landing # 再帰 execute if entity @s[distance=..15] positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:artifact/0952.lunatic_rod/trigger/4.recursive diff --git a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/bullet.mcfunction b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/bullet.mcfunction index 332edacce8..bb3147fbfd 100644 --- a/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/bullet.mcfunction +++ b/Asset/data/asset/functions/artifact/0971.laser_eye_helmet/shot/bullet.mcfunction @@ -9,11 +9,11 @@ # ここから先は神器側の効果の処理を書く # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @s add Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # ターゲットにタグ付与 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] add LandingTarget + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] add LandingTarget # 演出 particle minecraft:composter ~ ~ ~ 0.1 0.1 0.1 0 1 diff --git a/Asset/data/asset/functions/artifact/0976.brave_sword/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/0976.brave_sword/trigger/damage.mcfunction index 1087e19a8e..bd8a321495 100644 --- a/Asset/data/asset/functions/artifact/0976.brave_sword/trigger/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0976.brave_sword/trigger/damage.mcfunction @@ -5,8 +5,8 @@ # @within function asset:artifact/0976.brave_sword/trigger/3.main # タグ付与 - execute positioned ^ ^ ^1 run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..3] add R4.Hit - execute as @e[type=#lib:living,type=!player,tag=R4.Hit,tag=!Uninterferable,distance=..3] positioned ^ ^ ^-100 run tag @s[type=#lib:living,type=!player,tag=R4.Hit,tag=!Uninterferable,distance=..100] remove R4.Hit + execute positioned ^ ^ ^1 run tag @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..3] add R4.Hit + execute as @e[type=#lib:living_without_player,tag=R4.Hit,tag=!Uninterferable,distance=..3] positioned ^ ^ ^-100 run tag @s[type=#lib:living_without_player,tag=R4.Hit,tag=!Uninterferable,distance=..100] remove R4.Hit # 引数の設定 execute store result storage api: Argument.Damage float 1 run random value 125..185 @@ -15,7 +15,7 @@ # 補正functionを実行 execute as @p[tag=this] run function api:damage/modifier # ダメージ実行 - execute as @e[type=#lib:living,type=!player,tag=R4.Hit,tag=!Uninterferable,distance=..3] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=R4.Hit,tag=!Uninterferable,distance=..3] run function api:damage/ # リセット function api:damage/reset @@ -23,8 +23,8 @@ # ノクバ耐性を考慮して吹っ飛ばす data modify storage lib: Argument.VectorMagnitude set value -0.7 data modify storage lib: Argument.KnockbackResist set value true - execute as @e[type=#lib:living,type=!player,tag=R4.Hit,tag=!Uninterferable,distance=..3] at @s facing entity @p[tag=this] feet rotated ~ ~5 run function lib:motion/ + execute as @e[type=#lib:living_without_player,tag=R4.Hit,tag=!Uninterferable,distance=..3] at @s facing entity @p[tag=this] feet rotated ~ ~5 run function lib:motion/ data remove storage lib: Argument # リセット - tag @e[type=#lib:living,type=!player,tag=R4.Hit,tag=!Uninterferable,distance=..3] remove R4.Hit + tag @e[type=#lib:living_without_player,tag=R4.Hit,tag=!Uninterferable,distance=..3] remove R4.Hit diff --git a/Asset/data/asset/functions/artifact/0983.icicle_blade/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/0983.icicle_blade/trigger/damage.mcfunction index 7e0dd3fd4e..f5226457da 100644 --- a/Asset/data/asset/functions/artifact/0983.icicle_blade/trigger/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0983.icicle_blade/trigger/damage.mcfunction @@ -5,19 +5,19 @@ # @within function asset:artifact/0983.icicle_blade/trigger/3.main # ターゲット指定 - tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..5] add RB.Hit - execute as @e[type=#lib:living,type=!player,tag=RB.Hit,tag=!Uninterferable,distance=..5] positioned ^ ^ ^-100 run tag @s[type=#lib:living,type=!player,tag=RB.Hit,tag=!Uninterferable,distance=..100] remove RB.Hit + tag @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..5] add RB.Hit + execute as @e[type=#lib:living_without_player,tag=RB.Hit,tag=!Uninterferable,distance=..5] positioned ^ ^ ^-100 run tag @s[type=#lib:living_without_player,tag=RB.Hit,tag=!Uninterferable,distance=..100] remove RB.Hit # 演出 - execute as @e[type=#lib:living,type=!player,tag=RB.Hit,tag=!Uninterferable,distance=..5] run particle snowflake ~ ~0.5 ~ 0 1 0 0 5 normal + execute as @e[type=#lib:living_without_player,tag=RB.Hit,tag=!Uninterferable,distance=..5] run particle snowflake ~ ~0.5 ~ 0 1 0 0 5 normal # ダメージを与える data modify storage api: Argument.Damage set value 200f data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=RB.Hit,tag=!Uninterferable,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=RB.Hit,tag=!Uninterferable,distance=..5] run function api:damage/ # リセット function api:damage/reset - tag @e[type=#lib:living,type=!player,tag=RB.Hit,tag=!Uninterferable,distance=..5] remove RB.Hit + tag @e[type=#lib:living_without_player,tag=RB.Hit,tag=!Uninterferable,distance=..5] remove RB.Hit diff --git a/Asset/data/asset/functions/artifact/0985.ark_of_the_sanctuary/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/0985.ark_of_the_sanctuary/trigger/damage.mcfunction index 4043e485fb..e8430420c2 100644 --- a/Asset/data/asset/functions/artifact/0985.ark_of_the_sanctuary/trigger/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0985.ark_of_the_sanctuary/trigger/damage.mcfunction @@ -7,8 +7,8 @@ # asset:artifact/0985.ark_of_the_sanctuary/trigger/rapid_slash # タグ付与 - execute positioned ^ ^ ^1 run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..3] add RD.Hit - execute as @e[type=#lib:living,type=!player,tag=RD.Hit,tag=!Uninterferable,distance=..3] positioned ^ ^ ^-100 run tag @s[type=#lib:living,type=!player,tag=RD.Hit,tag=!Uninterferable,distance=..100] remove RD.Hit + execute positioned ^ ^ ^1 run tag @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..3] add RD.Hit + execute as @e[type=#lib:living_without_player,tag=RD.Hit,tag=!Uninterferable,distance=..3] positioned ^ ^ ^-100 run tag @s[type=#lib:living_without_player,tag=RD.Hit,tag=!Uninterferable,distance=..100] remove RD.Hit # 引数の設定 execute store result storage api: Argument.Damage float 1 run random value 200..280 @@ -19,7 +19,7 @@ function api:damage/modifier # ダメージ実行 - execute as @e[type=#lib:living,type=!player,tag=RD.Hit,tag=!Uninterferable,distance=..16] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=RD.Hit,tag=!Uninterferable,distance=..16] run function api:damage/ # リセット function api:damage/reset @@ -27,8 +27,8 @@ # ノクバ耐性を考慮して吹っ飛ばす data modify storage lib: Argument.VectorMagnitude set value -0.4 data modify storage lib: Argument.KnockbackResist set value true - execute as @e[type=#lib:living,type=!player,tag=RD.Hit,tag=!Uninterferable,distance=..16] at @s facing entity @p[tag=this] feet rotated ~ ~5 run function lib:motion/ + execute as @e[type=#lib:living_without_player,tag=RD.Hit,tag=!Uninterferable,distance=..16] at @s facing entity @p[tag=this] feet rotated ~ ~5 run function lib:motion/ data remove storage lib: Argument # リセット - tag @e[type=#lib:living,type=!player,tag=RD.Hit,distance=..16] remove RD.Hit + tag @e[type=#lib:living_without_player,tag=RD.Hit,distance=..16] remove RD.Hit diff --git a/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/4.damage.mcfunction b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/4.damage.mcfunction index 65d6a532ed..c750b10ba0 100644 --- a/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/4.damage.mcfunction +++ b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/4.damage.mcfunction @@ -5,8 +5,8 @@ # @within function asset:artifact/1028.executioner_axe/trigger/3.main # 演出 - execute positioned as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] positioned ~ ~1.3 ~ run function asset:artifact/1028.executioner_axe/trigger/particle - execute positioned as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] positioned ~ ~1.3 ~ run particle block redstone_block ~ ~ ~ 0.1 0 0.1 0 10 + execute positioned as @e[type=#lib:living_without_player,tag=Victim,distance=..10] positioned ~ ~1.3 ~ run function asset:artifact/1028.executioner_axe/trigger/particle + execute positioned as @e[type=#lib:living_without_player,tag=Victim,distance=..10] positioned ~ ~1.3 ~ run particle block redstone_block ~ ~ ~ 0.1 0 0.1 0 10 playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 @@ -23,6 +23,6 @@ # 補正functionを実行 function api:damage/modifier # ダメージを与える - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/5.damage2.mcfunction b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/5.damage2.mcfunction index 5a0d7d26e0..b043cf9519 100644 --- a/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/5.damage2.mcfunction +++ b/Asset/data/asset/functions/artifact/1028.executioner_axe/trigger/5.damage2.mcfunction @@ -5,8 +5,8 @@ # @within function asset:artifact/1028.executioner_axe/trigger/3.main # 演出 - execute positioned as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] positioned ~ ~1.3 ~ run function asset:artifact/1028.executioner_axe/trigger/particle - execute positioned as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] positioned ~ ~1.3 ~ run particle block redstone_block ~ ~ ~ 0.1 0 0.1 0 100 + execute positioned as @e[type=#lib:living_without_player,tag=Victim,distance=..10] positioned ~ ~1.3 ~ run function asset:artifact/1028.executioner_axe/trigger/particle + execute positioned as @e[type=#lib:living_without_player,tag=Victim,distance=..10] positioned ~ ~1.3 ~ run particle block redstone_block ~ ~ ~ 0.1 0 0.1 0 100 playsound entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 playsound minecraft:item.trident.return player @a ~ ~ ~ 1 1 @@ -24,6 +24,6 @@ # 補正functionを実行 function api:damage/modifier # ダメージを与える - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/1034.eiya/trigger/5.damage2.mcfunction b/Asset/data/asset/functions/artifact/1034.eiya/trigger/5.damage2.mcfunction index 6fb78556d3..893d0f4ac0 100644 --- a/Asset/data/asset/functions/artifact/1034.eiya/trigger/5.damage2.mcfunction +++ b/Asset/data/asset/functions/artifact/1034.eiya/trigger/5.damage2.mcfunction @@ -16,9 +16,9 @@ # ターゲット設定 tag @e[type=#lib:living,tag=Victim,distance=..6] add Target - execute positioned ^2 ^ ^0.5 run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2.5] add Target - execute positioned ^ ^ ^2.5 run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..3.5] add Target - execute positioned ^-2 ^ ^0.5 run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2.5] add Target + execute positioned ^2 ^ ^0.5 run tag @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2.5] add Target + execute positioned ^ ^ ^2.5 run tag @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..3.5] add Target + execute positioned ^-2 ^ ^0.5 run tag @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2.5] add Target # ダメージ設定 execute store result storage api: Argument.Damage double 0.1 run scoreboard players operation $BaseDamage Temporary += $MP Temporary diff --git a/Asset/data/asset/functions/artifact/1078.pigeon_blood/attack_melee/damage.m.mcfunction b/Asset/data/asset/functions/artifact/1078.pigeon_blood/attack_melee/damage.m.mcfunction index 65ca60c3ca..e2bc547228 100644 --- a/Asset/data/asset/functions/artifact/1078.pigeon_blood/attack_melee/damage.m.mcfunction +++ b/Asset/data/asset/functions/artifact/1078.pigeon_blood/attack_melee/damage.m.mcfunction @@ -45,7 +45,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "None" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..6,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..6,limit=1] run function api:damage/ function api:damage/reset # 共鳴攻撃 function asset:artifact/1078.pigeon_blood/attack_melee/summon_resonance_attack diff --git a/Asset/data/asset/functions/artifact/1079.allochromatic/click/shot/recursive.m.mcfunction b/Asset/data/asset/functions/artifact/1079.allochromatic/click/shot/recursive.m.mcfunction index f5bb7ca8de..c8130df570 100644 --- a/Asset/data/asset/functions/artifact/1079.allochromatic/click/shot/recursive.m.mcfunction +++ b/Asset/data/asset/functions/artifact/1079.allochromatic/click/shot/recursive.m.mcfunction @@ -8,6 +8,6 @@ particle dust 0.25 0.7 100000000 0.7 ^ ^ ^ 0 0 0 0 1 particle dust 0.25 0.7 100000000 0.7 ^ ^ ^0.15 0 0 0 0 1 # 命中判定 - execute positioned ~-.5 ~-.5 ~-.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] at @s run return run function asset:artifact/1079.allochromatic/click/shot/hit.m with storage asset:temp TZ.Const.Damage + execute positioned ~-.5 ~-.5 ~-.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] at @s run return run function asset:artifact/1079.allochromatic/click/shot/hit.m with storage asset:temp TZ.Const.Damage # 再帰 $execute positioned ^ ^ ^0.3 if entity @s[distance=..$(DistanceMax)] run function asset:artifact/1079.allochromatic/click/shot/recursive.m with storage asset:temp TZ.Const diff --git a/Asset/data/asset/functions/artifact/1089.antimatter_gatling_rifle/trigger/bullet.mcfunction b/Asset/data/asset/functions/artifact/1089.antimatter_gatling_rifle/trigger/bullet.mcfunction index 6de47aa72a..6e05cf5275 100644 --- a/Asset/data/asset/functions/artifact/1089.antimatter_gatling_rifle/trigger/bullet.mcfunction +++ b/Asset/data/asset/functions/artifact/1089.antimatter_gatling_rifle/trigger/bullet.mcfunction @@ -7,11 +7,11 @@ # asset:artifact/1089.antimatter_gatling_rifle/trigger/shot # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @s add Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # ターゲットにタグ付与 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] add LandingTarget + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] add LandingTarget # 演出 particle dust 0.161 0.161 0.161 0.5 ~ ~ ~ 0 0 0 0 0 diff --git a/Asset/data/asset/functions/artifact/1163.rail_shooter/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/1163.rail_shooter/trigger/damage.mcfunction index e7a3103b51..eb2f9341f6 100644 --- a/Asset/data/asset/functions/artifact/1163.rail_shooter/trigger/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/1163.rail_shooter/trigger/damage.mcfunction @@ -17,9 +17,9 @@ data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier # ダメージ - execute as @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..5,limit=1] at @s run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=LandingTarget,tag=!Uninterferable,distance=..5,limit=1] at @s run function api:damage/ # リセット function api:damage/reset # 着弾タグを消す - tag @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..5,limit=1] remove LandingTarget + tag @e[type=#lib:living_without_player,tag=LandingTarget,tag=!Uninterferable,distance=..5,limit=1] remove LandingTarget diff --git a/Asset/data/asset/functions/artifact/1163.rail_shooter/trigger/damage_full.mcfunction b/Asset/data/asset/functions/artifact/1163.rail_shooter/trigger/damage_full.mcfunction index a222b4eb90..265e1f9570 100644 --- a/Asset/data/asset/functions/artifact/1163.rail_shooter/trigger/damage_full.mcfunction +++ b/Asset/data/asset/functions/artifact/1163.rail_shooter/trigger/damage_full.mcfunction @@ -18,9 +18,9 @@ data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier # ダメージ - execute as @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..5,limit=1] at @s run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=LandingTarget,tag=!Uninterferable,distance=..5,limit=1] at @s run function api:damage/ # リセット function api:damage/reset # 着弾タグを消す - tag @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..5,limit=1] remove LandingTarget + tag @e[type=#lib:living_without_player,tag=LandingTarget,tag=!Uninterferable,distance=..5,limit=1] remove LandingTarget diff --git a/Asset/data/asset/functions/artifact/1163.rail_shooter/trigger/shoot.mcfunction b/Asset/data/asset/functions/artifact/1163.rail_shooter/trigger/shoot.mcfunction index 300b69d06d..4154ec63dd 100644 --- a/Asset/data/asset/functions/artifact/1163.rail_shooter/trigger/shoot.mcfunction +++ b/Asset/data/asset/functions/artifact/1163.rail_shooter/trigger/shoot.mcfunction @@ -8,11 +8,11 @@ # ここから先は神器側の効果の処理を書く # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run tag @s add Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # ターゲットにタグ付与 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] add LandingTarget + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run tag @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] add LandingTarget # 演出 execute if entity @s[tag=!WB.FullCharge] run particle dust 0.769 0.973 0.863 0.5 ~ ~ ~ 0 0 0 0 5 diff --git a/Asset/data/asset/functions/artifact/1175.rubber_mallet/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1175.rubber_mallet/trigger/3.main.mcfunction index a65f66019e..613f1c91ee 100644 --- a/Asset/data/asset/functions/artifact/1175.rubber_mallet/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1175.rubber_mallet/trigger/3.main.mcfunction @@ -10,8 +10,8 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle sweep_attack ~ ~1 ~ 0 0 0 1 1 - execute positioned as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function asset:artifact/1175.rubber_mallet/trigger/particle + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..10] run particle sweep_attack ~ ~1 ~ 0 0 0 1 1 + execute positioned as @e[type=#lib:living_without_player,tag=Victim,distance=..10] run function asset:artifact/1175.rubber_mallet/trigger/particle playsound minecraft:entity.player.attack.sweep player @a ~ ~ ~ 1 0 playsound minecraft:entity.player.attack.sweep player @a ~ ~ ~ 1 0.5 playsound minecraft:entity.glow_squid.squirt player @a ~ ~ ~ 1 1.56 diff --git a/Asset/data/asset/functions/artifact/1177.spinnrade/trigger/search_target.mcfunction b/Asset/data/asset/functions/artifact/1177.spinnrade/trigger/search_target.mcfunction index 7d14b99862..b450afecf4 100644 --- a/Asset/data/asset/functions/artifact/1177.spinnrade/trigger/search_target.mcfunction +++ b/Asset/data/asset/functions/artifact/1177.spinnrade/trigger/search_target.mcfunction @@ -7,7 +7,7 @@ # asset:artifact/1177.spinnrade/trigger/search_target # 近くに敵がいたらMobUUIDをスコアに入れておいてreturn - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] store result score $WP.TargetMobUUID Temporary run return run scoreboard players get @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] MobUUID + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] store result score $WP.TargetMobUUID Temporary run return run scoreboard players get @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] MobUUID # 再帰 execute if entity @s[distance=..24] positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision run function asset:artifact/1177.spinnrade/trigger/search_target diff --git a/Asset/data/asset/functions/artifact/1192.celestial_harmony/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1192.celestial_harmony/trigger/3.main.mcfunction index ecce9ef744..4f42d51122 100644 --- a/Asset/data/asset/functions/artifact/1192.celestial_harmony/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1192.celestial_harmony/trigger/3.main.mcfunction @@ -22,7 +22,7 @@ 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=Victim,distance=..6,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..6,limit=1] run function api:damage/ function api:damage/reset # 星を降らせるエフェクトを付与する <=10%: 8, <=20%: 7, <=30%: 6, <=40%: 4, <=50%: 3, >50%: 2 個 @@ -38,7 +38,7 @@ execute if score $MPPer Temporary matches 31..40 run data modify storage api: Argument.Duration set value 7 execute if score $MPPer Temporary matches 41..50 run data modify storage api: Argument.Duration set value 5 execute if score $MPPer Temporary matches 51.. run data modify storage api: Argument.Duration set value 3 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..6,limit=1] run function api:entity/mob/effect/give + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..6,limit=1] run function api:entity/mob/effect/give function api:entity/mob/effect/reset # リセット diff --git a/Asset/data/asset/functions/artifact/1193.firebrand/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1193.firebrand/trigger/3.main.mcfunction index d672e50b50..b2e2b361c4 100644 --- a/Asset/data/asset/functions/artifact/1193.firebrand/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1193.firebrand/trigger/3.main.mcfunction @@ -10,12 +10,12 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..10] run function asset:artifact/1193.firebrand/trigger/vfx + execute at @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..10] run function asset:artifact/1193.firebrand/trigger/vfx # ダメージ execute store result storage api: Argument.Damage float 1 run random value 1010..1200 data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/1200.alchemy_hammer/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1200.alchemy_hammer/trigger/3.main.mcfunction index e80ad35410..31e067a8e7 100644 --- a/Asset/data/asset/functions/artifact/1200.alchemy_hammer/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1200.alchemy_hammer/trigger/3.main.mcfunction @@ -24,9 +24,9 @@ execute store result score $Random Temporary run random value 1..6 # 条件を満たしたなら光の柱を召喚 # 現状２本召喚しているがここの調整はバランス班に任せます ということで3本 - execute if score $Random Temporary matches 6 at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function asset:artifact/1200.alchemy_hammer/trigger/summon_laser - execute if score $Random Temporary matches 6 at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function asset:artifact/1200.alchemy_hammer/trigger/summon_laser - execute if score $Random Temporary matches 6 at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function asset:artifact/1200.alchemy_hammer/trigger/summon_laser + execute if score $Random Temporary matches 6 at @e[type=#lib:living_without_player,tag=Victim,distance=..6] run function asset:artifact/1200.alchemy_hammer/trigger/summon_laser + execute if score $Random Temporary matches 6 at @e[type=#lib:living_without_player,tag=Victim,distance=..6] run function asset:artifact/1200.alchemy_hammer/trigger/summon_laser + execute if score $Random Temporary matches 6 at @e[type=#lib:living_without_player,tag=Victim,distance=..6] run function asset:artifact/1200.alchemy_hammer/trigger/summon_laser # ダメージ代入 execute store result storage api: Argument.Damage float 1 run scoreboard players get $Damage Temporary @@ -36,7 +36,7 @@ # 補正 function api:damage/modifier # ダメージを与える - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,distance=..6] run function api:damage/ # リセット scoreboard players reset $Damage Temporary diff --git a/Asset/data/asset/functions/artifact/1200.alchemy_hammer/trigger/summon_laser.mcfunction b/Asset/data/asset/functions/artifact/1200.alchemy_hammer/trigger/summon_laser.mcfunction index e3c8bea80d..0ae56f0972 100644 --- a/Asset/data/asset/functions/artifact/1200.alchemy_hammer/trigger/summon_laser.mcfunction +++ b/Asset/data/asset/functions/artifact/1200.alchemy_hammer/trigger/summon_laser.mcfunction @@ -9,7 +9,7 @@ #declare tag SpreadMarker # 前方拡散 - execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..6] run summon marker ~ ~ ~ {Tags:["SpreadMarker"]} + execute at @e[type=#lib:living_without_player,tag=Victim,distance=..6] run summon marker ~ ~ ~ {Tags:["SpreadMarker"]} data modify storage lib: Argument.Bounds set value [[2d,2d],[0d,0d],[2d,2d]] execute as @e[type=marker,tag=SpreadMarker,distance=..10] at @s run function lib:spread_entity/ diff --git a/Asset/data/asset/functions/artifact/1205.electric_fly_swatter/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1205.electric_fly_swatter/trigger/3.main.mcfunction index 4bbe1f82a0..3aff839fdd 100644 --- a/Asset/data/asset/functions/artifact/1205.electric_fly_swatter/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1205.electric_fly_swatter/trigger/3.main.mcfunction @@ -10,20 +10,20 @@ # ここから先は神器側の効果の処理 # 演出 - execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..6] at @s run function asset:artifact/1205.electric_fly_swatter/trigger/vfx + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..6] at @s run function asset:artifact/1205.electric_fly_swatter/trigger/vfx # ダメージ # 敵が1ブロック以上浮いてるならダメージ1.5倍 execute store result storage api: Argument.Damage float 1 run random value 400..500 - execute at @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..6] if block ~ ~-1 ~ #lib:no_collision_without_fluid store result storage api: Argument.Damage float 1.5 run data get storage api: Argument.Damage + execute at @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..6] if block ~ ~-1 ~ #lib:no_collision_without_fluid store result storage api: Argument.Damage float 1.5 run data get storage api: Argument.Damage data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Thunder" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..6] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..6] run function api:damage/ function api:damage/reset # 敵が浮いてるなら叩き落とす - execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Immovable,tag=!Uninterferable,distance=..6] at @s if block ~ ~-1 ~ #lib:no_collision_without_fluid run function asset:artifact/1205.electric_fly_swatter/trigger/dragon_strike/ + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Immovable,tag=!Uninterferable,distance=..6] at @s if block ~ ~-1 ~ #lib:no_collision_without_fluid run function asset:artifact/1205.electric_fly_swatter/trigger/dragon_strike/ # リセット scoreboard players reset $Recursive Temporary diff --git a/Asset/data/asset/functions/artifact/1208.secret_art_waterfall/trigger/recursive.mcfunction b/Asset/data/asset/functions/artifact/1208.secret_art_waterfall/trigger/recursive.mcfunction index ab25e2bb47..9cfacdfff8 100644 --- a/Asset/data/asset/functions/artifact/1208.secret_art_waterfall/trigger/recursive.mcfunction +++ b/Asset/data/asset/functions/artifact/1208.secret_art_waterfall/trigger/recursive.mcfunction @@ -13,7 +13,7 @@ execute if entity @s[tag=!Check] if score $Recursive Temporary matches 16.. run function asset:artifact/1208.secret_art_waterfall/trigger/summon_object # 近くに敵がいる - execute if entity @s[tag=!Check] positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0] at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function asset:artifact/1208.secret_art_waterfall/trigger/summon_object + execute if entity @s[tag=!Check] positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function asset:artifact/1208.secret_art_waterfall/trigger/summon_object # 再帰 scoreboard players add $Recursive Temporary 1 diff --git a/Asset/data/asset/functions/artifact/1217.archer_fish/trigger/search_target.mcfunction b/Asset/data/asset/functions/artifact/1217.archer_fish/trigger/search_target.mcfunction index 4aa5e9876e..a0dd5739ed 100644 --- a/Asset/data/asset/functions/artifact/1217.archer_fish/trigger/search_target.mcfunction +++ b/Asset/data/asset/functions/artifact/1217.archer_fish/trigger/search_target.mcfunction @@ -7,7 +7,7 @@ # asset:artifact/1217.archer_fish/trigger/search_target # 近くに敵がいたらMobUUIDをスコアに入れておいてreturn - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] store result score $XT.TargetMobUUID Temporary run return run scoreboard players get @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] MobUUID + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] store result score $XT.TargetMobUUID Temporary run return run scoreboard players get @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] MobUUID # 再帰 execute if entity @s[distance=..20] positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision run function asset:artifact/1217.archer_fish/trigger/search_target diff --git a/Asset/data/asset/functions/artifact/1257.thor_staff/trigger/recursive.mcfunction b/Asset/data/asset/functions/artifact/1257.thor_staff/trigger/recursive.mcfunction index e21ff945f5..d678f495ee 100644 --- a/Asset/data/asset/functions/artifact/1257.thor_staff/trigger/recursive.mcfunction +++ b/Asset/data/asset/functions/artifact/1257.thor_staff/trigger/recursive.mcfunction @@ -13,7 +13,7 @@ execute if entity @s[tag=!Check] if score $Recursive Temporary matches 16.. run function asset:artifact/1257.thor_staff/trigger/summon_object # 近くに敵がいる - execute if entity @s[tag=!Check] positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0] at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function asset:artifact/1257.thor_staff/trigger/summon_object + execute if entity @s[tag=!Check] positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function asset:artifact/1257.thor_staff/trigger/summon_object # 再帰 scoreboard players add $Recursive Temporary 1 diff --git a/Asset/data/asset/functions/artifact/1260.rod_of_light_orb/trigger/recursive.mcfunction b/Asset/data/asset/functions/artifact/1260.rod_of_light_orb/trigger/recursive.mcfunction index bffe63e941..c4857d6478 100644 --- a/Asset/data/asset/functions/artifact/1260.rod_of_light_orb/trigger/recursive.mcfunction +++ b/Asset/data/asset/functions/artifact/1260.rod_of_light_orb/trigger/recursive.mcfunction @@ -13,7 +13,7 @@ execute if entity @s[tag=!Check] if score $Recursive Temporary matches 16.. run function asset:artifact/1260.rod_of_light_orb/trigger/summon_object # 近くに敵がいる - execute if entity @s[tag=!Check] positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0] at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function asset:artifact/1260.rod_of_light_orb/trigger/summon_object + execute if entity @s[tag=!Check] positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function asset:artifact/1260.rod_of_light_orb/trigger/summon_object # 再帰 scoreboard players add $Recursive Temporary 1 diff --git a/Asset/data/asset/functions/artifact/1265.thunder_ray/trigger/recursive.mcfunction b/Asset/data/asset/functions/artifact/1265.thunder_ray/trigger/recursive.mcfunction index a726c6c701..0aed02175e 100644 --- a/Asset/data/asset/functions/artifact/1265.thunder_ray/trigger/recursive.mcfunction +++ b/Asset/data/asset/functions/artifact/1265.thunder_ray/trigger/recursive.mcfunction @@ -13,7 +13,7 @@ execute if entity @s[tag=!Check] if score $Recursive Temporary matches 48.. run function asset:artifact/1265.thunder_ray/trigger/thunder # 近くに敵がいる - execute if entity @s[tag=!Check] positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0] at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function asset:artifact/1265.thunder_ray/trigger/thunder + execute if entity @s[tag=!Check] positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function asset:artifact/1265.thunder_ray/trigger/thunder # 再帰 scoreboard players add $Recursive Temporary 1 diff --git a/Asset/data/asset/functions/artifact/1268.axe_of_wrath_fire/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1268.axe_of_wrath_fire/trigger/3.main.mcfunction index 8044038a46..7b2db2c28e 100644 --- a/Asset/data/asset/functions/artifact/1268.axe_of_wrath_fire/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1268.axe_of_wrath_fire/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute positioned as @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..10] run function asset:artifact/1268.axe_of_wrath_fire/trigger/vfx/ + execute positioned as @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..10] run function asset:artifact/1268.axe_of_wrath_fire/trigger/vfx/ playsound item.totem.use player @a ~ ~ ~ 0.9 0.8 playsound entity.blaze.ambient player @a ~ ~ ~ 0.8 0.5 playsound entity.blaze.shoot player @a ~ ~ ~ 0.8 0.50 @@ -22,5 +22,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/1269.apocalypse/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1269.apocalypse/trigger/3.main.mcfunction index b060f26cac..21e32877c1 100644 --- a/Asset/data/asset/functions/artifact/1269.apocalypse/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1269.apocalypse/trigger/3.main.mcfunction @@ -18,7 +18,7 @@ execute store result score $Z9.Stack Temporary run data get storage api: Return.Effect.Stack # 演出 - execute positioned as @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..10] rotated ~ 0 positioned ~ ~0.2 ~ run function asset:artifact/1269.apocalypse/trigger/vfx/ + execute positioned as @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..10] rotated ~ 0 positioned ~ ~0.2 ~ run function asset:artifact/1269.apocalypse/trigger/vfx/ # スタック毎のダメージ設定 execute if score $Z9.Stack Temporary matches 1 run scoreboard players set $Damage Temporary 2200 @@ -35,7 +35,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "None" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..10] run function api:damage/ function api:damage/reset # バフ解除 diff --git a/Asset/data/asset/functions/artifact/1273.maidchan_plush/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1273.maidchan_plush/trigger/2.check_condition.mcfunction index c4aaf728b3..5ae45194d0 100644 --- a/Asset/data/asset/functions/artifact/1273.maidchan_plush/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1273.maidchan_plush/trigger/2.check_condition.mcfunction @@ -19,7 +19,7 @@ scoreboard players reset $MPPer Temporary # 敵がいるかみる - execute unless entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..6] run tag @s remove CanUsed + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..6] run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1273.maidchan_plush/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1273.maidchan_plush/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1273.maidchan_plush/trigger/3.main.mcfunction index 87a385196a..3d3f80e02c 100644 --- a/Asset/data/asset/functions/artifact/1273.maidchan_plush/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1273.maidchan_plush/trigger/3.main.mcfunction @@ -10,7 +10,7 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..6,sort=nearest,limit=1] positioned ~ ~1 ~ run function asset:artifact/1273.maidchan_plush/trigger/vfx + execute at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..6,sort=nearest,limit=1] positioned ~ ~1 ~ run function asset:artifact/1273.maidchan_plush/trigger/vfx # 敵にダメージ data modify storage api: Argument.Damage set value 300.0f @@ -19,6 +19,6 @@ # 補正functionを実行 function api:damage/modifier # ダメージを与える - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..6,sort=nearest,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..6,sort=nearest,limit=1] run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/1282.ice_axe/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1282.ice_axe/trigger/3.main.mcfunction index 57d63f514e..855ef9d0cd 100644 --- a/Asset/data/asset/functions/artifact/1282.ice_axe/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1282.ice_axe/trigger/3.main.mcfunction @@ -10,12 +10,12 @@ # ここから先は神器側の効果の処理を書く # 演出 - execute at @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..10] run function asset:artifact/1282.ice_axe/trigger/vfx + execute at @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..10] run function asset:artifact/1282.ice_axe/trigger/vfx # ダメージ execute store result storage api: Argument.Damage float 1 run random value 220..270 data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..10] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Victim,tag=!Uninterferable,distance=..10] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/effect/0316.aurora_slash/tick/slash/1.mcfunction b/Asset/data/asset/functions/effect/0316.aurora_slash/tick/slash/1.mcfunction index 9f218abf45..d2c8844d96 100644 --- a/Asset/data/asset/functions/effect/0316.aurora_slash/tick/slash/1.mcfunction +++ b/Asset/data/asset/functions/effect/0316.aurora_slash/tick/slash/1.mcfunction @@ -15,7 +15,7 @@ # ダメージ判定 # 前方に強めの判定 - execute positioned ^ ^ ^8 run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..8] add 316.Target + execute positioned ^ ^ ^8 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..8] add 316.Target # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage.Slash1 @@ -23,8 +23,8 @@ data modify storage api: Argument.ElementType set value "Thunder" data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=316.Target,distance=..4.2] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=316.Target,distance=..4.2] run function api:damage/ function api:damage/reset # リセット - tag @e[type=#lib:living,type=!player,tag=Enemy,tag=316.Target,distance=..16] remove 316.Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=316.Target,distance=..16] remove 316.Target diff --git a/Asset/data/asset/functions/effect/0316.aurora_slash/tick/slash/2.mcfunction b/Asset/data/asset/functions/effect/0316.aurora_slash/tick/slash/2.mcfunction index 03bd33adde..3337e005f5 100644 --- a/Asset/data/asset/functions/effect/0316.aurora_slash/tick/slash/2.mcfunction +++ b/Asset/data/asset/functions/effect/0316.aurora_slash/tick/slash/2.mcfunction @@ -15,7 +15,7 @@ # ダメージ判定 # 前方に強めの判定 - execute positioned ^ ^ ^8 run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..8] add 316.Target + execute positioned ^ ^ ^8 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..8] add 316.Target # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage.Slash2 @@ -23,8 +23,8 @@ data modify storage api: Argument.ElementType set value "Thunder" data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=316.Target,distance=..4.2] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=316.Target,distance=..4.2] run function api:damage/ function api:damage/reset # リセット - tag @e[type=#lib:living,type=!player,tag=Enemy,tag=316.Target,distance=..16] remove 316.Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=316.Target,distance=..16] remove 316.Target diff --git a/Asset/data/asset/functions/effect/0316.aurora_slash/tick/slash/3.mcfunction b/Asset/data/asset/functions/effect/0316.aurora_slash/tick/slash/3.mcfunction index 4d698913e0..10618c3e26 100644 --- a/Asset/data/asset/functions/effect/0316.aurora_slash/tick/slash/3.mcfunction +++ b/Asset/data/asset/functions/effect/0316.aurora_slash/tick/slash/3.mcfunction @@ -15,7 +15,7 @@ # ダメージ判定 # 前方に強めの判定 - execute positioned ^ ^ ^8 run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..8] add 316.Target + execute positioned ^ ^ ^8 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..8] add 316.Target # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage.Slash3 @@ -23,8 +23,8 @@ data modify storage api: Argument.ElementType set value "Thunder" data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=316.Target,distance=..4.5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=316.Target,distance=..4.5] run function api:damage/ function api:damage/reset # リセット - tag @e[type=#lib:living,type=!player,tag=Enemy,tag=316.Target,distance=..16] remove 316.Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=316.Target,distance=..16] remove 316.Target diff --git a/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/charge_shot/landing.mcfunction b/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/charge_shot/landing.mcfunction index 75c388c656..1d1aefa35c 100644 --- a/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/charge_shot/landing.mcfunction +++ b/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/charge_shot/landing.mcfunction @@ -5,7 +5,7 @@ # @within function asset:effect/0320.fatalerror_charge/end/charge_shot/loop # 演出 - execute at @e[type=#lib:living,type=!player,tag=Target,tag=!Uninterferable,distance=..25] run particle dust 0.824 0.918 0.98 1 ~ ~0.5 ~ 0.1 1 0.1 0 40 + execute at @e[type=#lib:living_without_player,tag=Target,tag=!Uninterferable,distance=..25] run particle dust 0.824 0.918 0.98 1 ~ ~0.5 ~ 0.1 1 0.1 0 40 # ダメージ設定 data modify storage api: Argument.Damage set from storage asset:context this.Damage.Charge @@ -13,9 +13,9 @@ data modify storage api: Argument.ElementType set value "Thunder" function api:damage/modifier # ダメージ - execute as @e[type=#lib:living,type=!player,tag=Target,tag=!Uninterferable,distance=..25] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Target,tag=!Uninterferable,distance=..25] run function api:damage/ # リセット function api:damage/reset # 着弾タグを消す - tag @e[type=#lib:living,type=!player,tag=Target,tag=!Uninterferable,distance=..25] remove Target + tag @e[type=#lib:living_without_player,tag=Target,tag=!Uninterferable,distance=..25] remove Target diff --git a/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/shot/landing.mcfunction b/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/shot/landing.mcfunction index fa3cfed9e5..70146d3932 100644 --- a/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/shot/landing.mcfunction +++ b/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/shot/landing.mcfunction @@ -13,9 +13,9 @@ data modify storage api: Argument.ElementType set value "Thunder" function api:damage/modifier # ダメージ - execute as @e[type=#lib:living,type=!player,tag=Target,tag=!Uninterferable,distance=..5,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Target,tag=!Uninterferable,distance=..5,limit=1] run function api:damage/ # リセット function api:damage/reset # 着弾タグを消す - tag @e[type=#lib:living,type=!player,tag=Target,tag=!Uninterferable,distance=..5,limit=1] remove Target + tag @e[type=#lib:living_without_player,tag=Target,tag=!Uninterferable,distance=..5,limit=1] remove Target diff --git a/Asset/data/asset/functions/effect/0330.deep_slash/tick/slash/damage/1_4.mcfunction b/Asset/data/asset/functions/effect/0330.deep_slash/tick/slash/damage/1_4.mcfunction index 89c49d6696..7038c4dd48 100644 --- a/Asset/data/asset/functions/effect/0330.deep_slash/tick/slash/damage/1_4.mcfunction +++ b/Asset/data/asset/functions/effect/0330.deep_slash/tick/slash/damage/1_4.mcfunction @@ -6,14 +6,14 @@ # ダメージ判定 # 前方に強めの判定 - execute positioned ^ ^ ^8 run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..8] add 330.Target + execute positioned ^ ^ ^8 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..8] add 330.Target # ダメージ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=330.Target,distance=..4.2] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=330.Target,distance=..4.2] run function api:damage/ function api:damage/reset # リセット - tag @e[type=#lib:living,type=!player,tag=Enemy,tag=330.Target,distance=..16] remove 330.Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=330.Target,distance=..16] remove 330.Target diff --git a/Asset/data/asset/functions/effect/0330.deep_slash/tick/slash/damage/5.mcfunction b/Asset/data/asset/functions/effect/0330.deep_slash/tick/slash/damage/5.mcfunction index 88145ee429..71fe9f1f10 100644 --- a/Asset/data/asset/functions/effect/0330.deep_slash/tick/slash/damage/5.mcfunction +++ b/Asset/data/asset/functions/effect/0330.deep_slash/tick/slash/damage/5.mcfunction @@ -6,14 +6,14 @@ # ダメージ判定 # 前方に強めの判定 - execute positioned ^ ^ ^8 run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..8] add 330.Target + execute positioned ^ ^ ^8 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..8] add 330.Target # ダメージ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=330.Target,distance=..4.8] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=330.Target,distance=..4.8] run function api:damage/ function api:damage/reset # リセット - tag @e[type=#lib:living,type=!player,tag=Enemy,tag=330.Target,distance=..16] remove 330.Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=330.Target,distance=..16] remove 330.Target diff --git a/Asset/data/asset/functions/mob/0234.walleye/tick/2.3.explode.mcfunction b/Asset/data/asset/functions/mob/0234.walleye/tick/2.3.explode.mcfunction index a07304adac..fe50b1f833 100644 --- a/Asset/data/asset/functions/mob/0234.walleye/tick/2.3.explode.mcfunction +++ b/Asset/data/asset/functions/mob/0234.walleye/tick/2.3.explode.mcfunction @@ -10,7 +10,7 @@ particle lava ~ ~ ~ 2 2 2 0 100 normal # ダメージを与える - execute as @e[type=#lib:living,type=!player,tag=!Enemy,distance=..6] run function asset:mob/0234.walleye/tick/damage + execute as @e[type=#lib:living_without_player,tag=!Enemy,distance=..6] run function asset:mob/0234.walleye/tick/damage execute as @a[distance=..6] run function asset:mob/0234.walleye/tick/damage # 自死 diff --git a/Asset/data/asset/functions/mob/0274.death_saw_jiki/tick/3.damage.mcfunction b/Asset/data/asset/functions/mob/0274.death_saw_jiki/tick/3.damage.mcfunction index 4bef457d6b..7cbd641bf9 100644 --- a/Asset/data/asset/functions/mob/0274.death_saw_jiki/tick/3.damage.mcfunction +++ b/Asset/data/asset/functions/mob/0274.death_saw_jiki/tick/3.damage.mcfunction @@ -23,7 +23,7 @@ # 補正functionを実行 function api:damage/modifier # 対象に - tag @e[type=#lib:living,type=!player,tag=Friend,distance=..1] add DamageTarget + tag @e[type=#lib:living_without_player,tag=Friend,distance=..1] add DamageTarget tag @a[tag=!PlayerShouldInvulnerable,distance=..1] add DamageTarget execute as @e[type=#lib:living,tag=DamageTarget,distance=..1] run function api:damage/ # リセット diff --git a/Asset/data/asset/functions/object/0002.duplicate_hit_protection_mixin/register.mcfunction b/Asset/data/asset/functions/object/0002.duplicate_hit_protection_mixin/register.mcfunction index 990cc8b50a..1278e61fdc 100644 --- a/Asset/data/asset/functions/object/0002.duplicate_hit_protection_mixin/register.mcfunction +++ b/Asset/data/asset/functions/object/0002.duplicate_hit_protection_mixin/register.mcfunction @@ -20,7 +20,7 @@ # data modify storage api: Argument.AttackType set value ... # data modify storage api: Argument.ElementType set value ... # execute ... run function api:damage/modifier -# execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..50] run function { +# execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..50] run function { # function asset:object/call.m {method:"check_duplicate"} # execute if predicate asset:object/0002.duplicate_hit_protection_mixin/is_first_hit run function api:damage/ # } diff --git a/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/hit.mcfunction b/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/hit.mcfunction index 63ad916cdd..eb5f7e2483 100644 --- a/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/hit.mcfunction +++ b/Asset/data/asset/functions/object/1002.malleus_maleficarum/tick/hit.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1002.malleus_maleficarum/tick/ # 魔女化 - execute positioned ~-1 ~-1 ~-1 as @e[type=#lib:living,type=!player,type=!witch,tag=!Uninterferable,tag=!Enemy.Boss,tag=!Uninterferable,dx=1,dy=1,dz=1,sort=nearest,limit=1] at @s run function asset:object/1002.malleus_maleficarum/tick/witchification + execute positioned ~-1 ~-1 ~-1 as @e[type=#lib:living_without_player,type=!witch,tag=!Uninterferable,tag=!Enemy.Boss,tag=!Uninterferable,dx=1,dy=1,dz=1,sort=nearest,limit=1] at @s run function asset:object/1002.malleus_maleficarum/tick/witchification # 消滅 execute on vehicle run kill @s diff --git a/Asset/data/asset/functions/object/1006.terra_shot/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1006.terra_shot/detect_hit_entity/.mcfunction index fa26872d81..810eacd94f 100644 --- a/Asset/data/asset/functions/object/1006.terra_shot/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1006.terra_shot/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1006/detect_hit_entity # 判定 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1006.terra_shot/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1006.terra_shot/hit_entity/.mcfunction index 167873dee0..dbded97cb2 100644 --- a/Asset/data/asset/functions/object/1006.terra_shot/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1006.terra_shot/hit_entity/.mcfunction @@ -15,7 +15,7 @@ data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,sort=random,limit=1] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,sort=random,limit=1] run function api:damage/ function api:damage/reset # パーティクル diff --git a/Asset/data/asset/functions/object/1009.arrow/detect_hit_entity/from_player.mcfunction b/Asset/data/asset/functions/object/1009.arrow/detect_hit_entity/from_player.mcfunction index b7aff560f7..307859ef11 100644 --- a/Asset/data/asset/functions/object/1009.arrow/detect_hit_entity/from_player.mcfunction +++ b/Asset/data/asset/functions/object/1009.arrow/detect_hit_entity/from_player.mcfunction @@ -4,4 +4,4 @@ # # @within function asset:object/1009.arrow/detect_hit_entity/ -execute positioned ~-0.3 ~-0.3 ~-0.3 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] positioned ~-0.4 ~-0.4 ~-0.4 if entity @s[dx=0] run data modify storage asset:context IsHitEntity set value true +execute positioned ~-0.3 ~-0.3 ~-0.3 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] positioned ~-0.4 ~-0.4 ~-0.4 if entity @s[dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_player/.mcfunction b/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_player/.mcfunction index bbbcb90e55..04c8556848 100644 --- a/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_player/.mcfunction +++ b/Asset/data/asset/functions/object/1009.arrow/hit_entity/from_player/.mcfunction @@ -13,7 +13,7 @@ #declare tag 1009.Target # 攻撃対象特定 - execute positioned ~-0.3 ~-0.3 ~-0.3 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] positioned ~-0.4 ~-0.4 ~-0.4 if entity @s[dx=0] run tag @s add 1009.Hit - execute positioned ~-0.3 ~-0.3 ~-0.3 as @e[type=#lib:living,type=!player,tag=1009.Hit,dx=0,sort=random,limit=1] run tag @s add 1009.Target - execute positioned ~-0.3 ~-0.3 ~-0.3 run tag @e[type=#lib:living,type=!player,tag=1009.Hit,dx=0] remove 1009.Hit - execute positioned ~-0.3 ~-0.3 ~-0.3 as @e[type=#lib:living,type=!player,tag=1009.Target,dx=0] positioned ~0.3 ~0.3 ~0.3 run function asset:object/1009.arrow/hit_entity/from_player/as_target + execute positioned ~-0.3 ~-0.3 ~-0.3 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] positioned ~-0.4 ~-0.4 ~-0.4 if entity @s[dx=0] run tag @s add 1009.Hit + execute positioned ~-0.3 ~-0.3 ~-0.3 as @e[type=#lib:living_without_player,tag=1009.Hit,dx=0,sort=random,limit=1] run tag @s add 1009.Target + execute positioned ~-0.3 ~-0.3 ~-0.3 run tag @e[type=#lib:living_without_player,tag=1009.Hit,dx=0] remove 1009.Hit + execute positioned ~-0.3 ~-0.3 ~-0.3 as @e[type=#lib:living_without_player,tag=1009.Target,dx=0] positioned ~0.3 ~0.3 ~0.3 run function asset:object/1009.arrow/hit_entity/from_player/as_target diff --git a/Asset/data/asset/functions/object/1010.fire_magic/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1010.fire_magic/detect_hit_entity/.mcfunction index dfb53a1e78..d411be8afe 100644 --- a/Asset/data/asset/functions/object/1010.fire_magic/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1010.fire_magic/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1010/detect_hit_entity # ヒット検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1010.fire_magic/kill/.mcfunction b/Asset/data/asset/functions/object/1010.fire_magic/kill/.mcfunction index df720556c3..52bbc8e1cd 100644 --- a/Asset/data/asset/functions/object/1010.fire_magic/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1010.fire_magic/kill/.mcfunction @@ -23,7 +23,7 @@ data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-1 ~-0.5 ~-1 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=1,dy=2.5,dz=1] run function api:damage/ + execute positioned ~-1 ~-0.5 ~-1 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=1,dy=2.5,dz=1] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1012.traffic_sign/tick/.mcfunction b/Asset/data/asset/functions/object/1012.traffic_sign/tick/.mcfunction index f270bd7b1a..2541be4cf0 100644 --- a/Asset/data/asset/functions/object/1012.traffic_sign/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1012.traffic_sign/tick/.mcfunction @@ -30,7 +30,7 @@ scoreboard players operation $Interval Temporary = @s General.Object.Tick scoreboard players operation $Interval Temporary %= $12 Const execute if score $Interval Temporary matches 0 run function api:damage/single_damage_session/open - execute if score $Interval Temporary matches 0 as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..4] at @s run function asset:object/1012.traffic_sign/tick/damage/ + execute if score $Interval Temporary matches 0 as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..4] at @s run function asset:object/1012.traffic_sign/tick/damage/ execute if score $Interval Temporary matches 0 run function api:damage/single_damage_session/close # 3.25 秒経過したらキル diff --git a/Asset/data/asset/functions/object/1014.lunar_flare/kill/.mcfunction b/Asset/data/asset/functions/object/1014.lunar_flare/kill/.mcfunction index f255678a27..3b91992458 100644 --- a/Asset/data/asset/functions/object/1014.lunar_flare/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1014.lunar_flare/kill/.mcfunction @@ -23,8 +23,8 @@ data modify storage api: Argument.ElementType set value "None" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] positioned ~-2 ~-2 ~-2 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=3,dy=3,dz=3] run function api:damage/ - execute positioned ~-0.5 ~-0.5 ~-0.5 unless entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] at @s positioned ~-2 ~-2 ~-2 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=3,dy=3,dz=3] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] positioned ~-2 ~-2 ~-2 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=3,dy=3,dz=3] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 unless entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] at @s positioned ~-2 ~-2 ~-2 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=3,dy=3,dz=3] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1019.voltage_bullet/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1019.voltage_bullet/detect_hit_entity/.mcfunction index ce568c2d71..4fe3e7bf96 100644 --- a/Asset/data/asset/functions/object/1019.voltage_bullet/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1019.voltage_bullet/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1019/detect_hit_entity # ヒット検知 - execute if score @s General.Object.Tick matches 13.. positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true + execute if score @s General.Object.Tick matches 13.. positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1019.voltage_bullet/kill/.mcfunction b/Asset/data/asset/functions/object/1019.voltage_bullet/kill/.mcfunction index 93ee399493..908d855162 100644 --- a/Asset/data/asset/functions/object/1019.voltage_bullet/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1019.voltage_bullet/kill/.mcfunction @@ -22,7 +22,7 @@ data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1021.sina_tk_bullet/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1021.sina_tk_bullet/detect_hit_entity/.mcfunction index c9431a9da9..3ddecdccbf 100644 --- a/Asset/data/asset/functions/object/1021.sina_tk_bullet/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1021.sina_tk_bullet/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1021/detect_hit_entity # ヒット検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1021.sina_tk_bullet/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1021.sina_tk_bullet/hit_entity/.mcfunction index 5d7b26824e..a818fcd4b9 100644 --- a/Asset/data/asset/functions/object/1021.sina_tk_bullet/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1021.sina_tk_bullet/hit_entity/.mcfunction @@ -13,7 +13,7 @@ data modify storage api: Argument.AttackType set value "Physical" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1023.star/kill/.mcfunction b/Asset/data/asset/functions/object/1023.star/kill/.mcfunction index a5ad84df45..528ef97bfd 100644 --- a/Asset/data/asset/functions/object/1023.star/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1023.star/kill/.mcfunction @@ -14,7 +14,7 @@ particle scrape ~ ~ ~ 0.5 0.5 0.5 0 30 normal @a # 鈍足を1秒付与 - effect give @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] slowness 1 1 true + effect give @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] slowness 1 1 true # UserID execute store result score $UserID Temporary run data get storage asset:context this.UserID @@ -24,7 +24,7 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "None" execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run function api:damage/ function api:damage/reset # 消滅 diff --git a/Asset/data/asset/functions/object/1041.grand_flame/tick/landing.mcfunction b/Asset/data/asset/functions/object/1041.grand_flame/tick/landing.mcfunction index 5ce6543b40..0787678219 100644 --- a/Asset/data/asset/functions/object/1041.grand_flame/tick/landing.mcfunction +++ b/Asset/data/asset/functions/object/1041.grand_flame/tick/landing.mcfunction @@ -39,7 +39,7 @@ data modify storage api: Argument.ElementType set value "Fire" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1042.mini_black_hole_flying/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1042.mini_black_hole_flying/detect_hit_entity/.mcfunction index 4db9088e22..e68a4daf60 100644 --- a/Asset/data/asset/functions/object/1042.mini_black_hole_flying/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1042.mini_black_hole_flying/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1042/detect_hit_entity # 判定 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1043.mini_black_hole/tick/.mcfunction b/Asset/data/asset/functions/object/1043.mini_black_hole/tick/.mcfunction index a0152b434e..f2d5c6e03a 100644 --- a/Asset/data/asset/functions/object/1043.mini_black_hole/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1043.mini_black_hole/tick/.mcfunction @@ -25,7 +25,7 @@ execute if score $Interval Temporary matches 0 run playsound entity.enderman.teleport neutral @a[distance=..32] ~ ~ ~ 1 0 # 敵吸い込み - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Immovable,tag=!Uninterferable,distance=..15] run function asset:object/1043.mini_black_hole/tick/enemy_suction + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Immovable,tag=!Uninterferable,distance=..15] run function asset:object/1043.mini_black_hole/tick/enemy_suction # リセット scoreboard players reset $Interval Temporary diff --git a/Asset/data/asset/functions/object/1043.mini_black_hole/tick/damage/.mcfunction b/Asset/data/asset/functions/object/1043.mini_black_hole/tick/damage/.mcfunction index 77217c0eda..41166c0011 100644 --- a/Asset/data/asset/functions/object/1043.mini_black_hole/tick/damage/.mcfunction +++ b/Asset/data/asset/functions/object/1043.mini_black_hole/tick/damage/.mcfunction @@ -19,9 +19,9 @@ data modify storage api: Argument.BypassModifier set value 1b execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=1043.Target,tag=!Uninterferable,distance=..8] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=1043.Target,tag=!Uninterferable,distance=..8] run function api:damage/ function api:damage/reset # リセット scoreboard players reset $UserID Temporary - tag @e[type=#lib:living,type=!player,tag=1043.Target,tag=!Uninterferable,distance=..8] remove 1043.Target + tag @e[type=#lib:living_without_player,tag=1043.Target,tag=!Uninterferable,distance=..8] remove 1043.Target diff --git a/Asset/data/asset/functions/object/1043.mini_black_hole/tick/damage/search_target.m.mcfunction b/Asset/data/asset/functions/object/1043.mini_black_hole/tick/damage/search_target.m.mcfunction index 533d918bb5..da61475819 100644 --- a/Asset/data/asset/functions/object/1043.mini_black_hole/tick/damage/search_target.m.mcfunction +++ b/Asset/data/asset/functions/object/1043.mini_black_hole/tick/damage/search_target.m.mcfunction @@ -5,4 +5,4 @@ # @within function asset:object/1043.mini_black_hole/tick/damage/ # 着弾タグを付ける - $tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..$(Num)] add 1043.Target + $tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..$(Num)] add 1043.Target diff --git a/Asset/data/asset/functions/object/1046.magic_bullet/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1046.magic_bullet/hit_entity/.mcfunction index e25c685aea..8828d39638 100644 --- a/Asset/data/asset/functions/object/1046.magic_bullet/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1046.magic_bullet/hit_entity/.mcfunction @@ -18,7 +18,7 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Fire" execute as @p[tag=Owner] run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run function asset:object/1046.magic_bullet/hit_entity/damage + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run function asset:object/1046.magic_bullet/hit_entity/damage function api:damage/reset # プレイヤーに対するダメージ diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/kill/deal_damage.m.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/kill/deal_damage.m.mcfunction index ed131ea8a3..92cc48103d 100644 --- a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/kill/deal_damage.m.mcfunction +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/kill/deal_damage.m.mcfunction @@ -14,5 +14,5 @@ $execute store result storage api: Argument.Damage double 0.01 run data get stor data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Fire" execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier -$execute positioned ~-$(RangeMax) ~-$(RangeMax) ~-$(RangeMax) as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=$(RangeMaxD),dy=$(RangeMaxD),dz=$(RangeMaxD)] positioned ~$(RangeMax) ~$(RangeMax) ~$(RangeMax) $(RangeMinSubCommand)run function api:damage/ +$execute positioned ~-$(RangeMax) ~-$(RangeMax) ~-$(RangeMax) as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=$(RangeMaxD),dy=$(RangeMaxD),dz=$(RangeMaxD)] positioned ~$(RangeMax) ~$(RangeMax) ~$(RangeMax) $(RangeMinSubCommand)run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/object/1051.time_laser/tick/.mcfunction b/Asset/data/asset/functions/object/1051.time_laser/tick/.mcfunction index b3e5e9dcc7..0ce41a4499 100644 --- a/Asset/data/asset/functions/object/1051.time_laser/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1051.time_laser/tick/.mcfunction @@ -23,9 +23,9 @@ scoreboard players reset $IntervalTime Temporary # 追尾 - execute positioned ^ ^ ^5 run tag @e[type=#lib:living,type=!player,tag=Enemy,distance=..5,sort=nearest,limit=1] add 1051.Target - execute facing entity @e[type=#lib:living,type=!player,tag=1051.Target,distance=..10,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-1200 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ - tag @e[type=#lib:living,type=!player,tag=1051.Target,distance=..10,limit=1] remove 1051.Target + execute positioned ^ ^ ^5 run tag @e[type=#lib:living_without_player,tag=Enemy,distance=..5,sort=nearest,limit=1] add 1051.Target + execute facing entity @e[type=#lib:living_without_player,tag=1051.Target,distance=..10,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-1200 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ + tag @e[type=#lib:living_without_player,tag=1051.Target,distance=..10,limit=1] remove 1051.Target # 演出 playsound minecraft:block.stone_button.click_on player @a ~ ~ ~ 0.6 1.4 diff --git a/Asset/data/asset/functions/object/1054.ride_missile/kill/.mcfunction b/Asset/data/asset/functions/object/1054.ride_missile/kill/.mcfunction index c066ea78b1..b39c16da33 100644 --- a/Asset/data/asset/functions/object/1054.ride_missile/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1054.ride_missile/kill/.mcfunction @@ -24,7 +24,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" execute as @p[tag=1054.Owner] run function api:damage/modifier - execute positioned ~-3 ~-3 ~-3 as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=5,dy=5,dz=5] run function api:damage/ + execute positioned ~-3 ~-3 ~-3 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=5,dy=5,dz=5] run function api:damage/ function api:damage/reset function asset:object/super.method diff --git a/Asset/data/asset/functions/object/1063.magic_circle_of_rebirth/tick/turn/search.m.mcfunction b/Asset/data/asset/functions/object/1063.magic_circle_of_rebirth/tick/turn/search.m.mcfunction index a9f9acbf30..8d1591fb16 100644 --- a/Asset/data/asset/functions/object/1063.magic_circle_of_rebirth/tick/turn/search.m.mcfunction +++ b/Asset/data/asset/functions/object/1063.magic_circle_of_rebirth/tick/turn/search.m.mcfunction @@ -5,4 +5,4 @@ # Diameter : int # @within function asset:object/1063.magic_circle_of_rebirth/tick/turn/ -$execute positioned ^ ^ ^$(Radius) as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..$(Radius),sort=nearest] at @p[tag=TJ.This] unless entity @s[distance=..$(Min)] unless entity @e[type=#lib:living,type=!player,tag=TJ.Target,tag=!Uninterferable,distance=..$(Diameter),limit=1] run tag @s add TJ.Target +$execute positioned ^ ^ ^$(Radius) as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..$(Radius),sort=nearest] at @p[tag=TJ.This] unless entity @s[distance=..$(Min)] unless entity @e[type=#lib:living_without_player,tag=TJ.Target,tag=!Uninterferable,distance=..$(Diameter),limit=1] run tag @s add TJ.Target diff --git a/Asset/data/asset/functions/object/1064.fire_of_rebirth/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1064.fire_of_rebirth/detect_hit_entity/.mcfunction index c1f8c09f18..e8dc667826 100644 --- a/Asset/data/asset/functions/object/1064.fire_of_rebirth/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1064.fire_of_rebirth/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1064/detect_hit_entity # 判定 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1064.fire_of_rebirth/kill/.mcfunction b/Asset/data/asset/functions/object/1064.fire_of_rebirth/kill/.mcfunction index 7cd704a9a0..a1bb1bc678 100644 --- a/Asset/data/asset/functions/object/1064.fire_of_rebirth/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1064.fire_of_rebirth/kill/.mcfunction @@ -19,7 +19,7 @@ data modify storage api: Argument.ElementType set value "Fire" execute store result score $TK.UserID Temporary run data get storage asset:context this.UserID execute as @a if score $TK.UserID Temporary = @s UserID run function api:damage/modifier - execute positioned ~-2 ~-2 ~-2 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=3,dy=3,dz=3] run function api:damage/ + execute positioned ~-2 ~-2 ~-2 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=3,dy=3,dz=3] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1065.hex_sting/kill/deal_damage.m.mcfunction b/Asset/data/asset/functions/object/1065.hex_sting/kill/deal_damage.m.mcfunction index b567b44de1..64e561580d 100644 --- a/Asset/data/asset/functions/object/1065.hex_sting/kill/deal_damage.m.mcfunction +++ b/Asset/data/asset/functions/object/1065.hex_sting/kill/deal_damage.m.mcfunction @@ -14,5 +14,5 @@ $execute store result storage api: Argument.Damage double 0.01 run data get stor data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier -$execute positioned ~-$(RangeMax) ~-$(RangeMax) ~-$(RangeMax) as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=$(RangeMaxD),dy=$(RangeMaxD),dz=$(RangeMaxD)] positioned ~$(RangeMax) ~$(RangeMax) ~$(RangeMax) $(RangeMinSubCommand)run function api:damage/ +$execute positioned ~-$(RangeMax) ~-$(RangeMax) ~-$(RangeMax) as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=$(RangeMaxD),dy=$(RangeMaxD),dz=$(RangeMaxD)] positioned ~$(RangeMax) ~$(RangeMax) ~$(RangeMax) $(RangeMinSubCommand)run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/object/1070.arrow_of_vinderre/pre_hit/.mcfunction b/Asset/data/asset/functions/object/1070.arrow_of_vinderre/pre_hit/.mcfunction index 305fb5197e..66b31a4c0e 100644 --- a/Asset/data/asset/functions/object/1070.arrow_of_vinderre/pre_hit/.mcfunction +++ b/Asset/data/asset/functions/object/1070.arrow_of_vinderre/pre_hit/.mcfunction @@ -16,7 +16,7 @@ data modify storage api: Argument.ID set value 279 data modify storage api: Argument.FieldOverride.UserID set from storage asset:context this.UserID data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal - execute as @e[type=#lib:living,type=!player,tag=1009.Target,distance=..0.1] run function api:entity/mob/effect/give + execute as @e[type=#lib:living_without_player,tag=1009.Target,distance=..0.1] run function api:entity/mob/effect/give function api:entity/mob/effect/reset # 25% の確率で敵が Immovable でなければ TP する @@ -24,7 +24,7 @@ execute positioned ~-0.1 ~-0.1 ~-0.1 if entity @e[type=#lib:living,tag=1009.Target,tag=Immovable,dx=0] run return 0 # TP - execute as @e[type=#lib:living,type=!player,tag=1009.Target,distance=..0.1] at @a[tag=1009.Player] rotated ~ 0 run tp @s ^ ^ ^2 + execute as @e[type=#lib:living_without_player,tag=1009.Target,distance=..0.1] at @a[tag=1009.Player] rotated ~ 0 run tp @s ^ ^ ^2 # SE playsound minecraft:entity.enderman.teleport player @a ~ ~ ~ 1 1 0 diff --git a/Asset/data/asset/functions/object/1072.arrow_of_phoenix/pre_hit/.mcfunction b/Asset/data/asset/functions/object/1072.arrow_of_phoenix/pre_hit/.mcfunction index 4dfd7216bc..846c4112a7 100644 --- a/Asset/data/asset/functions/object/1072.arrow_of_phoenix/pre_hit/.mcfunction +++ b/Asset/data/asset/functions/object/1072.arrow_of_phoenix/pre_hit/.mcfunction @@ -19,7 +19,7 @@ playsound item.firecharge.use player @a[distance=..100] ~ ~ ~ 10 1 # 燃やす - data modify entity @e[type=#lib:living,type=!player,tag=1009.Target,distance=..0.1,limit=1] Fire set value 200s + data modify entity @e[type=#lib:living_without_player,tag=1009.Target,distance=..0.1,limit=1] Fire set value 200s # ダメージ設定 execute unless predicate lib:is_day unless predicate lib:weather/is_sunny run data modify storage asset:context this.Damage set from storage asset:context this.DamageForNightCloudy execute if predicate lib:is_day unless predicate lib:weather/is_sunny run data modify storage asset:context this.Damage set from storage asset:context this.DamageForNightSunny diff --git a/Asset/data/asset/functions/object/1078.gun/tick/shot/bullet_rec.mcfunction b/Asset/data/asset/functions/object/1078.gun/tick/shot/bullet_rec.mcfunction index f57f7f3b9f..55a0034ee3 100644 --- a/Asset/data/asset/functions/object/1078.gun/tick/shot/bullet_rec.mcfunction +++ b/Asset/data/asset/functions/object/1078.gun/tick/shot/bullet_rec.mcfunction @@ -7,14 +7,14 @@ # asset:object/1078.gun/tick/shot/bullet_rec # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @s add Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # 演出 particle dust 1 0.831 0.325 0.4 ~ ~ ~ 0 0 0 0 6 # 着弾 - execute if entity @s[tag=Landing] positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] at @s run function asset:object/1078.gun/tick/shot/deal_damage + execute if entity @s[tag=Landing] positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] at @s run function asset:object/1078.gun/tick/shot/deal_damage # 再起 execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:object/1078.gun/tick/shot/bullet_rec diff --git a/Asset/data/asset/functions/object/1081.barrel/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1081.barrel/detect_hit_entity/.mcfunction index ffceac66c3..a7a2fc4d71 100644 --- a/Asset/data/asset/functions/object/1081.barrel/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1081.barrel/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1081/detect_hit_entity # ヒット判定 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,dy=0.02,dz=0,sort=nearest,limit=1] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,dy=0.02,dz=0,sort=nearest,limit=1] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1081.barrel/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1081.barrel/hit_entity/.mcfunction index 65b646abd7..37ce7b9970 100644 --- a/Asset/data/asset/functions/object/1081.barrel/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1081.barrel/hit_entity/.mcfunction @@ -10,18 +10,18 @@ #declare tag 1081.Hit # 対象特定 - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,dy=0.02,dz=0,sort=random,limit=1] run tag @s add 1081.Hit + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,dy=0.02,dz=0,sort=random,limit=1] run tag @s add 1081.Hit # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage execute if entity @e[type=#lib:living,tag=1081.Hit,tag=ExtendedCollision,distance=..10] store result storage api: Argument.Damage double 0.0125 run data get storage asset:context this.Damage 10 data modify storage api: Argument.AttackType set value "Physical" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=1081.Hit,dx=0,dy=0.02,dz=0,limit=1] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=1081.Hit,dx=0,dy=0.02,dz=0,limit=1] run function api:damage/ function api:damage/reset # リセット - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=1081.Hit,dx=0,dy=0.02,dz=0,limit=1] run tag @s remove 1081.Hit + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=1081.Hit,dx=0,dy=0.02,dz=0,limit=1] run tag @s remove 1081.Hit # 消滅 scoreboard players reset $UserID Temporary diff --git a/Asset/data/asset/functions/object/1091.flame_boomerang/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1091.flame_boomerang/detect_hit_entity/.mcfunction index 7a9424229c..4563b393c3 100644 --- a/Asset/data/asset/functions/object/1091.flame_boomerang/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1091.flame_boomerang/detect_hit_entity/.mcfunction @@ -5,7 +5,7 @@ # @within asset:object/alias/1091/detect_hit_entity # 敵にヒットしたか - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true # 一定Tick経過後はプレイヤーにヒットしたかもチェック execute if score @s General.Object.Tick matches 21.. positioned ~-0.5 ~-0.5 ~-0.5 if entity @p[tag=Owner,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1091.flame_boomerang/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1091.flame_boomerang/hit_entity/.mcfunction index f6f4987b98..1b785192bc 100644 --- a/Asset/data/asset/functions/object/1091.flame_boomerang/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1091.flame_boomerang/hit_entity/.mcfunction @@ -13,9 +13,9 @@ data modify storage api: Argument.ElementType set value "Fire" data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0] run function asset:object/1091.flame_boomerang/hit_entity/damage + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run function asset:object/1091.flame_boomerang/hit_entity/damage function api:damage/reset # リセット scoreboard players reset $UserID Temporary - tag @e[type=#lib:living,type=!player,tag=1091.TargetEntity,distance=..5] remove 1091.TargetEntity + tag @e[type=#lib:living_without_player,tag=1091.TargetEntity,distance=..5] remove 1091.TargetEntity diff --git a/Asset/data/asset/functions/object/1093.miracle_magic/tick/damage.mcfunction b/Asset/data/asset/functions/object/1093.miracle_magic/tick/damage.mcfunction index 163e6c955f..3fc2381e16 100644 --- a/Asset/data/asset/functions/object/1093.miracle_magic/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1093.miracle_magic/tick/damage.mcfunction @@ -22,11 +22,11 @@ data modify storage api: Argument.ElementType set value "None" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..50,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=LandingTarget,tag=!Uninterferable,distance=..50,limit=1] run function api:damage/ function api:damage/reset # 着弾タグを消す - tag @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..50,limit=1] remove LandingTarget + tag @e[type=#lib:living_without_player,tag=LandingTarget,tag=!Uninterferable,distance=..50,limit=1] remove LandingTarget # リセット scoreboard players reset $UserID Temporary diff --git a/Asset/data/asset/functions/object/1093.miracle_magic/tick/shoot.mcfunction b/Asset/data/asset/functions/object/1093.miracle_magic/tick/shoot.mcfunction index 1f5cb6c85f..c6503417d5 100644 --- a/Asset/data/asset/functions/object/1093.miracle_magic/tick/shoot.mcfunction +++ b/Asset/data/asset/functions/object/1093.miracle_magic/tick/shoot.mcfunction @@ -7,11 +7,11 @@ # asset:object/1093.miracle_magic/tick/shoot # 着弾検知 - execute if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] run tag @s add Landing + execute if entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # ターゲットにタグ付与 - execute if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] run tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2,limit=1] add LandingTarget + execute if entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2] run tag @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2,limit=1] add LandingTarget # 演出 particle dust 1 1 1 1 ~ ~ ~ 0.2 0.2 0.2 0 12 diff --git a/Asset/data/asset/functions/object/1094.aa_missile/tick/damage.mcfunction b/Asset/data/asset/functions/object/1094.aa_missile/tick/damage.mcfunction index 03d9548fe6..f2b10c4070 100644 --- a/Asset/data/asset/functions/object/1094.aa_missile/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1094.aa_missile/tick/damage.mcfunction @@ -1,6 +1,6 @@ #> asset:object/1094.aa_missile/tick/damage # -# +# # # @within function asset:object/1094.aa_missile/tick/hit @@ -10,7 +10,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" $execute as @p[scores={UserID=$(UserID)}] run function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ function api:damage/reset # particle diff --git a/Asset/data/asset/functions/object/1096.was_laser/tick/shoot/.mcfunction b/Asset/data/asset/functions/object/1096.was_laser/tick/shoot/.mcfunction index 829b462866..b06fe020ff 100644 --- a/Asset/data/asset/functions/object/1096.was_laser/tick/shoot/.mcfunction +++ b/Asset/data/asset/functions/object/1096.was_laser/tick/shoot/.mcfunction @@ -36,7 +36,7 @@ data modify storage lib: args.dx set value 2.5 data modify storage lib: args.dy set value 2.5 execute store result storage lib: args.dz float 0.5 run scoreboard players get $Range Temporary - data modify storage lib: args.selector set value "@e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..40]" + data modify storage lib: args.selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..40]" # マクロでRotatableDXYZの実行位置を調整する execute store result storage asset:temp Args.Pos float 0.5 run scoreboard players get $Range Temporary @@ -48,11 +48,11 @@ data modify storage api: Argument.ElementType set value "Fire" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=DXYZ,tag=!Uninterferable,distance=..40] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=DXYZ,tag=!Uninterferable,distance=..40] run function api:damage/ function api:damage/reset # リセット - tag @e[type=#lib:living,type=!player,tag=Enemy,tag=DXYZ,distance=..40] remove DXYZ + tag @e[type=#lib:living_without_player,tag=Enemy,tag=DXYZ,distance=..40] remove DXYZ scoreboard players reset $Range Temporary scoreboard players reset $UserID Temporary data remove storage asset:temp Args diff --git a/Asset/data/asset/functions/object/1097.celestial_star/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1097.celestial_star/detect_hit_entity/.mcfunction index 02178979e9..d2f383cedc 100644 --- a/Asset/data/asset/functions/object/1097.celestial_star/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1097.celestial_star/detect_hit_entity/.mcfunction @@ -4,4 +4,4 @@ # # @within asset:object/alias/1097/detect_hit_entity -execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true +execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1097.celestial_star/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1097.celestial_star/hit_entity/.mcfunction index bb0a03e641..9d7bcb2086 100644 --- a/Asset/data/asset/functions/object/1097.celestial_star/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1097.celestial_star/hit_entity/.mcfunction @@ -21,7 +21,7 @@ # modifier をかける execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier # ダメージを与える - 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] positioned ~0.5 ~0.5 ~0.5 run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] positioned ~0.5 ~0.5 ~0.5 run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1097.celestial_star/tick/.mcfunction b/Asset/data/asset/functions/object/1097.celestial_star/tick/.mcfunction index eb3bf1ec42..bce6649753 100644 --- a/Asset/data/asset/functions/object/1097.celestial_star/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1097.celestial_star/tick/.mcfunction @@ -12,12 +12,12 @@ # データ取得 execute store result score $TargetMobUUID Temporary run data get storage asset:context this.TargetMobUUID # ターゲットが居たらそいつを、居なければ近いやつをものすごい勢いでホーミングする - execute if data storage asset:context this.TargetMobUUID positioned ^ ^ ^10 as @e[type=#lib:living,type=!player,distance=..10] if score @s MobUUID = $TargetMobUUID Temporary run tag @s add 1097.CelestialTarget - execute unless data storage asset:context this.TargetMobUUID positioned ^ ^ ^10 as @e[type=#lib:living,type=!player,distance=..10,sort=nearest,limit=1] run tag @s add 1097.CelestialTarget + execute if data storage asset:context this.TargetMobUUID positioned ^ ^ ^10 as @e[type=#lib:living_without_player,distance=..10] if score @s MobUUID = $TargetMobUUID Temporary run tag @s add 1097.CelestialTarget + execute unless data storage asset:context this.TargetMobUUID positioned ^ ^ ^10 as @e[type=#lib:living_without_player,distance=..10,sort=nearest,limit=1] run tag @s add 1097.CelestialTarget execute facing entity @e[type=#lib:living,tag=1097.CelestialTarget,distance=..20,limit=1] eyes positioned ^ ^ ^-70 rotated as @s positioned ^ ^ ^-40 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ # リセット scoreboard players reset $TargetMobUUID Temporary - tag @e[type=#lib:living,type=!player,tag=1097.CelestialTarget,distance=..20,limit=1] remove 1097.CelestialTarget + tag @e[type=#lib:living_without_player,tag=1097.CelestialTarget,distance=..20,limit=1] remove 1097.CelestialTarget # VFX execute at @s run particle firework ~ ~ ~ 0.2 0.2 0.2 0 1 diff --git a/Asset/data/asset/functions/object/1098.alchemy_laser/tick/shot.mcfunction b/Asset/data/asset/functions/object/1098.alchemy_laser/tick/shot.mcfunction index 1786a49d40..9a2f21e8f9 100644 --- a/Asset/data/asset/functions/object/1098.alchemy_laser/tick/shot.mcfunction +++ b/Asset/data/asset/functions/object/1098.alchemy_laser/tick/shot.mcfunction @@ -22,7 +22,7 @@ data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..1.5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..1.5] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1100.conviction_shot/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1100.conviction_shot/detect_hit_entity/.mcfunction index 55c46f4a14..0c9c998dc8 100644 --- a/Asset/data/asset/functions/object/1100.conviction_shot/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1100.conviction_shot/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1100/detect_hit_entity # Tagがあればヒット判定 割と大きめ - execute if entity @s[tag=1100.Damage] positioned ~-0.75 ~-0.75 ~-0.75 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5,limit=1] run data modify storage asset:context IsHitEntity set value true + execute if entity @s[tag=1100.Damage] positioned ~-0.75 ~-0.75 ~-0.75 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5,limit=1] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1101.tnt/tick/damage/.mcfunction b/Asset/data/asset/functions/object/1101.tnt/tick/damage/.mcfunction index eded4af541..c4bda0ed87 100644 --- a/Asset/data/asset/functions/object/1101.tnt/tick/damage/.mcfunction +++ b/Asset/data/asset/functions/object/1101.tnt/tick/damage/.mcfunction @@ -9,7 +9,7 @@ #declare score_holder $UserID # 範囲内のMobに再帰で壁貫通をしてないかチェック - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..8] at @s facing entity @e[type=marker,tag=this,distance=..8.1] feet run function asset:object/1101.tnt/tick/damage/check_block + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..8] at @s facing entity @e[type=marker,tag=this,distance=..8.1] feet run function asset:object/1101.tnt/tick/damage/check_block # User特定 execute store result score $UserID Temporary run data get storage asset:context this.UserID @@ -22,8 +22,8 @@ # リセット scoreboard players reset $UserID Temporary - tag @e[type=#lib:living,type=!player,tag=1101.Hit,distance=..8] remove 1101.Hit - tag @e[type=#lib:living,type=!player,tag=1101.AlreadyHit,distance=..8] remove 1101.AlreadyHit + tag @e[type=#lib:living_without_player,tag=1101.Hit,distance=..8] remove 1101.Hit + tag @e[type=#lib:living_without_player,tag=1101.AlreadyHit,distance=..8] remove 1101.AlreadyHit # 消滅 kill @s diff --git a/Asset/data/asset/functions/object/1101.tnt/tick/damage/deal_damage.m.mcfunction b/Asset/data/asset/functions/object/1101.tnt/tick/damage/deal_damage.m.mcfunction index cae32e74f8..9e5ce71b78 100644 --- a/Asset/data/asset/functions/object/1101.tnt/tick/damage/deal_damage.m.mcfunction +++ b/Asset/data/asset/functions/object/1101.tnt/tick/damage/deal_damage.m.mcfunction @@ -10,8 +10,8 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Fire" execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - $execute as @e[type=#lib:living,type=!player,tag=1101.Hit,tag=!AlreadyHit,distance=$(Distance)] run function api:damage/ + $execute as @e[type=#lib:living_without_player,tag=1101.Hit,tag=!AlreadyHit,distance=$(Distance)] run function api:damage/ function api:damage/reset # 重複ヒット防止Tag - $tag @e[type=#lib:living,type=!player,tag=1101.Hit,distance=$(Distance)] add 1101.AldreadyHit + $tag @e[type=#lib:living_without_player,tag=1101.Hit,distance=$(Distance)] add 1101.AldreadyHit diff --git a/Asset/data/asset/functions/object/1101.tnt/tick/on_vehicle.mcfunction b/Asset/data/asset/functions/object/1101.tnt/tick/on_vehicle.mcfunction index 311b2e51fe..93a915cedc 100644 --- a/Asset/data/asset/functions/object/1101.tnt/tick/on_vehicle.mcfunction +++ b/Asset/data/asset/functions/object/1101.tnt/tick/on_vehicle.mcfunction @@ -9,11 +9,11 @@ #declare tag 1101.IsNearMob # 近くにMobがいれば、Motionをリセットして自身にTagを付与 - execute if entity @s[tag=!1101.IsNearMob] if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2,limit=1] run data modify entity @s Motion set value [0f,0f,0f] - execute if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2,limit=1] run tag @s add 1101.IsNearMob + execute if entity @s[tag=!1101.IsNearMob] if entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2,limit=1] run data modify entity @s Motion set value [0f,0f,0f] + execute if entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2,limit=1] run tag @s add 1101.IsNearMob # Tagがある状態で近くに敵がいなければTagを削除 - execute if entity @s[tag=1101.IsNearMob] unless entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2,limit=1] run tag @s remove 1101.IsNearMob + execute if entity @s[tag=1101.IsNearMob] unless entity @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2,limit=1] run tag @s remove 1101.IsNearMob # Tagがあれば敵にtpし続ける - execute if entity @s[tag=1101.IsNearMob] run tp @s @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2,sort=nearest,limit=1] + execute if entity @s[tag=1101.IsNearMob] run tp @s @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2,sort=nearest,limit=1] diff --git a/Asset/data/asset/functions/object/1102.turret/tick/shot/bullet_rec.mcfunction b/Asset/data/asset/functions/object/1102.turret/tick/shot/bullet_rec.mcfunction index 78fc4d9d8c..f2b8c852ca 100644 --- a/Asset/data/asset/functions/object/1102.turret/tick/shot/bullet_rec.mcfunction +++ b/Asset/data/asset/functions/object/1102.turret/tick/shot/bullet_rec.mcfunction @@ -7,14 +7,14 @@ # asset:object/1102.turret/tick/shot/bullet_rec # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0] run tag @s add Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # 演出 particle dust 0.345 0.345 0.345 0.4 ~ ~ ~ 0 0 0 0 6 # 着弾 - execute if entity @s[tag=Landing] positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] at @s run function asset:object/1102.turret/tick/shot/deal_damage + execute if entity @s[tag=Landing] positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] at @s run function asset:object/1102.turret/tick/shot/deal_damage # 再帰 execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:object/1102.turret/tick/shot/bullet_rec diff --git a/Asset/data/asset/functions/object/1103.light_ball/tick/track.m.mcfunction b/Asset/data/asset/functions/object/1103.light_ball/tick/track.m.mcfunction index 5d9f355c3d..e9a1bbe659 100644 --- a/Asset/data/asset/functions/object/1103.light_ball/tick/track.m.mcfunction +++ b/Asset/data/asset/functions/object/1103.light_ball/tick/track.m.mcfunction @@ -4,5 +4,5 @@ # # @within function asset:object/1103.light_ball/tick/ -$execute as @e[type=#lib:living,type=!player,tag=!Death,tag=!Uninterferable,scores={MobUUID=$(TargetID)},distance=..50,limit=1] at @s anchored eyes run return run tp @e[type=item_display,tag=this,limit=1] ^ ^ ^ +$execute as @e[type=#lib:living_without_player,tag=!Death,tag=!Uninterferable,scores={MobUUID=$(TargetID)},distance=..50,limit=1] at @s anchored eyes run return run tp @e[type=item_display,tag=this,limit=1] ^ ^ ^ kill @s diff --git a/Asset/data/asset/functions/object/1104.poison_flowgun/pre_hit/.mcfunction b/Asset/data/asset/functions/object/1104.poison_flowgun/pre_hit/.mcfunction index e6591b2556..cde69add2d 100644 --- a/Asset/data/asset/functions/object/1104.poison_flowgun/pre_hit/.mcfunction +++ b/Asset/data/asset/functions/object/1104.poison_flowgun/pre_hit/.mcfunction @@ -13,5 +13,5 @@ data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.PoisonDamage data modify storage api: Argument.FieldOverride.AppliedFrom set from storage asset:context this.UserID data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=1009.Target,dx=0] run function api:entity/mob/effect/give + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=1009.Target,dx=0] run function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/object/1109.deadly_poison_flowgun/pre_hit/.mcfunction b/Asset/data/asset/functions/object/1109.deadly_poison_flowgun/pre_hit/.mcfunction index 02795c8670..7776a22481 100644 --- a/Asset/data/asset/functions/object/1109.deadly_poison_flowgun/pre_hit/.mcfunction +++ b/Asset/data/asset/functions/object/1109.deadly_poison_flowgun/pre_hit/.mcfunction @@ -13,5 +13,5 @@ data modify storage api: Argument.FieldOverride.Damage set from storage asset:context this.PoisonDamage data modify storage api: Argument.FieldOverride.AppliedFrom set from storage asset:context this.UserID data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=1009.Target,dx=0] run function api:entity/mob/effect/give + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=1009.Target,dx=0] run function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/object/1111.archer_fish/tick/.mcfunction b/Asset/data/asset/functions/object/1111.archer_fish/tick/.mcfunction index 2da8987665..66d0d5f85e 100644 --- a/Asset/data/asset/functions/object/1111.archer_fish/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1111.archer_fish/tick/.mcfunction @@ -15,12 +15,12 @@ # データ取得 execute store result score $TargetMobUUID Temporary run data get storage asset:context this.TargetMobUUID # ターゲットが居たらそいつを、居なければ近いやつをものすごい勢いでホーミングする - execute if data storage asset:context this.TargetMobUUID positioned ^ ^ ^10 as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10] if score @s MobUUID = $TargetMobUUID Temporary run tag @s add 1111.FishTarget - execute unless data storage asset:context this.TargetMobUUID positioned ^ ^ ^10 as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] run tag @s add 1111.FishTarget + execute if data storage asset:context this.TargetMobUUID positioned ^ ^ ^10 as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..10] if score @s MobUUID = $TargetMobUUID Temporary run tag @s add 1111.FishTarget + execute unless data storage asset:context this.TargetMobUUID positioned ^ ^ ^10 as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] run tag @s add 1111.FishTarget execute facing entity @e[type=#lib:living,tag=1111.FishTarget,distance=..20,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-1200 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ # リセット scoreboard players reset $TargetMobUUID Temporary - tag @e[type=#lib:living,type=!player,tag=1111.FishTarget,distance=..20,limit=1] remove 1111.FishTarget + tag @e[type=#lib:living_without_player,tag=1111.FishTarget,distance=..20,limit=1] remove 1111.FishTarget # super.tick execute at @s run function asset:object/super.tick diff --git a/Asset/data/asset/functions/object/1112.school_of_fish/tick/summon.mcfunction b/Asset/data/asset/functions/object/1112.school_of_fish/tick/summon.mcfunction index 5683262953..899d94d742 100644 --- a/Asset/data/asset/functions/object/1112.school_of_fish/tick/summon.mcfunction +++ b/Asset/data/asset/functions/object/1112.school_of_fish/tick/summon.mcfunction @@ -14,7 +14,7 @@ # ターゲットと同じMobUUIDを持つ敵がいるかチェック execute if data storage asset:context this.TargetMobUUID store result score $1112.TargetMobUUID Temporary run data get storage asset:context this.TargetMobUUID - execute if data storage asset:context this.TargetMobUUID as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..25] if score @s MobUUID = $1112.TargetMobUUID Temporary run data modify storage asset:temp Check set value true + execute if data storage asset:context this.TargetMobUUID as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..25] if score @s MobUUID = $1112.TargetMobUUID Temporary run data modify storage asset:temp Check set value true # サケクリティカル execute if predicate lib:random_pass_per/4 run data modify storage api: Argument.FieldOverride.SalmonCrit set value true diff --git a/Asset/data/asset/functions/object/1113.soulfire_sword/tick/explode.mcfunction b/Asset/data/asset/functions/object/1113.soulfire_sword/tick/explode.mcfunction index e4471dcffd..6fb1b66eb4 100644 --- a/Asset/data/asset/functions/object/1113.soulfire_sword/tick/explode.mcfunction +++ b/Asset/data/asset/functions/object/1113.soulfire_sword/tick/explode.mcfunction @@ -22,6 +22,6 @@ data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..5] run function api:damage/ function api:damage/reset scoreboard players reset $UserID Temporary diff --git a/Asset/data/asset/functions/object/1114.butterfly_attack/tick/5/damage/.mcfunction b/Asset/data/asset/functions/object/1114.butterfly_attack/tick/5/damage/.mcfunction index f2095b735a..2ace894450 100644 --- a/Asset/data/asset/functions/object/1114.butterfly_attack/tick/5/damage/.mcfunction +++ b/Asset/data/asset/functions/object/1114.butterfly_attack/tick/5/damage/.mcfunction @@ -25,7 +25,7 @@ execute as @p[tag=Owner] at @s anchored eyes positioned ^ ^ ^ run function asset:object/1114.butterfly_attack/tick/5/damage/find_target_line # 1114.Targetがいなければ、前方かつ最も近い敵を狙う - execute at @p[tag=Owner] unless entity @e[type=#lib:living,type=!player,tag=1114.Target,distance=..10] positioned ^ ^ ^3 run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..3] add 1114.Target + execute at @p[tag=Owner] unless entity @e[type=#lib:living_without_player,tag=1114.Target,distance=..10] positioned ^ ^ ^3 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..3] add 1114.Target # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage @@ -33,11 +33,11 @@ data modify storage api: Argument.ElementType set value "Fire" data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute as @p[tag=Owner] run function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=1114.Target,distance=..10,sort=nearest,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=1114.Target,distance=..10,sort=nearest,limit=1] run function api:damage/ function api:damage/reset # リセット tag @p[tag=Owner] remove Owner - tag @e[type=#lib:living,type=!player,tag=1114.Target,distance=..10] remove 1114.Target + tag @e[type=#lib:living_without_player,tag=1114.Target,distance=..10] remove 1114.Target scoreboard players reset $UserID Temporary scoreboard players reset $RecursiveCount Temporary diff --git a/Asset/data/asset/functions/object/1114.butterfly_attack/tick/5/damage/find_target_line.mcfunction b/Asset/data/asset/functions/object/1114.butterfly_attack/tick/5/damage/find_target_line.mcfunction index 9d9db4caa2..2795ea4ee4 100644 --- a/Asset/data/asset/functions/object/1114.butterfly_attack/tick/5/damage/find_target_line.mcfunction +++ b/Asset/data/asset/functions/object/1114.butterfly_attack/tick/5/damage/find_target_line.mcfunction @@ -7,7 +7,7 @@ # asset:object/1114.butterfly_attack/tick/5/damage/find_target_line # 敵がいたらTagつけてReturn - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run return run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] add 1114.Target + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run return run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] add 1114.Target # 再帰 scoreboard players add $RecursiveCount Temporary 1 diff --git a/Asset/data/asset/functions/object/1126.freeze_trap/tick/.mcfunction b/Asset/data/asset/functions/object/1126.freeze_trap/tick/.mcfunction index 21726538bd..da7210ffa9 100644 --- a/Asset/data/asset/functions/object/1126.freeze_trap/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1126.freeze_trap/tick/.mcfunction @@ -22,7 +22,7 @@ execute if data storage asset:context this{Interval:0} run data modify storage asset:context this.Interval set value 3 # ヒット判定 - execute if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..2] run function asset:object/1126.freeze_trap/tick/boom + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] run function asset:object/1126.freeze_trap/tick/boom # 消滅時に爆発 execute if score @s General.Object.Tick matches 400.. run function asset:object/1126.freeze_trap/tick/boom diff --git a/Asset/data/asset/functions/object/1130.thunder_stiletto/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1130.thunder_stiletto/detect_hit_entity/.mcfunction index 29a72b29a5..c7b855b0d3 100644 --- a/Asset/data/asset/functions/object/1130.thunder_stiletto/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1130.thunder_stiletto/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1130/detect_hit_entity # 判定 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1130.thunder_stiletto/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1130.thunder_stiletto/hit_entity/.mcfunction index 1ef2399897..10543247c1 100644 --- a/Asset/data/asset/functions/object/1130.thunder_stiletto/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1130.thunder_stiletto/hit_entity/.mcfunction @@ -17,7 +17,7 @@ data modify storage api: Argument.ElementType set value "Thunder" data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] run function api:damage/ function api:damage/reset # JumpBoost:trueなら跳躍力上昇を付与 diff --git a/Asset/data/asset/functions/object/1139.simple_grenade/tick/boom.mcfunction b/Asset/data/asset/functions/object/1139.simple_grenade/tick/boom.mcfunction index 2b433e3626..8593836443 100644 --- a/Asset/data/asset/functions/object/1139.simple_grenade/tick/boom.mcfunction +++ b/Asset/data/asset/functions/object/1139.simple_grenade/tick/boom.mcfunction @@ -24,8 +24,8 @@ # 対象選定 # 着弾時にdistanceだとワンチャンすぐ近くの対称に当たらない可能性があるのでdxyzでも判定しておく - execute positioned ~-0.5 ~-0.5 ~-0.5 run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,dx=0] add 1139.Target - tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..4] add 1139.Target + execute positioned ~-0.5 ~-0.5 ~-0.5 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] add 1139.Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] add 1139.Target # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage @@ -38,7 +38,7 @@ # リセット scoreboard players reset $UserID Temporary - tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..10] remove 1139.Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] remove 1139.Target # 消滅 execute on vehicle run kill @s diff --git a/Asset/data/asset/functions/object/1140.arrow_of_honey_bee/pre_hit/.mcfunction b/Asset/data/asset/functions/object/1140.arrow_of_honey_bee/pre_hit/.mcfunction index d5ff166fa2..c3342e4161 100644 --- a/Asset/data/asset/functions/object/1140.arrow_of_honey_bee/pre_hit/.mcfunction +++ b/Asset/data/asset/functions/object/1140.arrow_of_honey_bee/pre_hit/.mcfunction @@ -9,12 +9,12 @@ #declare tag 1009.Target # 演出 - execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living,type=!player,tag=1009.Target,dx=0] run particle dust 1.000 0.741 0.141 0.8 ~ ~1.2 ~ 0.5 0.5 0.5 0 50 normal - execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living,type=!player,tag=1009.Target,dx=0] run particle minecraft:falling_honey ~ ~1.2 ~ 0.5 0.5 0.5 0 20 + execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living_without_player,tag=1009.Target,dx=0] run particle dust 1.000 0.741 0.141 0.8 ~ ~1.2 ~ 0.5 0.5 0.5 0 50 normal + execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living_without_player,tag=1009.Target,dx=0] run particle minecraft:falling_honey ~ ~1.2 ~ 0.5 0.5 0.5 0 20 # 鈍足をTickから秒に変換しマクロで付与 execute store result storage asset:temp Args.Duration int 0.05 run data get storage asset:context this.Duration - execute as @e[type=#lib:living,type=!player,tag=1009.Target,dx=0] run function asset:object/1140.arrow_of_honey_bee/pre_hit/slowness.m with storage asset:temp Args + execute as @e[type=#lib:living_without_player,tag=1009.Target,dx=0] run function asset:object/1140.arrow_of_honey_bee/pre_hit/slowness.m with storage asset:temp Args data remove storage asset:temp Args # エフェクト付与 @@ -24,5 +24,5 @@ data modify storage api: Argument.FieldOverride.DamageInterval set from storage asset:context this.PoisonDamageInterval data modify storage api: Argument.FieldOverride.AppliedFrom set from storage asset:context this.UserID data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=1009.Target,dx=0] run function api:entity/mob/effect/give + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=1009.Target,dx=0] run function api:entity/mob/effect/give function api:entity/mob/effect/reset diff --git a/Asset/data/asset/functions/object/1143.arrow_of_hekireki/pre_hit/.mcfunction b/Asset/data/asset/functions/object/1143.arrow_of_hekireki/pre_hit/.mcfunction index e61118f789..56f78d4734 100644 --- a/Asset/data/asset/functions/object/1143.arrow_of_hekireki/pre_hit/.mcfunction +++ b/Asset/data/asset/functions/object/1143.arrow_of_hekireki/pre_hit/.mcfunction @@ -9,10 +9,10 @@ #declare tag 1009.Target # 演出 - execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living,type=!player,tag=1009.Target,dx=0] positioned ~ ~0.2 ~ run function asset:object/1143.arrow_of_hekireki/thunder/ + execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living_without_player,tag=1009.Target,dx=0] positioned ~ ~0.2 ~ run function asset:object/1143.arrow_of_hekireki/thunder/ # ヒット判定をしておく - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=1009.Target,dx=0] run function asset:object/call.m {method:"check_duplicate"} + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=1009.Target,dx=0] run function asset:object/call.m {method:"check_duplicate"} # Hit判定tag tag @s add 1143.Hit diff --git a/Asset/data/asset/functions/object/1146.rubeus_resonance/tick/attack/do.mcfunction b/Asset/data/asset/functions/object/1146.rubeus_resonance/tick/attack/do.mcfunction index a430abb8b8..02fcdd746e 100644 --- a/Asset/data/asset/functions/object/1146.rubeus_resonance/tick/attack/do.mcfunction +++ b/Asset/data/asset/functions/object/1146.rubeus_resonance/tick/attack/do.mcfunction @@ -23,15 +23,15 @@ # リセット scoreboard players reset $VU.Random Temporary # ターゲット - tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2.8] add VU.Candidate - execute positioned ^ ^ ^-1.4 run tag @e[type=#lib:living,type=!player,tag=VU.Candidate,distance=..1.2] remove VU.Candidate + tag @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..2.8] add VU.Candidate + execute positioned ^ ^ ^-1.4 run tag @e[type=#lib:living_without_player,tag=VU.Candidate,distance=..1.2] remove VU.Candidate # ダメージ # 候補のうち最寄りの１体に攻撃する data modify storage api: Argument.Damage set from storage asset:context this.Damage data modify storage api: Argument.AttackType set value "Physical" # data modify storage api: Argument.ElementType set value "None" execute as @a[tag=VU.Owner,limit=1] run function api:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=VU.Candidate,distance=..2.8,sort=nearest,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=VU.Candidate,distance=..2.8,sort=nearest,limit=1] run function api:damage/ function api:damage/reset # リセット - tag @e[type=#lib:living,type=!player,tag=VU.Candidate,distance=..2.8] remove VU.Candidate + tag @e[type=#lib:living_without_player,tag=VU.Candidate,distance=..2.8] remove VU.Candidate diff --git a/Asset/data/asset/functions/object/1147.sapphirus_resonance/tick/attack/.mcfunction b/Asset/data/asset/functions/object/1147.sapphirus_resonance/tick/attack/.mcfunction index ed130dca41..c00778bbe7 100644 --- a/Asset/data/asset/functions/object/1147.sapphirus_resonance/tick/attack/.mcfunction +++ b/Asset/data/asset/functions/object/1147.sapphirus_resonance/tick/attack/.mcfunction @@ -18,10 +18,10 @@ # プレイヤー前方の地点から一定範囲内の敵を探す # 敵がいない場合、後ろを向く (??????) # いる場合、その敵の方向を向く - execute as @a[tag=VV.Owner,limit=1] at @s anchored eyes positioned ^ ^ ^5 run tag @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..7.5,sort=nearest,limit=1] add Target - execute unless entity @e[type=#lib:living,type=!player,tag=Target,tag=!Uninterferable,limit=1] as @e[type=marker,tag=this,distance=..10,limit=1] facing entity @s eyes facing ^ ^ ^-1 positioned as @s run tp @s ~ ~ ~ ~ ~ - execute if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,limit=1] as @e[type=marker,tag=this,distance=..10,limit=1] at @s facing entity @e[type=#lib:living,type=!player,tag=Target,tag=!Uninterferable,limit=1] eyes run tp @s ~ ~ ~ ~ ~ - tag @e[type=#lib:living,type=!player,tag=Target,tag=!Uninterferable,limit=1] remove Target + execute as @a[tag=VV.Owner,limit=1] at @s anchored eyes positioned ^ ^ ^5 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7.5,sort=nearest,limit=1] add Target + execute unless entity @e[type=#lib:living_without_player,tag=Target,tag=!Uninterferable,limit=1] as @e[type=marker,tag=this,distance=..10,limit=1] facing entity @s eyes facing ^ ^ ^-1 positioned as @s run tp @s ~ ~ ~ ~ ~ + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,limit=1] as @e[type=marker,tag=this,distance=..10,limit=1] at @s facing entity @e[type=#lib:living_without_player,tag=Target,tag=!Uninterferable,limit=1] eyes run tp @s ~ ~ ~ ~ ~ + tag @e[type=#lib:living_without_player,tag=Target,tag=!Uninterferable,limit=1] remove Target # 演出 execute at @s run function asset:object/1147.sapphirus_resonance/tick/attack/effect # 射撃する diff --git a/Asset/data/asset/functions/object/1147.sapphirus_resonance/tick/attack/recursive.m.mcfunction b/Asset/data/asset/functions/object/1147.sapphirus_resonance/tick/attack/recursive.m.mcfunction index 54d4f6b1bb..8933639b08 100644 --- a/Asset/data/asset/functions/object/1147.sapphirus_resonance/tick/attack/recursive.m.mcfunction +++ b/Asset/data/asset/functions/object/1147.sapphirus_resonance/tick/attack/recursive.m.mcfunction @@ -8,6 +8,6 @@ particle dust 0.25 0.7 100000000 0.7 ^ ^ ^ 0 0 0 0 1 particle dust 0.25 0.7 100000000 0.7 ^ ^ ^0.15 0 0 0 0 1 # 命中判定 - execute positioned ~-.5 ~-.5 ~-.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] at @s run return run function asset:object/1147.sapphirus_resonance/tick/attack/hit + execute positioned ~-.5 ~-.5 ~-.5 as @e[type=#lib:living_without_player,tag=!Uninterferable,dx=0,limit=1] at @s run return run function asset:object/1147.sapphirus_resonance/tick/attack/hit # 再帰 $execute positioned ^ ^ ^0.3 if entity @s[distance=..$(DistanceMax)] run function asset:object/1147.sapphirus_resonance/tick/attack/recursive.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/2221.aurora_scaffold/tick/check_owner.mcfunction b/Asset/data/asset/functions/object/2221.aurora_scaffold/tick/check_owner.mcfunction index a9e847be96..b58a1b5919 100644 --- a/Asset/data/asset/functions/object/2221.aurora_scaffold/tick/check_owner.mcfunction +++ b/Asset/data/asset/functions/object/2221.aurora_scaffold/tick/check_owner.mcfunction @@ -12,7 +12,7 @@ execute store result score $OwnerID Temporary run data get storage asset:context this.MobUUID # 同IDのMobが周囲にいるかチェックし、いればTickを戻す - execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10] if score @s MobUUID = $OwnerID Temporary run scoreboard players set @e[type=marker,tag=this,distance=..0.01,sort=nearest,limit=1] General.Object.Tick 120 + execute as @e[type=#lib:living_without_player,tag=!Uninterferable,distance=..10] if score @s MobUUID = $OwnerID Temporary run scoreboard players set @e[type=marker,tag=this,distance=..0.01,sort=nearest,limit=1] General.Object.Tick 120 # リセット scoreboard players reset $OwnerID Temporary From 63f19803b9e55e750185821472ea5577b9e575a2 Mon Sep 17 00:00:00 2001 From: Lapis-LJA <87566955+Lapis-LJA@users.noreply.github.com> Date: Wed, 31 Dec 2025 06:49:46 +0900 Subject: [PATCH 2/2] type=#lib:living,tag=Enemy -> type=#lib:living_without_player,tag=Enemy --- .../trigger/3.main.mcfunction | 8 ++++---- .../trigger/attack/dragon_strike/.mcfunction | 2 +- .../trigger/3.main.mcfunction | 2 +- .../trigger/2.check_condition.mcfunction | 4 ++-- .../trigger/3.main.mcfunction | 18 +++++++++--------- .../trigger/3.1.shoot.mcfunction | 2 +- .../trigger/3.2.damage.mcfunction | 2 +- .../trigger/turn_to_enemy.mcfunction | 2 +- .../trigger/shot.mcfunction | 2 +- .../0600.xtal/trigger/5.slash.mcfunction | 2 +- .../trigger/2.check_condition.mcfunction | 2 +- .../trigger/3.3.2.set_target.mcfunction | 2 +- .../trigger/find_target/.mcfunction | 2 +- .../trigger/find_target/by_ray.mcfunction | 2 +- .../trigger/2.check_condition.mcfunction | 2 +- .../trigger/damage.mcfunction | 2 +- .../trigger/slash.mcfunction | 2 +- .../0931.d_u_t_y/trigger/3.main.mcfunction | 4 ++-- .../trigger/3.main.mcfunction | 2 +- .../trigger/summon_object.mcfunction | 2 +- .../trigger/slash/first.mcfunction | 8 ++++---- .../trigger/slash/second.mcfunction | 12 ++++++------ .../trigger/combo/laser.mcfunction | 2 +- .../trigger/combo/laser_finish.mcfunction | 2 +- .../trigger/3.main.mcfunction | 2 +- .../1076.death_snap/trigger/3.main.mcfunction | 16 ++++++++-------- .../1076.death_snap/trigger/damage.mcfunction | 2 +- .../trigger/2.check_condition.mcfunction | 2 +- .../trigger/3.main.mcfunction | 2 +- .../trigger/summon.mcfunction | 2 +- .../trigger/2.check_condition.mcfunction | 4 ++-- .../1174.sanguis/trigger/3.main.mcfunction | 2 +- .../trigger/combo/slash3.mcfunction | 2 +- .../trigger/select_target.mcfunction | 14 +++++++------- .../trigger/select_target.mcfunction | 6 +++--- .../trigger/thunder.mcfunction | 2 +- .../fullset/passive.mcfunction | 2 +- .../end/charge_shot/loop.mcfunction | 2 +- .../end/shot/loop.mcfunction | 4 ++-- .../effect/0603.domination/tick/.mcfunction | 2 +- .../mob/0019.horus_priest/tick/heal.mcfunction | 4 ++-- .../0084.falcios_priest/tick/heal.mcfunction | 4 ++-- .../mob/0219.aorta/attack/.mcfunction | 2 +- .../mob/0219.aorta/hurt/rupture.mcfunction | 4 ++-- .../mob/0444.super_dragon/tick/.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../tick/find_target/.mcfunction | 4 ++-- .../1016.starry_lake/tick/damage/.mcfunction | 2 +- .../tick/ripple/set_pos.mcfunction | 2 +- .../1016.starry_lake/tick/wave/10.mcfunction | 2 +- .../1016.starry_lake/tick/wave/11.mcfunction | 2 +- .../1016.starry_lake/tick/wave/12.mcfunction | 2 +- .../1016.starry_lake/tick/wave/13.mcfunction | 2 +- .../1016.starry_lake/tick/wave/14.mcfunction | 2 +- .../1016.starry_lake/tick/wave/15.mcfunction | 2 +- .../1016.starry_lake/tick/wave/16.mcfunction | 2 +- .../1016.starry_lake/tick/wave/2.mcfunction | 2 +- .../1016.starry_lake/tick/wave/3.mcfunction | 2 +- .../1016.starry_lake/tick/wave/4.mcfunction | 2 +- .../1016.starry_lake/tick/wave/5.mcfunction | 2 +- .../1016.starry_lake/tick/wave/6.mcfunction | 2 +- .../1016.starry_lake/tick/wave/7.mcfunction | 2 +- .../1016.starry_lake/tick/wave/8.mcfunction | 2 +- .../1016.starry_lake/tick/wave/9.mcfunction | 2 +- .../1017.starry_ripple/tick/damage.mcfunction | 2 +- .../1019.voltage_bullet/tick/.mcfunction | 2 +- .../1023.star/detect_hit_entity/.mcfunction | 2 +- .../object/1023.star/tick/.mcfunction | 2 +- .../tick/damage_and_heal.mcfunction | 2 +- .../1029.barrage_spirit/tick/.mcfunction | 4 ++-- .../1029.barrage_spirit/tick/shoot.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../kill/.mcfunction | 2 +- .../kill/.mcfunction | 4 ++-- .../detect_hit_entity/.mcfunction | 2 +- .../1049.lexiel_rod_fireball/tick/.mcfunction | 2 +- .../object/1050.call_fulstuka/tick/.mcfunction | 2 +- .../tick/1.skill_gun/2.first_tick.mcfunction | 2 +- .../tick/1.skill_gun/4.shot.mcfunction | 4 ++-- .../tick/2.skill_melee/2.first_tick.mcfunction | 4 ++-- .../tick/2.skill_melee/3.slash.mcfunction | 4 ++-- .../tick/skill_select.mcfunction | 4 ++-- .../1051.time_laser/tick/damage.mcfunction | 4 ++-- .../1051.time_laser/tick/loop.mcfunction | 4 ++-- .../object/1052.maid/tick/.mcfunction | 2 +- .../object/1052.maid/tick/action.mcfunction | 2 +- .../1052.maid/tick/shot/damage.mcfunction | 4 ++-- .../object/1052.maid/tick/shot/loop.mcfunction | 4 ++-- .../1053.flamethrower_ball/tick/hit.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../1055.elemental_fish/tick/.mcfunction | 4 ++-- .../detect_hit_entity/.mcfunction | 2 +- .../hit_entity/.mcfunction | 2 +- .../1056.elemental_bullet/init/.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../detect_hit_entity/check.mcfunction | 4 ++-- .../object/1057.giant_pumpkin/tick/.mcfunction | 4 ++-- .../object/1058.brave_knight/tick/.mcfunction | 8 ++++---- .../tick/event/attack_mode.mcfunction | 10 +++++----- .../tick/event/combo/0.mcfunction | 6 +++--- .../tick/event/combo/1.mcfunction | 6 +++--- .../object/1059.book_of_hero/tick/.mcfunction | 8 ++++---- .../1059.book_of_hero/tick/attack.mcfunction | 4 ++-- .../detect_hit_entity/.mcfunction | 2 +- .../object/1065.hex_sting/tick/.mcfunction | 2 +- .../1066.knife/detect_hit_entity/.mcfunction | 2 +- .../object/1066.knife/hit_entity/.mcfunction | 2 +- .../1068.icicle/detect_hit_entity/.mcfunction | 2 +- .../object/1068.icicle/hit_entity/.mcfunction | 2 +- .../1075.inferno_rush_arm/tick/hit.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../1077.brave_slash/hit_entity/.mcfunction | 2 +- .../functions/object/1078.gun/tick/.mcfunction | 6 +++--- .../tick/summon_meteor.mcfunction | 2 +- .../object/1080.meteor_rain/kill/.mcfunction | 4 ++-- .../detect_hit_entity/.mcfunction | 2 +- .../kill/.mcfunction | 4 ++-- .../range_over/summon_small_shot.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../tick/homing.m.mcfunction | 8 ++++---- .../1085.sanguis_obj/tick/damage.mcfunction | 2 +- .../tick/landing/main.mcfunction | 2 +- .../tick/angel_damage.mcfunction | 4 ++-- .../1089.cosmo_beam/tick/shot.mcfunction | 6 +++--- .../1092.water_magic/tick/damage.mcfunction | 4 ++-- .../tick/damage.mcfunction | 2 +- .../hit_entity/.mcfunction | 2 +- .../1100.conviction_shot/tick/.mcfunction | 6 +++--- .../object/1102.turret/tick/.mcfunction | 10 +++++----- .../1106.sparkle_bomb/tick/boom.mcfunction | 4 ++-- .../detect_hit_entity/.mcfunction | 2 +- .../1107.crystal_dart/hit_block/.mcfunction | 6 +++--- .../hit_entity/damage.mcfunction | 2 +- .../1108.waterfall/tick/damage.mcfunction | 2 +- .../1110.heavy_lava_bomb/tick/boom.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../object/1111.archer_fish/kill/.mcfunction | 4 ++-- .../1116.ember_object/tick/damage.mcfunction | 2 +- .../1126.freeze_trap/tick/boom.mcfunction | 4 ++-- .../detect_hit_entity/.mcfunction | 2 +- .../hit_entity/.mcfunction | 4 ++-- .../detect_hit_entity/.mcfunction | 2 +- .../hit_entity/.mcfunction | 2 +- .../length_decison_recursive.mcfunction | 2 +- .../1136.thor_thunder/tick/damage.mcfunction | 2 +- .../1141.big_water_balloon/hit/.mcfunction | 4 ++-- .../detect_hit_entity/.mcfunction | 2 +- .../hit_entity/.mcfunction | 4 ++-- .../kill/object_summon.mcfunction | 4 ++-- .../tick/thunder.mcfunction | 2 +- .../detect_hit_entity/.mcfunction | 2 +- .../1145.throwing_ark/hit_entity/.mcfunction | 2 +- .../object/2087.patriot/hit_entity/.mcfunction | 4 ++-- 153 files changed, 250 insertions(+), 250 deletions(-) diff --git a/Asset/data/asset/functions/artifact/0075.whirlpool_wand/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0075.whirlpool_wand/trigger/3.main.mcfunction index 8a15e25c4a..5eb3382d01 100644 --- a/Asset/data/asset/functions/artifact/0075.whirlpool_wand/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0075.whirlpool_wand/trigger/3.main.mcfunction @@ -10,16 +10,16 @@ # ここから先は神器側の効果の処理を書く # 演出(水中) - execute at @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,predicate=lib:is_in_water/include_flowing,distance=..5] run function asset:artifact/0075.whirlpool_wand/trigger/vfx/inside_water + execute at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,predicate=lib:is_in_water/include_flowing,distance=..5] run function asset:artifact/0075.whirlpool_wand/trigger/vfx/inside_water # 演出(水中ではない) - execute at @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,predicate=!lib:is_in_water/include_flowing,distance=..5] run function asset:artifact/0075.whirlpool_wand/trigger/vfx/outside_water + execute at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,predicate=!lib:is_in_water/include_flowing,distance=..5] run function asset:artifact/0075.whirlpool_wand/trigger/vfx/outside_water # ダメージ(水中) data modify storage api: Argument.Damage set value 25f data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,predicate=lib:is_in_water/include_flowing,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,predicate=lib:is_in_water/include_flowing,distance=..5] run function api:damage/ function api:damage/reset # ダメージ(水中ではない) @@ -27,5 +27,5 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,predicate=!lib:is_in_water/include_flowing,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,predicate=!lib:is_in_water/include_flowing,distance=..5] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/trigger/attack/dragon_strike/.mcfunction b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/trigger/attack/dragon_strike/.mcfunction index 74c1d616cc..49dd251be7 100644 --- a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/trigger/attack/dragon_strike/.mcfunction +++ b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/trigger/attack/dragon_strike/.mcfunction @@ -34,7 +34,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" function api:damage/modifier - execute at @e[type=#lib:living,tag=Victim,distance=..50] as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..3] run function api:damage/ + execute at @e[type=#lib:living,tag=Victim,distance=..50] as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..3] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/artifact/0253.holy_barrier/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0253.holy_barrier/trigger/3.main.mcfunction index 5dc367b068..4d79cb9258 100644 --- a/Asset/data/asset/functions/artifact/0253.holy_barrier/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0253.holy_barrier/trigger/3.main.mcfunction @@ -15,7 +15,7 @@ # 攻撃対象にタグ付け tag @e[type=#lib:living,tag=!Enemy.Boss,tag=!Uninterferable,predicate=asset:artifact/0253.holy_barrier/is_angry,distance=..128] add 71.Target - tag @e[type=#lib:living,tag=Enemy,tag=!Enemy.Boss,tag=!Uninterferable,distance=..16] add 71.Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Enemy.Boss,tag=!Uninterferable,distance=..16] add 71.Target #音 playsound minecraft:block.respawn_anchor.deplete player @a[distance=..16] ~ ~ ~ 1 1 1 diff --git a/Asset/data/asset/functions/artifact/0342.super_dragon_bell/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0342.super_dragon_bell/trigger/2.check_condition.mcfunction index a9850cb48f..8a14938aad 100644 --- a/Asset/data/asset/functions/artifact/0342.super_dragon_bell/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0342.super_dragon_bell/trigger/2.check_condition.mcfunction @@ -13,8 +13,8 @@ execute if entity @s[tag=CanUsed] if predicate lib:is_ban_tp_area run tag @s remove CanUsed # 天使が近くにいたら使用不可 - execute if entity @s[tag=CanUsed] if entity @e[type=#lib:living,tag=Enemy.Boss,distance=..32] run tellraw @a {"text":"スーパードラゴンは怯えて呼び出しに応じなかった","color":"red"} - execute if entity @s[tag=CanUsed] if entity @e[type=#lib:living,tag=Enemy.Boss,distance=..32] run tag @s remove CanUsed + execute if entity @s[tag=CanUsed] if entity @e[type=#lib:living_without_player,tag=Enemy.Boss,distance=..32] run tellraw @a {"text":"スーパードラゴンは怯えて呼び出しに応じなかった","color":"red"} + execute if entity @s[tag=CanUsed] if entity @e[type=#lib:living_without_player,tag=Enemy.Boss,distance=..32] run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/0342.super_dragon_bell/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0361.rainbow_crystal/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0361.rainbow_crystal/trigger/3.main.mcfunction index d13d02e3d6..80ca3c88b1 100644 --- a/Asset/data/asset/functions/artifact/0361.rainbow_crystal/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0361.rainbow_crystal/trigger/3.main.mcfunction @@ -17,35 +17,35 @@ playsound minecraft:block.beacon.activate player @a ~ ~ ~ 1 1 # 敵の位置で演出 - execute at @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] run particle dust 255 255 255 0.5 ~ ~0.25 ~ 0.025 5 0.025 0 100 force @a + execute at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] run particle dust 255 255 255 0.5 ~ ~0.25 ~ 0.025 5 0.025 0 100 force @a # 物理 data modify storage api: Argument.Damage set value 210f data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementTypeNone set value "None" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ function api:damage/reset data modify storage api: Argument.Damage set value 210f data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementTypeNone set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ function api:damage/reset data modify storage api: Argument.Damage set value 210f data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementTypeNone set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ function api:damage/reset data modify storage api: Argument.Damage set value 210f data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementTypeNone set value "Thunder" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ function api:damage/reset # 魔法 @@ -53,26 +53,26 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementTypeNone set value "None" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ function api:damage/reset data modify storage api: Argument.Damage set value 210f data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementTypeNone set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ function api:damage/reset data modify storage api: Argument.Damage set value 210f data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementTypeNone set value "Water" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ function api:damage/reset data modify storage api: Argument.Damage set value 210f data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementTypeNone set value "Thunder" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0370.burn_sorcery/trigger/3.1.shoot.mcfunction b/Asset/data/asset/functions/artifact/0370.burn_sorcery/trigger/3.1.shoot.mcfunction index b66c22696c..19d86c2919 100644 --- a/Asset/data/asset/functions/artifact/0370.burn_sorcery/trigger/3.1.shoot.mcfunction +++ b/Asset/data/asset/functions/artifact/0370.burn_sorcery/trigger/3.1.shoot.mcfunction @@ -8,7 +8,7 @@ # ここから先は神器側の効果の処理を書く # 着弾検知 - execute if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2] run tag @s add Landing + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # 演出 diff --git a/Asset/data/asset/functions/artifact/0370.burn_sorcery/trigger/3.2.damage.mcfunction b/Asset/data/asset/functions/artifact/0370.burn_sorcery/trigger/3.2.damage.mcfunction index 5fa3770ae7..b539b32285 100644 --- a/Asset/data/asset/functions/artifact/0370.burn_sorcery/trigger/3.2.damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0370.burn_sorcery/trigger/3.2.damage.mcfunction @@ -19,5 +19,5 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Fire" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..3.5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..3.5] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/turn_to_enemy.mcfunction b/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/turn_to_enemy.mcfunction index 8937f6108d..e9de61c227 100644 --- a/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/turn_to_enemy.mcfunction +++ b/Asset/data/asset/functions/artifact/0374.thunder_spell/trigger/turn_to_enemy.mcfunction @@ -5,7 +5,7 @@ # @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_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] add Target + execute if entity @e[type=#lib:living_without_player,tag=Enemy] positioned ^ ^ ^4 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] add Target tag @e[type=#lib:living_without_player,tag=Target,distance=..8,sort=nearest,limit=1] add NearestTarget # 最も近い敵を狙って方向転換 diff --git a/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/trigger/shot.mcfunction b/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/trigger/shot.mcfunction index b7c44ba27f..959b8e38c3 100644 --- a/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/trigger/shot.mcfunction +++ b/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/trigger/shot.mcfunction @@ -12,7 +12,7 @@ particle minecraft:dolphin ~ ~ ~ 0.1 0.1 0.1 1 30 force # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] add CZ.HitEntity + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] add CZ.HitEntity execute if entity @e[type=#lib:living,tag=CZ.HitEntity,distance=..40] run tag @s add CZ.HitFlag # 再帰 diff --git a/Asset/data/asset/functions/artifact/0600.xtal/trigger/5.slash.mcfunction b/Asset/data/asset/functions/artifact/0600.xtal/trigger/5.slash.mcfunction index 1e833c7cc0..d4ac7f6fd0 100644 --- a/Asset/data/asset/functions/artifact/0600.xtal/trigger/5.slash.mcfunction +++ b/Asset/data/asset/functions/artifact/0600.xtal/trigger/5.slash.mcfunction @@ -23,7 +23,7 @@ scoreboard players reset $Random Temporary # ターゲット選定 - execute positioned ^ ^ ^3 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..3] add Target + execute positioned ^ ^ ^3 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..3] add Target # ダメージ data modify storage api: Argument.Damage set value 300.0f diff --git a/Asset/data/asset/functions/artifact/0797.heartbleed/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0797.heartbleed/trigger/2.check_condition.mcfunction index 4f3b371c20..d879c48167 100644 --- a/Asset/data/asset/functions/artifact/0797.heartbleed/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0797.heartbleed/trigger/2.check_condition.mcfunction @@ -8,7 +8,7 @@ function asset:artifact/common/check_condition/mainhand # ターゲットがいるかチェック - execute as @e[type=#lib:living,tag=Enemy,distance=..5] facing entity @s feet positioned ^ ^ ^4 rotated as @p[tag=this] positioned ^ ^ ^-3 if entity @p[tag=this,distance=..5] run tag @s add M5.Victim + execute as @e[type=#lib:living_without_player,tag=Enemy,distance=..5] facing entity @s feet positioned ^ ^ ^4 rotated as @p[tag=this] positioned ^ ^ ^-3 if entity @p[tag=this,distance=..5] run tag @s add M5.Victim execute unless entity @e[type=#lib:living,tag=M5.Victim,distance=..5] run tellraw @s [{"text": "攻撃対象がいません。","color":"red"}] execute unless entity @e[type=#lib:living,tag=M5.Victim,distance=..5] run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0820.jewel_rod_of_horai/trigger/3.3.2.set_target.mcfunction b/Asset/data/asset/functions/artifact/0820.jewel_rod_of_horai/trigger/3.3.2.set_target.mcfunction index 05fe12864e..4a6c23f10c 100644 --- a/Asset/data/asset/functions/artifact/0820.jewel_rod_of_horai/trigger/3.3.2.set_target.mcfunction +++ b/Asset/data/asset/functions/artifact/0820.jewel_rod_of_horai/trigger/3.3.2.set_target.mcfunction @@ -15,7 +15,7 @@ #declare tag MS.TargetCandidate # 候補を探索 - tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..12] add MS.TargetCandidate + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..12] add MS.TargetCandidate # 四角錐の範囲外の敵を除外 execute as @e[type=#lib:living,tag=MS.TargetCandidate,distance=..12] run function asset:artifact/0820.jewel_rod_of_horai/trigger/search_target diff --git a/Asset/data/asset/functions/artifact/0837.the_world_knife/trigger/find_target/.mcfunction b/Asset/data/asset/functions/artifact/0837.the_world_knife/trigger/find_target/.mcfunction index 2184ea70e8..0e314f28fe 100644 --- a/Asset/data/asset/functions/artifact/0837.the_world_knife/trigger/find_target/.mcfunction +++ b/Asset/data/asset/functions/artifact/0837.the_world_knife/trigger/find_target/.mcfunction @@ -7,6 +7,6 @@ # 視点先に敵が居るならそいつを対象とする execute anchored eyes positioned ^ ^ ^ run function asset:artifact/0837.the_world_knife/trigger/find_target/by_ray # 視点先に敵が居なかったら正面の一番近い敵を対象とする - execute unless entity @e[type=#lib:living,tag=N9.TargetCandidate,distance=..5] anchored eyes positioned ^ ^ ^2.5 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2.5] add N9.TargetCandidate + execute unless entity @e[type=#lib:living,tag=N9.TargetCandidate,distance=..5] anchored eyes positioned ^ ^ ^2.5 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2.5] add N9.TargetCandidate tag @e[type=#lib:living,tag=N9.TargetCandidate,distance=..5,sort=nearest,limit=1] add N9.Target tag @e[type=#lib:living,tag=N9.TargetCandidate,distance=..5] remove N9.TargetCandidate diff --git a/Asset/data/asset/functions/artifact/0837.the_world_knife/trigger/find_target/by_ray.mcfunction b/Asset/data/asset/functions/artifact/0837.the_world_knife/trigger/find_target/by_ray.mcfunction index e49bcad0d6..9b6e9f78bc 100644 --- a/Asset/data/asset/functions/artifact/0837.the_world_knife/trigger/find_target/by_ray.mcfunction +++ b/Asset/data/asset/functions/artifact/0837.the_world_knife/trigger/find_target/by_ray.mcfunction @@ -4,5 +4,5 @@ # # @within function asset:artifact/0837.the_world_knife/trigger/find_target/* -execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~-1 ~-1 ~-1 if entity @s[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run return run tag @s add N9.TargetCandidate +execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~-1 ~-1 ~-1 if entity @s[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run return run tag @s add N9.TargetCandidate execute positioned ^ ^ ^0.25 if entity @s[distance=..5] run function asset:artifact/0837.the_world_knife/trigger/find_target/by_ray diff --git a/Asset/data/asset/functions/artifact/0844.closed_eyes_of_love/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/0844.closed_eyes_of_love/trigger/2.check_condition.mcfunction index 26f7808fdd..71156a05f5 100644 --- a/Asset/data/asset/functions/artifact/0844.closed_eyes_of_love/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/0844.closed_eyes_of_love/trigger/2.check_condition.mcfunction @@ -10,7 +10,7 @@ function asset:artifact/common/check_condition/hotbar # 他にアイテム等確認する場合はここに書く #範囲内に敵がいるか確認 - execute anchored eyes positioned ^ ^ ^ positioned ~-1 ~0.5 ~-1 unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=1,dy=1,dz=1] run tag @s remove CanUsed + execute anchored eyes positioned ^ ^ ^ positioned ~-1 ~0.5 ~-1 unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=1,dy=1,dz=1] run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/0844.closed_eyes_of_love/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/0844.closed_eyes_of_love/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/0844.closed_eyes_of_love/trigger/damage.mcfunction index 057ead46f1..70b2d0639b 100644 --- a/Asset/data/asset/functions/artifact/0844.closed_eyes_of_love/trigger/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0844.closed_eyes_of_love/trigger/damage.mcfunction @@ -9,5 +9,5 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Thunder" function api:damage/modifier - execute anchored eyes positioned ^ ^ ^ positioned ~-1 ~0.5 ~-1 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=1,dy=1,dz=1] run function api:damage/ + execute anchored eyes positioned ^ ^ ^ positioned ~-1 ~0.5 ~-1 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=1,dy=1,dz=1] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0870.samurai_blade/trigger/slash.mcfunction b/Asset/data/asset/functions/artifact/0870.samurai_blade/trigger/slash.mcfunction index d20dc166f5..e0a50dcea9 100644 --- a/Asset/data/asset/functions/artifact/0870.samurai_blade/trigger/slash.mcfunction +++ b/Asset/data/asset/functions/artifact/0870.samurai_blade/trigger/slash.mcfunction @@ -14,5 +14,5 @@ data modify storage api: Argument.ElementType set value "Thunder" data modify storage api: Argument.AdditionalMPHeal set value 3.2f function api:damage/modifier - execute positioned ^ ^ ^1.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2] run function api:damage/ + execute positioned ^ ^ ^1.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0931.d_u_t_y/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0931.d_u_t_y/trigger/3.main.mcfunction index 19d48a4cb2..749877b4e1 100644 --- a/Asset/data/asset/functions/artifact/0931.d_u_t_y/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0931.d_u_t_y/trigger/3.main.mcfunction @@ -13,8 +13,8 @@ # ここから先は神器側の効果の処理を書く # ダメージ計算 - execute as @e[type=#lib:living,tag=Enemy,tag=!ExtendedCollision,tag=!Uninterferable,distance=..5] run function asset:artifact/0931.d_u_t_y/trigger/add_enemy_num - execute as @e[type=#lib:living,tag=Enemy,tag= ExtendedCollision,distance=..5] run function api:mob/apply_to_forward_target/with_non-idempotent.m {CB:"asset:artifact/0931.d_u_t_y/trigger/add_enemy_num",Key:"asset:artifact/0931.d_u_t_y/trigger/3.main",IsForwardedOnly:true} + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!ExtendedCollision,tag=!Uninterferable,distance=..5] run function asset:artifact/0931.d_u_t_y/trigger/add_enemy_num + execute as @e[type=#lib:living_without_player,tag=Enemy,tag= ExtendedCollision,distance=..5] run function api:mob/apply_to_forward_target/with_non-idempotent.m {CB:"asset:artifact/0931.d_u_t_y/trigger/add_enemy_num",Key:"asset:artifact/0931.d_u_t_y/trigger/3.main",IsForwardedOnly:true} function api:mob/apply_to_forward_target/reset_initial_apply.m {Key:"asset:artifact/0931.d_u_t_y/trigger/3.main"} execute if score $PV.EnemyNum Temporary matches 11.. run scoreboard players set $PV.EnemyNum Temporary 10 execute store result storage api: Argument.Damage float 80 run scoreboard players get $PV.EnemyNum Temporary diff --git a/Asset/data/asset/functions/artifact/0959.whirlwind_scabbard/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0959.whirlwind_scabbard/trigger/3.main.mcfunction index 6bb2f792c2..8f21f6d074 100644 --- a/Asset/data/asset/functions/artifact/0959.whirlwind_scabbard/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0959.whirlwind_scabbard/trigger/3.main.mcfunction @@ -21,7 +21,7 @@ # ターゲット指定 Victimと前方を対象にする tag @e[type=#lib:living,tag=Victim,tag=!Enemy.Boss,tag=!Immovable,tag=!Uninterferable,distance=..10] add Target - execute as @e[type=#lib:living,tag=Enemy,tag=!Enemy.Boss,tag=!Uninterferable,distance=..5] at @p[tag=this] positioned ^ ^ ^-3 unless entity @s[distance=..3] run tag @s add Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Enemy.Boss,tag=!Uninterferable,distance=..5] at @p[tag=this] positioned ^ ^ ^-3 unless entity @s[distance=..3] run tag @s add Target # 前方の5体を対象に、プレイヤーの方向と逆方向に飛ぶ execute as @e[type=#lib:living,tag=Target,distance=..10,sort=nearest,limit=5] at @s facing entity @p[tag=this] eyes rotated ~180 -18 run function lib:motion/ diff --git a/Asset/data/asset/functions/artifact/0981.soulfire_burst/trigger/summon_object.mcfunction b/Asset/data/asset/functions/artifact/0981.soulfire_burst/trigger/summon_object.mcfunction index 6314c52007..55bed7e4f3 100644 --- a/Asset/data/asset/functions/artifact/0981.soulfire_burst/trigger/summon_object.mcfunction +++ b/Asset/data/asset/functions/artifact/0981.soulfire_burst/trigger/summon_object.mcfunction @@ -21,7 +21,7 @@ # マーカーの方を向いて召喚 data modify storage api: Argument.ID set value 1083 execute store result storage api: Argument.FieldOverride.Damage int 1 run random value 150..195 - execute store result storage api: Argument.FieldOverride.TargetID int 1 positioned ^ ^ ^10 run scoreboard players get @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] MobUUID + execute store result storage api: Argument.FieldOverride.TargetID int 1 positioned ^ ^ ^10 run scoreboard players get @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] MobUUID execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage api: PersistentArgument.AdditionalMPHeal execute facing entity @e[type=marker,tag=SpreadMarker,distance=..32,limit=1] eyes run function api:object/summon diff --git a/Asset/data/asset/functions/artifact/1017.cutlass_of_endless_silence/trigger/slash/first.mcfunction b/Asset/data/asset/functions/artifact/1017.cutlass_of_endless_silence/trigger/slash/first.mcfunction index 1048224026..476066a889 100644 --- a/Asset/data/asset/functions/artifact/1017.cutlass_of_endless_silence/trigger/slash/first.mcfunction +++ b/Asset/data/asset/functions/artifact/1017.cutlass_of_endless_silence/trigger/slash/first.mcfunction @@ -9,16 +9,16 @@ playsound minecraft:item.trident.return player @a ~ ~ ~ 1 2 # タグ付与 - execute positioned ^ ^ ^1 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2] add S9.Hit - execute positioned ^ ^ ^2 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2] add S9.Hit + execute positioned ^ ^ ^1 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add S9.Hit + execute positioned ^ ^ ^2 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add S9.Hit # ダメージ設定 data modify storage api: Argument.Damage set value 400.0f data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "None" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=S9.Hit,tag=!Uninterferable,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=S9.Hit,tag=!Uninterferable,distance=..5] run function api:damage/ # リセット function api:damage/reset - tag @e[type=#lib:living,tag=Enemy,tag=S9.Hit,tag=!Uninterferable,distance=..10] remove S9.Hit + tag @e[type=#lib:living_without_player,tag=Enemy,tag=S9.Hit,tag=!Uninterferable,distance=..10] remove S9.Hit diff --git a/Asset/data/asset/functions/artifact/1017.cutlass_of_endless_silence/trigger/slash/second.mcfunction b/Asset/data/asset/functions/artifact/1017.cutlass_of_endless_silence/trigger/slash/second.mcfunction index 8f23b75d99..30f914d760 100644 --- a/Asset/data/asset/functions/artifact/1017.cutlass_of_endless_silence/trigger/slash/second.mcfunction +++ b/Asset/data/asset/functions/artifact/1017.cutlass_of_endless_silence/trigger/slash/second.mcfunction @@ -9,15 +9,15 @@ playsound minecraft:item.trident.return player @a ~ ~ ~ 1 2 # タグ付与 - execute positioned ^ ^ ^1 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2] add S9.Hit - execute positioned ^ ^ ^2 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2] add S9.Hit + execute positioned ^ ^ ^1 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add S9.Hit + execute positioned ^ ^ ^2 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add S9.Hit # ダメージ data modify storage api: Argument.Damage set value 600.0f data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "None" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=S9.Hit,tag=!Uninterferable,distance=..5] at @s run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=S9.Hit,tag=!Uninterferable,distance=..5] at @s run function api:damage/ # リセット function api:damage/reset @@ -29,13 +29,13 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "None" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!S9.Hit,tag=!Uninterferable,nbt={OnGround:1b},distance=..8] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!S9.Hit,tag=!Uninterferable,nbt={OnGround:1b},distance=..8] run function api:damage/ # 上空へ飛ばす - execute as @e[type=#lib:living,tag=Enemy,tag=!Immovable,tag=!Uninterferable,nbt={OnGround:1b},distance=..8] run function asset:artifact/1017.cutlass_of_endless_silence/trigger/slash/levitation + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Immovable,tag=!Uninterferable,nbt={OnGround:1b},distance=..8] run function asset:artifact/1017.cutlass_of_endless_silence/trigger/slash/levitation # リセット function api:damage/reset - tag @e[type=#lib:living,tag=Enemy,tag=S9.Hit,tag=!Uninterferable,distance=..10] remove S9.Hit + tag @e[type=#lib:living_without_player,tag=Enemy,tag=S9.Hit,tag=!Uninterferable,distance=..10] remove S9.Hit # SDS close function api:damage/single_damage_session/close diff --git a/Asset/data/asset/functions/artifact/1024.brave_rod/trigger/combo/laser.mcfunction b/Asset/data/asset/functions/artifact/1024.brave_rod/trigger/combo/laser.mcfunction index e0fd5b913f..f347c2b31e 100644 --- a/Asset/data/asset/functions/artifact/1024.brave_rod/trigger/combo/laser.mcfunction +++ b/Asset/data/asset/functions/artifact/1024.brave_rod/trigger/combo/laser.mcfunction @@ -18,7 +18,7 @@ particle dust 0.1 0.7 1 0.3 ^ ^ ^-0.5 0.07 0.07 0.07 1 1 force @a[distance=..30] # ダメージ判定 - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run function asset:artifact/1024.brave_rod/trigger/combo/laser_damage + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run function asset:artifact/1024.brave_rod/trigger/combo/laser_damage # 後でレーザーの長さを決めるためにスコア加算 scoreboard players add @s Temporary 1 diff --git a/Asset/data/asset/functions/artifact/1024.brave_rod/trigger/combo/laser_finish.mcfunction b/Asset/data/asset/functions/artifact/1024.brave_rod/trigger/combo/laser_finish.mcfunction index 8a344c530d..ee68a7987e 100644 --- a/Asset/data/asset/functions/artifact/1024.brave_rod/trigger/combo/laser_finish.mcfunction +++ b/Asset/data/asset/functions/artifact/1024.brave_rod/trigger/combo/laser_finish.mcfunction @@ -17,7 +17,7 @@ particle dust 0.3 0.9 1 0.3 ^ ^ ^-0.5 0.07 0.07 0.07 1 1 force @a[distance=..30] # ダメージ判定 - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run function asset:artifact/1024.brave_rod/trigger/combo/laser_damage + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run function asset:artifact/1024.brave_rod/trigger/combo/laser_damage # 後でレーザーの長さを決めるためにスコア加算 scoreboard players add @s Temporary 1 diff --git a/Asset/data/asset/functions/artifact/1055.compass_of_sea_abyss/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1055.compass_of_sea_abyss/trigger/3.main.mcfunction index ff4327c561..5a1a38de2a 100644 --- a/Asset/data/asset/functions/artifact/1055.compass_of_sea_abyss/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1055.compass_of_sea_abyss/trigger/3.main.mcfunction @@ -17,7 +17,7 @@ # ターゲット選定 # Attackerと周囲の敵5体 tag @e[type=#lib:living,tag=Attacker,distance=..32] add Target - tag @e[type=#lib:living,tag=Enemy,tag=!Attacker,tag=!Uninterferable,distance=..16,sort=nearest,limit=5] add Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Attacker,tag=!Uninterferable,distance=..16,sort=nearest,limit=5] add Target # 演出 execute positioned ~ ~0.2 ~ rotated ~ 0 run function asset:artifact/1055.compass_of_sea_abyss/trigger/vfx_compass diff --git a/Asset/data/asset/functions/artifact/1076.death_snap/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1076.death_snap/trigger/3.main.mcfunction index 7ce12d6749..73ca6bdf5c 100644 --- a/Asset/data/asset/functions/artifact/1076.death_snap/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1076.death_snap/trigger/3.main.mcfunction @@ -21,19 +21,19 @@ scoreboard players set $TW.Count Temporary 4 # 前方にいるモブにタグをつける - execute anchored eyes positioned ^ ^ ^7 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..7] add TW.Target - execute anchored eyes positioned ^ ^ ^12 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10] add TW.Target - execute anchored eyes positioned ^ ^ ^30 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..25] add TW.Target + execute anchored eyes positioned ^ ^ ^7 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7] add TW.Target + execute anchored eyes positioned ^ ^ ^12 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] add TW.Target + execute anchored eyes positioned ^ ^ ^30 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..25] add TW.Target # 前方にいるモブ"が"不可視の即着弾飛ばす - execute as @e[type=#lib:living,tag=Enemy,tag=TW.Target,tag=!Uninterferable,distance=..30,sort=random] at @s anchored eyes positioned ^ ^ ^ facing entity @p[tag=this,distance=..100] eyes run function asset:artifact/1076.death_snap/trigger/shot + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=TW.Target,tag=!Uninterferable,distance=..30,sort=random] at @s anchored eyes positioned ^ ^ ^ facing entity @p[tag=this,distance=..100] eyes run function asset:artifact/1076.death_snap/trigger/shot # ヒットタグがついたモブがいる場合、攻撃を行う - execute if entity @e[type=#lib:living,tag=Enemy,tag=TW.Hit,tag=!Uninterferable,distance=..30] run function asset:artifact/1076.death_snap/trigger/damage + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=TW.Hit,tag=!Uninterferable,distance=..30] run function asset:artifact/1076.death_snap/trigger/damage # リセット - tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..100] remove TW.Target - tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..100] remove TW.Hit - tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..100] remove TW.Landing + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..100] remove TW.Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..100] remove TW.Hit + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..100] remove TW.Landing scoreboard players reset $TW.Count Temporary diff --git a/Asset/data/asset/functions/artifact/1076.death_snap/trigger/damage.mcfunction b/Asset/data/asset/functions/artifact/1076.death_snap/trigger/damage.mcfunction index 7cb259c4db..dfdc731fee 100644 --- a/Asset/data/asset/functions/artifact/1076.death_snap/trigger/damage.mcfunction +++ b/Asset/data/asset/functions/artifact/1076.death_snap/trigger/damage.mcfunction @@ -9,6 +9,6 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Thunder" function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=TW.Hit,tag=!Uninterferable,distance=..30] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=TW.Hit,tag=!Uninterferable,distance=..30] run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/2.check_condition.mcfunction index f44085834c..ddf7321b48 100644 --- a/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/2.check_condition.mcfunction @@ -9,7 +9,7 @@ # 他にアイテム等確認する場合はここに書く # 発動範囲内に敵がいない時は発動しない。これはプレイヤーが意識する必要がないため発動条件として書かない。 - execute unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..20] run tag @s remove CanUsed + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..20] run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1118.time_samsara/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/3.main.mcfunction index 314c2419d7..86b8e2af55 100644 --- a/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/3.main.mcfunction @@ -10,4 +10,4 @@ # ここから先は神器側の効果の処理を書く # 近くのモブのうちランダムな野郎を狙って撃つ - execute at @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..12,sort=random,limit=1] positioned ~ ~1 ~ run function asset:artifact/1118.time_samsara/trigger/summon + execute at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..12,sort=random,limit=1] positioned ~ ~1 ~ run function asset:artifact/1118.time_samsara/trigger/summon diff --git a/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/summon.mcfunction b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/summon.mcfunction index ee74be360e..1e5ab8988b 100644 --- a/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/summon.mcfunction +++ b/Asset/data/asset/functions/artifact/1118.time_samsara/trigger/summon.mcfunction @@ -18,7 +18,7 @@ data modify storage api: Argument.FieldOverride.Damage set value 12f data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage api: PersistentArgument.AdditionalMPHeal execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID - execute at @e[type=marker,tag=SpreadMarker,distance=..30] facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] eyes positioned ^ ^ ^-3 run function api:object/summon + execute at @e[type=marker,tag=SpreadMarker,distance=..30] facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] eyes positioned ^ ^ ^-3 run function api:object/summon # 前方拡散をキル kill @e[type=marker,tag=SpreadMarker,distance=..30] diff --git a/Asset/data/asset/functions/artifact/1166.airlift/trigger/2.check_condition.mcfunction b/Asset/data/asset/functions/artifact/1166.airlift/trigger/2.check_condition.mcfunction index b968407004..caa7d108f8 100644 --- a/Asset/data/asset/functions/artifact/1166.airlift/trigger/2.check_condition.mcfunction +++ b/Asset/data/asset/functions/artifact/1166.airlift/trigger/2.check_condition.mcfunction @@ -8,8 +8,8 @@ function asset:artifact/common/check_condition/auto # 他にアイテム等確認する場合はここに書く 今だと自然沸きmobをトリガーにされるが、今後廃止されるとのことなのでこれでいく - execute unless entity @e[type=#lib:living,tag=Enemy,distance=..30] if entity @s[tag=CanUsed] run tellraw @s [{"text":"近くに敵がいません。","color":"red"}] - execute unless entity @e[type=#lib:living,tag=Enemy,distance=..30] run tag @s remove CanUsed + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,distance=..30] if entity @s[tag=CanUsed] run tellraw @s [{"text":"近くに敵がいません。","color":"red"}] + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,distance=..30] run tag @s remove CanUsed # CanUsedタグをチェックして3.main.mcfunctionを実行する execute if entity @s[tag=CanUsed] run function asset:artifact/1166.airlift/trigger/3.main diff --git a/Asset/data/asset/functions/artifact/1174.sanguis/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/1174.sanguis/trigger/3.main.mcfunction index 74f2572055..9dde77f647 100644 --- a/Asset/data/asset/functions/artifact/1174.sanguis/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/1174.sanguis/trigger/3.main.mcfunction @@ -35,7 +35,7 @@ # 補正functionを実行 function api:damage/modifier # ダメージ実行 - execute at @e[type=#lib:living,tag=Enemy,tag=Victim,tag=!Uninterferable,distance=..5,sort=nearest,limit=1] as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..1.2] run function api:damage/ + execute at @e[type=#lib:living_without_player,tag=Enemy,tag=Victim,tag=!Uninterferable,distance=..5,sort=nearest,limit=1] as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1.2] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/artifact/1174.sanguis/trigger/combo/slash3.mcfunction b/Asset/data/asset/functions/artifact/1174.sanguis/trigger/combo/slash3.mcfunction index e43e71aba1..2a5e8491d5 100644 --- a/Asset/data/asset/functions/artifact/1174.sanguis/trigger/combo/slash3.mcfunction +++ b/Asset/data/asset/functions/artifact/1174.sanguis/trigger/combo/slash3.mcfunction @@ -19,4 +19,4 @@ execute store result storage api: Argument.FieldOverride.Damage double 1 run random value 80..110 data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage api: PersistentArgument.AdditionalMPHeal execute store result storage api: Argument.FieldOverride.UserID int 1 run scoreboard players get @s UserID - execute positioned as @e[type=#lib:living,tag=Enemy,tag=Victim,tag=!Uninterferable,distance=..5,sort=nearest,limit=1] run function api:object/summon + execute positioned as @e[type=#lib:living_without_player,tag=Enemy,tag=Victim,tag=!Uninterferable,distance=..5,sort=nearest,limit=1] run function api:object/summon diff --git a/Asset/data/asset/functions/artifact/1176.b_l_e_s_s/trigger/select_target.mcfunction b/Asset/data/asset/functions/artifact/1176.b_l_e_s_s/trigger/select_target.mcfunction index 9cb9cb95a3..0860408e32 100644 --- a/Asset/data/asset/functions/artifact/1176.b_l_e_s_s/trigger/select_target.mcfunction +++ b/Asset/data/asset/functions/artifact/1176.b_l_e_s_s/trigger/select_target.mcfunction @@ -1,22 +1,22 @@ #> asset:artifact/1176.b_l_e_s_s/trigger/select_target # -# +# # # @within function asset:artifact/1176.b_l_e_s_s/trigger/2.check_condition # クロスヘア中心15度以内のエンティティにタグ付け - execute anchored eyes positioned ^ ^ ^25 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..25] positioned as @s facing entity @p[tag=this] feet positioned ^ ^ ^1000 rotated as @p[tag=this] positioned ^ ^ ^1000 if entity @s[distance=..261.1] run tag @s add WO.Candidate - #execute if entity @e[type=#lib:living,tag=Enemy,tag=WO.Candidate,tag=!Uninterferable] run say detect - #execute unless entity @e[type=#lib:living,tag=Enemy,tag=WO.Candidate,tag=!Uninterferable] run say nodetect + execute anchored eyes positioned ^ ^ ^25 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..25] positioned as @s facing entity @p[tag=this] feet positioned ^ ^ ^1000 rotated as @p[tag=this] positioned ^ ^ ^1000 if entity @s[distance=..261.1] run tag @s add WO.Candidate + #execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=WO.Candidate,tag=!Uninterferable] run say detect + #execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=WO.Candidate,tag=!Uninterferable] run say nodetect # 候補と発動者の間に遮蔽ブロックがあるか確認、近くにいる候補を優先して対象にしたいので近くからやる - execute as @e[type=#lib:living,tag=Enemy,tag=WO.Candidate,tag=!Uninterferable,sort=nearest] at @s anchored eyes positioned ^ ^ ^ facing entity @p[tag=this] eyes run function asset:artifact/1176.b_l_e_s_s/trigger/block_check + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=WO.Candidate,tag=!Uninterferable,sort=nearest] at @s anchored eyes positioned ^ ^ ^ facing entity @p[tag=this] eyes run function asset:artifact/1176.b_l_e_s_s/trigger/block_check # 選択した対象のID取得 scoreboard players operation $WO.TargetID Temporary = @e[tag=WO.Target] MobUUID # reset - tag @e[type=#lib:living,tag=Enemy,tag=WO.Candidate,tag=!Uninterferable] remove WO.Candidate - tag @e[type=#lib:living,tag=Enemy,tag=WO.Target,tag=!Uninterferable] remove WO.Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=WO.Candidate,tag=!Uninterferable] remove WO.Candidate + tag @e[type=#lib:living_without_player,tag=Enemy,tag=WO.Target,tag=!Uninterferable] remove WO.Target diff --git a/Asset/data/asset/functions/artifact/1207.quadrainbow_icequality/trigger/select_target.mcfunction b/Asset/data/asset/functions/artifact/1207.quadrainbow_icequality/trigger/select_target.mcfunction index a85e9dcd5b..4262d4a95f 100644 --- a/Asset/data/asset/functions/artifact/1207.quadrainbow_icequality/trigger/select_target.mcfunction +++ b/Asset/data/asset/functions/artifact/1207.quadrainbow_icequality/trigger/select_target.mcfunction @@ -1,11 +1,11 @@ #> asset:artifact/1207.quadrainbow_icequality/trigger/select_target # -# +# # # @within function asset:artifact/1207.quadrainbow_icequality/trigger/3.main # 左右30度以内にいる1番近い敵を最初に探索 -execute unless entity @e[type=#lib:living,tag=XJ.Target,distance=..5,sort=nearest] as @e[type=#lib:living,tag=Enemy,distance=..5] run function asset:artifact/1207.quadrainbow_icequality/trigger/search_30deg +execute unless entity @e[type=#lib:living,tag=XJ.Target,distance=..5,sort=nearest] as @e[type=#lib:living_without_player,tag=Enemy,distance=..5] run function asset:artifact/1207.quadrainbow_icequality/trigger/search_30deg # いなかったら90度以内まで範囲拡大して再探索 -execute unless entity @e[type=#lib:living,tag=XJ.Target,distance=..5,sort=nearest] as @e[type=#lib:living,tag=Enemy,distance=..5] run function asset:artifact/1207.quadrainbow_icequality/trigger/search_90deg +execute unless entity @e[type=#lib:living,tag=XJ.Target,distance=..5,sort=nearest] as @e[type=#lib:living_without_player,tag=Enemy,distance=..5] run function asset:artifact/1207.quadrainbow_icequality/trigger/search_90deg diff --git a/Asset/data/asset/functions/artifact/1265.thunder_ray/trigger/thunder.mcfunction b/Asset/data/asset/functions/artifact/1265.thunder_ray/trigger/thunder.mcfunction index 570b94eaf1..c7d1f5e50e 100644 --- a/Asset/data/asset/functions/artifact/1265.thunder_ray/trigger/thunder.mcfunction +++ b/Asset/data/asset/functions/artifact/1265.thunder_ray/trigger/thunder.mcfunction @@ -19,5 +19,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,tag=Enemy,tag=!Uninterferable,distance=..3] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..3] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/passive.mcfunction b/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/passive.mcfunction index 1c4da9e5f8..488584e4cf 100644 --- a/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/passive.mcfunction +++ b/Asset/data/asset/functions/effect/0243.oblivious_snow/fullset/passive.mcfunction @@ -6,4 +6,4 @@ particle snowflake ~ ~0.3 ~ 0.5 0.1 0.5 0.05 1 normal @a[distance=..16] # 周囲に鈍足を付与 - effect give @e[type=#lib:living,tag=Enemy,tag=!Enemy.Boss,distance=..3.5] slowness 1 0 true + effect give @e[type=#lib:living_without_player,tag=Enemy,tag=!Enemy.Boss,distance=..3.5] slowness 1 0 true diff --git a/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/charge_shot/loop.mcfunction b/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/charge_shot/loop.mcfunction index 5f84113f6b..ddc24511df 100644 --- a/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/charge_shot/loop.mcfunction +++ b/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/charge_shot/loop.mcfunction @@ -11,7 +11,7 @@ particle dust 0.824 0.918 1 0.4 ^ ^ ^ 0.4 0.4 0.4 0 10 # ヒットしたら対象に着弾検知Tagを付与 - execute positioned ~-0.75 ~-0.75 ~-0.75 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5] run tag @s add Target + execute positioned ~-0.75 ~-0.75 ~-0.75 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5] run tag @s add Target # 距離が来るor壁が来た場合、着弾タグをつける execute unless block ^ ^ ^0.6 #lib:no_collision run tag @s add Landing execute unless entity @s[distance=..15] run tag @s add Landing diff --git a/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/shot/loop.mcfunction b/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/shot/loop.mcfunction index 6395670c23..6ab0f7732d 100644 --- a/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/shot/loop.mcfunction +++ b/Asset/data/asset/functions/effect/0320.fatalerror_charge/end/shot/loop.mcfunction @@ -10,8 +10,8 @@ particle dust 0.824 0.918 0.98 0.3 ^ ^ ^ 0 0 0 0 10 # ヒットしたら自身と対象に着弾検知Tagを付与 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run tag @s add Landing - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] add Target + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run tag @s add Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] add Target # ダメージを与える execute if entity @s[tag=Landing] run function asset:effect/0320.fatalerror_charge/end/shot/landing diff --git a/Asset/data/asset/functions/effect/0603.domination/tick/.mcfunction b/Asset/data/asset/functions/effect/0603.domination/tick/.mcfunction index cbd5bd8dca..8a63484add 100644 --- a/Asset/data/asset/functions/effect/0603.domination/tick/.mcfunction +++ b/Asset/data/asset/functions/effect/0603.domination/tick/.mcfunction @@ -13,7 +13,7 @@ execute if predicate lib:random_pass_per/30 run particle minecraft:electric_spark ~ ~1 ~ 0.4 0.4 0.4 0 1 # ターゲットにTagを付与 - execute at @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] if score @s 603.TargetUUID = @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..0.01,sort=nearest,limit=1] MobUUID run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..0.01,sort=nearest,limit=1] add FacingTarget + execute at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] if score @s 603.TargetUUID = @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..0.01,sort=nearest,limit=1] MobUUID run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..0.01,sort=nearest,limit=1] add FacingTarget # 2tick毎に実行するようにする scoreboard players add @s 603.Tick 1 diff --git a/Asset/data/asset/functions/mob/0019.horus_priest/tick/heal.mcfunction b/Asset/data/asset/functions/mob/0019.horus_priest/tick/heal.mcfunction index 4297cfa7e5..2766cb5eb6 100644 --- a/Asset/data/asset/functions/mob/0019.horus_priest/tick/heal.mcfunction +++ b/Asset/data/asset/functions/mob/0019.horus_priest/tick/heal.mcfunction @@ -5,14 +5,14 @@ # @within function asset:mob/0019.horus_priest/tick/ # 演出 - execute at @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=5] run particle heart ~ ~1 ~ 0.3 0.3 0.3 0 10 + execute at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=5] run particle heart ~ ~1 ~ 0.3 0.3 0.3 0 10 playsound minecraft:entity.arrow.hit_player hostile @a ~ ~ ~ 1 1 # 回復 function api:global_vars/get_difficulty execute store result storage api: Argument.Heal int 50 run data get storage api: Return.Difficulty function api:heal/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=5] run function api:heal/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=5] run function api:heal/ function api:heal/reset # リセット diff --git a/Asset/data/asset/functions/mob/0084.falcios_priest/tick/heal.mcfunction b/Asset/data/asset/functions/mob/0084.falcios_priest/tick/heal.mcfunction index c923bc6808..9cda2c1667 100644 --- a/Asset/data/asset/functions/mob/0084.falcios_priest/tick/heal.mcfunction +++ b/Asset/data/asset/functions/mob/0084.falcios_priest/tick/heal.mcfunction @@ -18,14 +18,14 @@ playsound block.sculk_sensor.clicking hostile @a ~ ~ ~ 0.8 0 0 playsound block.fire.ambient hostile @a ~ ~ ~ 1.5 0.8 0 playsound ogg:mob.vex.idle1 hostile @a ~ ~ ~ 0.8 0 0 - execute as @e[type=#lib:living,tag=Enemy,tag=!NotTarget,tag=!Uninterferable,distance=..10,sort=nearest,limit=5] at @s run particle heart ~ ~1.2 ~ 0.4 0.4 0.4 0 20 normal @a + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!NotTarget,tag=!Uninterferable,distance=..10,sort=nearest,limit=5] at @s run particle heart ~ ~1.2 ~ 0.4 0.4 0.4 0 20 normal @a # 回復 # 難易度値によって回復量が変動 function api:global_vars/get_difficulty execute store result storage api: Argument.Heal int 400 run data get storage api: Return.Difficulty function api:heal/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!NotTarget,tag=!Uninterferable,distance=..10,sort=nearest,limit=5] run function api:heal/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!NotTarget,tag=!Uninterferable,distance=..10,sort=nearest,limit=5] run function api:heal/ function api:heal/reset # リセット diff --git a/Asset/data/asset/functions/mob/0219.aorta/attack/.mcfunction b/Asset/data/asset/functions/mob/0219.aorta/attack/.mcfunction index a9e71a8851..7c567729a3 100644 --- a/Asset/data/asset/functions/mob/0219.aorta/attack/.mcfunction +++ b/Asset/data/asset/functions/mob/0219.aorta/attack/.mcfunction @@ -32,4 +32,4 @@ function api:heal/reset # ノーマル以上なら周囲に移動速度上昇を付与 - execute if predicate api:global_vars/difficulty/min/2_hard run effect give @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..5] speed 3 0 true + execute if predicate api:global_vars/difficulty/min/2_hard run effect give @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] speed 3 0 true diff --git a/Asset/data/asset/functions/mob/0219.aorta/hurt/rupture.mcfunction b/Asset/data/asset/functions/mob/0219.aorta/hurt/rupture.mcfunction index 9ee7a81a0f..39aa17a7fa 100644 --- a/Asset/data/asset/functions/mob/0219.aorta/hurt/rupture.mcfunction +++ b/Asset/data/asset/functions/mob/0219.aorta/hurt/rupture.mcfunction @@ -18,11 +18,11 @@ # 難易度値に比例して回復量が増加 execute store result storage api: Argument.Heal int 200 run data get storage api: Return.Difficulty function api:heal/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!this,tag=!Uninterferable,distance=..5] run function api:heal/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!this,tag=!Uninterferable,distance=..5] run function api:heal/ function api:heal/reset # 移動速度上昇を付与 - effect give @e[type=#lib:living,tag=Enemy,tag=!this,tag=!Uninterferable,distance=..5] speed 3 2 true + effect give @e[type=#lib:living_without_player,tag=Enemy,tag=!this,tag=!Uninterferable,distance=..5] speed 3 2 true # 奈落行き function api:mob/kill diff --git a/Asset/data/asset/functions/mob/0444.super_dragon/tick/.mcfunction b/Asset/data/asset/functions/mob/0444.super_dragon/tick/.mcfunction index 31ac483594..b9d5abcc5f 100644 --- a/Asset/data/asset/functions/mob/0444.super_dragon/tick/.mcfunction +++ b/Asset/data/asset/functions/mob/0444.super_dragon/tick/.mcfunction @@ -11,4 +11,4 @@ execute if predicate lib:is_ban_tp_area run function asset:mob/0444.super_dragon/tick/tpban_area # 天使が近くにいたら死ぬ - execute if entity @e[type=#lib:living,tag=Enemy.Boss,distance=..32,limit=1] run function asset:mob/0444.super_dragon/tick/near_angel + execute if entity @e[type=#lib:living_without_player,tag=Enemy.Boss,distance=..32,limit=1] run function asset:mob/0444.super_dragon/tick/near_angel diff --git a/Asset/data/asset/functions/object/1014.lunar_flare/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1014.lunar_flare/detect_hit_entity/.mcfunction index d6f47fb540..7a4c6cb2a8 100644 --- a/Asset/data/asset/functions/object/1014.lunar_flare/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1014.lunar_flare/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1014/detect_hit_entity # ヒット判定 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1015.call_fish/tick/find_target/.mcfunction b/Asset/data/asset/functions/object/1015.call_fish/tick/find_target/.mcfunction index 7cd34c66dc..703917c48d 100644 --- a/Asset/data/asset/functions/object/1015.call_fish/tick/find_target/.mcfunction +++ b/Asset/data/asset/functions/object/1015.call_fish/tick/find_target/.mcfunction @@ -5,10 +5,10 @@ # @within function asset:object/1015.call_fish/tick/ # ターゲットにできる敵がいなければreturn - execute unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10,limit=1] run return fail + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10,limit=1] run return fail # ターゲット可能な敵を近い順に探す - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest] run function asset:object/1015.call_fish/tick/find_target/ready + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest] run function asset:object/1015.call_fish/tick/find_target/ready # ターゲットがいれば攻撃する execute at @e[type=#lib:living,tag=1015.Target,distance=..10] run function asset:object/1015.call_fish/tick/attack diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/damage/.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/damage/.mcfunction index 78aa81eb6d..781afe2bed 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/damage/.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/damage/.mcfunction @@ -17,7 +17,7 @@ data modify storage api: Argument.ElementType set value "Water" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=1016.Target,tag=!Uninterferable,distance=..7.5] run function asset:object/1016.starry_lake/tick/damage/check_duplicate + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=1016.Target,tag=!Uninterferable,distance=..7.5] run function asset:object/1016.starry_lake/tick/damage/check_duplicate function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/ripple/set_pos.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/ripple/set_pos.mcfunction index 2520124350..77bc50adc2 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/ripple/set_pos.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/ripple/set_pos.mcfunction @@ -10,7 +10,7 @@ #declare tag SpreadMarker # エリア内の平面上にに敵がいた場合、その位置で召喚するという処理 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..7.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=4,dz=14] run tag @s add RippleTarget + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=4,dz=14] run tag @s add RippleTarget # 切り取ってもRippleTargetがいた場合、その敵の近くで拡散するようにする execute at @e[type=#lib:living,tag=RippleTarget,distance=..7.5,sort=random,limit=1] run summon marker ~ ~ ~ {Tags:["SpreadMarker"]} diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/10.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/10.mcfunction index b87b4655ce..034275dbb9 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/10.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/10.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=4.01..4.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=4.01..4.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target # 円 10 particle dust 0.2 0.2 0.65 4 ^0 ^ ^-4.5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/11.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/11.mcfunction index 16e7d36bb6..86921859c0 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/11.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/11.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=4.51..5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=4.51..5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target # 円 11 particle dust 0.2 0.2 0.7 4 ^0 ^ ^-5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/12.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/12.mcfunction index 58fc9d6cb9..8c874e8b87 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/12.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/12.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=5.01..5.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=5.01..5.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target # 円 12 particle dust 0.2 0.2 0.75 4 ^0 ^ ^-5.5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/13.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/13.mcfunction index 2bfa0dd54d..57c6bc90ba 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/13.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/13.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=5.5..6] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=5.5..6] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target # 円 13 particle dust 0.2 0.2 0.8 4 ^0 ^ ^-6 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/14.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/14.mcfunction index f70703cf26..cee0b5e79d 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/14.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/14.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=6.01..6.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=6.01..6.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target # 円 14 particle dust 0.2 0.2 0.9 4 ^0 ^ ^-6.5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/15.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/15.mcfunction index 8e63174f9e..e17265b57a 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/15.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/15.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=6.51..7] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=6.51..7] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target # 円 15 particle dust 0.2 0.2 0.95 4 ^0 ^ ^-7 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/16.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/16.mcfunction index d5f6eab4ad..f2d2e6c372 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/16.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/16.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=7.01..7.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=7.01..7.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target # 円 16 particle dust 0.2 0.2 1 4 ^0 ^ ^-7.5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/2.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/2.mcfunction index 7add83b410..515e50a5dd 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/2.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/2.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..0.5] add 1016.Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..0.5] add 1016.Target # 円 2 particle dust 0.2 0.2 0.25 4 ^0 ^ ^-0.5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/3.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/3.mcfunction index e399587417..50ba94ebf5 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/3.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/3.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=0.51..1] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=4,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=0.51..1] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=4,dz=14] run tag @s add 1016.Target # 円 3 particle dust 0.2 0.2 0.3 4 ^0 ^ ^-1 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/4.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/4.mcfunction index 2309048127..9fc5270dbd 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/4.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/4.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=1.01..1.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=4,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=1.01..1.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=4,dz=14] run tag @s add 1016.Target # 円 4 particle dust 0.2 0.2 0.35 4 ^0 ^ ^-1.5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/5.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/5.mcfunction index 8369b9f4ba..722cdc3d1e 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/5.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/5.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=1.51..2] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=4,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=1.51..2] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=4,dz=14] run tag @s add 1016.Target # 円 5 particle dust 0.2 0.2 0.4 4 ^0 ^ ^-2 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/6.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/6.mcfunction index 8d325f2437..870d074a6c 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/6.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/6.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=2.01..2.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=2.01..2.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target # 円 6 particle dust 0.2 0.2 0.45 4 ^0 ^ ^-2.5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/7.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/7.mcfunction index eb5dcd4636..f7abce906e 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/7.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/7.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=2.51..3] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=2.51..3] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target # 円 7 particle dust 0.2 0.2 0.5 4 ^0 ^ ^-3 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/8.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/8.mcfunction index ab8c794a26..9e45b11259 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/8.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/8.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=3.01..3.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=3.01..3.5] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target # 円 8 particle dust 0.2 0.2 0.55 4 ^0 ^ ^-3.5 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/9.mcfunction b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/9.mcfunction index 0975c7a61d..fcbd026445 100644 --- a/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/9.mcfunction +++ b/Asset/data/asset/functions/object/1016.starry_lake/tick/wave/9.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1016.starry_lake/tick/ # ドーナツ状の当たり判定にentityがいた場合Tagを付与 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=3.51..4] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=3.51..4] positioned ~-7.5 ~-1 ~-7.5 if entity @s[dx=14,dy=1,dz=14] run tag @s add 1016.Target # 円 9 particle dust 0.2 0.2 0.6 4 ^0 ^ ^-4 0 0 0 0 1 diff --git a/Asset/data/asset/functions/object/1017.starry_ripple/tick/damage.mcfunction b/Asset/data/asset/functions/object/1017.starry_ripple/tick/damage.mcfunction index b490a48e2f..a134f85dca 100644 --- a/Asset/data/asset/functions/object/1017.starry_ripple/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1017.starry_ripple/tick/damage.mcfunction @@ -21,7 +21,7 @@ data modify storage api: Argument.ElementType set value "Water" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1019.voltage_bullet/tick/.mcfunction b/Asset/data/asset/functions/object/1019.voltage_bullet/tick/.mcfunction index 1a30ccd40a..ab0157c825 100644 --- a/Asset/data/asset/functions/object/1019.voltage_bullet/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1019.voltage_bullet/tick/.mcfunction @@ -15,7 +15,7 @@ execute if score @s General.Object.Tick matches ..5 unless block ^ ^ ^0.5 #lib:no_collision run data modify storage asset:context this.MovePerStep set value 0 # 13の時、敵の方を向く - execute if score @s General.Object.Tick matches 13 run tp @s ~ ~ ~ facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..20,sort=nearest,limit=1] eyes + execute if score @s General.Object.Tick matches 13 run tp @s ~ ~ ~ facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..20,sort=nearest,limit=1] eyes execute if score @s General.Object.Tick matches 13 run particle firework ~ ~ ~ 0 0 0 0.2 10 normal @a execute if score @s General.Object.Tick matches 13 run playsound entity.firework_rocket.blast neutral @a ~ ~ ~ 0.6 2 0 diff --git a/Asset/data/asset/functions/object/1023.star/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1023.star/detect_hit_entity/.mcfunction index 273928f14d..1e11d22a99 100644 --- a/Asset/data/asset/functions/object/1023.star/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1023.star/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1023/detect_hit_entity # 判定 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1023.star/tick/.mcfunction b/Asset/data/asset/functions/object/1023.star/tick/.mcfunction index 867276542c..7b179770ec 100644 --- a/Asset/data/asset/functions/object/1023.star/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1023.star/tick/.mcfunction @@ -15,7 +15,7 @@ execute as @a[distance=..32] facing entity @s eyes run function asset:object/1023.star/tick/vfx # 前方の敵に誘導する - execute if data storage asset:context this{StartDelay:0} positioned ^ ^ ^15 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..15] add Target + execute if data storage asset:context this{StartDelay:0} positioned ^ ^ ^15 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..15] add Target execute if data storage asset:context this{StartDelay:0} facing entity @e[type=#lib:living,tag=Target,distance=..30,sort=nearest,limit=1] eyes positioned ^ ^ ^-80 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ execute if data storage asset:context this{StartDelay:0} run tag @e[type=#lib:living,tag=Target,distance=..30] remove Target diff --git a/Asset/data/asset/functions/object/1027.rain_area/tick/damage_and_heal.mcfunction b/Asset/data/asset/functions/object/1027.rain_area/tick/damage_and_heal.mcfunction index 3252fde6b7..5d1fea1022 100644 --- a/Asset/data/asset/functions/object/1027.rain_area/tick/damage_and_heal.mcfunction +++ b/Asset/data/asset/functions/object/1027.rain_area/tick/damage_and_heal.mcfunction @@ -31,7 +31,7 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Water" execute as @p[tag=Owner] run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=1027.TargetEntity,tag=!Uninterferable,distance=..20] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=1027.TargetEntity,tag=!Uninterferable,distance=..20] run function api:damage/ function api:damage/reset # 回復 diff --git a/Asset/data/asset/functions/object/1029.barrage_spirit/tick/.mcfunction b/Asset/data/asset/functions/object/1029.barrage_spirit/tick/.mcfunction index fc40872aba..8637fdea2c 100644 --- a/Asset/data/asset/functions/object/1029.barrage_spirit/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1029.barrage_spirit/tick/.mcfunction @@ -21,10 +21,10 @@ execute facing entity @e[type=marker,tag=MoveMarker,distance=0.5..1,limit=1] eyes run tp @s ^ ^ ^0.1 # 付近に敵がいたら攻撃モードへと移行 - execute if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..15] run tag @s add 1029.AttackMode + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..15] run tag @s add 1029.AttackMode # 付近に敵がいたらそっちへの攻撃を優先 - execute facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..15,sort=nearest,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.05 ~ ~ + execute facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..15,sort=nearest,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.05 ~ ~ # ポーズ # (待機) diff --git a/Asset/data/asset/functions/object/1029.barrage_spirit/tick/shoot.mcfunction b/Asset/data/asset/functions/object/1029.barrage_spirit/tick/shoot.mcfunction index 4a814c81e7..55119bea38 100644 --- a/Asset/data/asset/functions/object/1029.barrage_spirit/tick/shoot.mcfunction +++ b/Asset/data/asset/functions/object/1029.barrage_spirit/tick/shoot.mcfunction @@ -12,7 +12,7 @@ summon marker ~ ~ ~ {Tags:["SpreadMarker"]} data modify storage lib: Argument.Distance set value 15 data modify storage lib: Argument.Spread set value 3 - execute facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..20,sort=nearest,limit=1] eyes as @e[type=marker,tag=SpreadMarker,limit=1] run function lib:forward_spreader/circle + execute facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..20,sort=nearest,limit=1] eyes as @e[type=marker,tag=SpreadMarker,limit=1] run function lib:forward_spreader/circle # 弾を召喚する data modify storage api: Argument.ID set value 1030 diff --git a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/detect_hit_entity/.mcfunction index 920c670ff9..fa3bbfe6be 100644 --- a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1030/detect_hit_entity # 判定 - execute if entity @s positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true + execute if entity @s positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/kill/.mcfunction b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/kill/.mcfunction index ce45df5e5f..b695de7993 100644 --- a/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1030.barrage_spirit_bullet/kill/.mcfunction @@ -5,7 +5,7 @@ # @within asset:object/alias/1030/kill # ダメージ - execute if entity @s positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run function asset:object/1030.barrage_spirit_bullet/kill/damage + execute if entity @s positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run function asset:object/1030.barrage_spirit_bullet/kill/damage # 演出 particle minecraft:electric_spark ~ ~ ~ 0 0 0 0.5 5 diff --git a/Asset/data/asset/functions/object/1040.thelema_persuit_sword/kill/.mcfunction b/Asset/data/asset/functions/object/1040.thelema_persuit_sword/kill/.mcfunction index 084bf7ab1d..ea4501fc3d 100644 --- a/Asset/data/asset/functions/object/1040.thelema_persuit_sword/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1040.thelema_persuit_sword/kill/.mcfunction @@ -28,11 +28,11 @@ # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage - execute positioned ~-1 ~ ~-1 if entity @e[type=#lib:living,tag=Enemy,tag=ExtendedCollision,dx=1,dy=2,dz=1,sort=nearest,limit=1] store result storage api: Argument.Damage double 0.2 run data get storage asset:context this.Damage + execute positioned ~-1 ~ ~-1 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=ExtendedCollision,dx=1,dy=2,dz=1,sort=nearest,limit=1] store result storage api: Argument.Damage double 0.2 run data get storage asset:context this.Damage data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "Water" execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute if data storage api: Argument.Damage positioned ~-1 ~ ~-1 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=1,dy=2,dz=1,sort=nearest,limit=1] run function api:damage/ + execute if data storage api: Argument.Damage positioned ~-1 ~ ~-1 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=1,dy=2,dz=1,sort=nearest,limit=1] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_entity/.mcfunction index 523258a48a..fa2bd62edd 100644 --- a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1049/detect_hit_entity # 判定 - execute if entity @s positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true + execute if entity @s positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/tick/.mcfunction b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/tick/.mcfunction index 576abffd80..4f3e5f8f3a 100644 --- a/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1049.lexiel_rod_fireball/tick/.mcfunction @@ -11,7 +11,7 @@ # ホーミング用の遅延 execute store result storage asset:context this.HomingDelay int 0.9999999999 run data get storage asset:context this.HomingDelay 1 # 前方にいる一番近い敵をターゲットする - execute if data storage asset:context this{HomingDelay:0} positioned ^ ^ ^15 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..15] run tag @s add 1049.TargetCandidate + execute if data storage asset:context this{HomingDelay:0} positioned ^ ^ ^15 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..15] run tag @s add 1049.TargetCandidate execute if data storage asset:context this{HomingDelay:0} facing entity @e[type=#lib:living,tag=1049.TargetCandidate,distance=..15,sort=nearest,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-450 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~ execute if data storage asset:context this{HomingDelay:0} run tag @e[type=#lib:living,tag=1049.TargetCandidate,distance=..30] remove 1049.TargetCandidate diff --git a/Asset/data/asset/functions/object/1050.call_fulstuka/tick/.mcfunction b/Asset/data/asset/functions/object/1050.call_fulstuka/tick/.mcfunction index a4486c20d4..eac5b8c7e9 100644 --- a/Asset/data/asset/functions/object/1050.call_fulstuka/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1050.call_fulstuka/tick/.mcfunction @@ -14,7 +14,7 @@ execute if score @s 1050.ActionTime matches 0 if score @s General.Object.Tick matches 600.. run function asset:object/1050.call_fulstuka/tick/return # 敵が周囲にいないのに時間が着てしまった場合。スコアを戻す - execute if score @s 1050.ActionTime matches 0 unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..20] run scoreboard players set @s 1050.ActionTime -10 + execute if score @s 1050.ActionTime matches 0 unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..20] run scoreboard players set @s 1050.ActionTime -10 # 敵が周囲にいたらスキル選択 execute if score @s 1050.ActionTime matches 0 run function asset:object/1050.call_fulstuka/tick/skill_select diff --git a/Asset/data/asset/functions/object/1050.call_fulstuka/tick/1.skill_gun/2.first_tick.mcfunction b/Asset/data/asset/functions/object/1050.call_fulstuka/tick/1.skill_gun/2.first_tick.mcfunction index 803972f83c..52ceab725a 100644 --- a/Asset/data/asset/functions/object/1050.call_fulstuka/tick/1.skill_gun/2.first_tick.mcfunction +++ b/Asset/data/asset/functions/object/1050.call_fulstuka/tick/1.skill_gun/2.first_tick.mcfunction @@ -11,4 +11,4 @@ item replace entity @s armor.head with stick{CustomModelData:20191} # 向きかえる - tp @s ~ ~ ~ facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] + tp @s ~ ~ ~ facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] diff --git a/Asset/data/asset/functions/object/1050.call_fulstuka/tick/1.skill_gun/4.shot.mcfunction b/Asset/data/asset/functions/object/1050.call_fulstuka/tick/1.skill_gun/4.shot.mcfunction index 682a7220fe..878b26ac65 100644 --- a/Asset/data/asset/functions/object/1050.call_fulstuka/tick/1.skill_gun/4.shot.mcfunction +++ b/Asset/data/asset/functions/object/1050.call_fulstuka/tick/1.skill_gun/4.shot.mcfunction @@ -7,11 +7,11 @@ # asset:object/1050.call_fulstuka/tick/1.skill_gun/4.shot # 着弾検知 - execute if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2] run tag @s add Landing + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # ターゲットにタグ付与 - execute if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2] run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2] add LandingTarget + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] add LandingTarget # 演出 particle dust 1 0 0.749 0.5 ~ ~ ~ 0 0 0 0 6 diff --git a/Asset/data/asset/functions/object/1050.call_fulstuka/tick/2.skill_melee/2.first_tick.mcfunction b/Asset/data/asset/functions/object/1050.call_fulstuka/tick/2.skill_melee/2.first_tick.mcfunction index bd80560018..719f0845f9 100644 --- a/Asset/data/asset/functions/object/1050.call_fulstuka/tick/2.skill_melee/2.first_tick.mcfunction +++ b/Asset/data/asset/functions/object/1050.call_fulstuka/tick/2.skill_melee/2.first_tick.mcfunction @@ -11,6 +11,6 @@ data modify entity @s Pose.LeftArm set value [48f,16f,0f] # 敵の付近にテレポート - execute at @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..20,sort=nearest,limit=1] positioned ~ ~0.5 ~ run function asset:object/1050.call_fulstuka/tick/spread_teleport + execute at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..20,sort=nearest,limit=1] positioned ~ ~0.5 ~ run function asset:object/1050.call_fulstuka/tick/spread_teleport - execute at @s run tp @s ~ ~ ~ facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] + execute at @s run tp @s ~ ~ ~ facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] diff --git a/Asset/data/asset/functions/object/1050.call_fulstuka/tick/2.skill_melee/3.slash.mcfunction b/Asset/data/asset/functions/object/1050.call_fulstuka/tick/2.skill_melee/3.slash.mcfunction index 54140eb96c..23807c2f29 100644 --- a/Asset/data/asset/functions/object/1050.call_fulstuka/tick/2.skill_melee/3.slash.mcfunction +++ b/Asset/data/asset/functions/object/1050.call_fulstuka/tick/2.skill_melee/3.slash.mcfunction @@ -21,11 +21,11 @@ execute store result score $OwnerID Temporary run data get storage asset:context this.UserID execute at @a if score $OwnerID Temporary = @p UserID as @p run function api:damage/modifier # data modify storage api: Argument.BypassModifier set value false - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2] at @s run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] at @s run function api:damage/ # リセット scoreboard players reset $OwnerID Temporary function api:damage/reset # 演出 playsound minecraft:item.trident.return neutral @a ~ ~ ~ 1 2 - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2] at @s run particle dust 1 0 0.749 2 ~ ~1 ~ 0.6 0.6 0.6 0 50 normal @a + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2] at @s run particle dust 1 0 0.749 2 ~ ~1 ~ 0.6 0.6 0.6 0 50 normal @a diff --git a/Asset/data/asset/functions/object/1050.call_fulstuka/tick/skill_select.mcfunction b/Asset/data/asset/functions/object/1050.call_fulstuka/tick/skill_select.mcfunction index 66e4afc58f..0ac48b3233 100644 --- a/Asset/data/asset/functions/object/1050.call_fulstuka/tick/skill_select.mcfunction +++ b/Asset/data/asset/functions/object/1050.call_fulstuka/tick/skill_select.mcfunction @@ -16,10 +16,10 @@ # 周囲に敵が居ない場合、銃にする - execute unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10] run scoreboard players set $Random Temporary 0 + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] run scoreboard players set $Random Temporary 0 # 周囲に敵がいる場合剣にする - execute if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..5] run scoreboard players set $Random Temporary 1 + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run scoreboard players set $Random Temporary 1 # スキル選択 execute if score $Random Temporary matches 0 run tag @s add 1050.SkillGun diff --git a/Asset/data/asset/functions/object/1051.time_laser/tick/damage.mcfunction b/Asset/data/asset/functions/object/1051.time_laser/tick/damage.mcfunction index 17d6c95339..3f26d7bd33 100644 --- a/Asset/data/asset/functions/object/1051.time_laser/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1051.time_laser/tick/damage.mcfunction @@ -15,11 +15,11 @@ data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute store result score $OwnerID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $OwnerID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=LandingTarget,tag=!Uninterferable,sort=nearest] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=LandingTarget,tag=!Uninterferable,sort=nearest] run function api:damage/ function api:damage/reset # 着弾タグを消す - tag @e[type=#lib:living,tag=Enemy,tag=LandingTarget,tag=!Uninterferable,sort=nearest] remove LandingTarget + tag @e[type=#lib:living_without_player,tag=Enemy,tag=LandingTarget,tag=!Uninterferable,sort=nearest] remove LandingTarget # リセット scoreboard players reset $OwnerID Temporary diff --git a/Asset/data/asset/functions/object/1051.time_laser/tick/loop.mcfunction b/Asset/data/asset/functions/object/1051.time_laser/tick/loop.mcfunction index ba3c82aa9b..13522b18e1 100644 --- a/Asset/data/asset/functions/object/1051.time_laser/tick/loop.mcfunction +++ b/Asset/data/asset/functions/object/1051.time_laser/tick/loop.mcfunction @@ -13,11 +13,11 @@ execute if predicate lib:random_pass_per/25 run particle minecraft:glow ~ ~ ~ 0.15 0.15 0.15 0 1 # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run tag @s add Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run tag @s add Landing execute unless block ^ ^ ^1 #lib:no_collision run tag @s add Landing # ターゲットにタグ付与 - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run tag @s add LandingTarget + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run tag @s add LandingTarget # 着弾 execute if entity @s[tag=Landing] run function asset:object/1051.time_laser/tick/damage diff --git a/Asset/data/asset/functions/object/1052.maid/tick/.mcfunction b/Asset/data/asset/functions/object/1052.maid/tick/.mcfunction index 5f722f5c2c..c614334a89 100644 --- a/Asset/data/asset/functions/object/1052.maid/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1052.maid/tick/.mcfunction @@ -22,7 +22,7 @@ execute if entity @a[tag=1052.Owner,distance=..3] run effect give @s slowness 1 127 true # 敵が近くにいたら、射撃用意、リロード中は無視する - execute unless score @s 1052.ActionTime matches ..-1 if entity @a[tag=1052.Owner,distance=..8] if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..14] run function asset:object/1052.maid/tick/action + execute unless score @s 1052.ActionTime matches ..-1 if entity @a[tag=1052.Owner,distance=..8] if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..14] run function asset:object/1052.maid/tick/action # クールダウン execute if score @s 1052.ActionTime matches ..-1 run scoreboard players add @s 1052.ActionTime 1 diff --git a/Asset/data/asset/functions/object/1052.maid/tick/action.mcfunction b/Asset/data/asset/functions/object/1052.maid/tick/action.mcfunction index 3f889bf68f..e1d5f3085d 100644 --- a/Asset/data/asset/functions/object/1052.maid/tick/action.mcfunction +++ b/Asset/data/asset/functions/object/1052.maid/tick/action.mcfunction @@ -5,7 +5,7 @@ # @within function asset:object/1052.maid/tick/ # 敵の方向を見る - tp @s ~ ~ ~ facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..14,sort=nearest,limit=1] + tp @s ~ ~ ~ facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..14,sort=nearest,limit=1] # 動き止める effect give @s slowness 1 127 true diff --git a/Asset/data/asset/functions/object/1052.maid/tick/shot/damage.mcfunction b/Asset/data/asset/functions/object/1052.maid/tick/shot/damage.mcfunction index 3862b0ed0e..81d8054f71 100644 --- a/Asset/data/asset/functions/object/1052.maid/tick/shot/damage.mcfunction +++ b/Asset/data/asset/functions/object/1052.maid/tick/shot/damage.mcfunction @@ -12,10 +12,10 @@ data modify storage api: Argument.ElementType set value "None" # ダメージ execute as @p[tag=1052.Owner] run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=LandingTarget,tag=!Uninterferable,distance=..60,sort=nearest,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=LandingTarget,tag=!Uninterferable,distance=..60,sort=nearest,limit=1] run function api:damage/ # リセット scoreboard players reset $OwnerID Temporary function api:damage/reset # 着弾タグを消す - tag @e[type=#lib:living,tag=Enemy,tag=LandingTarget,tag=!Uninterferable,distance=..60,sort=nearest,limit=1] remove LandingTarget + tag @e[type=#lib:living_without_player,tag=Enemy,tag=LandingTarget,tag=!Uninterferable,distance=..60,sort=nearest,limit=1] remove LandingTarget diff --git a/Asset/data/asset/functions/object/1052.maid/tick/shot/loop.mcfunction b/Asset/data/asset/functions/object/1052.maid/tick/shot/loop.mcfunction index 10a35852da..3b62616352 100644 --- a/Asset/data/asset/functions/object/1052.maid/tick/shot/loop.mcfunction +++ b/Asset/data/asset/functions/object/1052.maid/tick/shot/loop.mcfunction @@ -8,11 +8,11 @@ # 着弾検知 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run tag @s add Landing + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing # ターゲットにタグ付与 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] add LandingTarget + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] add LandingTarget # 演出 particle minecraft:dust 0.122 0.122 0.122 0.7 ~ ~ ~ 0 0 0 0 0 diff --git a/Asset/data/asset/functions/object/1053.flamethrower_ball/tick/hit.mcfunction b/Asset/data/asset/functions/object/1053.flamethrower_ball/tick/hit.mcfunction index aae60201f6..e1f574e5aa 100644 --- a/Asset/data/asset/functions/object/1053.flamethrower_ball/tick/hit.mcfunction +++ b/Asset/data/asset/functions/object/1053.flamethrower_ball/tick/hit.mcfunction @@ -23,7 +23,7 @@ # ダメージ execute store result score $OwnerID Temporary run data get storage asset:context this.UserID execute at @a if score $OwnerID Temporary = @p UserID as @p run function api:damage/modifier - execute positioned ~-1.75 ~-1.75 ~-1.75 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=2.5,dy=2.5,dz=2.5] run function api:damage/ + execute positioned ~-1.75 ~-1.75 ~-1.75 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=2.5,dy=2.5,dz=2.5] run function api:damage/ # リセット function api:damage/reset scoreboard players reset $OwnerID Temporary diff --git a/Asset/data/asset/functions/object/1054.ride_missile/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1054.ride_missile/detect_hit_entity/.mcfunction index 42c6ef82e4..46d4244925 100644 --- a/Asset/data/asset/functions/object/1054.ride_missile/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1054.ride_missile/detect_hit_entity/.mcfunction @@ -4,4 +4,4 @@ # # @within asset:object/alias/1054/detect_hit_entity -execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true +execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1055.elemental_fish/tick/.mcfunction b/Asset/data/asset/functions/object/1055.elemental_fish/tick/.mcfunction index 94d93dc3d3..98262a8faf 100644 --- a/Asset/data/asset/functions/object/1055.elemental_fish/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1055.elemental_fish/tick/.mcfunction @@ -36,13 +36,13 @@ execute if data storage asset:context this{Element:Water} positioned ^ ^ ^-0.3 run particle dust 0 0.667 1 0.7 ~ ~ ~ 0.1 0.1 0.1 0 1 force @a[distance=..40] # 付近に敵がいるならスコア増やす - execute if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..15] run scoreboard players add @s 1055.Attack 1 + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..15] run scoreboard players add @s 1055.Attack 1 # 魔法攻撃 execute if entity @s[scores={1055.Attack=20..}] rotated ~ 0 positioned ^0.1 ^0.4 ^0.5 run function asset:object/1055.elemental_fish/tick/shoot # 付近に敵がいないならスコアリセット - execute unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..15] run scoreboard players reset @s 1055.Attack + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..15] run scoreboard players reset @s 1055.Attack # 存在時間 scoreboard players add @s General.Object.Tick 1 diff --git a/Asset/data/asset/functions/object/1056.elemental_bullet/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1056.elemental_bullet/detect_hit_entity/.mcfunction index e03a1265b7..9ef1f4f450 100644 --- a/Asset/data/asset/functions/object/1056.elemental_bullet/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1056.elemental_bullet/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1056/detect_hit_entity # ヒット判定 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1056.elemental_bullet/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1056.elemental_bullet/hit_entity/.mcfunction index cddc4c9efb..234e7c5bff 100644 --- a/Asset/data/asset/functions/object/1056.elemental_bullet/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1056.elemental_bullet/hit_entity/.mcfunction @@ -20,7 +20,7 @@ data modify storage api: Argument.ElementType set from storage asset:context this.Element function api:damage/ execute at @a if score $1056.Owner Temporary = @p UserID as @p run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=nearest,limit=1] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1056.elemental_bullet/init/.mcfunction b/Asset/data/asset/functions/object/1056.elemental_bullet/init/.mcfunction index a62daa6e80..bb183349a7 100644 --- a/Asset/data/asset/functions/object/1056.elemental_bullet/init/.mcfunction +++ b/Asset/data/asset/functions/object/1056.elemental_bullet/init/.mcfunction @@ -5,7 +5,7 @@ # @within asset:object/alias/1056/init # 敵の方を向く - tp @s ~ ~ ~ facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] eyes + tp @s ~ ~ ~ facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] eyes # スピード設定 data modify storage asset:context this.Speed set value 1 diff --git a/Asset/data/asset/functions/object/1057.giant_pumpkin/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1057.giant_pumpkin/detect_hit_entity/.mcfunction index 773de986c7..f45399a316 100644 --- a/Asset/data/asset/functions/object/1057.giant_pumpkin/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1057.giant_pumpkin/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1057/detect_hit_entity # 回転し始め、または高速回転中のみヒット判定を行う - execute unless entity @s[tag=!2031.BeginningSpin,tag=!2031.HighSpeedSpinning] if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..5] run function asset:object/1057.giant_pumpkin/detect_hit_entity/check + execute unless entity @s[tag=!2031.BeginningSpin,tag=!2031.HighSpeedSpinning] if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run function asset:object/1057.giant_pumpkin/detect_hit_entity/check diff --git a/Asset/data/asset/functions/object/1057.giant_pumpkin/detect_hit_entity/check.mcfunction b/Asset/data/asset/functions/object/1057.giant_pumpkin/detect_hit_entity/check.mcfunction index a6e0af4cec..f25160e32a 100644 --- a/Asset/data/asset/functions/object/1057.giant_pumpkin/detect_hit_entity/check.mcfunction +++ b/Asset/data/asset/functions/object/1057.giant_pumpkin/detect_hit_entity/check.mcfunction @@ -8,11 +8,11 @@ data modify storage lib: args.dx set value 1.8 data modify storage lib: args.dy set value 1.8 data modify storage lib: args.dz set value 1.8 - data modify storage lib: args.selector set value "@e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..5]" + data modify storage lib: args.selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5]" function lib:rotatable_dxyz/m with storage lib: args # 高速回転状態なら多重ヒット防止処理を行う execute if entity @s[tag=2031.HighSpeedSpinning] as @e[type=#lib:living,tag=DXYZ,distance=..5] run function asset:object/1057.giant_pumpkin/detect_hit_entity/check_multiple_hit/ # ヒット判定 - execute if entity @e[type=#lib:living,tag=Enemy,tag=DXYZ,tag=!Uninterferable,distance=..5] run data modify storage asset:context IsHitEntity set value true + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=DXYZ,tag=!Uninterferable,distance=..5] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1057.giant_pumpkin/tick/.mcfunction b/Asset/data/asset/functions/object/1057.giant_pumpkin/tick/.mcfunction index 149d7883b1..e23b2810ba 100644 --- a/Asset/data/asset/functions/object/1057.giant_pumpkin/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1057.giant_pumpkin/tick/.mcfunction @@ -9,12 +9,12 @@ #declare tag Targetable # 高速回転状態じゃない時、前方の敵の方を向かせる - #execute if entity @s[tag=!2031.HighSpeedSpinning] positioned ^ ^ ^15 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..15] add Targetable + #execute if entity @s[tag=!2031.HighSpeedSpinning] positioned ^ ^ ^15 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..15] add Targetable #execute if entity @s[tag=!2031.HighSpeedSpinning] facing entity @e[type=#lib:living,tag=Targetable,distance=..30,sort=nearest,limit=1] feet rotated ~ 0 run tp @s ~ ~ ~ ~ ~ #execute if entity @s[tag=!2031.HighSpeedSpinning] run tag @e[type=#lib:living,tag=Targetable,distance=..30] remove Targetable # 高速回転状態の時、前方の敵に誘導させる - execute if entity @s[tag=2031.HighSpeedSpinning] positioned ^ ^ ^15 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..15] add Targetable + execute if entity @s[tag=2031.HighSpeedSpinning] positioned ^ ^ ^15 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..15] add Targetable execute if entity @s[tag=2031.HighSpeedSpinning] facing entity @e[type=#lib:living,tag=Targetable,distance=..30,sort=nearest,limit=1] feet positioned ^ ^ ^-150 rotated as @s positioned ^ ^ ^-800 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ 0 execute if entity @s[tag=2031.HighSpeedSpinning] run tag @e[type=#lib:living,tag=Targetable,distance=..30] remove Targetable diff --git a/Asset/data/asset/functions/object/1058.brave_knight/tick/.mcfunction b/Asset/data/asset/functions/object/1058.brave_knight/tick/.mcfunction index 454158a86b..621e38b0f1 100644 --- a/Asset/data/asset/functions/object/1058.brave_knight/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1058.brave_knight/tick/.mcfunction @@ -12,7 +12,7 @@ execute at @p[tag=1058.OwnerPlayer,distance=..60] rotated ~ 0 run summon marker ^-1 ^1 ^-1 {Tags:[1058.MoveMarker]} # マスターの最寄りの敵を自身のターゲットとする - execute at @p[tag=1058.OwnerPlayer,distance=..60] run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] add 1058.TargetedEnemy + execute at @p[tag=1058.OwnerPlayer,distance=..60] run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] add 1058.TargetedEnemy # マスターのマーカーに誘導移動 execute if entity @s[tag=!1058.AttackMode] facing entity @e[type=marker,tag=1058.MoveMarker,distance=1..60,sort=nearest,limit=1] eyes positioned ^ ^ ^-20 rotated as @s positioned ^ ^ ^-40 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.6 ~ ~ @@ -24,8 +24,8 @@ execute if entity @e[type=marker,tag=1058.MoveMarker,distance=..3,limit=1] run tag @s[tag=1058.StopAttack] remove 1058.StopAttack # 付近に敵がいたら攻撃モードへと移行 - execute if entity @s[tag=!1058.AttackMode,tag=!1058.StopAttack] if entity @e[type=#lib:living,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=..8] run function asset:object/1058.brave_knight/tick/event/dash - execute if entity @e[type=#lib:living,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=..8] run tag @s[tag=!1058.StopAttack] add 1058.AttackMode + execute if entity @s[tag=!1058.AttackMode,tag=!1058.StopAttack] if entity @e[type=#lib:living_without_player,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=..8] run function asset:object/1058.brave_knight/tick/event/dash + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=..8] run tag @s[tag=!1058.StopAttack] add 1058.AttackMode # 攻撃モード時の処理 execute if entity @s[tag=1058.AttackMode] run function asset:object/1058.brave_knight/tick/event/attack_mode @@ -44,4 +44,4 @@ # リセット kill @e[type=marker,tag=1058.MoveMarker] tag @a[tag=1058.OwnerPlayer] remove 1058.OwnerPlayer - tag @e[type=#lib:living,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable] remove 1058.TargetedEnemy + tag @e[type=#lib:living_without_player,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable] remove 1058.TargetedEnemy diff --git a/Asset/data/asset/functions/object/1058.brave_knight/tick/event/attack_mode.mcfunction b/Asset/data/asset/functions/object/1058.brave_knight/tick/event/attack_mode.mcfunction index 58c11b215d..13d897a211 100644 --- a/Asset/data/asset/functions/object/1058.brave_knight/tick/event/attack_mode.mcfunction +++ b/Asset/data/asset/functions/object/1058.brave_knight/tick/event/attack_mode.mcfunction @@ -5,19 +5,19 @@ # @within function asset:object/1058.brave_knight/tick/ # 付近に敵がいたらそっちへ移動 - execute facing entity @e[type=#lib:living,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=1.5..15,sort=nearest,limit=1] feet run tp @s ^ ^ ^0.6 ~ ~ + execute facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=1.5..15,sort=nearest,limit=1] feet run tp @s ^ ^ ^0.6 ~ ~ # 近くの敵の方を向く - execute unless entity @s[tag=1058.FacingLock] facing entity @e[type=#lib:living,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=..1.5,sort=nearest,limit=1] feet run tp @s ~ ~ ~ ~ ~ + execute unless entity @s[tag=1058.FacingLock] facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=..1.5,sort=nearest,limit=1] feet run tp @s ~ ~ ~ ~ ~ # オーナーの最寄りの敵にパーティクル出す - execute as @e[type=#lib:living,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=..8] at @s anchored eyes run particle dust 1 0 0 0.7 ^ ^0.5 ^ 0 0 0 1 1 normal @p[tag=1058.OwnerPlayer] + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=..8] at @s anchored eyes run particle dust 1 0 0 0.7 ^ ^0.5 ^ 0 0 0 1 1 normal @p[tag=1058.OwnerPlayer] # 剣ぶんまわし - execute if entity @e[type=#lib:living,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=..2,sort=nearest,limit=1] run function asset:object/1058.brave_knight/tick/event/combo/ + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=..2,sort=nearest,limit=1] run function asset:object/1058.brave_knight/tick/event/combo/ # 攻撃モード時、離れ過ぎると帰ってくる execute unless entity @e[type=marker,tag=1058.MoveMarker,distance=..10,limit=1] run function asset:object/1058.brave_knight/tick/event/force_back # 付近に敵がいなかったら解除 - execute unless entity @e[type=#lib:living,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=..8] run function asset:object/1058.brave_knight/tick/event/turn_off_attackmode + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=1058.TargetedEnemy,tag=!Uninterferable,distance=..8] run function asset:object/1058.brave_knight/tick/event/turn_off_attackmode diff --git a/Asset/data/asset/functions/object/1058.brave_knight/tick/event/combo/0.mcfunction b/Asset/data/asset/functions/object/1058.brave_knight/tick/event/combo/0.mcfunction index 3d84b94d33..4e009536fd 100644 --- a/Asset/data/asset/functions/object/1058.brave_knight/tick/event/combo/0.mcfunction +++ b/Asset/data/asset/functions/object/1058.brave_knight/tick/event/combo/0.mcfunction @@ -20,14 +20,14 @@ data modify entity @s Pose.RightArm set value [225f,0f,90f] # パーティクル - execute facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] feet anchored eyes positioned ^ ^0.25 ^ positioned ^ ^ ^1 run function asset:object/1058.brave_knight/tick/event/combo/particle + execute facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] feet anchored eyes positioned ^ ^0.25 ^ positioned ^ ^ ^1 run function asset:object/1058.brave_knight/tick/event/combo/particle # フィールド設定 data modify storage api: Argument.FieldOverride set value {Color:50175,Frames:[20335,20336,20337],Scale:[1.5f,1.5f,0.1f],Transformation:{left_rotation:[-0.7f,0.0f,0.0f,-0.7f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f]}} # 召喚 data modify storage api: Argument.ID set value 2001 - execute facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] feet anchored eyes positioned ^ ^0.25 ^ positioned ^ ^ ^1 run function api:object/summon + execute facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] feet anchored eyes positioned ^ ^0.25 ^ positioned ^ ^ ^1 run function api:object/summon # ダメージを与える - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] run function asset:object/1058.brave_knight/tick/event/combo/damage + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] run function asset:object/1058.brave_knight/tick/event/combo/damage diff --git a/Asset/data/asset/functions/object/1058.brave_knight/tick/event/combo/1.mcfunction b/Asset/data/asset/functions/object/1058.brave_knight/tick/event/combo/1.mcfunction index ad0a8dda0f..0f0ac1a33a 100644 --- a/Asset/data/asset/functions/object/1058.brave_knight/tick/event/combo/1.mcfunction +++ b/Asset/data/asset/functions/object/1058.brave_knight/tick/event/combo/1.mcfunction @@ -17,14 +17,14 @@ data modify entity @s Pose.RightArm set value [15f,0f,90f] # パーティクル - execute facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] feet anchored eyes positioned ^ ^0.25 ^ positioned ^ ^ ^1 run function asset:object/1058.brave_knight/tick/event/combo/particle + execute facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] feet anchored eyes positioned ^ ^0.25 ^ positioned ^ ^ ^1 run function asset:object/1058.brave_knight/tick/event/combo/particle # フィールド設定 data modify storage api: Argument.FieldOverride set value {Color:50175,Frames:[20335,20336,20337],Scale:[1.5f,1.5f,0.1f],Transformation:{left_rotation:[0.0f,0.7f,0.7f,0.0f],right_rotation:[0f,0f,0f,1f],translation:[0f,0f,0f]}} # 召喚 data modify storage api: Argument.ID set value 2001 - execute facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] feet anchored eyes positioned ^ ^0.25 ^ positioned ^ ^ ^1 run function api:object/summon + execute facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] feet anchored eyes positioned ^ ^0.25 ^ positioned ^ ^ ^1 run function api:object/summon # ダメージを与える - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] run function asset:object/1058.brave_knight/tick/event/combo/damage + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,sort=nearest,limit=1] run function asset:object/1058.brave_knight/tick/event/combo/damage diff --git a/Asset/data/asset/functions/object/1059.book_of_hero/tick/.mcfunction b/Asset/data/asset/functions/object/1059.book_of_hero/tick/.mcfunction index 8665d3b4fe..a614f6a4e9 100644 --- a/Asset/data/asset/functions/object/1059.book_of_hero/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1059.book_of_hero/tick/.mcfunction @@ -23,18 +23,18 @@ execute unless entity @p[tag=1059.OwnerPlayer,distance=..8] facing entity @p[tag=1059.OwnerPlayer] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.2 ~ ~ # 周囲にプレイヤーがいる場合、かつ敵がいない場合、プレイヤーを追尾 - execute if entity @p[tag=1059.OwnerPlayer,distance=..8] unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..6] facing entity @p[tag=1059.OwnerPlayer] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.2 ~ ~ + execute if entity @p[tag=1059.OwnerPlayer,distance=..8] unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..6] facing entity @p[tag=1059.OwnerPlayer] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.2 ~ ~ # 周囲にプレイヤーがいて、かつ敵が近くにいる場合、範囲内なら敵を追う - execute if entity @p[tag=1059.OwnerPlayer,distance=..8] if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..6] facing entity @e[type=#lib:living,distance=..6,sort=nearest,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.2 ~ ~ + execute if entity @p[tag=1059.OwnerPlayer,distance=..8] if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..6] facing entity @e[type=#lib:living,distance=..6,sort=nearest,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-800 facing entity @s eyes positioned as @s run tp @s ^ ^ ^0.2 ~ ~ # スコア増やす scoreboard players add @s 1059.ActionTime 1 # 敵が周囲にいてスコア達したら実行 - execute if score @s 1059.ActionTime matches 40.. if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10] run function asset:object/1059.book_of_hero/tick/attack + execute if score @s 1059.ActionTime matches 40.. if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] run function asset:object/1059.book_of_hero/tick/attack # 敵が周囲にいない状態でスコア達したらスコア戻す - execute if score @s 1059.ActionTime matches 40.. unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10] run scoreboard players set @s 1059.ActionTime 0 + execute if score @s 1059.ActionTime matches 40.. unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] run scoreboard players set @s 1059.ActionTime 0 # カベにぶつかった際の処理 execute unless block ^ ^ ^0.5 #lib:no_collision at @s run tp @s ~ ~ ~ ~45 ~-45 diff --git a/Asset/data/asset/functions/object/1059.book_of_hero/tick/attack.mcfunction b/Asset/data/asset/functions/object/1059.book_of_hero/tick/attack.mcfunction index dd1147ae2b..7842306fcf 100644 --- a/Asset/data/asset/functions/object/1059.book_of_hero/tick/attack.mcfunction +++ b/Asset/data/asset/functions/object/1059.book_of_hero/tick/attack.mcfunction @@ -11,7 +11,7 @@ #declare score_holder $Level # 演出 - execute at @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] run function asset:object/1059.book_of_hero/tick/vfx + execute at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] run function asset:object/1059.book_of_hero/tick/vfx # 変数 function api:global_vars/game_progress @@ -38,7 +38,7 @@ # ダメージ execute store result score $OwnerID Temporary run data get storage asset:context this.UserID execute as @p[tag=1059.OwnerPlayer] run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/object/1065.hex_sting/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1065.hex_sting/detect_hit_entity/.mcfunction index c806c7d237..44a92a3946 100644 --- a/Asset/data/asset/functions/object/1065.hex_sting/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1065.hex_sting/detect_hit_entity/.mcfunction @@ -4,4 +4,4 @@ # # @within asset:object/alias/1065/detect_hit_entity -execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true +execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1065.hex_sting/tick/.mcfunction b/Asset/data/asset/functions/object/1065.hex_sting/tick/.mcfunction index 63c16775dc..ac20823159 100644 --- a/Asset/data/asset/functions/object/1065.hex_sting/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1065.hex_sting/tick/.mcfunction @@ -13,7 +13,7 @@ particle minecraft:campfire_cosy_smoke ~ ~-0.2 ~ 0.1 0.1 0.1 0 1 force # 前方にいる一番近い敵をターゲットする - execute positioned ^ ^ ^16.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..13.5] run tag @s add 1065.TargetCandidate + execute positioned ^ ^ ^16.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..13.5] run tag @s add 1065.TargetCandidate execute as @e[type=#lib:living,tag=1065.TargetCandidate,distance=..30,sort=nearest,limit=1] run tag @s add 1065.Target # 向きを変える execute if entity @e[type=#lib:living,tag=1065.Target,distance=00..10] facing entity @e[type=#lib:living,tag=1065.Target,distance=..10,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-0200 facing entity @s eyes positioned as @s run tp @s ~ ~ ~ ~ ~ diff --git a/Asset/data/asset/functions/object/1066.knife/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1066.knife/detect_hit_entity/.mcfunction index 0343f8ca19..39e245517d 100644 --- a/Asset/data/asset/functions/object/1066.knife/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1066.knife/detect_hit_entity/.mcfunction @@ -4,4 +4,4 @@ # # @within asset:object/alias/1066/detect_hit_entity -execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true +execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1066.knife/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1066.knife/hit_entity/.mcfunction index 353232bef8..29fcbf9fc6 100644 --- a/Asset/data/asset/functions/object/1066.knife/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1066.knife/hit_entity/.mcfunction @@ -10,7 +10,7 @@ #declare tag 1066.TargetCandidate # ヒット対象候補にタグを付ける - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run tag @s add 1066.TargetCandidate + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run tag @s add 1066.TargetCandidate # ダメージ与える data modify storage api: Argument.Damage set from storage asset:context this.Damage diff --git a/Asset/data/asset/functions/object/1068.icicle/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1068.icicle/detect_hit_entity/.mcfunction index 3da94f8502..434fbcb664 100644 --- a/Asset/data/asset/functions/object/1068.icicle/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1068.icicle/detect_hit_entity/.mcfunction @@ -4,4 +4,4 @@ # # @within asset:object/alias/1068/detect_hit_entity -execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true +execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1068.icicle/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1068.icicle/hit_entity/.mcfunction index d7e836302f..ced4c136be 100644 --- a/Asset/data/asset/functions/object/1068.icicle/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1068.icicle/hit_entity/.mcfunction @@ -10,7 +10,7 @@ #declare tag 1068.Hit # 対象にタグを付ける - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run tag @s add 1068.Hit + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run tag @s add 1068.Hit # 鈍足付与 effect give @e[type=#lib:living,tag=1068.Hit,distance=..10] slowness 10 2 # ダメージ与える diff --git a/Asset/data/asset/functions/object/1075.inferno_rush_arm/tick/hit.mcfunction b/Asset/data/asset/functions/object/1075.inferno_rush_arm/tick/hit.mcfunction index 7ea304e936..705489153c 100644 --- a/Asset/data/asset/functions/object/1075.inferno_rush_arm/tick/hit.mcfunction +++ b/Asset/data/asset/functions/object/1075.inferno_rush_arm/tick/hit.mcfunction @@ -13,7 +13,7 @@ data modify storage lib: args.dx set value 1.6 data modify storage lib: args.dy set value 1.6 data modify storage lib: args.dz set value 2.4 - data modify storage lib: args.selector set value "@e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..5]" + data modify storage lib: args.selector set value "@e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5]" function lib:rotatable_dxyz/m with storage lib: args # DXYZが付与された敵がいなければreturn diff --git a/Asset/data/asset/functions/object/1077.brave_slash/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1077.brave_slash/detect_hit_entity/.mcfunction index 4db99f4647..8fe3ae7fea 100644 --- a/Asset/data/asset/functions/object/1077.brave_slash/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1077.brave_slash/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1077/detect_hit_entity # 判定 - execute positioned ~-0.75 ~-0.75 ~-0.75 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.75 ~-0.75 ~-0.75 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1077.brave_slash/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1077.brave_slash/hit_entity/.mcfunction index eee7eb8c40..8a48017f1b 100644 --- a/Asset/data/asset/functions/object/1077.brave_slash/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1077.brave_slash/hit_entity/.mcfunction @@ -17,7 +17,7 @@ execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier # ダメージ実行 - execute positioned ~-0.75 ~-0.75 ~-0.75 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5] run function asset:object/1077.brave_slash/hit_entity/damage + execute positioned ~-0.75 ~-0.75 ~-0.75 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5] run function asset:object/1077.brave_slash/hit_entity/damage # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/object/1078.gun/tick/.mcfunction b/Asset/data/asset/functions/object/1078.gun/tick/.mcfunction index 3cdc71adaa..ffac28e819 100644 --- a/Asset/data/asset/functions/object/1078.gun/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1078.gun/tick/.mcfunction @@ -9,9 +9,9 @@ #declare score_holder $TickInterval # 敵を狙う - execute if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] at @e[tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] positioned ~ ~1 ~ facing entity @s eyes positioned ^ ^ ^100 rotated as @s positioned ^ ^ ^-300 facing entity @s feet positioned as @s run tp @s ^ ^ ^ ~ ~ + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] at @e[tag=Enemy,tag=!Uninterferable,distance=..30,sort=nearest,limit=1] positioned ~ ~1 ~ facing entity @s eyes positioned ^ ^ ^100 rotated as @s positioned ^ ^ ^-300 facing entity @s feet positioned as @s run tp @s ^ ^ ^ ~ ~ # 敵いないとプレイヤー見る - execute unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-300 facing entity @s feet positioned as @s run tp @s ^ ^ ^ ~ ~ + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] facing entity @p feet positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-300 facing entity @s feet positioned as @s run tp @s ^ ^ ^ ~ ~ # Tick加算 scoreboard players add @s General.Object.Tick 1 @@ -19,7 +19,7 @@ # Tick % 20 == 0 で発射 scoreboard players operation $TickInterval Temporary = @s General.Object.Tick scoreboard players operation $TickInterval Temporary %= $20 Const - execute if score $TickInterval Temporary matches 0 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..30] run function asset:object/1078.gun/tick/shot/ + execute if score $TickInterval Temporary matches 0 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..30] run function asset:object/1078.gun/tick/shot/ # 消滅処理 execute if score @s General.Object.Tick matches 200.. run kill @s diff --git a/Asset/data/asset/functions/object/1079.meteor_rain_emitter/tick/summon_meteor.mcfunction b/Asset/data/asset/functions/object/1079.meteor_rain_emitter/tick/summon_meteor.mcfunction index c0cc2f50ea..4c584abe7c 100644 --- a/Asset/data/asset/functions/object/1079.meteor_rain_emitter/tick/summon_meteor.mcfunction +++ b/Asset/data/asset/functions/object/1079.meteor_rain_emitter/tick/summon_meteor.mcfunction @@ -16,7 +16,7 @@ execute as @e[type=marker,tag=SpreadMarker,distance=..128,limit=1] at @s run function lib:spread_entity/ # 付近のランダムな敵一体を対象として狙う - execute positioned ~-40 ~-8 ~-40 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=79,dy=24,dz=79,sort=random,limit=1] add MeteorTarget + execute positioned ~-40 ~-8 ~-40 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=79,dy=24,dz=79,sort=random,limit=1] add MeteorTarget execute if entity @e[type=#lib:living,tag=MeteorTarget,distance=..50,limit=1] store result storage api: Argument.FieldOverride.TargetID int 1 run scoreboard players get @e[type=#lib:living,tag=MeteorTarget,distance=..50,limit=1] MobUUID # メテオのブレ用の拡散 diff --git a/Asset/data/asset/functions/object/1080.meteor_rain/kill/.mcfunction b/Asset/data/asset/functions/object/1080.meteor_rain/kill/.mcfunction index b5fff6637e..9a70746238 100644 --- a/Asset/data/asset/functions/object/1080.meteor_rain/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1080.meteor_rain/kill/.mcfunction @@ -19,8 +19,8 @@ data modify storage api: Argument.ElementType set value "Fire" # 実行時に受け取っているUserIDの持ち主として補正を実行 function asset:object/1080.meteor_rain/kill/modifier.m with storage asset:context this - execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..4] run function api:damage/ - execute positioned ~-0.5 ~-0.5 ~-0.5 unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..4] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] run function api:damage/ function api:damage/reset # 消滅 diff --git a/Asset/data/asset/functions/object/1082.soulfire_burst_bigshot/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1082.soulfire_burst_bigshot/detect_hit_entity/.mcfunction index 92342f468d..1190de7783 100644 --- a/Asset/data/asset/functions/object/1082.soulfire_burst_bigshot/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1082.soulfire_burst_bigshot/detect_hit_entity/.mcfunction @@ -4,4 +4,4 @@ # # @within asset:object/alias/1082/detect_hit_entity -execute positioned ~-1 ~-1 ~-1 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=1,dy=1,dz=1] run data modify storage asset:context IsHitEntity set value true +execute positioned ~-1 ~-1 ~-1 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=1,dy=1,dz=1] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1082.soulfire_burst_bigshot/kill/.mcfunction b/Asset/data/asset/functions/object/1082.soulfire_burst_bigshot/kill/.mcfunction index cb746e25ca..11b336840b 100644 --- a/Asset/data/asset/functions/object/1082.soulfire_burst_bigshot/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1082.soulfire_burst_bigshot/kill/.mcfunction @@ -23,8 +23,8 @@ data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal # 直撃したやつと、着弾地点の位置の範囲内にタグを付与 - execute positioned ~-1 ~-1 ~-1 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=1,dy=1,dz=1] add Hit - tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..4] add Hit + execute positioned ~-1 ~-1 ~-1 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=1,dy=1,dz=1] add Hit + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] add Hit # 実行時に受け取っているUserIDの持ち主として補正を実行 function asset:object/1082.soulfire_burst_bigshot/kill/modifier.m with storage asset:context this diff --git a/Asset/data/asset/functions/object/1082.soulfire_burst_bigshot/range_over/summon_small_shot.mcfunction b/Asset/data/asset/functions/object/1082.soulfire_burst_bigshot/range_over/summon_small_shot.mcfunction index 00819b118c..086f414310 100644 --- a/Asset/data/asset/functions/object/1082.soulfire_burst_bigshot/range_over/summon_small_shot.mcfunction +++ b/Asset/data/asset/functions/object/1082.soulfire_burst_bigshot/range_over/summon_small_shot.mcfunction @@ -21,7 +21,7 @@ # マーカーの方を向いて召喚 data modify storage api: Argument.ID set value 1083 - execute store result storage api: Argument.FieldOverride.TargetID int 1 positioned ^ ^ ^20 run scoreboard players get @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..20,sort=nearest,limit=1] MobUUID + execute store result storage api: Argument.FieldOverride.TargetID int 1 positioned ^ ^ ^20 run scoreboard players get @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..20,sort=nearest,limit=1] MobUUID execute store result storage api: Argument.FieldOverride.UserID int 1 run data get storage asset:context this.UserID data modify storage api: Argument.FieldOverride.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute facing entity @e[type=marker,tag=SpreadMarker,distance=..32,limit=1] eyes run function api:object/summon diff --git a/Asset/data/asset/functions/object/1083.soulfire_burst_smallshot/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1083.soulfire_burst_smallshot/detect_hit_entity/.mcfunction index b5c5285290..a216ab099e 100644 --- a/Asset/data/asset/functions/object/1083.soulfire_burst_smallshot/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1083.soulfire_burst_smallshot/detect_hit_entity/.mcfunction @@ -4,4 +4,4 @@ # # @within asset:object/alias/1083/detect_hit_entity -execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true +execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1083.soulfire_burst_smallshot/tick/homing.m.mcfunction b/Asset/data/asset/functions/object/1083.soulfire_burst_smallshot/tick/homing.m.mcfunction index fa2c34efc4..a581034048 100644 --- a/Asset/data/asset/functions/object/1083.soulfire_burst_smallshot/tick/homing.m.mcfunction +++ b/Asset/data/asset/functions/object/1083.soulfire_burst_smallshot/tick/homing.m.mcfunction @@ -9,11 +9,11 @@ #declare tag NoHoming # ターゲットにしない人にタグ付与 - execute positioned ^35 ^ ^ run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..25] add NoHoming - execute positioned ^-35 ^ ^ run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..25] add NoHoming + execute positioned ^35 ^ ^ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..25] add NoHoming + execute positioned ^-35 ^ ^ run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..25] add NoHoming # 追尾 - $execute facing entity @e[type=#lib:living,tag=Enemy,tag=!NoHoming,tag=!Uninterferable,distance=..20,scores={MobUUID=$(TargetID)}] eyes positioned ^ ^ ^-1 rotated as @s positioned ^ ^ ^-3 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ + $execute facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!NoHoming,tag=!Uninterferable,distance=..20,scores={MobUUID=$(TargetID)}] eyes positioned ^ ^ ^-1 rotated as @s positioned ^ ^ ^-3 facing entity @s feet positioned as @s run tp @s ~ ~ ~ ~ ~ # タグリセット - tag @e[type=#lib:living,tag=Enemy,tag=NoHoming,tag=!Uninterferable,distance=..30] remove NoHoming + tag @e[type=#lib:living_without_player,tag=Enemy,tag=NoHoming,tag=!Uninterferable,distance=..30] remove NoHoming diff --git a/Asset/data/asset/functions/object/1085.sanguis_obj/tick/damage.mcfunction b/Asset/data/asset/functions/object/1085.sanguis_obj/tick/damage.mcfunction index 4d9e2c97de..f8b088418b 100644 --- a/Asset/data/asset/functions/object/1085.sanguis_obj/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1085.sanguis_obj/tick/damage.mcfunction @@ -21,7 +21,7 @@ # modifier をかける execute as @a[tag=1085.Player] run function api:damage/modifier # ダメージを与える - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..1.2] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..1.2] run function api:damage/ function api:damage/reset # タグ削除 diff --git a/Asset/data/asset/functions/object/1086.lightning_exploit/tick/landing/main.mcfunction b/Asset/data/asset/functions/object/1086.lightning_exploit/tick/landing/main.mcfunction index 6cc56eaaa8..b137393421 100644 --- a/Asset/data/asset/functions/object/1086.lightning_exploit/tick/landing/main.mcfunction +++ b/Asset/data/asset/functions/object/1086.lightning_exploit/tick/landing/main.mcfunction @@ -30,7 +30,7 @@ # 補正functionを実行 execute as @a[tag=1086.Owner,sort=nearest,limit=1] run function api:damage/modifier # ダメージを与える - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..3.5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..3.5] run function api:damage/ # リセット function api:damage/reset tag @a[tag=1086.Owner] remove 1086.Owner diff --git a/Asset/data/asset/functions/object/1089.cosmo_beam/tick/angel_damage.mcfunction b/Asset/data/asset/functions/object/1089.cosmo_beam/tick/angel_damage.mcfunction index 386b9186bc..8f1f2b690d 100644 --- a/Asset/data/asset/functions/object/1089.cosmo_beam/tick/angel_damage.mcfunction +++ b/Asset/data/asset/functions/object/1089.cosmo_beam/tick/angel_damage.mcfunction @@ -13,7 +13,7 @@ # 実行位置 ~-8 ~-105 ~-8 # 数をカウントして、ダメージを割る - execute store result score $Count Temporary if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,scores={MobID=0..},dx=15,dy=199,dz=15] + execute store result score $Count Temporary if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,scores={MobID=0..},dx=15,dy=199,dz=15] execute store result score $Damage Temporary run data get storage asset:context this.Damage scoreboard players operation $Damage Temporary /= $Count Temporary # 更に10で割る @@ -24,7 +24,7 @@ data modify storage api: Argument.ElementType set value "Tunder" execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier # ダメージ - execute as @e[type=#lib:living,tag=Enemy,tag=Enemy.Boss,tag=!Uninterferable,dx=15,dy=199,dz=15] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=Enemy.Boss,tag=!Uninterferable,dx=15,dy=199,dz=15] run function api:damage/ # リセット function api:damage/reset scoreboard players reset $Count diff --git a/Asset/data/asset/functions/object/1089.cosmo_beam/tick/shot.mcfunction b/Asset/data/asset/functions/object/1089.cosmo_beam/tick/shot.mcfunction index 04bf42ebdd..8b6064896c 100644 --- a/Asset/data/asset/functions/object/1089.cosmo_beam/tick/shot.mcfunction +++ b/Asset/data/asset/functions/object/1089.cosmo_beam/tick/shot.mcfunction @@ -26,7 +26,7 @@ execute store result score $UserID Temporary run data get storage asset:context this.UserID # 数をカウントして、ダメージを割る - execute store result score $Count Temporary positioned ~-8 ~-105 ~-8 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,scores={MobID=0..},dx=15,dy=199,dz=15] + execute store result score $Count Temporary positioned ~-8 ~-105 ~-8 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,scores={MobID=0..},dx=15,dy=199,dz=15] execute store result score $Damage Temporary run data get storage asset:context this.Damage scoreboard players operation $Damage Temporary /= $Count Temporary # debug tellraw @a {"score":{"name":"$Damage","objective":"Temporary"}} @@ -37,11 +37,11 @@ execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier # ダメージ - execute positioned ~-8 ~-105 ~-8 as @e[type=#lib:living,tag=Enemy,tag=!Enemy.Boss,tag=!Uninterferable,dx=15,dy=199,dz=15] run function api:damage/ + execute positioned ~-8 ~-105 ~-8 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Enemy.Boss,tag=!Uninterferable,dx=15,dy=199,dz=15] run function api:damage/ # リセット function api:damage/reset scoreboard players reset $Count scoreboard players reset $Damage # もし天使がいるなら、天使には軽減したダメージを与える - execute positioned ~-8 ~-105 ~-8 if entity @e[type=#lib:living,tag=Enemy.Boss,tag=!Uninterferable,dx=15,dy=199,dz=15] run function asset:object/1089.cosmo_beam/tick/angel_damage + execute positioned ~-8 ~-105 ~-8 if entity @e[type=#lib:living_without_player,tag=Enemy.Boss,tag=!Uninterferable,dx=15,dy=199,dz=15] run function asset:object/1089.cosmo_beam/tick/angel_damage diff --git a/Asset/data/asset/functions/object/1092.water_magic/tick/damage.mcfunction b/Asset/data/asset/functions/object/1092.water_magic/tick/damage.mcfunction index 783dc49ba2..9f9db29a3e 100644 --- a/Asset/data/asset/functions/object/1092.water_magic/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1092.water_magic/tick/damage.mcfunction @@ -15,11 +15,11 @@ data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ function api:damage/reset # 演出 - execute at @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..5] run particle minecraft:block water ~ ~1 ~ 0.1 1.3 0.1 10 30 + execute at @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run particle minecraft:block water ~ ~1 ~ 0.1 1.3 0.1 10 30 playsound entity.dolphin.splash neutral @a ~ ~ ~ 1 2 playsound entity.dolphin.splash neutral @a ~ ~ ~ 1 1 playsound entity.dolphin.splash neutral @a ~ ~ ~ 1 0 diff --git a/Asset/data/asset/functions/object/1099.conviction_sword/tick/damage.mcfunction b/Asset/data/asset/functions/object/1099.conviction_sword/tick/damage.mcfunction index dbe3c12edf..349cd5e798 100644 --- a/Asset/data/asset/functions/object/1099.conviction_sword/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1099.conviction_sword/tick/damage.mcfunction @@ -14,5 +14,5 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "None" execute as @p[tag=Owner] run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..4] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] run function api:damage/ function api:damage/reset diff --git a/Asset/data/asset/functions/object/1100.conviction_shot/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1100.conviction_shot/hit_entity/.mcfunction index 0cf1b61a5b..2f0c272769 100644 --- a/Asset/data/asset/functions/object/1100.conviction_shot/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1100.conviction_shot/hit_entity/.mcfunction @@ -16,7 +16,7 @@ data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "None" execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.75 ~-0.75 ~-0.75 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5,sort=nearest,limit=1] run function api:damage/ + execute positioned ~-0.75 ~-0.75 ~-0.75 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5,sort=nearest,limit=1] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1100.conviction_shot/tick/.mcfunction b/Asset/data/asset/functions/object/1100.conviction_shot/tick/.mcfunction index beaef8914b..6e535e6cde 100644 --- a/Asset/data/asset/functions/object/1100.conviction_shot/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1100.conviction_shot/tick/.mcfunction @@ -11,11 +11,11 @@ particle dust 0.455 0.027 0.027 2 ~ ~ ~ 0.1 0.1 0.1 5 2 force # 周囲に敵がいなければ、MovePerStepを0.25に戻す - execute unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] run data modify storage asset:context this.MovePerStep set value 0.25 + execute unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] run data modify storage asset:context this.MovePerStep set value 0.25 # 周囲に敵がいれば追尾 & MovePerStepを0.5に変更 - execute if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] facing entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-200 facing entity @s eyes positioned as @s run tp @s ^ ^ ^ ~ ~ - execute if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] run data modify storage asset:context this.MovePerStep set value 0.5 + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] eyes positioned ^ ^ ^-100 rotated as @s positioned ^ ^ ^-200 facing entity @s eyes positioned as @s run tp @s ^ ^ ^ ~ ~ + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] run data modify storage asset:context this.MovePerStep set value 0.5 # 前方に壁があればMovePerStepを0に変更 execute at @s run function asset:object/1100.conviction_shot/tick/check_forward_block with storage asset:context this diff --git a/Asset/data/asset/functions/object/1102.turret/tick/.mcfunction b/Asset/data/asset/functions/object/1102.turret/tick/.mcfunction index b61925f803..76c7a4a985 100644 --- a/Asset/data/asset/functions/object/1102.turret/tick/.mcfunction +++ b/Asset/data/asset/functions/object/1102.turret/tick/.mcfunction @@ -20,20 +20,20 @@ scoreboard players reset $1102.ShotCount # 敵がいたらそっち向く - execute if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10] positioned ~-5 ~ ~-5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..20,dx=9,dy=0,dz=9] run tag @s add 1102.Target - execute if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..10] facing entity @e[type=#lib:living,tag=Enemy,tag=1102.Target,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] eyes rotated ~ 0 run tp @s ~ ~ ~ ~ ~ + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] positioned ~-5 ~ ~-5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..20,dx=9,dy=0,dz=9] run tag @s add 1102.Target + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..10] facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=1102.Target,tag=!Uninterferable,distance=..10,sort=nearest,limit=1] eyes rotated ~ 0 run tp @s ~ ~ ~ ~ ~ # 4tickおきに実行するやつ # 実行時間を移す scoreboard players operation $Interval Temporary = @s General.Object.Tick # 4tickおきに実行 scoreboard players operation $Interval Temporary %= $2 Const - execute if entity @e[type=#lib:living,tag=Enemy,tag=1102.Target,distance=..10] if score $Interval Temporary matches 0 if entity @s[tag=1102.Even] positioned ~ ~0.3 ~ positioned ^-0.4 ^ ^ run function asset:object/1102.turret/tick/shot/shot - execute if entity @e[type=#lib:living,tag=Enemy,tag=1102.Target,distance=..10] if score $Interval Temporary matches 0 unless entity @s[tag=1102.Even] positioned ~ ~0.3 ~ positioned ^0.4 ^ ^ run function asset:object/1102.turret/tick/shot/shot + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=1102.Target,distance=..10] if score $Interval Temporary matches 0 if entity @s[tag=1102.Even] positioned ~ ~0.3 ~ positioned ^-0.4 ^ ^ run function asset:object/1102.turret/tick/shot/shot + execute if entity @e[type=#lib:living_without_player,tag=Enemy,tag=1102.Target,distance=..10] if score $Interval Temporary matches 0 unless entity @s[tag=1102.Even] positioned ~ ~0.3 ~ positioned ^0.4 ^ ^ run function asset:object/1102.turret/tick/shot/shot # リセット scoreboard players reset $Interval tag @s remove 1102.Even # ターゲットのタグを消す - tag @e[type=#lib:living,tag=Enemy,tag=1102.Target,tag=!Uninterferable,distance=..40] remove 1102.Target + tag @e[type=#lib:living_without_player,tag=Enemy,tag=1102.Target,tag=!Uninterferable,distance=..40] remove 1102.Target # 消滅処理 kill @s[scores={General.Object.Tick=120..}] diff --git a/Asset/data/asset/functions/object/1106.sparkle_bomb/tick/boom.mcfunction b/Asset/data/asset/functions/object/1106.sparkle_bomb/tick/boom.mcfunction index 883bdab94a..70d4784d61 100644 --- a/Asset/data/asset/functions/object/1106.sparkle_bomb/tick/boom.mcfunction +++ b/Asset/data/asset/functions/object/1106.sparkle_bomb/tick/boom.mcfunction @@ -8,7 +8,7 @@ # @private #declare score_holder $UserID -# 演出　 +# 演出 particle firework ~ ~ ~ 0 0 0 0.3 45 force @a[distance=..48] particle dust 0.2 1 1 1.5 ~ ~ ~ 1 1 1 0 40 force @a[distance=..48] particle scrape ~ ~ ~ 0 0 0 10 70 force @a[distance=..48] @@ -23,7 +23,7 @@ data modify storage api: Argument.ElementType set value "Thunder" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-2.0 ~-2.0 ~-2.0 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=3.0,dy=3.0,dz=3.0] run function api:damage/ + execute positioned ~-2.0 ~-2.0 ~-2.0 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=3.0,dy=3.0,dz=3.0] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1107.crystal_dart/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1107.crystal_dart/detect_hit_entity/.mcfunction index 31eb46ca2c..0f969b7e30 100644 --- a/Asset/data/asset/functions/object/1107.crystal_dart/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1107.crystal_dart/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1107/detect_hit_entity -execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true +execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1107.crystal_dart/hit_block/.mcfunction b/Asset/data/asset/functions/object/1107.crystal_dart/hit_block/.mcfunction index 3d7e47d557..dd4da4021a 100644 --- a/Asset/data/asset/functions/object/1107.crystal_dart/hit_block/.mcfunction +++ b/Asset/data/asset/functions/object/1107.crystal_dart/hit_block/.mcfunction @@ -15,9 +15,9 @@ function lib:reflection_bullet/ # 敵がいるならそっちを向く - execute at @s positioned ^ ^ ^20 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..20] run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..20,sort=nearest,limit=1] add Target - execute at @s if entity @e[type=#lib:living,tag=Enemy,tag=Target,tag=!Uninterferable,distance=..40] run tp @s ~ ~ ~ facing entity @e[type=#lib:living,tag=Enemy,tag=Target,tag=!Uninterferable,distance=..40,sort=nearest,limit=1] eyes - tag @e[type=#lib:living,tag=Enemy,tag=Target,tag=!Uninterferable,distance=..40] remove Target + execute at @s positioned ^ ^ ^20 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..20] run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..20,sort=nearest,limit=1] add Target + execute at @s if entity @e[type=#lib:living_without_player,tag=Enemy,tag=Target,tag=!Uninterferable,distance=..40] run tp @s ~ ~ ~ facing entity @e[type=#lib:living_without_player,tag=Enemy,tag=Target,tag=!Uninterferable,distance=..40,sort=nearest,limit=1] eyes + tag @e[type=#lib:living_without_player,tag=Enemy,tag=Target,tag=!Uninterferable,distance=..40] remove Target # ヒット判定復活 tag @s remove 1107.CannotHit # 反射回数が6なら死 diff --git a/Asset/data/asset/functions/object/1107.crystal_dart/hit_entity/damage.mcfunction b/Asset/data/asset/functions/object/1107.crystal_dart/hit_entity/damage.mcfunction index 908f50f2ff..c37e3da6c7 100644 --- a/Asset/data/asset/functions/object/1107.crystal_dart/hit_entity/damage.mcfunction +++ b/Asset/data/asset/functions/object/1107.crystal_dart/hit_entity/damage.mcfunction @@ -17,7 +17,7 @@ data modify storage api: Argument.ElementType set value "Thunder" execute if data storage asset:context this.AdditionalMPHeal run data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.75 ~-0.75 ~-0.75 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5,sort=nearest,limit=1] run function api:damage/ + execute positioned ~-0.75 ~-0.75 ~-0.75 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5,sort=nearest,limit=1] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1108.waterfall/tick/damage.mcfunction b/Asset/data/asset/functions/object/1108.waterfall/tick/damage.mcfunction index 7ea4a66b04..3dac827ed9 100644 --- a/Asset/data/asset/functions/object/1108.waterfall/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1108.waterfall/tick/damage.mcfunction @@ -22,7 +22,7 @@ data modify storage api: Argument.ElementType set value "Water" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..3] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..3] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/boom.mcfunction b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/boom.mcfunction index be3c3a8b9d..4c371ad9b6 100644 --- a/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/boom.mcfunction +++ b/Asset/data/asset/functions/object/1110.heavy_lava_bomb/tick/boom.mcfunction @@ -22,7 +22,7 @@ data modify storage api: Argument.ElementType set value "Fire" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..5] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1111.archer_fish/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1111.archer_fish/detect_hit_entity/.mcfunction index 50049ee05b..14f36c0672 100644 --- a/Asset/data/asset/functions/object/1111.archer_fish/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1111.archer_fish/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1111/detect_hit_entity # 判定 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1111.archer_fish/kill/.mcfunction b/Asset/data/asset/functions/object/1111.archer_fish/kill/.mcfunction index d263527c80..0d6146c318 100644 --- a/Asset/data/asset/functions/object/1111.archer_fish/kill/.mcfunction +++ b/Asset/data/asset/functions/object/1111.archer_fish/kill/.mcfunction @@ -13,7 +13,7 @@ particle dust 0.365 0.733 1 1.2 ^ ^-0.3 ^ 0.3 0.3 0.3 0 10 normal @a playsound minecraft:entity.player.splash.high_speed neutral @a ~ ~ ~ 0.3 2 -# ダメージ　 +# ダメージ # サケクリティカルならダメージ2倍 data modify storage api: Argument.Damage set from storage asset:context this.Damage execute if data storage asset:context this{SalmonCrit:true} store result storage api: Argument.Damage float 2 run data get storage api: Argument.Damage @@ -22,7 +22,7 @@ data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1116.ember_object/tick/damage.mcfunction b/Asset/data/asset/functions/object/1116.ember_object/tick/damage.mcfunction index 0739409f53..e99ace1f11 100644 --- a/Asset/data/asset/functions/object/1116.ember_object/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1116.ember_object/tick/damage.mcfunction @@ -25,7 +25,7 @@ data modify storage api: Argument.AttackType set value "Magic" data modify storage api: Argument.ElementType set value "Fire" execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..6] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..6] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1126.freeze_trap/tick/boom.mcfunction b/Asset/data/asset/functions/object/1126.freeze_trap/tick/boom.mcfunction index bbf04b6f39..b20d097cce 100644 --- a/Asset/data/asset/functions/object/1126.freeze_trap/tick/boom.mcfunction +++ b/Asset/data/asset/functions/object/1126.freeze_trap/tick/boom.mcfunction @@ -28,7 +28,7 @@ playsound ogg:mob.breeze.deflect3 neutral @a ~ ~ ~ 1.3 0.9 # 鈍足 - effect give @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..4] slowness 3 2 true + effect give @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] slowness 3 2 true # ダメージ data modify storage api: Argument.Damage set from storage asset:context this.Damage @@ -36,7 +36,7 @@ data modify storage api: Argument.ElementType set value "Water" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..4] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1131.red_knight_slash_shot/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1131.red_knight_slash_shot/detect_hit_entity/.mcfunction index 10e16cc475..9f3a67643d 100644 --- a/Asset/data/asset/functions/object/1131.red_knight_slash_shot/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1131.red_knight_slash_shot/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within function asset:object/alias/1131/detect_hit_entity # 判定 - execute positioned ~-0.75 ~-0.75 ~-0.75 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.75 ~-0.75 ~-0.75 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1131.red_knight_slash_shot/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1131.red_knight_slash_shot/hit_entity/.mcfunction index 6a026fbe31..42458d432f 100644 --- a/Asset/data/asset/functions/object/1131.red_knight_slash_shot/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1131.red_knight_slash_shot/hit_entity/.mcfunction @@ -28,9 +28,9 @@ execute as @p[tag=1131.Player,distance=..64] run function api:damage/modifier # 多重ヒット防止判定部分でタグを付与した対象にダメージを与える - execute positioned ~-0.75 ~-0.75 ~-0.75 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5] run function asset:object/1131.red_knight_slash_shot/hit_entity/damage + execute positioned ~-0.75 ~-0.75 ~-0.75 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0.5,dy=0.5,dz=0.5] run function asset:object/1131.red_knight_slash_shot/hit_entity/damage # リセット function api:damage/reset tag @p[tag=1131.Player,distance=..64] remove 1131.Player - #tag @e[type=#lib:living,tag=Enemy,tag=1131.TargetEntity,distance=..16] remove 1131.TargetEntity + #tag @e[type=#lib:living_without_player,tag=Enemy,tag=1131.TargetEntity,distance=..16] remove 1131.TargetEntity diff --git a/Asset/data/asset/functions/object/1132.red_knight_zenith_slash/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1132.red_knight_zenith_slash/detect_hit_entity/.mcfunction index d9b8983e9b..d5a89eb1d8 100644 --- a/Asset/data/asset/functions/object/1132.red_knight_zenith_slash/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1132.red_knight_zenith_slash/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within function asset:object/alias/1132/detect_hit_entity # ヒット判定 - execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true + execute positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,limit=1] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1132.red_knight_zenith_slash/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1132.red_knight_zenith_slash/hit_entity/.mcfunction index 3b679b8540..9e66a618c2 100644 --- a/Asset/data/asset/functions/object/1132.red_knight_zenith_slash/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1132.red_knight_zenith_slash/hit_entity/.mcfunction @@ -32,7 +32,7 @@ execute as @p[tag=1132.Player,distance=..64] run function api:damage/modifier # ダメージ実行 - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run function api:damage/ # リセット function api:damage/reset diff --git a/Asset/data/asset/functions/object/1132.red_knight_zenith_slash/init/visual_laser/length_decison_recursive.mcfunction b/Asset/data/asset/functions/object/1132.red_knight_zenith_slash/init/visual_laser/length_decison_recursive.mcfunction index 25c9261e4f..3fc9d8ae2b 100644 --- a/Asset/data/asset/functions/object/1132.red_knight_zenith_slash/init/visual_laser/length_decison_recursive.mcfunction +++ b/Asset/data/asset/functions/object/1132.red_knight_zenith_slash/init/visual_laser/length_decison_recursive.mcfunction @@ -10,4 +10,4 @@ scoreboard players add @s Temporary 1 # 壁がなかったり、対象にあたったりしなければ再帰 - execute if entity @s[distance=..25] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:object/1132.red_knight_zenith_slash/init/visual_laser/length_decison_recursive + execute if entity @s[distance=..25] positioned ~-0.5 ~-0.5 ~-0.5 unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] positioned ~0.5 ~0.5 ~0.5 positioned ^ ^ ^1 if block ~ ~ ~ #lib:no_collision run function asset:object/1132.red_knight_zenith_slash/init/visual_laser/length_decison_recursive diff --git a/Asset/data/asset/functions/object/1136.thor_thunder/tick/damage.mcfunction b/Asset/data/asset/functions/object/1136.thor_thunder/tick/damage.mcfunction index 95371e748e..123d7f57cc 100644 --- a/Asset/data/asset/functions/object/1136.thor_thunder/tick/damage.mcfunction +++ b/Asset/data/asset/functions/object/1136.thor_thunder/tick/damage.mcfunction @@ -21,7 +21,7 @@ data modify storage api: Argument.ElementType set value "Thunder" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..2.5] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..2.5] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1141.big_water_balloon/hit/.mcfunction b/Asset/data/asset/functions/object/1141.big_water_balloon/hit/.mcfunction index 4eefe9bf71..5d121e03d4 100644 --- a/Asset/data/asset/functions/object/1141.big_water_balloon/hit/.mcfunction +++ b/Asset/data/asset/functions/object/1141.big_water_balloon/hit/.mcfunction @@ -33,8 +33,8 @@ execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier # 直撃したやつと、着弾地点の位置の範囲内にタグを付与 - execute positioned ~-1 ~-1 ~-1 run tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=1,dy=1,dz=1] add Hit - tag @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..4] add Hit + execute positioned ~-1 ~-1 ~-1 run tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=1,dy=1,dz=1] add Hit + tag @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..4] add Hit # タグを与えた対象にダメージを与える execute as @e[type=#lib:living,tag=Hit,distance=..16] run function api:damage/ diff --git a/Asset/data/asset/functions/object/1142.raging_passion_pickaxe/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1142.raging_passion_pickaxe/detect_hit_entity/.mcfunction index 4df6690a22..cc61e294a8 100644 --- a/Asset/data/asset/functions/object/1142.raging_passion_pickaxe/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1142.raging_passion_pickaxe/detect_hit_entity/.mcfunction @@ -5,4 +5,4 @@ # @within asset:object/alias/1142/detect_hit_entity # Tagがある時のみに判定 - execute if entity @s[tag=1142.Damage] positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true + execute if entity @s[tag=1142.Damage] positioned ~-0.5 ~-0.5 ~-0.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0] run data modify storage asset:context IsHitEntity set value true diff --git a/Asset/data/asset/functions/object/1142.raging_passion_pickaxe/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1142.raging_passion_pickaxe/hit_entity/.mcfunction index 57fbe13f97..d0f9859a30 100644 --- a/Asset/data/asset/functions/object/1142.raging_passion_pickaxe/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1142.raging_passion_pickaxe/hit_entity/.mcfunction @@ -15,7 +15,7 @@ data modify storage api: Argument.AdditionalMPHeal set from storage asset:context this.AdditionalMPHeal execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,tag=Enemy,tag=!ExtendedCollision,tag=!Uninterferable,dx=0] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!ExtendedCollision,tag=!Uninterferable,dx=0] run function api:damage/ function api:damage/reset # ダメージ execute store result storage api: Argument.Damage double 0.009 run data get storage asset:context this.Damage 10 @@ -24,7 +24,7 @@ execute store result storage api: Argument.AdditionalMPHeal double 0.009 run data get storage asset:context this.AdditionalMPHeal 10 execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,tag=Enemy,tag= ExtendedCollision,tag=!Uninterferable,dx=0] run function api:damage/ + execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living_without_player,tag=Enemy,tag= ExtendedCollision,tag=!Uninterferable,dx=0] run function api:damage/ function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1143.arrow_of_hekireki/kill/object_summon.mcfunction b/Asset/data/asset/functions/object/1143.arrow_of_hekireki/kill/object_summon.mcfunction index 5d903fb016..b2d7f15223 100644 --- a/Asset/data/asset/functions/object/1143.arrow_of_hekireki/kill/object_summon.mcfunction +++ b/Asset/data/asset/functions/object/1143.arrow_of_hekireki/kill/object_summon.mcfunction @@ -11,5 +11,5 @@ data modify storage api: Argument.FieldOverride.DuplicateHitProtectForNonPlayer set from storage asset:context this.DuplicateHitProtectForNonPlayer # 近くに敵がいるか否かで召喚位置を変える - execute positioned ~-0.5 ~-0.5 ~-0.5 unless entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] at @s positioned ~ ~0.2 ~ run function api:object/summon - execute positioned ~-0.5 ~-0.5 ~-0.5 positioned as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] positioned ~ ~0.2 ~ run function api:object/summon + execute positioned ~-0.5 ~-0.5 ~-0.5 unless entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] at @s positioned ~ ~0.2 ~ run function api:object/summon + execute positioned ~-0.5 ~-0.5 ~-0.5 positioned as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=0,sort=random,limit=1] positioned ~ ~0.2 ~ run function api:object/summon diff --git a/Asset/data/asset/functions/object/1144.hekireki_thunder/tick/thunder.mcfunction b/Asset/data/asset/functions/object/1144.hekireki_thunder/tick/thunder.mcfunction index ef939c1c7f..0cc963132a 100644 --- a/Asset/data/asset/functions/object/1144.hekireki_thunder/tick/thunder.mcfunction +++ b/Asset/data/asset/functions/object/1144.hekireki_thunder/tick/thunder.mcfunction @@ -22,7 +22,7 @@ data modify storage api: Argument.ElementType set value "Thunder" execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..3.5] run function asset:object/1144.hekireki_thunder/tick/check_duplicate + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..3.5] run function asset:object/1144.hekireki_thunder/tick/check_duplicate function api:damage/reset # リセット diff --git a/Asset/data/asset/functions/object/1145.throwing_ark/detect_hit_entity/.mcfunction b/Asset/data/asset/functions/object/1145.throwing_ark/detect_hit_entity/.mcfunction index 177cc90bb6..6a3e68fd00 100644 --- a/Asset/data/asset/functions/object/1145.throwing_ark/detect_hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1145.throwing_ark/detect_hit_entity/.mcfunction @@ -12,6 +12,6 @@ scoreboard players operation $Interval Temporary = @s General.Object.Tick # 数Tickおきに実行 scoreboard players operation $Interval Temporary %= $2 Const - execute if score $Interval Temporary matches 0 positioned ~-1.5 ~-1.5 ~-1.5 if entity @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=2,dy=2,dz=2] run data modify storage asset:context IsHitEntity set value true + execute if score $Interval Temporary matches 0 positioned ~-1.5 ~-1.5 ~-1.5 if entity @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=2,dy=2,dz=2] run data modify storage asset:context IsHitEntity set value true # リセット scoreboard players reset $Interval Temporary diff --git a/Asset/data/asset/functions/object/1145.throwing_ark/hit_entity/.mcfunction b/Asset/data/asset/functions/object/1145.throwing_ark/hit_entity/.mcfunction index 8122bd3b6f..0a75a68f70 100644 --- a/Asset/data/asset/functions/object/1145.throwing_ark/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/1145.throwing_ark/hit_entity/.mcfunction @@ -17,7 +17,7 @@ execute store result score $UserID Temporary run data get storage asset:context this.UserID execute as @a if score @s UserID = $UserID Temporary run function api:damage/modifier # ダメージ実行 - execute positioned ~-1.5 ~-1.5 ~-1.5 as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,dx=2,dy=2,dz=2] run function api:damage/ + execute positioned ~-1.5 ~-1.5 ~-1.5 as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,dx=2,dy=2,dz=2] run function api:damage/ # リセット function api:damage/reset scoreboard players reset $UserID Temporary diff --git a/Asset/data/asset/functions/object/2087.patriot/hit_entity/.mcfunction b/Asset/data/asset/functions/object/2087.patriot/hit_entity/.mcfunction index 8a1adf4ecc..4a4b163dcd 100644 --- a/Asset/data/asset/functions/object/2087.patriot/hit_entity/.mcfunction +++ b/Asset/data/asset/functions/object/2087.patriot/hit_entity/.mcfunction @@ -5,13 +5,13 @@ # @within asset:object/alias/2087/hit_entity # 割合ダメージ - execute as @e[type=#lib:living,tag=Enemy.Boss,distance=..8,sort=nearest,limit=1] run function api:mob/get_max_health + execute as @e[type=#lib:living_without_player,tag=Enemy.Boss,distance=..8,sort=nearest,limit=1] run function api:mob/get_max_health execute store result storage api: Argument.Damage float 0.03 run data get storage api: Return.MaxHealth 1 data modify storage api: Argument.AttackType set value "Physical" data modify storage api: Argument.ElementType set value "None" data modify storage api: Argument.FixedDamage set value true function api:damage/modifier - execute as @e[type=#lib:living,tag=Enemy,tag=!Uninterferable,distance=..7] run function api:damage/ + execute as @e[type=#lib:living_without_player,tag=Enemy,tag=!Uninterferable,distance=..7] run function api:damage/ function api:damage/reset # sound